Merge pull request RedisLabs#129 from RedisLabs/6.0.6-11

Release 6.0.6-11
yuvallevy2 · Jul 21, 2020 · 142e72d · 142e72d
2 parents b2c3f86 + f27aa12
commit 142e72d
Show file tree

Hide file tree

Showing 13 changed files with 31 additions and 34 deletions.
diff --git a/README.md b/README.md
@@ -26,9 +26,9 @@ This page describe how to deploy Redis Enterprise on Kubernetes using the Redis
 The following are the images and tags for this release:
 | Component | k8s | Openshift |
 | --- | --- | --- |
-| Redis Enterprise | `redislabs/redis:6.0.6-35` | `redislabs/redis:6.0.6-35.rhel7-openshift` |
-| Operator | `redislabs/operator:6.0.6-6` | `redislabs/operator:6.0.6-6.rhel7` |
-| Services Rigger | `redislabs/k8s-controller:6.0.6-6` | `redislabs/k8s-controller:6.0.6-6.rhel7` |
+| Redis Enterprise | `redislabs/redis:6.0.6-39` | `redislabs/redis:6.0.6-39.rhel7-openshift` |
+| Operator | `redislabs/operator:6.0.6-11` | `redislabs/operator:6.0.6-11.rhel7` |
+| Services Rigger | `redislabs/k8s-controller:6.0.6-11` | `redislabs/k8s-controller:6.0.6-11.rhel7` |
 > * RedHat certified images are available on [Redhat Catalog](https://access.redhat.com/containers/#/product/71f6d1bb3408bd0d) </br>
 
 
@@ -206,7 +206,7 @@ The operator deploys a `RedisEnterpriseCluster` with default configurations valu
     redisEnterpriseImageSpec:
       imagePullPolicy:  IfNotPresent
       repository:       redislabs/redis
-      versionTag:       6.0.6-35
+      versionTag:       6.0.6-39
   ```
 
 * Persistence
@@ -302,21 +302,21 @@ For example:
   redisEnterpriseImageSpec:
     imagePullPolicy:  IfNotPresent
     repository:       harbor.corp.local/redisenterprise/redis
-    versionTag:       6.0.6-35
+    versionTag:       6.0.6-39
 ```
 
 ```yaml
   redisEnterpriseServicesRiggerImageSpec:
     imagePullPolicy:  IfNotPresent
     repository:       harbor.corp.local/redisenterprise/k8s-controller
-    versionTag:       6.0.6-6
+    versionTag:       6.0.6-11
 ```
 
 ```yaml
   bootstrapperImageSpec:
     imagePullPolicy:  IfNotPresent
     repository:       harbor.corp.local/redisenterprise/operator
-    versionTag:       6.0.6-6
+    versionTag:       6.0.6-11
 ```
 
 In Operator Deployment spec (operator.yaml):
@@ -328,7 +328,7 @@ spec:
     spec:
       containers:
         - name: redis-enterprise-operator
-          image: harbor.corp.local/redisenterprise/operator:6.0.6-6
+          image: harbor.corp.local/redisenterprise/operator:6.0.6-11
 ```
 
 Image specification follow the [K8s Container schema](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.10/#container-v1-core).
@@ -377,7 +377,7 @@ spec:
 The Operator automates and simplifies the upgrade process.  
 The Redis Enterprise Cluster Software, and the Redis Enterprise Operator for Kubernetes versions are tightly coupled and should be upgraded together.  
 It is recommended to use the bundle.yaml to upgrade, as it loads all the relevant CRD documents for this version. If the updated CRDs are not loaded, the operator might fail.
-There are two ways to upgrade - either set 'autoUpgradeRedisEnterprise' within the Redis Enterprise Cluster Spec to instruct the operator to automatically upgrade to the compatible version, or specify the correct Redis Enterprise image manually using the versionTag attribute. The Redis Enterprise Version compatible with this release is 6.0.6-35
+There are two ways to upgrade - either set 'autoUpgradeRedisEnterprise' within the Redis Enterprise Cluster Spec to instruct the operator to automatically upgrade to the compatible version, or specify the correct Redis Enterprise image manually using the versionTag attribute. The Redis Enterprise version compatible with this release is 6.0.6-39
 
 ```yaml
   autoUpgradeRedisEnterprise: true
@@ -386,6 +386,5 @@ There are two ways to upgrade - either set 'autoUpgradeRedisEnterprise' within t
 Alternatively:
 ```yaml
   RedisEnterpriseImageSpec:
-    versionTag: redislabs/redis:6.0.6-35
+    versionTag: redislabs/redis:6.0.6-39
 ```
-
diff --git a/admission.bundle.yaml b/admission.bundle.yaml
@@ -75,7 +75,7 @@ spec:
       serviceAccountName: redis-enterprise-admission
       containers:
       - name: admin
-        image: redislabs/operator-internal:6.0.6-6
+        image: redislabs/operator:6.0.6-11
         command:
         - /usr/local/bin/admission
         args:
@@ -106,7 +106,7 @@ spec:
             scheme: HTTPS
       initContainers:
       - name: admin-init
-        image: redislabs/operator-internal:6.0.6-6
+        image: redislabs/operator:6.0.6-11
         command:
         - /usr/local/bin/admission
         args:

diff --git a/admission.openshift.bundle.yaml b/admission.openshift.bundle.yaml
@@ -75,7 +75,7 @@ spec:
       serviceAccountName: redis-enterprise-admission
       containers:
       - name: admin
-        image: redislabs/operator-internal:6.0.6-6.rhel7
+        image: redislabs/operator:6.0.6-11.rhel7
         command:
         - /usr/local/bin/admission
         args:
@@ -106,7 +106,7 @@ spec:
             scheme: HTTPS
       initContainers:
       - name: admin-init
-        image: redislabs/operator-internal:6.0.6-6.rhel7
+        image: redislabs/operator:6.0.6-11.rhel7
         command:
         - /usr/local/bin/admission
         args:

diff --git a/admission/deployment.yaml b/admission/deployment.yaml
@@ -14,7 +14,7 @@ spec:
       serviceAccountName: redis-enterprise-admission
       containers:
       - name: admin
-        image: redislabs/operator-internal:6.0.6-6
+        image: redislabs/operator:6.0.6-11
         command:
         - /usr/local/bin/admission
         args:
@@ -45,7 +45,7 @@ spec:
             scheme: HTTPS
       initContainers:
       - name: admin-init
-        image: redislabs/operator-internal:6.0.6-6
+        image: redislabs/operator:6.0.6-11
         command:
         - /usr/local/bin/admission
         args:
@@ -72,4 +72,3 @@ spec:
           requests:
             cpu: 100m
             memory: 256Mi
-
diff --git a/admission/deployment_openshift.yaml b/admission/deployment_openshift.yaml
@@ -14,7 +14,7 @@ spec:
       serviceAccountName: redis-enterprise-admission
       containers:
       - name: admin
-        image: redislabs/operator-internal:6.0.6-6.rhel7
+        image: redislabs/operator:6.0.6-11.rhel7
         command:
         - /usr/local/bin/admission
         args:
@@ -45,7 +45,7 @@ spec:
             scheme: HTTPS
       initContainers:
       - name: admin-init
-        image: redislabs/operator-internal:6.0.6-6.rhel7
+        image: redislabs/operator:6.0.6-11.rhel7
         command:
         - /usr/local/bin/admission
         args:
@@ -72,4 +72,3 @@ spec:
           requests:
             cpu: 100m
             memory: 256Mi
-
diff --git a/bundle.yaml b/bundle.yaml
@@ -115,7 +115,7 @@ spec:
       serviceAccountName: redis-enterprise-operator
       containers:
         - name: redis-enterprise-operator
-          image: redislabs/operator:6.0.6-6
+          image: redislabs/operator:6.0.6-11
           command:
           - redis-enterprise-operator
           imagePullPolicy: Always

diff --git a/openshift.bundle.yaml b/openshift.bundle.yaml
@@ -131,7 +131,7 @@ spec:
       serviceAccount: redis-enterprise-operator
       containers:
         - name: redis-enterprise-operator
-          image: redislabs/operator:6.0.6-6.rhel7
+          image: redislabs/operator:6.0.6-11.rhel7
           securityContext:
             runAsUser: 1001
           command:

diff --git a/openshift/operator_rhel.yaml b/openshift/operator_rhel.yaml
@@ -15,7 +15,7 @@ spec:
       serviceAccount: redis-enterprise-operator
       containers:
         - name: redis-enterprise-operator
-          image: redislabs/operator:6.0.6-6.rhel7
+          image: redislabs/operator:6.0.6-11.rhel7
           securityContext:
             runAsUser: 1001
           command:

diff --git a/openshift/redis-enterprise-cluster_rhel.yaml b/openshift/redis-enterprise-cluster_rhel.yaml
@@ -19,5 +19,5 @@ spec:
   redisEnterpriseImageSpec:
     imagePullPolicy:  IfNotPresent
     repository:       redislabs/redis
-    versionTag:       6.0.6-35.rhel7-openshift
+    versionTag:       6.0.6-39.rhel7-openshift
 
diff --git a/openshift/with_service_broker_rhel.yaml b/openshift/with_service_broker_rhel.yaml
@@ -11,4 +11,4 @@ spec:
   redisEnterpriseImageSpec:
     imagePullPolicy:  IfNotPresent
     repository:       redislabs/redis
-    versionTag:       6.0.6-35.rhel7-openshift
+    versionTag:       6.0.6-39.rhel7-openshift
diff --git a/operator.yaml b/operator.yaml
@@ -15,7 +15,7 @@ spec:
       serviceAccountName: redis-enterprise-operator
       containers:
         - name: redis-enterprise-operator
-          image: redislabs/operator:6.0.6-6
+          image: redislabs/operator:6.0.6-11
           command:
           - redis-enterprise-operator
           imagePullPolicy: Always

diff --git a/release_info.yaml b/release_info.yaml
@@ -1,3 +1,3 @@
-operatorVersion: 6.0.6-6
-rsVersion: 6.0.6-35
+operatorVersion: 6.0.6-11
+rsVersion: 6.0.6-39
 serviceBrokerVersion: 78_4b9b17f
diff --git a/topics.md b/topics.md
@@ -173,21 +173,21 @@ For example:
   redisEnterpriseImageSpec:
     imagePullPolicy:  IfNotPresent
     repository:       harbor.corp.local/redisenterprise/redis
-    versionTag:       6.0.6-35
+    versionTag:       6.0.6-39
 ```
 
 ```yaml
   redisEnterpriseServicesRiggerImageSpec:
     imagePullPolicy:  IfNotPresent
     repository:       harbor.corp.local/redisenterprise/k8s-controller
-    versionTag:       6.0.6-6
+    versionTag:       6.0.6-11
 ```
 
 ```yaml
   bootstrapperImageSpec:
     imagePullPolicy:  IfNotPresent
     repository:       harbor.corp.local/redisenterprise/operator
-    versionTag:       6.0.6-6
+    versionTag:       6.0.6-11
 ```
 
 In Operator Deployment spec (operator.yaml):
@@ -200,7 +200,7 @@ spec:
     spec:
       containers:
         - name: redis-enterprise-operator
-          image: harbor.corp.local/redisenterprise/operator:6.0.6-6
+          image: harbor.corp.local/redisenterprise/operator:6.0.6-11
 ```
 
 Image specification follow the [K8s Container schema](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.10/#container-v1-core).
@@ -315,7 +315,7 @@ The finalizer name is `finalizer.redisenterprisedatabases.app.redislabs.com`.
 When a user requests the deletion of REDB (for example by running `kubectl delete redb <name>`), the following happens:
 1. K8s API adds `DeletionTimestamp` to the REDB resource.
 2. The Operator notices the `DeletionTimestamp`, and sends delete request to the RS API.
-3. When RS API the approves delete request, the operator removes the REDB finalizer.
+3. When RS API approves the delete request, the operator removes the REDB finalizer.
 4. K8s cleans up the REDB resource, now that it has no finalizers.
 
 If for some reason the user ends up with an REDB resource that can't be deleted, because the finalizer can't be removed, they can remove the finalizer manually by editing the REDB resource.