Skip to content

Commit

Permalink
Merge pull request #610 from openshift-cherrypick-robot/cherry-pick-6…
Browse files Browse the repository at this point in the history
…06-to-release-4.16

[release-4.16] csv: update csv version to 4.16
  • Loading branch information
subhamkrai committed Mar 29, 2024
2 parents 7b19ad3 + 3dc1590 commit e971ea4
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
1 change: 1 addition & 0 deletions .commitlintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"core",
"cosi",
"csi",
"csv",
"doc",
"docs",
"exporter",
Expand Down
12 changes: 6 additions & 6 deletions build/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,21 @@ set -u
# See the License for the specific language governing permissions and
# limitations under the License.

BUILD_ROOT=$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd -P)
BUILD_ROOT=$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd -P)
SHA256CMD=${SHA256CMD:-shasum -a 256}

DOCKERCMD=${DOCKERCMD:-docker}

export scriptdir
scriptdir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
scriptdir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
export OUTPUT_DIR=${BUILD_ROOT}/_output
export WORK_DIR=${BUILD_ROOT}/.work
export CACHE_DIR=${BUILD_ROOT}/.cache
export GOOS
GOOS=$(go env GOOS)
export GOARCH
GOARCH=$(go env GOARCH)
DEFAULT_CSV_VERSION="4.15.0"
DEFAULT_CSV_VERSION="4.16.0"
CSV_VERSION="${CSV_VERSION:-${DEFAULT_CSV_VERSION}}"
SKIP_RANGE="${SKIP_RANGE:-""}"
REPLACES_CSV_VERSION="${REPLACES_CSV_VERSION:-""}"
Expand All @@ -39,12 +39,12 @@ BUNDLE_IMAGE="${BUNDLE_IMAGE:-${DEFAULT_BUNDLE_IMAGE}}"

function ver() {
local full_ver maj min bug build
full_ver="$1" # functions should name input params for easier understanding
full_ver="$1" # functions should name input params for easier understanding
maj="$(echo "${full_ver}" | cut -f1 -d'.')" # when splitting a param, name the components for easier understanding
min="$(echo "${full_ver}" | cut -f2 -d'.')"
bug="$(echo "${full_ver}" | cut -f3 -d'.')"
build="$(echo "${full_ver}" | cut -f4 -d'.')"
printf "%d%03d%03d%03d" "${maj}" "${min}" "${bug}" "${build}"
printf "%d%03d%03d%03d" "${maj}" "${min}" "${bug}" "${build}"
}

function check_git() {
Expand All @@ -54,7 +54,7 @@ function check_git() {
local gitversion
gitversion=$(git --version | cut -d" " -f3)

if (( $(ver "${gitversion}") > $(ver 2.6.6) && $(ver "${gitversion}") < $(ver 2.8.3) )); then
if (($(ver "${gitversion}") > $(ver 2.6.6) && $(ver "${gitversion}") < $(ver 2.8.3))); then
echo WARN: you are running git version "${gitversion}" which has a bug related to relative
echo WARN: submodule paths. Please consider upgrading to 2.8.3 or later
fi
Expand Down
4 changes: 2 additions & 2 deletions build/csv/ceph/rook-ceph-operator.clusterserviceversion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1860,7 +1860,7 @@ metadata:
OgogICAgICAgIHByaW50KGYiS2V5RXJyb3I6IHtrRXJyfSIpCiAgICBleGNlcHQgT1NFcnJvciBh
cyBvc0VycjoKICAgICAgICBwcmludChmIkVycm9yIHdoaWxlIHRyeWluZyB0byBvdXRwdXQgdGhl
IGRhdGE6IHtvc0Vycn0iKQogICAgZmluYWxseToKICAgICAgICByak9iai5zaHV0ZG93bigpCg==
name: rook-ceph-operator.v4.15.0
name: rook-ceph-operator.v4.16.0
namespace: placeholder
spec:
apiservicedefinitions: {}
Expand Down Expand Up @@ -3384,7 +3384,7 @@ spec:
provider:
name: Red Hat
url: https://www.redhat.com
version: 4.15.0
version: 4.16.0
minKubeVersion: 1.16.0
relatedImages:
- image: docker.io/rook/ceph:v1.13.0.399.g9c0d795e2
Expand Down

0 comments on commit e971ea4

Please sign in to comment.