Merge pull request #277 from RedisLabs/7.4.6-2

7.4.6-2
RedisLabs · Jul 26, 2024 · 2094768 · 2094768
2 parents a4b98af + daf2175
commit 2094768
Show file tree

Hide file tree

Showing 13 changed files with 149 additions and 149 deletions.
diff --git a/bundle.yaml b/bundle.yaml
@@ -15,18 +15,11 @@ rules:
       - serviceaccounts
       - rolebindings
     verbs:
-      - bind
-      - escalate
-      - impersonate
-      - userextras
       - create
       - get
-      - list
-      - watch
       - update
       - patch
       - delete
-      - deletecollection
   - apiGroups:
       - app.redislabs.com
     resources:
@@ -44,7 +37,6 @@ rules:
       - redisenterpriseactiveactivedatabases/finalizers
     verbs:
       - delete
-      - deletecollection
       - get
       - list
       - patch
@@ -58,17 +50,11 @@ rules:
     verbs:
       - update
       - get
-      - read
-      - list
-      - listallnamespaces
-      - watch
-      - watchlist
-      - watchlistallnamespaces
       - create
       - patch
-      - replace
       - delete
-      - deletecollection
+      - list
+      - watch
   - apiGroups:
       - ""
     resources:
@@ -93,11 +79,10 @@ rules:
     verbs:
       - create
       - delete
-      - deletecollection
       - get
-      - list
       - patch
       - update
+      - list
       - watch
   - apiGroups:
       - policy
@@ -118,8 +103,8 @@ rules:
       - delete
       - get
       - update
-      - list
       - watch
+      - list
   - apiGroups:
       - ""
     resources:
@@ -137,23 +122,23 @@ rules:
       - pods
     verbs:
       - get
-      - watch
       - list
       - update
       - patch
       - delete
+      - watch
   - apiGroups:
       - ""
     resources:
       - services
     verbs:
       - get
-      - watch
       - list
       - update
       - patch
       - create
       - delete
+      - watch
   - apiGroups:
       - policy
     resourceNames:
@@ -169,32 +154,24 @@ rules:
     verbs:
       - create
       - patch
-      - replace
       - delete
-      - deletecollection
-      - read
       - list
-      - listallnamespaces
-      - watch
-      - watchlist
-      - watchlistallnamespaces
-      - patchstatus
-      - readstatus
-      - replacestatus
       - update
+      - get
+      - watch
   - apiGroups:
       - networking.istio.io
     resources:
       - gateways
       - virtualservices
     verbs:
       - get
-      - watch
       - list
       - update
       - patch
       - create
       - delete
+      - watch
 ---
 ---
 apiVersion: rbac.authorization.k8s.io/v1
@@ -3930,6 +3907,21 @@ spec:
                   setting its value shall have no effect. Please view the corresponding
                   field in RS doc for more info.
                 type: boolean
+              backup:
+                description: Cluster-wide backup configurations
+                properties:
+                  s3:
+                    description: Configurations for backups to s3 and s3-compatible
+                      storage
+                    properties:
+                      caCertificateSecretName:
+                        description: Secret name that holds the S3 CA certificate, which contains the TLS certificate mapped to the key in the secret 'cert'
+                        type: string
+                      url:
+                        description: Specifies the URL for S3 export and import
+                        type: string
+                    type: object
+                type: object
               serviceAccountName:
                 description: Name of the service account to use
                 type: string
@@ -11196,6 +11188,16 @@ spec:
                 type: string
               resp3Default:
                 type: boolean
+              backup:
+                properties:
+                  s3:
+                    properties:
+                      caCertificateSecretName:
+                        type: string
+                      url:
+                        type: string
+                    type: object
+                type: object
               serviceAccountName:
                 type: string
               servicesRiggerSpec:
@@ -16530,7 +16532,7 @@ spec:
                       - name
                       type: object
                     redisVersion:
-                      description: Redis OSS version. 
+                      description: Redis OSS version.
                         Version can be specified via <major.minor> prefix,
                         or via channels - for existing databases - Upgrade
                         Redis OSS version. For new databases - the version which the
@@ -16719,7 +16721,7 @@ spec:
             - configMapRef:
                 name: "operator-environment-config"
                 optional: true
-          image: redislabs/operator:7.4.2-12
+          image: redislabs/operator:7.4.6-2
           imagePullPolicy: Always
           livenessProbe:
             failureThreshold: 3
