Fix the auto prune PVC featuregate enabled (#1065)

cockroachdb · Nov 8, 2024 · 6b957dd · 6b957dd
1 parent 00598c2
commit 6b957dd
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 0 deletions.
diff --git a/config/manager/patches/image.yaml b/config/manager/patches/image.yaml
@@ -312,6 +312,8 @@ spec:
               value: cockroachdb/cockroach:v23.2.12
             - name: RELATED_IMAGE_COCKROACH_v23_2_13
               value: cockroachdb/cockroach:v23.2.13
+            - name: RELATED_IMAGE_COCKROACH_v23_2_14
+              value: cockroachdb/cockroach:v23.2.14
             - name: RELATED_IMAGE_COCKROACH_v24_1_0
               value: cockroachdb/cockroach:v24.1.0
             - name: RELATED_IMAGE_COCKROACH_v24_1_1

diff --git a/config/manifests/bases/cockroach-operator.clusterserviceversion.yaml b/config/manifests/bases/cockroach-operator.clusterserviceversion.yaml
@@ -485,6 +485,8 @@ spec:
     name: RELATED_IMAGE_COCKROACH_v23_2_12
   - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:e0f21abea34825e55622c432a306f2e8aafd64d913eb78f2f601c51dc878a1da
     name: RELATED_IMAGE_COCKROACH_v23_2_13
+  - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:6366ba29f301a82215c05e60d78e1de66bcee85440ce2fc3c692712d4da32685
+    name: RELATED_IMAGE_COCKROACH_v23_2_14
   - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:5240f9f591263569fad7ee934e81fa8a1617de3c25da94ddd59ee5b2b3407f90
     name: RELATED_IMAGE_COCKROACH_v24_1_0
   - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:1374cbdc4ecf38e4b4226328f532e830b8932b34d9449bf2fbb36e60d0310521

diff --git a/config/manifests/patches/deployment_patch.yaml b/config/manifests/patches/deployment_patch.yaml
@@ -321,6 +321,8 @@ spec:
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:a0faa52a999289b308dc4caf050c6d9fe2f42e112aa30e4af282ed1f21c5c346
             - name: RELATED_IMAGE_COCKROACH_v23_2_13
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:e0f21abea34825e55622c432a306f2e8aafd64d913eb78f2f601c51dc878a1da
+            - name: RELATED_IMAGE_COCKROACH_v23_2_14
+              value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:6366ba29f301a82215c05e60d78e1de66bcee85440ce2fc3c692712d4da32685
             - name: RELATED_IMAGE_COCKROACH_v24_1_0
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:5240f9f591263569fad7ee934e81fa8a1617de3c25da94ddd59ee5b2b3407f90
             - name: RELATED_IMAGE_COCKROACH_v24_1_1

diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -150,6 +150,7 @@ rules:
   verbs:
   - list
   - update
+  - delete
 - apiGroups:
   - ""
   resources:

diff --git a/crdb-versions.yaml b/crdb-versions.yaml
@@ -451,6 +451,9 @@ CrdbVersions:
 - image: cockroachdb/cockroach:v23.2.13
   redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:e0f21abea34825e55622c432a306f2e8aafd64d913eb78f2f601c51dc878a1da
   tag: v23.2.13
+- image: cockroachdb/cockroach:v23.2.14
+  redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:6366ba29f301a82215c05e60d78e1de66bcee85440ce2fc3c692712d4da32685
+  tag: v23.2.14
 - image: cockroachdb/cockroach:v24.1.0
   redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:5240f9f591263569fad7ee934e81fa8a1617de3c25da94ddd59ee5b2b3407f90
   tag: v24.1.0

diff --git a/install/operator.yaml b/install/operator.yaml
@@ -163,6 +163,7 @@ rules:
   verbs:
   - list
   - update
+  - delete
 - apiGroups:
   - ""
   resources:
@@ -670,6 +671,8 @@ spec:
           value: cockroachdb/cockroach:v23.2.12
         - name: RELATED_IMAGE_COCKROACH_v23_2_13
           value: cockroachdb/cockroach:v23.2.13
+        - name: RELATED_IMAGE_COCKROACH_v23_2_14
+          value: cockroachdb/cockroach:v23.2.14
         - name: RELATED_IMAGE_COCKROACH_v24_1_0
           value: cockroachdb/cockroach:v24.1.0
         - name: RELATED_IMAGE_COCKROACH_v24_1_1
-Original file line number
+Diff line change
@@ Expand Up / @@ -150,6 +150,7 @@ rules: @@
       verbs:
       - list
       - update
+      - delete
     - apiGroups:
       - ""
       resources:
@@ Expand Down @@