replace spotahome/redis-operator by szlabs/redis-operator (#804)

* replace spotahome/redis-opertor by szlabs/szlabs Signed-off-by: yxxhero <aiopsclub@163.com> * add k8s 1.22 test Signed-off-by: yxxhero <aiopsclub@163.com> * add generated-diff-test file Signed-off-by: yxxhero <aiopsclub@163.com> * update kustomization-custom.md Signed-off-by: yxxhero <aiopsclub@163.com> * generate manifests Signed-off-by: yxxhero <aiopsclub@163.com> * update ci test ingress verion to v1.0.4 Signed-off-by: yxxhero <aiopsclub@163.com> * fix ingress version typo Signed-off-by: yxxhero <aiopsclub@163.com> * update ingress-controller version in ci Signed-off-by: yxxhero <aiopsclub@163.com> * update ingress-controller version in ci Signed-off-by: yxxhero <aiopsclub@163.com> * update cert manager version in ci Signed-off-by: yxxhero <aiopsclub@163.com> * update ci Signed-off-by: yxxhero <aiopsclub@163.com> * update ci Signed-off-by: yxxhero <aiopsclub@163.com> * changes: 1. certManager upgrade to 1.5.3 and 1.6.1 2. add k8s version 1.22 in ci 3. ingress upgrade to 1.0.1 4. go library about k8s upgrade to 0.22.3 5. controller-runtime upgrade to v0.10.2 6. minio-operator image upgrade to v4.1.3 7. postgres-operator image upgrade to v1.6.3 8. redis-operator image upgrade to v1.0.2 9. replace spotahome/redis-operator by szlabs/redis-operator Signed-off-by: yxxhero <aiopsclub@163.com> * change redis-operator image Signed-off-by: yxxhero <aiopsclub@163.com>
goharbor · Nov 10, 2021 · 7ebb561 · 7ebb561
1 parent 74eee8b
commit 7ebb561
Show file tree

Hide file tree

Showing 12 changed files with 947 additions and 138 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -132,18 +132,20 @@ jobs:
       matrix:
         # https://github.com/jetstack/cert-manager/tags
         certManager:
-        - "1.1.1"
+#        - "1.1.1"
 #        - "1.2.0"
-        - "1.4.3"
+        - "1.5.3"
+        - "1.6.1"
 
         # https://github.com/kubernetes-sigs/kind/releases
         k8sVersion:
         - "1.19.11"
         - "1.20.7"
         - "1.21.2"
+        - "1.22.0"
 
         ingress:
-        - "0.48.1"
+        - "1.0.1"
 
         samples:
         - "full_stack.yaml"

diff --git a/charts/harbor-operator/charts/redisoperator/README.md b/charts/harbor-operator/charts/redisoperator/README.md
@@ -9,7 +9,7 @@ A Helm chart for the Spotahome Redis Operator
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | containerName | string | `"redisoperator"` |  |
-| image | string | `"quay.io/spotahome/redis-operator"` |  |
+| image | string | `"ghcr.io/goharbor/redis-operator-ext"` |  |
 | monitoring.enabled | bool | `false` |  |
 | monitoring.prometheus.name | string | `"unknown"` |  |
 | monitoring.serviceAnnotations | object | `{}` |  |
@@ -23,7 +23,7 @@ A Helm chart for the Spotahome Redis Operator
 | resources.limits.memory | string | `"50Mi"` |  |
 | resources.requests.cpu | string | `"10m"` |  |
 | resources.requests.memory | string | `"50Mi"` |  |
-| tag | string | `"latest"` |  |
+| tag | string | `"v1.0.1"` |  |
 
 ----------------------------------------------
 Autogenerated from chart metadata using [helm-docs v1.4.0](https://github.com/norwoodj/helm-docs/releases/v1.4.0)
diff --git a/charts/harbor-operator/charts/redisoperator/values.yaml b/charts/harbor-operator/charts/redisoperator/values.yaml
@@ -1,5 +1,5 @@
-image: quay.io/spotahome/redis-operator
-tag: latest
+image: ghcr.io/goharbor/redis-operator-ext
+tag: v1.0.1
 pullPolicy: Always
 containerName: redisoperator
 podAnnotations: {}
@@ -19,4 +19,4 @@ monitoring:
   serviceMonitor: false
   serviceAnnotations: {}
   prometheus:
-    name: unknown
+    name: unknown
diff --git a/charts/harbor-operator/templates/crds.yaml b/charts/harbor-operator/templates/crds.yaml
diff --git a/docs/installation/kustomization-custom.md b/docs/installation/kustomization-custom.md
@@ -42,7 +42,7 @@ Follow the deployment guide shown [here](https://github.com/spotahome/redis-oper
 A simple way is:
 
 ```shell script
-kubectl create -f https://raw.githubusercontent.com/spotahome/redis-operator/master/example/operator/all-redis-operator-resources.yaml
+kubectl create -f https://raw.githubusercontent.com/szlabs/redis-operator/master/example/operator/all-redis-operator-resources.yaml
 ```
 
 Check the Redis operator status (by default it's deployed into the `default` namespace):
@@ -61,7 +61,7 @@ redisoperator-56d6888cc-5sz9k   1/1     Running   0          84s
 For deleting the Redis operator, just call:
 
 ```shell
-kubectl delete -f https://raw.githubusercontent.com/spotahome/redis-operator/master/example/operator/all-redis-operator-resources.yaml
+kubectl delete -f https://raw.githubusercontent.com/szlabs/redis-operator/master/example/operator/all-redis-operator-resources.yaml
 ```
 
 ## Deploy Minio operator (Optional)

diff --git a/go.mod b/go.mod
@@ -17,30 +17,34 @@ require (
 	github.com/minio/minio-go/v6 v6.0.57
 	github.com/mitchellh/reflectwalk v1.0.1 // indirect
 	github.com/onsi/ginkgo v1.16.4
-	github.com/onsi/gomega v1.13.0
+	github.com/onsi/gomega v1.15.0
 	github.com/opentracing-contrib/go-stdlib v1.0.0
 	github.com/opentracing/opentracing-go v1.2.0
 	github.com/ovh/configstore v0.3.2
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.11.0
 	github.com/sethvargo/go-password v0.1.3
-	github.com/sirupsen/logrus v1.7.0
+	github.com/sirupsen/logrus v1.8.1
 	github.com/spotahome/redis-operator v1.0.0
+	github.com/szlabs/redis-operator v1.0.1 // indirect
 	github.com/theupdateframework/notary v0.6.1
 	github.com/uber/jaeger-client-go v2.24.0+incompatible
 	github.com/uber/jaeger-lib v2.2.0+incompatible
 	github.com/zalando/postgres-operator v1.6.1
-	go.uber.org/zap v1.17.0
+	go.uber.org/zap v1.19.0
 	golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
-	golang.org/x/tools v0.1.2 // indirect
 	gopkg.in/yaml.v2 v2.4.0
-	k8s.io/api v0.21.1
-	k8s.io/apiextensions-apiserver v0.21.1
-	k8s.io/apimachinery v0.21.1
-	k8s.io/client-go v0.21.1
+	k8s.io/api v0.22.3
+	k8s.io/apiextensions-apiserver v0.22.3
+	k8s.io/apimachinery v0.22.3
+	k8s.io/client-go v0.22.3
 	k8s.io/klog v1.0.0
-	sigs.k8s.io/controller-runtime v0.9.0
+	sigs.k8s.io/controller-runtime v0.10.2
 	sigs.k8s.io/kustomize/kstatus v0.0.2
 	sigs.k8s.io/yaml v1.2.0
 )
+
+replace github.com/spotahome/redis-operator v1.0.0 => github.com/szlabs/redis-operator v1.0.1
+
+replace github.com/szlabs/redis-operator v1.0.1 => github.com/spotahome/redis-operator v1.0.0
diff --git a/go.sum b/go.sum
diff --git a/manifests/cluster/deployment.yaml b/manifests/cluster/deployment.yaml
diff --git a/manifests/cluster/kustomization.yaml b/manifests/cluster/kustomization.yaml
@@ -15,9 +15,9 @@ commonAnnotations:
 resources:
   - ../../config/default # harbor operator
   - patch/namespace.yaml
-  - https://raw.githubusercontent.com/spotahome/redis-operator/master/example/operator/all-redis-operator-resources.yaml?ref=v1.0.0 # redis operator
-  - github.com/zalando/postgres-operator/manifests?ref=v1.5.0 # postgresql operator
-  - github.com/minio/operator?ref=v4.0.6 # minIO storage operator
+  - https://raw.githubusercontent.com/szlabs/redis-operator/master/example/operator/all-redis-operator-resources.yaml?ref=v1.0.1 # redis operator
+  - github.com/zalando/postgres-operator/manifests?ref=v1.6.3 # postgresql operator
+  - github.com/minio/operator?ref=v4.1.3 # minIO storage operator
 
 # If you have to override the image source, uncomment this patch and also change the image source in the patch/image-source.yaml file.
 # Then rebuild.
@@ -38,10 +38,10 @@ patchesJson6902:
 
 images:
   - name: quay.io/spotahome/redis-operator
-    newName: ghcr.io/goharbor/redis-operator
-    newTag: v1.0.0
+    newName: ghcr.io/goharbor/redis-operator-ext
+    newTag: v1.0.1
   - name: minio/operator
-    newName: ghcr.io/goharbor/minio-operator
+    newName: quay.io/minio/operator 
   - name: minio/console
     newName: ghcr.io/goharbor/minio-console
   - name: registry.opensource.zalan.do/acid/postgres-operator