Fix merge conflict.

Signed-off-by: Rodrigo Reis <[email protected]>

Author: gargravarr

cluster/config-defaults.yaml

@@ -903,6 +903,9 @@ stackset_configmap_support_enabled: "true"
 stackset_configmap_support_enabled: "false"
 {{end}}
 
+# enable/disable secret support for stackset
+stackset_secret_support_enabled: "false"
+
 # enable/disable traffic segment support for stackset
 stackset_enable_traffic_segments: "false"
 {{if eq .Cluster.Environment "e2e"}}

cluster/manifests/stackset-controller/01-stack-crd.yaml

@@ -349,7 +349,7 @@ spec:
                 - maxReplicas
                 - metrics
                 type: object
-{{- if eq .Cluster.ConfigItems.stackset_configmap_support_enabled "true" }}
+{{- if or (eq .Cluster.ConfigItems.stackset_configmap_support_enabled "true") (eq .Cluster.ConfigItems.stackset_secret_support_enabled "true") }}
               configurationResources:
                 description: ConfigurationResources describes the ConfigMaps that
                   will be created. Later Secrets and PlatformCredentialSets will also
@@ -358,14 +358,26 @@ spec:
                   description: ConfigurationResourcesSpec makes it possible to defined
                     the config resources to be created
                   properties:
+{{- if eq .Cluster.ConfigItems.stackset_configmap_support_enabled "true" }}
                     configMapRef:
-                      description: ConfigMap to be versioned for Stack
+                      description: ConfigMap to be owned by Stack
+                      properties:
+                        name:
+                          description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                            TODO: Add other useful fields. apiVersion, kind, uid?'
+                          type: string
+                      type: object
+{{ end }}
+{{- if eq .Cluster.ConfigItems.stackset_secret_support_enabled "true" }}
+                    secretRef:
+                      description: Secret to be owned by Stack
                       properties:
                         name:
                           description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                             TODO: Add other useful fields. apiVersion, kind, uid?'
                           type: string
                       type: object
+{{ end }}
                   type: object
                 type: array
 {{ end }}

cluster/manifests/stackset-controller/01-stackset-crd.yaml

@@ -596,7 +596,7 @@ spec:
                         - maxReplicas
                         - metrics
                         type: object
-{{- if eq .Cluster.ConfigItems.stackset_configmap_support_enabled "true" }}
+{{- if or (eq .Cluster.ConfigItems.stackset_configmap_support_enabled "true") (eq .Cluster.ConfigItems.stackset_secret_support_enabled "true") }}
                       configurationResources:
                         description: ConfigurationResources describes the ConfigMaps
                           that will be created. Later Secrets and PlatformCredentialSets
@@ -605,15 +605,28 @@ spec:
                           description: ConfigurationResourcesSpec makes it possible
                             to defined the config resources to be created
                           properties:
+{{- if eq .Cluster.ConfigItems.stackset_configmap_support_enabled "true" }}
                             configMapRef:
-                              description: ConfigMap to be versioned for Stack
+                              description: ConfigMap to be owned by Stack
                               properties:
                                 name:
                                   description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                                     TODO: Add other useful fields. apiVersion, kind,
                                     uid?'
                                   type: string
                               type: object
+{{ end }}
+{{- if eq .Cluster.ConfigItems.stackset_secret_support_enabled "true" }}
+                            secretRef:
+                              description: Secret to be owned by Stack
+                              properties:
+                                name:
+                                  description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                    TODO: Add other useful fields. apiVersion, kind,
+                                    uid?'
+                                  type: string
+                              type: object
+{{ end }}
                           type: object
                         type: array
 {{ end }}

cluster/manifests/stackset-controller/deployment.yaml

@@ -40,6 +40,9 @@ spec:
 {{- if eq .Cluster.ConfigItems.stackset_configmap_support_enabled "true" }}
         - "--enable-configmap-support"
 {{- end }}
+{{- if eq .Cluster.ConfigItems.stackset_secret_support_enabled "true" }}
+        - "--enable-secret-support"
+{{- end }}
 {{- if eq .Cluster.ConfigItems.stackset_enable_traffic_segments "true" }}
         - "--enable-traffic-segments"
 {{- end }}

cluster/manifests/stackset-controller/rbac.yaml

@@ -110,6 +110,17 @@ rules:
   - create
   - update
 {{- end }}
+{{- if eq .Cluster.ConfigItems.stackset_secret_support_enabled "true" }}
+- apiGroups:
+  - ""
+  resources:
+  - secrets
+  verbs:
+  - get
+  - list
+  - create
+  - update
+{{- end }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding