From 04281bb2ec8a98122398e3a081592ed21f325acd Mon Sep 17 00:00:00 2001 From: subhamkrai Date: Wed, 27 Mar 2024 21:33:05 +0530 Subject: [PATCH 1/3] csv: update csv version to 4.16 updating csv version to 4.16 from 4.15 Signed-off-by: subhamkrai --- build/common.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build/common.sh b/build/common.sh index 24393b67c7a6..2fa9ba2b1f10 100644 --- a/build/common.sh +++ b/build/common.sh @@ -14,13 +14,13 @@ 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 @@ -28,7 +28,7 @@ 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:-""}" @@ -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() { @@ -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 From ffce4ba86ec5bd617179d2391b9fa5b0040da353 Mon Sep 17 00:00:00 2001 From: subhamkrai Date: Wed, 27 Mar 2024 21:33:41 +0530 Subject: [PATCH 2/3] ci: add csv as new commit title adding `csv` as new commit title for csv related changes. Signed-off-by: subhamkrai --- .commitlintrc.json | 1 + 1 file changed, 1 insertion(+) diff --git a/.commitlintrc.json b/.commitlintrc.json index 95c8309b1dd6..38bf3cfd1cbb 100644 --- a/.commitlintrc.json +++ b/.commitlintrc.json @@ -15,6 +15,7 @@ "core", "cosi", "csi", + "csv", "doc", "docs", "exporter", From 3dc15909e7cc211a97706c6e7190aa4522a83487 Mon Sep 17 00:00:00 2001 From: subhamkrai Date: Thu, 28 Mar 2024 13:07:35 +0530 Subject: [PATCH 3/3] csv: these are auto generated changes these are auto generated changes Signed-off-by: subhamkrai --- build/csv/ceph/rook-ceph-operator.clusterserviceversion.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/csv/ceph/rook-ceph-operator.clusterserviceversion.yaml b/build/csv/ceph/rook-ceph-operator.clusterserviceversion.yaml index 7ee310336b33..13e1e21e0ae8 100644 --- a/build/csv/ceph/rook-ceph-operator.clusterserviceversion.yaml +++ b/build/csv/ceph/rook-ceph-operator.clusterserviceversion.yaml @@ -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: {} @@ -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