promoting version 6.0.20-4 (#167)

Co-authored-by: Nick Terner <nick@redislabs.com> Co-authored-by: Yuval Levy <yuval.levy@redislabs.com>
RedisLabs · Apr 26, 2021 · 6ee29e2 · 6ee29e2
1 parent 70209f0
commit 6ee29e2
Show file tree

Hide file tree

Showing 21 changed files with 486 additions and 104 deletions.
diff --git a/README.md b/README.md
@@ -27,9 +27,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.12-57` | `redislabs/redis:6.0.12-57.rhel7-openshift` |
-| Operator | `redislabs/operator:6.0.12-5` | `redislabs/operator:6.0.12-5` |
-| Services Rigger | `redislabs/k8s-controller:6.0.12-5` | `redislabs/k8s-controller:6.0.12-5` |
+| Redis Enterprise | `redislabs/redis:6.0.20-69` | `redislabs/redis:6.0.20-69.rhel7-openshift` |
+| Operator | `redislabs/operator:6.0.20-4` | `redislabs/operator:6.0.20-4` |
+| Services Rigger | `redislabs/k8s-controller:6.0.20-4` | `redislabs/k8s-controller:6.0.20-4` |
 > * RedHat certified images are available on [Redhat Catalog](https://access.redhat.com/containers/#/product/71f6d1bb3408bd0d) </br>
 
 
@@ -130,7 +130,6 @@ This is the fastest way to get up and running with a new Redis Enterprise on Kub
          kubectl patch ValidatingWebhookConfiguration redb-admission --patch "$(cat modified-webhook.yaml)"
          ```
      * Verify the installation
-     
         In order to verify that the all the components of the Admission Controller are installed correctly, we will try to apply an invalid resource that should force the admission controller to reject it.  If it applies succesfully, it means the admission controller has not been hooked up correctly.
         
         ```shell script
@@ -156,7 +155,7 @@ This is the fastest way to get up and running with a new Redis Enterprise on Kub
    Create a `RedisEnterpriseDatabase` (REDB) by using Custom Resource.
    
    > Note: An example REDB.yaml file may be found [HERE] (https://github.com/RedisLabs/redis-enterprise-k8s-docs/tree/master/examples/v1alpha1). This is an alternative to copying and pasting the example code below into the CLI
-   
+
    The Redis Enterprise Operator can be instructed to manage databases on the Redis Enterprise Cluster using the REDB custom resource.
     Example:
     ```yaml
@@ -311,7 +310,7 @@ The operator deploys a `RedisEnterpriseCluster` with default configurations valu
     redisEnterpriseImageSpec:
       imagePullPolicy:  IfNotPresent
       repository:       redislabs/redis
-      versionTag:       6.0.12-57
+      versionTag:       6.0.20-69
   ```
 
 * Persistence
@@ -413,21 +412,21 @@ For example:
   redisEnterpriseImageSpec:
     imagePullPolicy:  IfNotPresent
     repository:       harbor.corp.local/redisenterprise/redis
-    versionTag:       6.0.12-57
+    versionTag:       6.0.20-69
 ```
 
 ```yaml
   redisEnterpriseServicesRiggerImageSpec:
     imagePullPolicy:  IfNotPresent
     repository:       harbor.corp.local/redisenterprise/k8s-controller
-    versionTag:       6.0.12-5
+    versionTag:       6.0.20-4
 ```
 
 ```yaml
   bootstrapperImageSpec:
     imagePullPolicy:  IfNotPresent
     repository:       harbor.corp.local/redisenterprise/operator
-    versionTag:       6.0.12-5
+    versionTag:       6.0.20-4
 ```
 
 In Operator Deployment spec (operator.yaml):
@@ -439,7 +438,7 @@ spec:
     spec:
       containers:
         - name: redis-enterprise-operator
-          image: harbor.corp.local/redisenterprise/operator:6.0.12-5
+          image: harbor.corp.local/redisenterprise/operator:6.0.20-4
 ```
 
 Image specification follow the [K8s Container schema](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.10/#container-v1-core).
@@ -490,7 +489,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.12-57
+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.20-69
 
 ```yaml
   autoUpgradeRedisEnterprise: true
@@ -499,7 +498,7 @@ There are two ways to upgrade - either set 'autoUpgradeRedisEnterprise' within t
 Alternatively:
 ```yaml
   RedisEnterpriseImageSpec:
-    versionTag: redislabs/redis:6.0.12-57
+    versionTag: redislabs/redis:6.0.20-69
 ```
 
 ## Supported K8S Distributions
@@ -508,22 +507,20 @@ Supported versions (platforms/versions that are not listed are not supported):
 | Distribution                    | Support Status |
 |---------------------------------|----------------|
 | Openshift 3.11 (K8s 1.11)       | supported      |
-| Openshift 4.1  (K8s 1.13)       | deprecated*    |
-| Openshift 4.2  (K8s 1.14)       | deprecated*    |
-| Openshift 4.3  (K8s 1.16)       | deprecated*    |
-| Openshift 4.4  (K8s 1.17)       | supported      |
+| Openshift 4.4  (K8s 1.17)       | deprecated     |
 | OpenShift 4.5  (K8s 1.18)       | supported      |
 | OpenShift 4.6  (K8s 1.19)       | supported      |
-| KOPS vanilla 1.13               | deprecated     |
-| KOPS vanilla 1.14               | deprecated      |
-| KOPS vanilla 1.15               | supported      |
+| OpenShift 4.7  (K8s 1.20)       | supported      |
+| KOPS vanilla 1.15               | deprecated     |
 | KOPS vanilla 1.16               | supported      |
 | KOPS vanilla 1.17               | supported      |
 | KOPS vanilla 1.18               | supported      |
 | KOPS vanilla 1.19               | supported      |
-| GKE 1.14                        | deprecated**   |
-| GKE 1.15                        | supported      |
-| GKE 1.16                        | supported      |
+| GKE 1.15                        | deprecated     |
+| GKE 1.16                        | deprecated     |
+| GKE 1.17                        | supported      |
+| GKE 1.18                        | supported      |
+| GKE 1.19                        | supported      |
 | Rancher 2.4 (K8s 1.17)          | supported      |
 | Rancher 2.4 (K8s 1.18)          | supported      |
 | Rancher 2.5 (K8s 1.17)          | supported      |

diff --git a/admission.bundle.yaml b/admission.bundle.yaml
@@ -57,7 +57,7 @@ spec:
       serviceAccountName: redis-enterprise-admission
       containers:
       - name: admin
-        image: redislabs/operator:6.0.12-5
+        image: redislabs/operator:6.0.20-4
         command:
         - /usr/local/bin/admission
         imagePullPolicy: Always
@@ -84,33 +84,4 @@ spec:
             path: /healthz
             port: 8443
             scheme: HTTPS
-      initContainers:
-      - name: admin-init
-        image: redislabs/operator:6.0.12-5
-        command:
-        - /usr/local/bin/admission
-        args:
-        - '-generate-tls'
-        imagePullPolicy: Always
-        env:
-        - name: POD_NAME
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.name
-        - name: POD_NAMESPACE
-          valueFrom:
-            fieldRef:
-                fieldPath: metadata.namespace
-        - name: POD_IP
-          valueFrom:
-            fieldRef:
-              fieldPath: status.podIP
-        resources:
-          limits:
-            cpu: 2000m
-            memory: 256Mi
-          requests:
-            cpu: 100m
-            memory: 256Mi
-
 ---
diff --git a/admission/README.md b/admission/README.md
@@ -92,6 +92,7 @@ metadata:
   name: redis-enterprise-database
 spec:
   evictionPolicy: illegal
+  defaultUser: false
 EOF
 ```
 

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:6.0.12-5
+        image: redislabs/operator:6.0.20-4
         command:
         - /usr/local/bin/admission
         imagePullPolicy: Always
@@ -41,32 +41,3 @@ spec:
             path: /healthz
             port: 8443
             scheme: HTTPS
-      initContainers:
-      - name: admin-init
-        image: redislabs/operator:6.0.12-5
-        command:
-        - /usr/local/bin/admission
-        args:
-        - '-generate-tls'
-        imagePullPolicy: Always
-        env:
-        - name: POD_NAME
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.name
-        - name: POD_NAMESPACE
-          valueFrom:
-            fieldRef:
-                fieldPath: metadata.namespace
-        - name: POD_IP
-          valueFrom:
-            fieldRef:
-              fieldPath: status.podIP
-        resources:
-          limits:
-            cpu: 2000m
-            memory: 256Mi
-          requests:
-            cpu: 100m
-            memory: 256Mi
-
diff --git a/bundle.yaml b/bundle.yaml
@@ -21,7 +21,7 @@ rules:
     verbs: ["get", "list", "watch"]
   - apiGroups: [""]
     resources: ["events"]
-    verbs: ["create"]
+    verbs: ["create", "patch"]
   - apiGroups: ["apps"]
     resources: ["deployments", "statefulsets", "replicasets"]
     verbs: ["*"]
@@ -508,6 +508,20 @@ spec:
             serviceAccountName:
               description: Name of the service account to use
               type: string
+            redisEnterpriseServicesConfiguration:
+              description: Cluster optional services settings
+              properties:
+                mdnsServer:
+                  properties:
+                    operatingMode:
+                      enum:
+                        - enabled
+                        - disabled
+                      type: string
+                  required:
+                    - operatingMode
+                  type: object
+              type: object
             servicesRiggerSpec:
               description: Specification for service rigger
               properties:
@@ -1797,7 +1811,7 @@ spec:
       serviceAccountName: redis-enterprise-operator
       containers:
         - name: redis-enterprise-operator
-          image: redislabs/operator:6.0.12-5
+          image: redislabs/operator:6.0.20-4
           command:
           - redis-enterprise-operator
           imagePullPolicy: Always
@@ -2151,6 +2165,12 @@ spec:
             defaultUser:
               description: Is connecting with a default user allowed?
               type: boolean
+            ossCluster:
+              description: OSS Cluster mode option
+              type: boolean
+            proxyPolicy:
+              description: The policy used for proxy binding to the endpoint
+              type: string
             evictionPolicy:
               description: Database eviction policy. see more https://docs.redislabs.com/latest/rs/administering/database-operations/eviction-policy/
               type: string

diff --git a/crds/v1/rec_crd.yaml b/crds/v1/rec_crd.yaml
@@ -433,6 +433,20 @@ spec:
             serviceAccountName:
               description: Name of the service account to use
               type: string
+            redisEnterpriseServicesConfiguration:
+              description: Cluster optional services settings
+              properties:
+                mdnsServer:
+                  properties:
+                    operatingMode:
+                      enum:
+                        - enabled
+                        - disabled
+                      type: string
+                  required:
+                    - operatingMode
+                  type: object
+              type: object
             servicesRiggerSpec:
               description: Specification for service rigger
               properties:

diff --git a/crds/v1alpha1/rec_crd.yaml b/crds/v1alpha1/rec_crd.yaml
@@ -135,6 +135,18 @@ spec:
                     value. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
                   type: object
               type: object
+            clusterCredentialSecretName:
+              description: Secret Name/Path to use for Cluster Credentials.  If left
+                blank, will use cluster name
+              type: string
+            clusterCredentialSecretRole:
+              description: Used only if ClusterCredentialSecretType is vault, to define
+                vault role to be used.  If blank, defaults to "redis-enterprise-operator"
+              type: string
+            clusterCredentialSecretType:
+              description: Type of Secret to use for ClusterCredential, Vault, Kuberetes,...
+                If left blank, will default ot kubernetes secrets
+              type: string
             clusterRecovery:
               description: ClusterRecovery initiates cluster recovery when set to
                 true. Note that this field is cleared automatically after the cluster
@@ -433,6 +445,20 @@ spec:
             serviceAccountName:
               description: Name of the service account to use
               type: string
+            redisEnterpriseServicesConfiguration:
+              description: Cluster optional services settings
+              properties:
+                mdnsServer:
+                  properties:
+                    operatingMode:
+                      enum:
+                      - enabled
+                      - disabled
+                      type: string
+                  required:
+                  - operatingMode
+                  type: object
+              type: object
             servicesRiggerSpec:
               description: Specification for service rigger
               properties:
@@ -1104,6 +1130,10 @@ spec:
             username:
               description: Username for the admin user of Redis Enterprise
               type: string
+            vaultCASecret:
+              description: K8s secret name containing Vault's CA cert - defaults to
+                "vault-ca-cert"
+              type: string
             volumes:
               description: additional volumes
               items:

diff --git a/crds/v1alpha1/redb_crd.yaml b/crds/v1alpha1/redb_crd.yaml
@@ -327,6 +327,12 @@ spec:
             defaultUser:
               description: Is connecting with a default user allowed?
               type: boolean
+            ossCluster:
+              description: OSS Cluster mode option
+              type: boolean
+            proxyPolicy:
+              description: The policy used for proxy binding to the endpoint
+              type: string
             evictionPolicy:
               description: Database eviction policy. see more https://docs.redislabs.com/latest/rs/administering/database-operations/eviction-policy/
               type: string

diff --git a/examples/v1alpha1/redb.yaml b/examples/v1alpha1/redb.yaml
@@ -5,4 +5,3 @@ metadata:
 spec:
   redisEnterpriseCluster:
     name: redis-enterprise
-  memorySize: 100MB
diff --git a/multi-namespace-redb/operator.yaml b/multi-namespace-redb/operator.yaml
@@ -15,7 +15,7 @@ spec:
       serviceAccountName: redis-enterprise-operator
       containers:
         - name: redis-enterprise-operator
-          image: redislabs/operator:6.0.12-5
+          image: redislabs/operator:6.0.20-4
           command:
           - redis-enterprise-operator
           imagePullPolicy: Always
-Original file line number
+Diff line change
@@ Expand Up / @@ -92,6 +92,7 @@ metadata: @@
       name: redis-enterprise-database
     spec:
       evictionPolicy: illegal
+      defaultUser: false
     EOF
     ```
@@ Expand Down @@