Skip to content

Commit

Permalink
Merge pull request #209 from RedisLabs/6.2.8-15
Browse files Browse the repository at this point in the history
promoting version 6.2.8-15
  • Loading branch information
yuvallevy2 authored Jan 19, 2022
2 parents e7ee0a8 + f1ae95a commit 74c0fb9
Show file tree
Hide file tree
Showing 9 changed files with 31 additions and 28 deletions.
20 changes: 10 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ High level architecture and overview of the solution can be found [HERE](https:/
The following are the images and tags for this release:
| Component | k8s | Openshift |
| --- | --- | --- |
| Redis Enterprise | `redislabs/redis:6.2.8-53` | `redislabs/redis:6.2.8-53.rhel7-openshift` |
| Operator | `redislabs/operator:6.2.8-11` | `redislabs/operator:6.2.8-11` |
| Services Rigger | `redislabs/k8s-controller:6.2.8-11` | `redislabs/k8s-controller:6.2.8-11` |
| Redis Enterprise | `redislabs/redis:6.2.8-64` | `redislabs/redis:6.2.8-64.rhel7-openshift` |
| Operator | `redislabs/operator:6.2.8-15` | `redislabs/operator:6.2.8-15` |
| Services Rigger | `redislabs/k8s-controller:6.2.8-15` | `redislabs/k8s-controller:6.2.8-15` |
> * RedHat certified images are available on [Redhat Catalog](https://access.redhat.com/containers/#/product/71f6d1bb3408bd0d) </br>

Expand Down Expand Up @@ -381,7 +381,7 @@ The operator deploys a `RedisEnterpriseCluster` with default configurations valu
redisEnterpriseImageSpec:
imagePullPolicy: IfNotPresent
repository: redislabs/redis
versionTag: 6.2.8-53
versionTag: 6.2.8-64
```
* Persistence
Expand Down Expand Up @@ -483,21 +483,21 @@ For example:
redisEnterpriseImageSpec:
imagePullPolicy: IfNotPresent
repository: harbor.corp.local/redisenterprise/redis
versionTag: 6.2.8-53
versionTag: 6.2.8-64
```
```yaml
redisEnterpriseServicesRiggerImageSpec:
imagePullPolicy: IfNotPresent
repository: harbor.corp.local/redisenterprise/k8s-controller
versionTag: 6.2.8-11
versionTag: 6.2.8-15
```
```yaml
bootstrapperImageSpec:
imagePullPolicy: IfNotPresent
repository: harbor.corp.local/redisenterprise/operator
versionTag: 6.2.8-11
versionTag: 6.2.8-15
```
In Operator Deployment spec (operator.yaml):
Expand All @@ -509,7 +509,7 @@ spec:
spec:
containers:
- name: redis-enterprise-operator
image: harbor.corp.local/redisenterprise/operator:6.2.8-11
image: harbor.corp.local/redisenterprise/operator:6.2.8-15
```
Image specification follow the [K8s Container schema](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.10/#container-v1-core).
Expand Down Expand Up @@ -632,7 +632,7 @@ Note: in the examples above the Redis Enterprise Cluster name is: 'rec' and the
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.2.8-53
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.2.8-64
```yaml
autoUpgradeRedisEnterprise: true
Expand All @@ -641,7 +641,7 @@ There are two ways to upgrade - either set 'autoUpgradeRedisEnterprise' within t
Alternatively:
```yaml
RedisEnterpriseImageSpec:
versionTag: redislabs/redis:6.2.8-53
versionTag: redislabs/redis:6.2.8-64
```
## Supported K8S Distributions
Expand Down
9 changes: 5 additions & 4 deletions bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ spec:
shortNames:
- redb
scope: Namespaced
preserveUnknownFields: false
versions:
- name: v1alpha1
served: true
Expand Down Expand Up @@ -446,7 +447,7 @@ spec:
description: Database port number. TCP port on which the database is
available. Will be generated automatically if omitted. can not be
changed after creation
type: integer
type: integer
databaseSecretName:
description: The name of the K8s secret that holds the password to the
database.
Expand Down Expand Up @@ -684,7 +685,6 @@ spec:
type: string
type: object
type: object

---
apiVersion: v1
kind: Service
Expand Down Expand Up @@ -715,7 +715,7 @@ spec:
serviceAccountName: redis-enterprise-operator
containers:
- name: redis-enterprise-operator
image: redislabs/operator:6.2.8-11
image: redislabs/operator:6.2.8-15
command:
- redis-enterprise-operator
imagePullPolicy: Always
Expand Down Expand Up @@ -757,7 +757,7 @@ spec:
port: 8080
scheme: HTTP
- name: admission
image: redislabs/operator:6.2.8-11
image: redislabs/operator:6.2.8-15
command:
- /usr/local/bin/admission
imagePullPolicy: Always
Expand Down Expand Up @@ -812,6 +812,7 @@ spec:
shortNames:
- rec
scope: Namespaced
preserveUnknownFields: false
versions:
- name: v1
served: true
Expand Down
1 change: 1 addition & 0 deletions crds/rec_crd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ spec:
shortNames:
- rec
scope: Namespaced
preserveUnknownFields: false
versions:
- name: v1
served: true
Expand Down
6 changes: 3 additions & 3 deletions crds/redb_crd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ spec:
shortNames:
- redb
scope: Namespaced
preserveUnknownFields: false
versions:
- name: v1alpha1
served: true
Expand Down Expand Up @@ -369,7 +370,7 @@ spec:
description: Database port number. TCP port on which the database is
available. Will be generated automatically if omitted. can not be
changed after creation
type: integer
type: integer
databaseSecretName:
description: The name of the K8s secret that holds the password to the
database.
Expand Down Expand Up @@ -606,5 +607,4 @@ spec:
description: Database compatibility version
type: string
type: object
type: object

type: object
4 changes: 2 additions & 2 deletions multi-namespace-redb/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.2.8-11
image: redislabs/operator:6.2.8-15
command:
- redis-enterprise-operator
imagePullPolicy: Always
Expand Down Expand Up @@ -57,7 +57,7 @@ spec:
port: 8080
scheme: HTTP
- name: admission
image: redislabs/operator:6.2.8-11
image: redislabs/operator:6.2.8-15
command:
- /usr/local/bin/admission
imagePullPolicy: Always
Expand Down
9 changes: 5 additions & 4 deletions openshift.bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ spec:
shortNames:
- redb
scope: Namespaced
preserveUnknownFields: false
versions:
- name: v1alpha1
served: true
Expand Down Expand Up @@ -467,7 +468,7 @@ spec:
description: Database port number. TCP port on which the database is
available. Will be generated automatically if omitted. can not be
changed after creation
type: integer
type: integer
databaseSecretName:
description: The name of the K8s secret that holds the password to the
database.
Expand Down Expand Up @@ -705,7 +706,6 @@ spec:
type: string
type: object
type: object

---
apiVersion: v1
kind: Service
Expand Down Expand Up @@ -736,7 +736,7 @@ spec:
serviceAccountName: redis-enterprise-operator
containers:
- name: redis-enterprise-operator
image: registry.connect.redhat.com/redislabs/redis-enterprise-operator:6.2.8-11
image: registry.connect.redhat.com/redislabs/redis-enterprise-operator:6.2.8-15
securityContext:
runAsUser: 1001
command:
Expand Down Expand Up @@ -782,7 +782,7 @@ spec:
port: 8080
scheme: HTTP
- name: admission
image: registry.connect.redhat.com/redislabs/redis-enterprise-operator:6.2.8-11
image: registry.connect.redhat.com/redislabs/redis-enterprise-operator:6.2.8-15
command:
- /usr/local/bin/admission
imagePullPolicy: Always
Expand Down Expand Up @@ -837,6 +837,7 @@ spec:
shortNames:
- rec
scope: Namespaced
preserveUnknownFields: false
versions:
- name: v1
served: true
Expand Down
4 changes: 2 additions & 2 deletions openshift/operator_rhel.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: registry.connect.redhat.com/redislabs/redis-enterprise-operator:6.2.8-11
image: registry.connect.redhat.com/redislabs/redis-enterprise-operator:6.2.8-15
securityContext:
runAsUser: 1001
command:
Expand Down Expand Up @@ -61,7 +61,7 @@ spec:
port: 8080
scheme: HTTP
- name: admission
image: registry.connect.redhat.com/redislabs/redis-enterprise-operator:6.2.8-11
image: registry.connect.redhat.com/redislabs/redis-enterprise-operator:6.2.8-15
command:
- /usr/local/bin/admission
imagePullPolicy: Always
Expand Down
2 changes: 1 addition & 1 deletion openshift/rec_rhel.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ spec:
nodes: 3
redisEnterpriseImageSpec:
repository: registry.connect.redhat.com/redislabs/redis-enterprise
versionTag: 6.2.8-53.rhel7-openshift
versionTag: 6.2.8-64.rhel7-openshift
redisEnterpriseServicesRiggerImageSpec:
repository: registry.connect.redhat.com/redislabs/services-manager
bootstrapperImageSpec:
Expand Down
4 changes: 2 additions & 2 deletions 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.2.8-11
image: redislabs/operator:6.2.8-15
command:
- redis-enterprise-operator
imagePullPolicy: Always
Expand Down Expand Up @@ -57,7 +57,7 @@ spec:
port: 8080
scheme: HTTP
- name: admission
image: redislabs/operator:6.2.8-11
image: redislabs/operator:6.2.8-15
command:
- /usr/local/bin/admission
imagePullPolicy: Always
Expand Down

0 comments on commit 74c0fb9

Please sign in to comment.