@@ -16767,7 +16769,7 @@ spec:
             - configMapRef:
                 name: "operator-environment-config"
                 optional: true
-          image: redislabs/operator:7.4.2-12
+          image: redislabs/operator:7.4.6-2
           imagePullPolicy: Always
           livenessProbe:
             failureThreshold: 3

diff --git a/crds/reaadb_crd.yaml b/crds/reaadb_crd.yaml
@@ -619,7 +619,7 @@ spec:
                       - name
                       type: object
                     redisVersion:
-                      description: Redis OSS version. 
+                      description: Redis OSS version.
                         Version can be specified via <major.minor> prefix,
                         or via channels - for existing databases - Upgrade
                         Redis OSS version. For new databases - the version which the

diff --git a/crds/rec_crd.yaml b/crds/rec_crd.yaml
@@ -3694,6 +3694,21 @@ spec:
                   setting its value shall have no effect. Please view the corresponding
                   field in RS doc for more info.
                 type: boolean
+              backup:
+                description: Cluster-wide backup configurations
+                properties:
+                  s3:
+                    description: Configurations for backups to s3 and s3-compatible
+                      storage
+                    properties:
+                      caCertificateSecretName:
+                        description: Secret name that holds the S3 CA certificate, which contains the TLS certificate mapped to the key in the secret 'cert'
+                        type: string
+                      url:
+                        description: Specifies the URL for S3 export and import
+                        type: string
+                    type: object
+                type: object
               serviceAccountName:
                 description: Name of the service account to use
                 type: string
@@ -10960,6 +10975,16 @@ spec:
                 type: string
               resp3Default:
                 type: boolean
+              backup:
+                properties:
+                  s3:
+                    properties:
+                      caCertificateSecretName:
+                        type: string
+                      url:
+                        type: string
+                    type: object
+                type: object
               serviceAccountName:
                 type: string
               servicesRiggerSpec:

diff --git a/log_collector/log_collector.py b/log_collector/log_collector.py
@@ -37,7 +37,7 @@
 logger.setLevel(logging.INFO)
 LOGGER_FORMAT = '%(asctime)s - %(levelname)s - %(message)s'
 logging.basicConfig(format=LOGGER_FORMAT)
-VERSION_LOG_COLLECTOR = "7.4.2-12"
+VERSION_LOG_COLLECTOR = "7.4.6-2"
 
 TIME_FORMAT = time.strftime("%Y%m%d-%H%M%S")
 

diff --git a/multi-namespace-redb/operator.yaml b/multi-namespace-redb/operator.yaml
@@ -41,7 +41,7 @@ spec:
             - configMapRef:
                 name: "operator-environment-config"
                 optional: true
-          image: redislabs/operator:7.4.2-12
+          image: redislabs/operator:7.4.6-2
           imagePullPolicy: Always
           livenessProbe:
             failureThreshold: 3
@@ -89,7 +89,7 @@ spec:
             - configMapRef:
                 name: "operator-environment-config"
                 optional: true
-          image: redislabs/operator:7.4.2-12
+          image: redislabs/operator:7.4.6-2
           imagePullPolicy: Always
           livenessProbe:
             failureThreshold: 3

diff --git a/multi-namespace-redb/role.yaml b/multi-namespace-redb/role.yaml
@@ -8,11 +8,10 @@ rules:
   - apiGroups:
       - app.redislabs.com
     resources: ["redisenterprisedatabases", "redisenterprisedatabases/status", "redisenterprisedatabases/finalizers"]
-    verbs: ["delete", "deletecollection", "get", "list", "patch", "create", "update", "watch"]
+    verbs: ["delete", "get", "list", "patch", "create", "update", "watch"]
   - apiGroups: [""]
     resources: ["secrets"]
-    verbs: ["update", "get", "read", "list", "listallnamespaces", "watch", "watchlist",
-            "watchlistallnamespaces", "create","patch","replace","delete","deletecollection"]
+    verbs: ["update", "get", "watch", "create", "patch", "list"]
   - apiGroups: [""]
     resources: ["endpoints"]
     verbs: ["get", "list", "watch"]
@@ -21,4 +20,4 @@ rules:
     verbs: ["create"]
   - apiGroups: [""]
     resources: ["services"]
-    verbs: ["get", "watch", "list", "update", "patch", "create", "delete"]
+    verbs: ["get", "list", "update", "patch", "create", "delete", "watch"]