use spotahome redis-operator

Signed-off-by: yxxhero <aiopsclub@163.com>

.github/workflows/build-dev.yml

@@ -12,7 +12,7 @@ jobs:
     steps:
     - uses: actions/setup-go@v2
       with:
-        go-version: 1.16
+        go-version: 1.17
     - uses: actions/checkout@v2
     - name: Build manager
       run: |
@@ -48,7 +48,7 @@ jobs:
     steps:
     - uses: actions/setup-go@v2
       with:
-        go-version: 1.16
+        go-version: 1.17
     - uses: actions/checkout@v2
     - name: Package charts
       run: make helm-generate

.github/workflows/release.yml

@@ -14,7 +14,7 @@ jobs:
       run: git fetch --prune --unshallow
     - uses: actions/setup-go@v2
       with:
-        go-version: 1.16
+        go-version: 1.17
     - name: prepare changelog
       run: |
         tag=${{ github.ref }}

.github/workflows/tests.yml

@@ -19,7 +19,7 @@ jobs:
     steps:
     - uses: actions/setup-go@v2
       with:
-        go-version: 1.16
+        go-version: 1.17
     - uses: actions/checkout@v2
     - run: make docker-build
 
@@ -37,7 +37,7 @@ jobs:
     steps:
     - uses: actions/setup-go@v2
       with:
-        go-version: 1.16
+        go-version: 1.17
     - uses: actions/checkout@v2
     - run: make go-lint
 
@@ -47,7 +47,7 @@ jobs:
     steps:
     - uses: actions/setup-go@v2
       with:
-        go-version: 1.16
+        go-version: 1.17
     - uses: actions/checkout@v2
     - run: make go-dependencies-test
 
@@ -57,7 +57,7 @@ jobs:
     steps:
     - uses: actions/setup-go@v2
       with:
-        go-version: 1.16
+        go-version: 1.17
     - uses: actions/checkout@v2
     - run: make generated-diff-test
 
@@ -73,7 +73,7 @@ jobs:
 
       - uses: actions/setup-go@v2
         with:
-          go-version: 1.16
+          go-version: 1.17
 
       - name: Cache go mod
         uses: actions/cache@v2
@@ -142,6 +142,7 @@ jobs:
         - "1.20.7"
         - "1.21.2"
         - "1.22.0"
+        - "1.23.0"
 
         ingress:
         - "1.0.5"
@@ -155,7 +156,7 @@ jobs:
 
     - uses: actions/setup-go@v2
       with:
-        go-version: 1.16
+        go-version: 1.17
 
     - uses: azure/setup-kubectl@v1
       with:
@@ -212,6 +213,8 @@ jobs:
           exit 1
         fi
 
+        kubectl get all -n ${operatorNamespace}
+
         sleep 10
 
     - name: install harbor
@@ -346,9 +349,11 @@ jobs:
         certManager:
           - "1.4.4"
 
-        # https://snapcraft.io/microk8s
         k8sVersion:
+          - "1.20.7"
+          - "1.21.2"
           - "1.22.0"
+          - "1.23.0"
 
         samples:
           - "full_stack.yaml"
@@ -358,7 +363,7 @@ jobs:
 
       - uses: actions/setup-go@v2
         with:
-          go-version: 1.16
+          go-version: 1.17
 
       - uses: azure/setup-kubectl@v1
         with:
@@ -554,7 +559,10 @@ jobs:
 
         # https://snapcraft.io/microk8s
         k8sVersion:
-          - "1.22.0"
+        - "1.20.7"
+        - "1.21.2"
+        - "1.22.0"
+        - "1.23.0"
 
         ingress:
           - "1.0.5"
@@ -564,7 +572,7 @@ jobs:
 
       - uses: actions/setup-go@v2
         with:
-          go-version: 1.16
+          go-version: 1.17
 
       - uses: azure/setup-kubectl@v1
         with:
@@ -728,7 +736,7 @@ jobs:
     steps:
     - uses: actions/setup-go@v2
       with:
-        go-version: 1.16
+        go-version: 1.17
     - uses: actions/checkout@v2
     - run: make manifests
     - uses: azure/k8s-bake@v1
@@ -743,7 +751,7 @@ jobs:
     steps:
     - uses: actions/setup-go@v2
       with:
