restructure deploy contents to support using kustomize

.lighthouse/jenkins-x/pullrequest.yaml

@@ -0,0 +1,28 @@
+apiVersion: tekton.dev/v1beta1
+kind: PipelineRun
+metadata:
+  name: pullrequest
+spec:
+  pipelineSpec:
+    tasks:
+    - name: from-build-pack
+      resources: {}
+      taskSpec:
+        metadata: {}
+        stepTemplate:
+          workingDir: /workspace/source
+          env:
+            - name: "NEXUS_AUTH"
+              valueFrom:
+                secretKeyRef:
+                  name: drivenow-maven-settings
+                  key: NEXUS_AUTH
+            - name: "KANIKO_ARGS"
+              value: "--build-arg=NEXUS_AUTH"
+
+        steps:
+        - image: uses:lighthouse:drivenow/jx3-pipelines/docker-helm-promote-pr/pullrequest.yaml@master
+  podTemplate: {}
+  serviceAccountName: tekton-bot
+  timeout: 240h0m0s
+status: {}

.lighthouse/jenkins-x/release.yaml

@@ -0,0 +1,27 @@
+apiVersion: tekton.dev/v1beta1
+kind: PipelineRun
+metadata:
+  name: release
+spec:
+  pipelineSpec:
+    tasks:
+    - name: from-build-pack
+      resources: {}
+      taskSpec:
+        metadata: {}
+        stepTemplate:
+          workingDir: /workspace/source
+          env:
+            - name: "NEXUS_AUTH"
+              valueFrom:
+                secretKeyRef:
+                  name: drivenow-maven-settings
+                  key: NEXUS_AUTH
+            - name: "KANIKO_ARGS"
+              value: "--build-arg=NEXUS_AUTH"
+        steps:
+        - image: uses:lighthouse:drivenow/jx3-pipelines/docker-helm-promote-pr/release.yaml@master
+  podTemplate: {}
+  serviceAccountName: tekton-bot
+  timeout: 240h0m0s
+status: {}

.lighthouse/jenkins-x/triggers.yaml

@@ -0,0 +1,16 @@
+apiVersion: config.lighthouse.jenkins-x.io/v1alpha1
+kind: TriggerConfig
+spec:
+  presubmits:
+  - name: pr
+    context: "pr"
+    always_run: true
+    optional: false
+    source: pullrequest.yaml
+  postsubmits:
+  - name: release
+    context: "release"
+    source: release.yaml
+    branches:
+    - ^main$
+    - ^master$

Dockerfile

@@ -13,10 +13,10 @@ ARG GIT_SHA=0000000
 
 WORKDIR /src
 
-COPY go.mod ./ go.sum ./
+COPY go.mod go.sum ./
 RUN GOPROXY=https://goproxy.cn,direct go mod download
 
-COPY pkg ./ cmd ./ version ./
+COPY ./ ./
 
 RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -o ${GOBIN}/${PROJECT_NAME} \
     -ldflags "-X ${REPO_PATH}/pkg/version.Version=${VERSION} -X ${REPO_PATH}/pkg/version.GitSHA=${GIT_SHA}" \

OWNERS

@@ -0,0 +1,4 @@
+approvers:
+- cameronbraid
+reviewers:
+- cameronbraid

OWNERS_ALIASES

@@ -0,0 +1,6 @@
+aliases:
+- cameronbraid
+best-approvers:
+- cameronbraid
+best-reviewers:
+- cameronbraid

deploy/cluster/kustomization.yaml

@@ -0,0 +1,7 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- ../common/
+- cluster_role.yaml
+- cluster_role_binding.yaml
+- operator.yaml

deploy/cluster/operator.yaml

@@ -16,7 +16,7 @@ spec:
       containers:
         - name: redis-operator
           # Replace this with the built image name
-          image: REPLACE_IMAGE
+          image: redis-operator
           command:
           - redis-operator
           imagePullPolicy: Always

deploy/common/kustomization.yaml

@@ -0,0 +1,5 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- redis_v1beta1_rediscluster_crd.yaml
+- service_account.yaml

deploy/crds/redis_v1beta1_rediscluster_crd.yaml → deploy/common/redis_v1beta1_rediscluster_crd.yaml

@@ -1,4 +1,4 @@
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: redisclusters.redis.kun

deploy/cluster/redis_v1beta1_rediscluster_cr.yaml → deploy/example/redis_v1beta1_rediscluster_cr.yaml

@@ -7,4 +7,4 @@ metadata:
   name: test
 spec:
   # Add fields here
-  size: 3
+  size: 3

deploy/namespace/kustomization.yaml

@@ -0,0 +1,7 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- ../common/
+- operator.yaml
+- role.yaml
+- role_binding.yaml

deploy/namespace/operator.yaml

@@ -16,7 +16,7 @@ spec:
       containers:
         - name: redis-operator
           # Replace this with the built image name
-          image: REPLACE_IMAGE
+          image: redis-operator
           command:
           - redis-operator
           imagePullPolicy: Always

pkg/client/redis/client.go

@@ -272,6 +272,10 @@ func (c *client) SetCustomRedisConfig(ip string, configs map[string]string, auth
 	rClient := rediscli.NewClient(options)
 	defer rClient.Close()
 
+	if err := c.applyRedisConfig("replica-announce-ip", ip, rClient); err != nil {
+		return err
+	}
+
 	for param, value := range configs {
 		//param, value, err := c.getConfigParameters(config)
 		//if err != nil {

pkg/controller/service/check.go

@@ -62,6 +62,10 @@ func (r *RedisClusterChecker) CheckRedisConfig(redisCluster *redisv1beta1.RedisC
 		return err
 	}
 
+	if _, ok := configs["replica-announce-ip"]; !ok {
+		return fmt.Errorf("configs conflict, expect: replica-announce-ip to be set")
+	}
+
 	// TODO when custom config use unit like mb gb, will return configs conflict
 	for key, value := range redisCluster.Spec.Config {
 		if value != configs[key] {

pkg/controller/service/heal.go

@@ -124,9 +124,9 @@ func (r *RedisClusterHealer) SetSentinelCustomConfig(ip string, rc *redisv1beta1
 
 // SetRedisCustomConfig will call redis to set the configuration given in config
 func (r *RedisClusterHealer) SetRedisCustomConfig(ip string, rc *redisv1beta1.RedisCluster, auth *util.AuthConfig) error {
-	if len(rc.Spec.Config) == 0 && len(auth.Password) == 0 {
-		return nil
-	}
+	// if len(rc.Spec.Config) == 0 && len(auth.Password) == 0 {
+	// 	return nil
+	// }
 
 	//if len(auth.Password) != 0 {
 	//	rc.Spec.Config["requirepass"] = auth.Password