Skip to content

Commit

Permalink
Merge pull request RedisLabs#142 from RedisLabs/6.0.8-1
Browse files Browse the repository at this point in the history
promoting version 6.0.8-1
  • Loading branch information
yuvallevy2 authored Oct 15, 2020
2 parents 796ad11 + fdcf1f9 commit d01ae3e
Show file tree
Hide file tree
Showing 34 changed files with 1,145 additions and 483 deletions.
35 changes: 20 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ This page describe how to deploy Redis Enterprise on Kubernetes using the Redis
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-24` | `redislabs/operator:6.0.6-24` |
| Services Rigger | `redislabs/k8s-controller:6.0.6-24` | `redislabs/k8s-controller:6.0.6-24` |
| Redis Enterprise | `redislabs/redis:6.0.8-28` | `redislabs/redis:6.0.8-28.rhel7-openshift` |
| Operator | `redislabs/operator:6.0.8-1` | `redislabs/operator:6.0.8-1` |
| Services Rigger | `redislabs/k8s-controller:6.0.8-1` | `redislabs/k8s-controller:6.0.8-1` |
> * RedHat certified images are available on [Redhat Catalog](https://access.redhat.com/containers/#/product/71f6d1bb3408bd0d) </br>

Expand Down Expand Up @@ -213,7 +213,7 @@ The operator deploys a `RedisEnterpriseCluster` with default configurations valu
redisEnterpriseImageSpec:
imagePullPolicy: IfNotPresent
repository: redislabs/redis
versionTag: 6.0.6-39
versionTag: 6.0.8-28
```
* Persistence
Expand Down Expand Up @@ -252,6 +252,12 @@ The operator deploys a `RedisEnterpriseCluster` with default configurations valu
uiServiceType: LoadBalancer
```
* Database service type (optional): Service types for access to databases. Should be a comma separated list. The possible values are cluster_ip, headless, and load_balancer. Default value is `cluster_ip,headless`. For example, to create on load_balancer type database services, explicitly add the following declaration to the Redis Enterprise Cluster spec:
```yaml
servicesRiggerSpec:
databaseServiceType: load_balancer
```
* UI annotations: Add custom annotation to the UI service
```yaml
uiAnnotations:
Expand Down Expand Up @@ -309,21 +315,21 @@ For example:
redisEnterpriseImageSpec:
imagePullPolicy: IfNotPresent
repository: harbor.corp.local/redisenterprise/redis
versionTag: 6.0.6-39
versionTag: 6.0.8-28
```
```yaml
redisEnterpriseServicesRiggerImageSpec:
imagePullPolicy: IfNotPresent
repository: harbor.corp.local/redisenterprise/k8s-controller
versionTag: 6.0.6-24
versionTag: 6.0.8-1
```
```yaml
bootstrapperImageSpec:
imagePullPolicy: IfNotPresent
repository: harbor.corp.local/redisenterprise/operator
versionTag: 6.0.6-24
versionTag: 6.0.8-1
```
In Operator Deployment spec (operator.yaml):
Expand All @@ -335,7 +341,7 @@ spec:
spec:
containers:
- name: redis-enterprise-operator
image: harbor.corp.local/redisenterprise/operator:6.0.6-24
image: harbor.corp.local/redisenterprise/operator:6.0.8-1
```
Image specification follow the [K8s Container schema](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.10/#container-v1-core).
Expand Down Expand Up @@ -386,7 +392,7 @@ spec:
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.0.6-39
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.0.8-28
```yaml
autoUpgradeRedisEnterprise: true
Expand All @@ -395,22 +401,22 @@ There are two ways to upgrade - either set 'autoUpgradeRedisEnterprise' within t
Alternatively:
```yaml
RedisEnterpriseImageSpec:
versionTag: redislabs/redis:6.0.6-39
versionTag: redislabs/redis:6.0.8-28
```
## Supported K8S Distributions
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 |
| KOPS vanilla 1.12 | supported |
| KOPS vanilla 1.11 | no longer supported |
| KOPS vanilla 1.12 | no longer supported |
| KOPS vanilla 1.13 | supported |
| KOPS vanilla 1.14 | supported |
| KOPS vanilla 1.15 | supported |
Expand All @@ -419,5 +425,4 @@ 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 |
| Rancher 2.4 | supported |
49 changes: 2 additions & 47 deletions admission.bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -38,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:
Expand Down Expand Up @@ -79,11 +57,9 @@ spec:
serviceAccountName: redis-enterprise-admission
containers:
- name: admin
image: redislabs/operator:6.0.6-24
image: redislabs/operator:6.0.8-1
command:
- /usr/local/bin/admission
args:
- '-v=0'
imagePullPolicy: Always
ports:
- containerPort: 443
Expand All @@ -110,12 +86,11 @@ spec:
scheme: HTTPS
initContainers:
- name: admin-init
image: redislabs/operator:6.0.6-24
image: redislabs/operator:6.0.8-1
command:
- /usr/local/bin/admission
args:
- '-generate-tls'
- '-v=1'
imagePullPolicy: Always
env:
- name: POD_NAME
Expand All @@ -139,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"]
---
161 changes: 0 additions & 161 deletions admission.openshift.bundle.yaml

This file was deleted.

Loading

0 comments on commit d01ae3e

Please sign in to comment.