Skip to content

Commit

Permalink
Merge pull request #208 from RedisLabs/6.2.8-11
Browse files Browse the repository at this point in the history 
promoting version 6.2.8-11
  • Loading branch information
@yuvallevy2
yuvallevy2 authored Jan 11, 2022
2 parents 704cecd + d5e52c0 commit e7ee0a8
Show file tree
Hide file tree
Showing 26 changed files with 41,910 additions and 12,592 deletions.
41 changes: 23 additions & 18 deletions README.md
View file
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-41` | `redislabs/redis:6.2.8-41.rhel7-openshift` |
| Operator | `redislabs/operator:6.2.8-2` | `redislabs/operator:6.2.8-2` |
| Services Rigger | `redislabs/k8s-controller:6.2.8-2` | `redislabs/k8s-controller:6.2.8-2` |
| 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` |
> * RedHat certified images are available on [Redhat Catalog](https://access.redhat.com/containers/#/product/71f6d1bb3408bd0d) </br>

Expand Down Expand Up @@ -136,9 +136,9 @@ This is the fastest way to get up and running with a new Redis Enterprise on Kub
```shell script
kubectl patch ValidatingWebhookConfiguration redb-admission --patch "$(cat modified-webhook.yaml)"
```
> **Note:** If you're not using multiple namespaces you may skip to ["Verify the installation"](#verify_admission_installation) step.

* Limiting the webhook to the relevant namespaces:
Unless limited, webhooks will intercept requests from all namespaces.<br>
In case you have several REC objects on your K8S cluster you need to limit the webhook to the relevant namespace.
Expand Down Expand Up @@ -217,11 +217,13 @@ This is the fastest way to get up and running with a new Redis Enterprise on Kub
### Installation on OpenShift
The "OpenShift" installations deploys the operator from the current release with the RHEL image from DockerHub and default OpenShift settings.
The "OpenShift" installation deploys the operator from the current release with the RHEL image from DockerHub and default OpenShift settings.
This is the fastest way to get up and running with a new cluster on OpenShift 3.x.
For OpenShift 4.x, you may choose to use OLM deployment from within your OpenShift cluster or follow the steps below.
Other custom configurations are referenced in this repository.
> Note: you will need to replace `<my-project>` with your project name
If you are running on OpenShift 3.x, use the `bundle.yaml` file located under `openshift_3_x` folder (see comment in step 4).
That folder also contains the custom resource definitions compatible with OpenShift 3.x.
> Note: you will need to replace `<my-project>` with your project name.
1. Create a new project:
Expand Down Expand Up @@ -252,6 +254,7 @@ Other custom configurations are referenced in this repository.
```bash
oc apply -f openshift.bundle.yaml
```
> Note: If you are running on OpenShift 3.x, use the `bundle.yaml` file located under `openshift_3_x` folder.
5. Redis Enterprise Cluster custom resource - `RedisEnterpriseCluster`
Expand All @@ -270,7 +273,7 @@ Other custom configurations are referenced in this repository.
admission-tls Opaque 2 2m43s
```
* Enable the Kubernetes webhook using the generated certificate
```shell script
# save cert
CERT=`kubectl get secret admission-tls -o jsonpath='{.data.cert}'`
Expand Down Expand Up @@ -378,7 +381,7 @@ The operator deploys a `RedisEnterpriseCluster` with default configurations valu
redisEnterpriseImageSpec:
imagePullPolicy: IfNotPresent
repository: redislabs/redis
versionTag: 6.2.8-41
versionTag: 6.2.8-53
```
* Persistence
Expand Down Expand Up @@ -480,21 +483,21 @@ For example:
redisEnterpriseImageSpec:
imagePullPolicy: IfNotPresent
repository: harbor.corp.local/redisenterprise/redis
versionTag: 6.2.8-41
versionTag: 6.2.8-53
```
```yaml
redisEnterpriseServicesRiggerImageSpec:
imagePullPolicy: IfNotPresent
repository: harbor.corp.local/redisenterprise/k8s-controller
versionTag: 6.2.8-2
versionTag: 6.2.8-11
```
```yaml
bootstrapperImageSpec:
imagePullPolicy: IfNotPresent
repository: harbor.corp.local/redisenterprise/operator
versionTag: 6.2.8-2
versionTag: 6.2.8-11
```
In Operator Deployment spec (operator.yaml):
Expand All @@ -506,7 +509,7 @@ spec:
spec:
containers:
- name: redis-enterprise-operator
image: harbor.corp.local/redisenterprise/operator:6.2.8-2
image: harbor.corp.local/redisenterprise/operator:6.2.8-11
```
Image specification follow the [K8s Container schema](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.10/#container-v1-core).
Expand Down Expand Up @@ -629,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-41
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
```yaml
autoUpgradeRedisEnterprise: true
Expand All @@ -638,7 +641,7 @@ There are two ways to upgrade - either set 'autoUpgradeRedisEnterprise' within t
Alternatively:
```yaml
RedisEnterpriseImageSpec:
versionTag: redislabs/redis:6.2.8-41
versionTag: redislabs/redis:6.2.8-53
```
## Supported K8S Distributions
Expand All @@ -650,23 +653,25 @@ Supported versions (platforms/versions that are not listed are not supported):
| OpenShift 4.6 (K8s 1.19) | supported |
| OpenShift 4.7 (K8s 1.20) | supported |
| OpenShift 4.8 (K8s 1.21) | supported |
| OpenShift 4.9 (K8s 1.22) | supported |
| KOPS vanilla 1.18 | supported |
| KOPS vanilla 1.19 | supported |
| KOPS vanilla 1.20 | supported |
| KOPS vanilla 1.21 | supported |
| KOPS vanilla 1.22 | supported |
| GKE 1.19 | supported |
| GKE 1.20 | supported |
| GKE 1.21 | supported |
| Rancher 2.4 (K8s 1.17) | deprecated |
| Rancher 2.4 (K8s 1.18) | deprecated |
| Rancher 2.5 (K8s 1.17) | supported |
| GKE 1.22 | supported |
| Rancher 2.5 (K8s 1.17) | deprecated |
| Rancher 2.5 (K8s 1.18) | supported |
| Rancher 2.5 (K8s 1.19) | supported |
| Rancher 2.5 (K8s 1.20) | supported |
| VMWare TKGIE** 1.10 (K8s 1.19) | supported |
| AKS 1.19 | supported |
| AKS 1.20 | supported |
| AKS 1.21 | supported |
| AKS 1.22 | supported |
| EKS 1.18 | supported |
| EKS 1.19 | supported |
| EKS 1.20 | supported |
Expand Down
140 changes: 137 additions & 3 deletions admission/gesher/crds/app.redislabs.com_namespacedvalidatingrule_crd.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: apiextensions.k8s.io/v1beta1
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
name: namespacedvalidatingrules.app.redislabs.com
Expand All @@ -14,5 +14,139 @@ spec:
- name: v1alpha1
served: true
storage: true
subresources:
status: {}
subresources:
status: {}
schema:
openAPIV3Schema:
properties:
apiVersion:
type: string
kind:
type: string
metadata:
type: object
spec:
properties:
webhooks:
items:
properties:
admissionReviewVersions:
items:
type: string
type: array
clientConfig:
properties:
caBundle:
format: byte
type: string
service:
properties:
name:
type: string
namespace:
type: string
path:
type: string
port:
format: int32
type: integer
required:
- name
- namespace
type: object
url:
type: string
type: object
failurePolicy:
type: string
matchPolicy:
type: string
name:
type: string
namespaceSelector:
properties:
matchExpressions:
items:
properties:
key:
type: string
operator:
type: string
values:
items:
type: string
type: array
required:
- key
- operator
type: object
type: array
matchLabels:
additionalProperties:
type: string
type: object
type: object
objectSelector:
properties:
matchExpressions:
items:
properties:
key:
type: string
operator:
type: string
values:
items:
type: string
type: array
required:
- key
- operator
type: object
type: array
matchLabels:
additionalProperties:
type: string
type: object
type: object
rules:
items:
properties:
apiGroups:
items:
type: string
type: array
apiVersions:
items:
type: string
type: array
operations:
items:
type: string
type: array
resources:
items:
type: string
type: array
scope:
type: string
type: object
type: array
sideEffects:
type: string
timeoutSeconds:
format: int32
type: integer
required:
- clientConfig
- name
type: object
type: array
type: object
status:
properties:
observedGeneration:
format: int64
type: integer
type: object
type: object
48 changes: 45 additions & 3 deletions admission/gesher/crds/app.redislabs.com_namespacedvalidatingtype_crd.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: apiextensions.k8s.io/v1beta1
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
name: namespacedvalidatingtypes.app.redislabs.com
Expand All @@ -14,5 +14,47 @@ spec:
- name: v1alpha1
served: true
storage: true
subresources:
status: {}
subresources:
status: {}
schema:
openAPIV3Schema:
properties:
apiVersion:
type: string
kind:
type: string
metadata:
type: object
spec:
properties:
types:
items:
properties:
apiGroups:
items:
type: string
type: array
apiVersions:
items:
type: string
type: array
operations:
items:
type: string
type: array
resources:
items:
type: string
type: array
scope:
type: string
type: object
type: array
type: object
status:
properties:
observedGeneration:
format: int64
type: integer
type: object
type: object
2 changes: 1 addition & 1 deletion admission/gesher/operator.openshift.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ spec:
volumeMounts:
- mountPath: /certs
name: certs
image: redislabs/gesher:0.4
image: redislabs/gesher:0.6
command:
- "/manager"
args:
Expand Down
2 changes: 1 addition & 1 deletion admission/gesher/operator.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ spec:
volumeMounts:
- mountPath: /certs
name: certs
image: redislabs/gesher:0.4
image: redislabs/gesher:0.6
command:
- "/manager"
args:
Expand Down
5 changes: 4 additions & 1 deletion admission/gesher/rule.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@ metadata:
spec:
webhooks:
- name: "redb-admission"
failurePolicy: "fail"
failurePolicy: Fail
timeoutSeconds: 25
matchPolicy: Exact
sideEffects: None
clientConfig:
service:
name: "admission"
Expand All @@ -18,4 +20,5 @@ spec:
apiVersions: ["v1alpha1"]
resources: ["redisenterprisedatabases"]
operations: ["*"]
admissionReviewVersions: ["v1"]

Loading

0 comments on commit e7ee0a8

Please sign in to comment.