From 4c2a3411f5a71c7d94fb71db826cb565ec5f065c Mon Sep 17 00:00:00 2001 From: Travis Nielsen Date: Tue, 20 Aug 2024 13:58:58 -0600 Subject: [PATCH 1/2] build: update the release version to v1.15.0 For the minor release update the documentation and manifests to v1.15.0 Signed-off-by: Travis Nielsen --- Documentation/Getting-Started/quickstart.md | 2 +- .../Storage-Configuration/Monitoring/ceph-monitoring.md | 2 +- Documentation/Upgrade/rook-upgrade.md | 4 ++-- deploy/charts/rook-ceph/values.yaml | 2 +- deploy/examples/direct-mount.yaml | 2 +- deploy/examples/images.txt | 2 +- deploy/examples/operator-openshift.yaml | 2 +- deploy/examples/operator.yaml | 2 +- deploy/examples/osd-purge.yaml | 2 +- deploy/examples/toolbox-job.yaml | 4 ++-- deploy/examples/toolbox-operator-image.yaml | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Documentation/Getting-Started/quickstart.md b/Documentation/Getting-Started/quickstart.md index 9f46625b4e9c..3f0080582212 100644 --- a/Documentation/Getting-Started/quickstart.md +++ b/Documentation/Getting-Started/quickstart.md @@ -36,7 +36,7 @@ To configure the Ceph storage cluster, at least one of these local storage optio A simple Rook cluster is created for Kubernetes with the following `kubectl` commands and [example manifests](https://github.com/rook/rook/blob/master/deploy/examples). ```console -$ git clone --single-branch --branch v1.15.0-beta.0 https://github.com/rook/rook.git +$ git clone --single-branch --branch v1.15.0 https://github.com/rook/rook.git cd rook/deploy/examples kubectl create -f crds.yaml -f common.yaml -f operator.yaml kubectl create -f cluster.yaml diff --git a/Documentation/Storage-Configuration/Monitoring/ceph-monitoring.md b/Documentation/Storage-Configuration/Monitoring/ceph-monitoring.md index 9202928cd0d3..8c47fa553849 100644 --- a/Documentation/Storage-Configuration/Monitoring/ceph-monitoring.md +++ b/Documentation/Storage-Configuration/Monitoring/ceph-monitoring.md @@ -48,7 +48,7 @@ There are two sources for metrics collection: From the root of your locally cloned Rook repo, go the monitoring directory: ```console -$ git clone --single-branch --branch v1.15.0-beta.0 https://github.com/rook/rook.git +$ git clone --single-branch --branch v1.15.0 https://github.com/rook/rook.git cd rook/deploy/examples/monitoring ``` diff --git a/Documentation/Upgrade/rook-upgrade.md b/Documentation/Upgrade/rook-upgrade.md index 983898cee45d..afdc430edb23 100644 --- a/Documentation/Upgrade/rook-upgrade.md +++ b/Documentation/Upgrade/rook-upgrade.md @@ -162,7 +162,7 @@ by the Operator. Also update the Custom Resource Definitions (CRDs). Get the latest common resources manifests that contain the latest changes. ```console -git clone --single-branch --depth=1 --branch v1.15.0-beta.0 https://github.com/rook/rook.git +git clone --single-branch --depth=1 --branch v1.15.0 https://github.com/rook/rook.git cd rook/deploy/examples ``` @@ -201,7 +201,7 @@ The largest portion of the upgrade is triggered when the operator's image is upd When the operator is updated, it will proceed to update all of the Ceph daemons. ```console -kubectl -n $ROOK_OPERATOR_NAMESPACE set image deploy/rook-ceph-operator rook-ceph-operator=rook/ceph:v1.15.0-beta.0 +kubectl -n $ROOK_OPERATOR_NAMESPACE set image deploy/rook-ceph-operator rook-ceph-operator=rook/ceph:v1.15.0 ``` ### **3. Update Ceph CSI** diff --git a/deploy/charts/rook-ceph/values.yaml b/deploy/charts/rook-ceph/values.yaml index afb94c739488..66480c6de22d 100644 --- a/deploy/charts/rook-ceph/values.yaml +++ b/deploy/charts/rook-ceph/values.yaml @@ -7,7 +7,7 @@ image: repository: docker.io/rook/ceph # -- Image tag # @default -- `master` - tag: v1.15.0-beta.0 + tag: v1.15.0 # -- Image pull policy pullPolicy: IfNotPresent diff --git a/deploy/examples/direct-mount.yaml b/deploy/examples/direct-mount.yaml index 47818d0209f1..5ab8844009b5 100644 --- a/deploy/examples/direct-mount.yaml +++ b/deploy/examples/direct-mount.yaml @@ -19,7 +19,7 @@ spec: serviceAccountName: rook-ceph-default containers: - name: rook-direct-mount - image: docker.io/rook/ceph:v1.15.0-beta.0 + image: docker.io/rook/ceph:v1.15.0 command: ["/bin/bash"] args: ["-m", "-c", "/usr/local/bin/toolbox.sh"] imagePullPolicy: IfNotPresent diff --git a/deploy/examples/images.txt b/deploy/examples/images.txt index d58c06ec1ce8..b4f1817738ce 100644 --- a/deploy/examples/images.txt +++ b/deploy/examples/images.txt @@ -1,4 +1,4 @@ - docker.io/rook/ceph:v1.15.0-beta.0 + docker.io/rook/ceph:v1.15.0 gcr.io/k8s-staging-sig-storage/objectstorage-sidecar:v20240513-v0.1.0-35-gefb3255 quay.io/ceph/ceph:v18.2.4 quay.io/ceph/cosi:v0.1.2 diff --git a/deploy/examples/operator-openshift.yaml b/deploy/examples/operator-openshift.yaml index ff1730f8e007..45dd395d1a8e 100644 --- a/deploy/examples/operator-openshift.yaml +++ b/deploy/examples/operator-openshift.yaml @@ -673,7 +673,7 @@ spec: serviceAccountName: rook-ceph-system containers: - name: rook-ceph-operator - image: docker.io/rook/ceph:v1.15.0-beta.0 + image: docker.io/rook/ceph:v1.15.0 args: ["ceph", "operator"] securityContext: runAsNonRoot: true diff --git a/deploy/examples/operator.yaml b/deploy/examples/operator.yaml index b2629baf9bc6..2cd6fea8d990 100644 --- a/deploy/examples/operator.yaml +++ b/deploy/examples/operator.yaml @@ -602,7 +602,7 @@ spec: serviceAccountName: rook-ceph-system containers: - name: rook-ceph-operator - image: docker.io/rook/ceph:v1.15.0-beta.0 + image: docker.io/rook/ceph:v1.15.0 args: ["ceph", "operator"] securityContext: runAsNonRoot: true diff --git a/deploy/examples/osd-purge.yaml b/deploy/examples/osd-purge.yaml index 4d3d5553648a..c6d901de696f 100644 --- a/deploy/examples/osd-purge.yaml +++ b/deploy/examples/osd-purge.yaml @@ -28,7 +28,7 @@ spec: serviceAccountName: rook-ceph-purge-osd containers: - name: osd-removal - image: docker.io/rook/ceph:v1.15.0-beta.0 + image: docker.io/rook/ceph:v1.15.0 # TODO: Insert the OSD ID in the last parameter that is to be removed # The OSD IDs are a comma-separated list. For example: "0" or "0,2". # If you want to preserve the OSD PVCs, set `--preserve-pvc true`. diff --git a/deploy/examples/toolbox-job.yaml b/deploy/examples/toolbox-job.yaml index a8021c41f443..c9cd1eb291af 100644 --- a/deploy/examples/toolbox-job.yaml +++ b/deploy/examples/toolbox-job.yaml @@ -10,7 +10,7 @@ spec: spec: initContainers: - name: config-init - image: docker.io/rook/ceph:v1.15.0-beta.0 + image: docker.io/rook/ceph:v1.15.0 command: ["/usr/local/bin/toolbox.sh"] args: ["--skip-watch"] imagePullPolicy: IfNotPresent @@ -29,7 +29,7 @@ spec: mountPath: /var/lib/rook-ceph-mon containers: - name: script - image: docker.io/rook/ceph:v1.15.0-beta.0 + image: docker.io/rook/ceph:v1.15.0 volumeMounts: - mountPath: /etc/ceph name: ceph-config diff --git a/deploy/examples/toolbox-operator-image.yaml b/deploy/examples/toolbox-operator-image.yaml index dd3f5410e6c8..24a8b2f86a43 100644 --- a/deploy/examples/toolbox-operator-image.yaml +++ b/deploy/examples/toolbox-operator-image.yaml @@ -25,7 +25,7 @@ spec: serviceAccountName: rook-ceph-default containers: - name: rook-ceph-tools-operator-image - image: docker.io/rook/ceph:v1.15.0-beta.0 + image: docker.io/rook/ceph:v1.15.0 command: - /bin/bash - -c From 3045076db8eeda24300ac3192e241fdf162671c3 Mon Sep 17 00:00:00 2001 From: Travis Nielsen Date: Tue, 20 Aug 2024 14:26:56 -0600 Subject: [PATCH 2/2] build: generate the local build tag with docker io The docker.io image prefix is expected to be prepended to the image names in the test images. This was missed in 14550 related to some CI tests, which was now causing the CI failures in the 1.15 branch where the search and replace was missing the new docker.io prefix. Signed-off-by: Travis Nielsen --- tests/framework/installer/settings.go | 4 ++-- tests/integration/ceph_upgrade_test.go | 2 +- tests/scripts/github-action-helper.sh | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/framework/installer/settings.go b/tests/framework/installer/settings.go index 7cea682b0737..145db3b7741f 100644 --- a/tests/framework/installer/settings.go +++ b/tests/framework/installer/settings.go @@ -26,7 +26,7 @@ import ( "github.com/rook/rook/tests/framework/utils" ) -var imageMatch = regexp.MustCompile(`image: rook\/ceph:[a-z0-9.-]+`) +var imageMatch = regexp.MustCompile(`image: docker.io/rook\/ceph:[a-z0-9.-]+`) func readManifest(filename string) string { rootDir, err := utils.FindRookRoot() @@ -39,7 +39,7 @@ func readManifest(filename string) string { if err != nil { panic(errors.Wrapf(err, "failed to read manifest at %s", manifest)) } - return imageMatch.ReplaceAllString(string(contents), "image: rook/ceph:"+LocalBuildTag) + return imageMatch.ReplaceAllString(string(contents), "image: docker.io/rook/ceph:"+LocalBuildTag) } func buildURL(rookVersion, filename string) string { diff --git a/tests/integration/ceph_upgrade_test.go b/tests/integration/ceph_upgrade_test.go index e7dcb1c0f8cc..a31184e959de 100644 --- a/tests/integration/ceph_upgrade_test.go +++ b/tests/integration/ceph_upgrade_test.go @@ -380,7 +380,7 @@ func (s *UpgradeSuite) verifyOperatorImage(expectedImage string) { // verify that the operator spec is updated version, err := k8sutil.GetDeploymentImage(context.TODO(), s.k8sh.Clientset, systemNamespace, operatorContainer, operatorContainer) assert.NoError(s.T(), err) - assert.Contains(s.T(), version, "rook/ceph:"+expectedImage) + assert.Contains(s.T(), "docker.io/rook/ceph:"+expectedImage, version) } func (s *UpgradeSuite) verifyRookUpgrade(numOSDs int) { diff --git a/tests/scripts/github-action-helper.sh b/tests/scripts/github-action-helper.sh index 6159d09d4795..cd10c8bb1a14 100755 --- a/tests/scripts/github-action-helper.sh +++ b/tests/scripts/github-action-helper.sh @@ -204,7 +204,7 @@ function build_rook() { tests/scripts/validate_modified_files.sh build docker images if [[ "$build_type" == "build" ]]; then - docker tag "$(docker images | awk '/build-/ {print $1}')" rook/ceph:local-build + docker tag "$(docker images | awk '/build-/ {print $1}')" docker.io/rook/ceph:local-build fi } @@ -246,7 +246,7 @@ function create_cluster_prerequisites() { function deploy_manifest_with_local_build() { sed -i 's/.*ROOK_CSI_ENABLE_NFS:.*/ ROOK_CSI_ENABLE_NFS: \"true\"/g' $1 if [[ "$USE_LOCAL_BUILD" != "false" ]]; then - sed -i "s|image: rook/ceph:.*|image: rook/ceph:local-build|g" $1 + sed -i "s|image: docker.io/rook/ceph:.*|image: docker.io/rook/ceph:local-build|g" $1 fi if [[ "$ALLOW_LOOP_DEVICES" = "true" ]]; then sed -i "s|ROOK_CEPH_ALLOW_LOOP_DEVICES: \"false\"|ROOK_CEPH_ALLOW_LOOP_DEVICES: \"true\"|g" $1 @@ -640,7 +640,7 @@ function test_multus_connections() { function create_operator_toolbox() { cd deploy/examples - sed -i "s|image: rook/ceph:.*|image: rook/ceph:local-build|g" toolbox-operator-image.yaml + sed -i "s|image: docker.io/rook/ceph:.*|image: docker.io/rook/ceph:local-build|g" toolbox-operator-image.yaml kubectl create -f toolbox-operator-image.yaml }