Merge pull request #14 from RedisLabs/michal-routes_rbac

RED-23791 add rbac for openshift routes

Author: michalrabinowitch

README.md

@@ -172,6 +172,15 @@ UI annotations - add custom annotation to the UI service
     uiAnnotation2: 'UI-Annotation2'
 ```
 
+
+SideCar containers- images that will run along side the redis enterprise containers
+```yaml
+  sideContainersSpec:
+    - name: sidecar
+      image: dockerhub_repo/repo:tag
+      imagePullPolicy: IfNotPresent
+```
+
 Service Broker (only for supported clusters)
 ```yaml 
   serviceBrokerSpec:
@@ -180,12 +189,31 @@ Service Broker (only for supported clusters)
       storageClassName: "gp2" #adjust according to infrastructure 
 ```
 
-SideCar containers- images that will run along side the redis enterprise containers
+CRDB (Active Active):
+*Currently supported for OpenShift
+
+```yaml 
+activeActive: # edit values according to your cluster
+  apiIngressUrl:  my-cluster1-api.myopenshiftcluster1.com 
+  dbIngressSuffix: -dbsuffix1.myopenshiftcluster1.com
+  method: openShiftRoute
+```
+
+With Service Broker support (add this in addition to serviceBrokerSpec section):
 ```yaml
-  sideContainersSpec:
-    - name: sidecar
-      image: dockerhub_repo/repo:tag
-      imagePullPolicy: IfNotPresent
+activeActive: # edit values according to your cluster
+  apiIngressUrl:  my-cluster1-api.myopenshiftcluster1.com
+  dbIngressSuffix: -dbsuffix1.myopenshiftcluster1.com
+  method: openShiftRoute
+    peerClusters:
+      - apiIngressUrl: my-cluster2-api.myopenshiftcluster2.com
+        authSecret: cluster2_secret
+        dbIngressSuffix: -dbsuffix2.myopenshiftcluster2.com
+        fqdn: <cluster2_name>.<cluster2_namespace>.svc.cluster.local
+      - apiIngressUrl: my-cluster3-api.myopenshiftcluster3.com
+        authSecret: cluster3_secret
+        dbIngressSuffix: -dbsuffix3.myopenshiftcluster3.com
+        fqdn: <cluster3_name>.<cluster3_namespace>.svc.cluster.local
 ```
 
 [requirements]: https://redislabs.com/redis-enterprise-documentation/administering/designing-production/hardware-requirements/

crd.yaml

@@ -1,4 +1,3 @@
-
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:

examples/persistent.yaml

@@ -6,4 +6,4 @@ spec:
   nodes: 3
   persistentSpec:
     enabled: true
-    storageClassName: "gp2"
+    storageClassName: "gp2" # edit according to infrastructure

examples/with_service_broker.yaml

@@ -4,9 +4,6 @@ metadata:
   name: "redis-enterprise"
 spec:
   nodes: 3
-  persistentSpec:
-    enabled: true
-    storageClassName: "gp2"
   serviceBrokerSpec:
     enabled: true
     persistentSpec:

examples/with_service_broker_rhel.yaml

@@ -1,26 +1,23 @@
 apiVersion: "app.redislabs.com/v1alpha1"
 kind: "RedisEnterpriseCluster"
 metadata:
-  name: "redis-enterprise-cluster"
+  name: "redis-enterprise"
 spec:
   nodes: 3
-  persistentSpec:
-    enabled: true
-    storageClassName: "gp2"
   serviceBrokerSpec:
     enabled: true
     persistentSpec:
       storageClassName: "gp2"
     imageSpec:
      imagePullPolicy:  Always
      repository:       redislabs/service-broker
-     versionTag:       39_5bfe271.rhel7
+     versionTag:       78_4b9b17f.rhel7
   redisEnterpriseImageSpec:
     imagePullPolicy:  IfNotPresent
     repository:       redislabs/redis
-    versionTag:       5.2.2-22.rhel7-openshift
-  redisEnterpriseControllerImageSpec:
+    versionTag:       5.4.0-19.rhel7-openshift
+  redisEnterpriseServicesRiggerImageSpec:
     imagePullPolicy:  IfNotPresent
     repository:       redislabs/k8s-controller
-    versionTag:       65_7e696a1.rhel7
-    
+    versionTag:       109_5c9af60.rhel7
+

operator.yaml

@@ -15,7 +15,7 @@ spec:
       serviceAccount: redis-enterprise-operator
       containers:
         - name: redis-enterprise-operator
-          image: redislabs/operator:267_32628ce
+          image: redislabs/operator:498_f987b08
           command:
           - redis-enterprise-operator
           imagePullPolicy: Always

operator_rhel.yaml

@@ -15,7 +15,7 @@ spec:
       serviceAccount: redis-enterprise-operator
       containers:
         - name: redis-enterprise-operator
-          image: redislabs/operator:267_32628ce.rhel7
+          image: redislabs/operator:498_f987b08.rhel7
           command:
           - redis-enterprise-operator
           imagePullPolicy: Always

rbac.yaml

@@ -8,10 +8,12 @@ rules:
   verbs: ["*"]
 - apiGroups:
   - app.redislabs.com
-  resources:
-  - "*"
-  verbs:
-  - "*"
+  resources: ["*"]
+  verbs: ["*"]
+- apiGroups:
+  - route.openshift.io
+  resources: ["routes", "routes/custom-host"]
+  verbs: ["*"]
 ---
 kind: ServiceAccount
 apiVersion: v1

redis-enterprise-cluster.yaml

@@ -1,7 +1,7 @@
 apiVersion: "app.redislabs.com/v1alpha1"
 kind: "RedisEnterpriseCluster"
 metadata:
-  name: "redis-enterprise-cluster"
+  name: "redis-enterprise"
 spec:
   nodes: 3
   persistentSpec:
@@ -18,6 +18,6 @@ spec:
       memory: 4Gi
   redisEnterpriseImageSpec:
     imagePullPolicy:  IfNotPresent
-    Repository:       redislabs/redis
-    versionTag:       5.2.2-22
+    repository:       redislabs/redis
+    versionTag:       5.4.0-19
 

redis-enterprise-cluster_rhel.yaml

@@ -1,7 +1,7 @@
 apiVersion: "app.redislabs.com/v1alpha1"
 kind: "RedisEnterpriseCluster"
 metadata:
-  name: "redis-enterprise-cluster"
+  name: "redis-enterprise"
 spec:
   nodes: 3
   persistentSpec:
@@ -18,10 +18,10 @@ spec:
       memory: 4Gi
   redisEnterpriseImageSpec:
     imagePullPolicy:  IfNotPresent
-    Repository:       redislabs/redis
-    versionTag:       5.2.2-22.rhel7-openshift
-  redisEnterpriseControllerImageSpec:
+    repository:       redislabs/redis
+    versionTag:       5.4.0-19.rhel7-openshift
+  redisEnterpriseServicesRiggerImageSpec:
     imagePullPolicy:  IfNotPresent
-    Repository:       redislabs/k8s-controller
-    versionTag:       65_7e696a1.rhel7
+    repository:       redislabs/k8s-controller
+    versionTag:       109_5c9af60.rhel7