Merge pull request #2 from RedisLabs/master

sync with redislabs master

.gitignore

@@ -1 +1 @@
-.idea
+.idea

admission.bundle.yaml

@@ -4,15 +4,6 @@ kind: ServiceAccount
 metadata:
   name: redis-enterprise-admission
 ---
-kind: ClusterRole
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: redis-enterprise-admission
-rules:
-  - apiGroups: ["certificates.k8s.io"]
-    resources: ["certificatesigningrequests"]
-    verbs: ["create", "watch"]
----
 kind: Role
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
@@ -21,6 +12,10 @@ rules:
   - apiGroups: [""]
     resources: ["secrets"]
     verbs: ["*"]
+  - apiGroups: ["app.redislabs.com"]
+    resources: ["*"]
+    verbs: ["*"]
+
 ---
 kind: RoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
@@ -34,19 +29,6 @@ roleRef:
   name: redis-enterprise-admission
   apiGroup: rbac.authorization.k8s.io
 ---
-kind: ClusterRoleBinding
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: redis-enterprise-admission
-subjects:
-- kind: ServiceAccount
-  namespace: NAMESPACE_OF_SERVICE_ACCOUNT
-  name: redis-enterprise-admission
-roleRef:
-  kind: ClusterRole
-  name: redis-enterprise-admission
-  apiGroup: rbac.authorization.k8s.io
----
 apiVersion: v1
 kind: Service
 metadata:
@@ -75,11 +57,9 @@ spec:
       serviceAccountName: redis-enterprise-admission
       containers:
       - name: admin
-        image: redislabs/operator:6.0.6-11
+        image: redislabs/operator:6.0.12-5
         command:
         - /usr/local/bin/admission
-        args:
-        - '-v=0'
         imagePullPolicy: Always
         ports:
         - containerPort: 443
@@ -90,10 +70,10 @@ spec:
               fieldPath: metadata.namespace
         resources:
           limits:
-            cpu: 100m
+            cpu: 1000m
             memory: 512Mi
           requests:
-            cpu: 25m
+            cpu: 250m
             memory: 256Mi
         readinessProbe:
           failureThreshold: 3
@@ -106,12 +86,11 @@ spec:
             scheme: HTTPS
       initContainers:
       - name: admin-init
-        image: redislabs/operator:6.0.6-11
+        image: redislabs/operator:6.0.12-5
         command:
         - /usr/local/bin/admission
         args:
         - '-generate-tls'
-        - '-v=1'
         imagePullPolicy: Always
         env:
         - name: POD_NAME
@@ -135,23 +114,3 @@ spec:
             memory: 256Mi
 
 ---
-apiVersion: admissionregistration.k8s.io/v1beta1
-kind: ValidatingWebhookConfiguration
-metadata:
-  name: redb-admission
-webhooks:
-- name: redb.admission.redislabs
-  failurePolicy: Fail
-  rules:
-  - apiGroups:   ["app.redislabs.com"]
-    apiVersions: ["v1alpha1"]
-    operations:  ["*"]
-    resources:   ["redisenterprisedatabases"]
-  clientConfig:
-    service:
-      namespace: NAMESPACE_OF_SERVICE_ACCOUNT
-      name: admission
-      path: /admission
-    caBundle: "" # Fill in with BASE64 encoded signed cert
-  admissionReviewVersions: ["v1beta1"]
----