Merge pull request #6576 from zalando-incubator/stack-owned-configmap

Update Stackset controller with Stack owned ConfigMap feature
zalando-incubator · Dec 1, 2023 · 9551883 · 9551883
2 parents 5996d4f + 7291816
commit 9551883
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 1 deletion.
diff --git a/cluster/config-defaults.yaml b/cluster/config-defaults.yaml
@@ -838,6 +838,9 @@ stackset_routegroup_support_enabled: "true"
 # E.g. switching from RouteGroup to Ingress or vice versa.
 stackset_ingress_source_switch_ttl: "5m"
 
+# enable/disable configmap support for stackset
+stackset_configmap_support_enabled: "false"
+
 # Enable/Disable profiling for Kubernetes components
 enable_control_plane_profiling: "false"
 

diff --git a/cluster/manifests/stackset-controller/01-stack-crd.yaml b/cluster/manifests/stackset-controller/01-stack-crd.yaml
@@ -349,6 +349,26 @@ spec:
                 - maxReplicas
                 - metrics
                 type: object
+{{- if eq .Cluster.ConfigItems.stackset_configmap_support_enabled "true" }}
+              configurationResources:
+                description: ConfigurationResources describes the ConfigMaps that
+                  will be created. Later Secrets and PlatformCredentialSets will also
+                  be defined on ConfigurationResources
+                items:
+                  description: ConfigurationResourcesSpec makes it possible to defined
+                    the config resources to be created
+                  properties:
+                    configMapRef:
+                      description: ConfigMap to be versioned for 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
+                  type: object
+                type: array
+{{ end }}
               externalIngress:
                 description: Stack specific ExternalIngress, based on the parent StackSet
                   at creation time.

diff --git a/cluster/manifests/stackset-controller/01-stackset-crd.yaml b/cluster/manifests/stackset-controller/01-stackset-crd.yaml
@@ -596,6 +596,27 @@ spec:
                         - maxReplicas
                         - metrics
                         type: object
+{{- if eq .Cluster.ConfigItems.stackset_configmap_support_enabled "true" }}
+                      configurationResources:
+                        description: ConfigurationResources describes the ConfigMaps
+                          that will be created. Later Secrets and PlatformCredentialSets
+                          will also be defined on ConfigurationResources
+                        items:
+                          description: ConfigurationResourcesSpec makes it possible
+                            to defined the config resources to be created
+                          properties:
+                            configMapRef:
+                              description: ConfigMap to be versioned for 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
+                          type: object
+                        type: array
+{{ end }}
                       minReadySeconds:
                         description: Minimum number of seconds for which a newly created
                           pod should be ready without any of its container crashing,

diff --git a/cluster/manifests/stackset-controller/deployment.yaml b/cluster/manifests/stackset-controller/deployment.yaml
@@ -1,4 +1,4 @@
-{{ $version := "v1.4.15" }}
+{{ $version := "v1.4.22" }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -36,6 +36,9 @@ spec:
 {{- if eq .Cluster.ConfigItems.stackset_routegroup_support_enabled "true" }}
         - "--enable-routegroup-support"
         - "--ingress-source-switch-ttl={{ .Cluster.ConfigItems.stackset_ingress_source_switch_ttl }}"
+{{- end }}
+{{- if eq .Cluster.ConfigItems.stackset_configmap_support_enabled "true" }}
+        - "--enable-configmap-support"
 {{- end }}
         - "--cluster-domain={{ .Values.hosted_zone }}"
         - "--cluster-domain=ingress.cluster.local"

diff --git a/cluster/manifests/stackset-controller/rbac.yaml b/cluster/manifests/stackset-controller/rbac.yaml
@@ -99,6 +99,17 @@ rules:
   - create
   - update
   - patch
+{{- if eq .Cluster.ConfigItems.stackset_configmap_support_enabled "true" }}
+- apiGroups:
+  - ""
+  resources:
+  - configmaps
+  verbs:
+  - get
+  - list
+  - create
+  - update
+{{- end }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding