Skip to content

Commit c2aadf8

Browse files
authored
Merge pull request #2 from RedisLabs/master
sync with redislabs master
2 parents a445545 + 118fc4c commit c2aadf8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+10208
-868
lines changed

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
.idea
1+
.idea

README.md

+182-39
Large diffs are not rendered by default.

admission.bundle.yaml

+8-49
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,6 @@ kind: ServiceAccount
44
metadata:
55
name: redis-enterprise-admission
66
---
7-
kind: ClusterRole
8-
apiVersion: rbac.authorization.k8s.io/v1
9-
metadata:
10-
name: redis-enterprise-admission
11-
rules:
12-
- apiGroups: ["certificates.k8s.io"]
13-
resources: ["certificatesigningrequests"]
14-
verbs: ["create", "watch"]
15-
---
167
kind: Role
178
apiVersion: rbac.authorization.k8s.io/v1
189
metadata:
@@ -21,6 +12,10 @@ rules:
2112
- apiGroups: [""]
2213
resources: ["secrets"]
2314
verbs: ["*"]
15+
- apiGroups: ["app.redislabs.com"]
16+
resources: ["*"]
17+
verbs: ["*"]
18+
2419
---
2520
kind: RoleBinding
2621
apiVersion: rbac.authorization.k8s.io/v1
@@ -34,19 +29,6 @@ roleRef:
3429
name: redis-enterprise-admission
3530
apiGroup: rbac.authorization.k8s.io
3631
---
37-
kind: ClusterRoleBinding
38-
apiVersion: rbac.authorization.k8s.io/v1
39-
metadata:
40-
name: redis-enterprise-admission
41-
subjects:
42-
- kind: ServiceAccount
43-
namespace: NAMESPACE_OF_SERVICE_ACCOUNT
44-
name: redis-enterprise-admission
45-
roleRef:
46-
kind: ClusterRole
47-
name: redis-enterprise-admission
48-
apiGroup: rbac.authorization.k8s.io
49-
---
5032
apiVersion: v1
5133
kind: Service
5234
metadata:
@@ -75,11 +57,9 @@ spec:
7557
serviceAccountName: redis-enterprise-admission
7658
containers:
7759
- name: admin
78-
image: redislabs/operator:6.0.6-11
60+
image: redislabs/operator:6.0.12-5
7961
command:
8062
- /usr/local/bin/admission
81-
args:
82-
- '-v=0'
8363
imagePullPolicy: Always
8464
ports:
8565
- containerPort: 443
@@ -90,10 +70,10 @@ spec:
9070
fieldPath: metadata.namespace
9171
resources:
9272
limits:
93-
cpu: 100m
73+
cpu: 1000m
9474
memory: 512Mi
9575
requests:
96-
cpu: 25m
76+
cpu: 250m
9777
memory: 256Mi
9878
readinessProbe:
9979
failureThreshold: 3
@@ -106,12 +86,11 @@ spec:
10686
scheme: HTTPS
10787
initContainers:
10888
- name: admin-init
109-
image: redislabs/operator:6.0.6-11
89+
image: redislabs/operator:6.0.12-5
11090
command:
11191
- /usr/local/bin/admission
11292
args:
11393
- '-generate-tls'
114-
- '-v=1'
11594
imagePullPolicy: Always
11695
env:
11796
- name: POD_NAME
@@ -135,23 +114,3 @@ spec:
135114
memory: 256Mi
136115

137116
---
138-
apiVersion: admissionregistration.k8s.io/v1beta1
139-
kind: ValidatingWebhookConfiguration
140-
metadata:
141-
name: redb-admission
142-
webhooks:
143-
- name: redb.admission.redislabs
144-
failurePolicy: Fail
145-
rules:
146-
- apiGroups: ["app.redislabs.com"]
147-
apiVersions: ["v1alpha1"]
148-
operations: ["*"]
149-
resources: ["redisenterprisedatabases"]
150-
clientConfig:
151-
service:
152-
namespace: NAMESPACE_OF_SERVICE_ACCOUNT
153-
name: admission
154-
path: /admission
155-
caBundle: "" # Fill in with BASE64 encoded signed cert
156-
admissionReviewVersions: ["v1beta1"]
157-
---

admission.openshift.bundle.yaml

-157
This file was deleted.

0 commit comments

Comments
 (0)