Skip to content

Commit

Permalink
Merge pull request RedisLabs#135 from RedisLabs/6.0.6-24
Browse files Browse the repository at this point in the history
promoting version 6.0.6-24
  • Loading branch information
yuvallevy2 authored Aug 30, 2020
2 parents 0ec741f + e0259a1 commit a24d02d
Show file tree
Hide file tree
Showing 10 changed files with 23 additions and 20 deletions.
15 changes: 9 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ The following are the images and tags for this release:
| Component | k8s | Openshift |
| --- | --- | --- |
| Redis Enterprise | `redislabs/redis:6.0.6-39` | `redislabs/redis:6.0.6-39.rhel7-openshift` |
| Operator | `redislabs/operator:6.0.6-23` | `redislabs/operator:6.0.6-23` |
| Services Rigger | `redislabs/k8s-controller:6.0.6-23` | `redislabs/k8s-controller:6.0.6-23` |
| Operator | `redislabs/operator:6.0.6-24` | `redislabs/operator:6.0.6-24` |
| Services Rigger | `redislabs/k8s-controller:6.0.6-24` | `redislabs/k8s-controller:6.0.6-24` |
> * RedHat certified images are available on [Redhat Catalog](https://access.redhat.com/containers/#/product/71f6d1bb3408bd0d) </br>

Expand Down Expand Up @@ -316,14 +316,14 @@ For example:
redisEnterpriseServicesRiggerImageSpec:
imagePullPolicy: IfNotPresent
repository: harbor.corp.local/redisenterprise/k8s-controller
versionTag: 6.0.6-23
versionTag: 6.0.6-24
```
```yaml
bootstrapperImageSpec:
imagePullPolicy: IfNotPresent
repository: harbor.corp.local/redisenterprise/operator
versionTag: 6.0.6-23
versionTag: 6.0.6-24
```
In Operator Deployment spec (operator.yaml):
Expand All @@ -335,7 +335,7 @@ spec:
spec:
containers:
- name: redis-enterprise-operator
image: harbor.corp.local/redisenterprise/operator:6.0.6-23
image: harbor.corp.local/redisenterprise/operator:6.0.6-24
```
Image specification follow the [K8s Container schema](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.10/#container-v1-core).
Expand Down Expand Up @@ -402,10 +402,11 @@ Alternatively:
Each release of the Redis Enterprise Operator deployment is thoroughly tested against a set of Kubernetes distributions. The table below lists these, along with the current release's support status. "Supported", as well as "deprecated" support status indicates the current release has been tested in this environment and supported by RedisLabs. "Deprecated" also indicates that support will be dropped in a coming future release. "No longer supported" indicates that support has been dropped for this distribution. Any distribution that isn't explicitly listed is not supported for production workloads by RedisLabs.
| Distribution | Support Status |
|-------------------|---------------------|
| Openshift 3.11 | supported |
| Openshift 3.11 | supported |
| Openshift 4.1 | supported |
| Openshift 4.2 | supported |
| Openshift 4.3 | supported |
| Openshift 4.4 | supported |
| KOPS vanilla 1.9 | no longer supported |
| KOPS vanilla 1.10 | no longer supported |
| KOPS vanilla 1.11 | deprecated |
Expand All @@ -418,3 +419,5 @@ Each release of the Redis Enterprise Operator deployment is thoroughly tested ag
| GKE 1.14 | supported |
| GKE 1.15 | supported |
| GKE 1.16 | supported |
| Rancher 2.4.5 | supported |
4 changes: 2 additions & 2 deletions admission.bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ spec:
serviceAccountName: redis-enterprise-admission
containers:
- name: admin
image: redislabs/operator:6.0.6-23
image: redislabs/operator:6.0.6-24
command:
- /usr/local/bin/admission
args:
Expand Down Expand Up @@ -110,7 +110,7 @@ spec:
scheme: HTTPS
initContainers:
- name: admin-init
image: redislabs/operator-internal:6.0.6-23
image: redislabs/operator:6.0.6-24
command:
- /usr/local/bin/admission
args:
Expand Down
4 changes: 2 additions & 2 deletions admission.openshift.bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ spec:
serviceAccountName: redis-enterprise-admission
containers:
- name: admin
image: redislabs/operator:6.0.6-23
image: redislabs/operator:6.0.6-24
command:
- /usr/local/bin/admission
args:
Expand Down Expand Up @@ -110,7 +110,7 @@ spec:
scheme: HTTPS
initContainers:
- name: admin-init
image: redislabs/operator:6.0.6-23
image: redislabs/operator:6.0.6-24
command:
- /usr/local/bin/admission
args:
Expand Down
4 changes: 2 additions & 2 deletions admission/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
serviceAccountName: redis-enterprise-admission
containers:
- name: admin
image: redislabs/operator:6.0.6-23
image: redislabs/operator:6.0.6-24
command:
- /usr/local/bin/admission
args:
Expand Down Expand Up @@ -45,7 +45,7 @@ spec:
scheme: HTTPS
initContainers:
- name: admin-init
image: redislabs/operator:6.0.6-23
image: redislabs/operator:6.0.6-24
command:
- /usr/local/bin/admission
args:
Expand Down
4 changes: 2 additions & 2 deletions admission/deployment_openshift.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
serviceAccountName: redis-enterprise-admission
containers:
- name: admin
image: redislabs/operator:6.0.6-23
image: redislabs/operator:6.0.6-24
command:
- /usr/local/bin/admission
args:
Expand Down Expand Up @@ -45,7 +45,7 @@ spec:
scheme: HTTPS
initContainers:
- name: admin-init
image: redislabs/operator:6.0.6-23
image: redislabs/operator:6.0.6-24
command:
- /usr/local/bin/admission
args:
Expand Down
2 changes: 1 addition & 1 deletion bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ spec:
serviceAccountName: redis-enterprise-operator
containers:
- name: redis-enterprise-operator
image: redislabs/operator:6.0.6-23
image: redislabs/operator:6.0.6-24
command:
- redis-enterprise-operator
imagePullPolicy: Always
Expand Down
2 changes: 1 addition & 1 deletion openshift.bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ spec:
serviceAccount: redis-enterprise-operator
containers:
- name: redis-enterprise-operator
image: redislabs/operator:6.0.6-23
image: redislabs/operator:6.0.6-24
securityContext:
runAsUser: 1001
command:
Expand Down
4 changes: 2 additions & 2 deletions openshift/operator_rhel.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: apps/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: redis-enterprise-operator
Expand All @@ -15,7 +15,7 @@ spec:
serviceAccount: redis-enterprise-operator
containers:
- name: redis-enterprise-operator
image: redislabs/operator:6.0.6-23
image: redislabs/operator:6.0.6-24
securityContext:
runAsUser: 1001
command:
Expand Down
2 changes: 1 addition & 1 deletion operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
serviceAccountName: redis-enterprise-operator
containers:
- name: redis-enterprise-operator
image: redislabs/operator:6.0.6-23
image: redislabs/operator:6.0.6-24
command:
- redis-enterprise-operator
imagePullPolicy: Always
Expand Down
2 changes: 1 addition & 1 deletion release_info.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
operatorVersion: 6.0.6-23
operatorVersion: 6.0.6-24
rsVersion: 6.0.6-39
serviceBrokerVersion: 78_4b9b17f

0 comments on commit a24d02d

Please sign in to comment.