-        go-version: 1.16
+        go-version: 1.17
     - uses: actions/checkout@v2
     - run: make manifests
     - uses: azure/k8s-bake@v1

Makefile

@@ -127,7 +127,7 @@ helm-install: helm helm-generate
 		--set installCRDs=true \
 		--set minio-operator.enabled=true \
 		--set postgres-operator.enabled=true \
-		--set redisoperator.enabled=true 
+		--set redis-operator.enabled=true 
 
 CLUSTER_NAME := harbor-operator
 

README.md

@@ -66,7 +66,7 @@ NOTES:
 
 [1] `.x` means all the patch releases of Harbor can be naturally supported in one operator version.
 
-[2] Use a [forked version](https://github.com/szlabs/redis-operator) of [spotahome/redis-operator](https://github.com/spotahome/redis-operator).
+[2] Use a [forked version](https://github.com/spotahome/redis-operator) of [spotahome/redis-operator](https://github.com/spotahome/redis-operator).
 
 ## Compatibility
 
@@ -138,7 +138,7 @@ Special thanks to the [contributors](./MAINTAINERS) who did significant contribu
 
 * [cert-manager](https://cert-manager.io/docs/)
 * [Underlying postgreSQL operator](https://github.com/zalando/postgres-operator)
-* [Underlying redis operator](https://github.com/szlabs/redis-operator)
+* [Underlying redis operator](https://github.com/spotahome/redis-operator)
 * [Underlying minio operator](https://github.com/minio/minio-operator)
 * [Kubernetes operator](https://kubernetes.io/docs/concepts/extend-kubernetes/operator/)
 * [Custom Resource Definition](https://kubernetes.io/docs/concepts/extend-kubernetes/api-extension/custom-resources/)

charts/harbor-operator/Chart.lock

@@ -2,11 +2,11 @@ dependencies:
 - name: minio-operator
   repository: https://operator.min.io/
   version: 4.3.2
-- name: redisoperator
-  repository: ""
-  version: 3.1.0
+- name: redis-operator
+  repository: https://spotahome.github.io/redis-operator
+  version: 3.1.4
 - name: postgres-operator
   repository: ""
   version: 1.6.3
-digest: sha256:242bc9e61b8d6ffb110e3b7a46218f9f3160d5e61a2ed372e3b060e6c9439104
-generated: "2021-11-02T14:09:21.061946+08:00"
+digest: sha256:a83ab1189da727ad8b68ed63268edf497e3c996aa89d5ee6527c6384e8ce2f66
+generated: "2022-01-18T22:38:09.96004016+08:00"

charts/harbor-operator/Chart.yaml

@@ -26,9 +26,10 @@ dependencies:
   repository: https://operator.min.io/
   tags:
     - storage
-- name: redisoperator
-  version: 3.1.0
-  condition: redisoperator.enabled
+- name: redis-operator
+  version: 3.1.4
+  condition: rediso-perator.enabled
+  repository: https://spotahome.github.io/redis-operator
   tags:
     - cache
 - name: postgres-operator

charts/harbor-operator/README.md

@@ -52,8 +52,8 @@ Deploy Harbor Operator
 | postgres-operator.enabled | bool | `false` | Whether to enabled [Postgres operator](https://github.com/zalando/postgres-operator) |
 | priorityClassName | string | `""` | priority class to be used for the harbor-operator pods |
 | rbac.create | bool | `true` | Whether to install Role Based Access Control |
-| redisoperator.enabled | bool | `false` | Whether to enabled [Redis Operator](https://github.com/spotahome/redis-operator) |
-| redisoperator.rbac.install | bool | `true` |  |
+| redis-operator.enabled | bool | `false` | Whether to enabled [Redis Operator](https://github.com/spotahome/redis-operator) |
+| redis-operator.rbac.install | bool | `true` |  |
 | replicaCount | int | `1` | Number of replicas for the controller |
 | resources | object | `{"limits":{"cpu":"500m","memory":"300Mi"},"requests":{"cpu":"300m","memory":"200Mi"}}` | Expects input structure as per specification <https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.18/#resourcerequirements-v1-core> |
 | service.port | int | `443` | Expose port for WebHook controller |