Merge pull request rook#14615 from travisn/release-1.15.0

build: Update the release version to v1.15.0
denppa · Aug 20, 2024 · 5b3fa88 · 5b3fa88
2 parents ed90a3e + 3045076
commit 5b3fa88
Show file tree

Hide file tree

Showing 14 changed files with 19 additions and 19 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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

diff --git 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
@@ -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
@@ -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
 }