feat(openstack-cloud-controller-manager): add splitMode

This allows the user to deploy the controller-manager split between the
management cluster and the workload cluster.

Author: cwrau

charts/openstack-cloud-controller-manager/Chart.lock

@@ -0,0 +1,6 @@
+dependencies:
+- name: common
+  repository: https://charts.bitnami.com/bitnami
+  version: 2.14.1
+digest: sha256:ac04d66e6abb3cfc89f4c10e49d79770c352c510744bc51e3595937721b7f41a
+generated: "2024-01-10T10:12:58.796725699+01:00"

charts/openstack-cloud-controller-manager/Chart.yaml

@@ -4,7 +4,7 @@ description: Openstack Cloud Controller Manager Helm Chart
 icon: https://object-storage-ca-ymq-1.vexxhost.net/swift/v1/6e4619c416ff4bd19e1c087f27a43eea/www-images-prod/openstack-logo/OpenStack-Logo-Vertical.png
 home: https://github.com/kubernetes/cloud-provider-openstack
 name: openstack-cloud-controller-manager
-version: 2.34.2
+version: 2.35.0
 maintainers:
   - name: eumel8
     email: f.kloeker@telekom.de

charts/openstack-cloud-controller-manager/charts/common-2.14.1.tgz

@@ -1,3 +1,4 @@
+{{- if or (not .Values.splitMode.enabled) (eq .Values.splitMode.type "workload") }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
@@ -96,3 +97,4 @@ rules:
   - list
   - get
   - watch
+{{- end }}

charts/openstack-cloud-controller-manager/templates/clusterrole.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.serviceMonitor.enabled }}
+{{- if and .Values.serviceMonitor.enabled (or (not .Values.splitMode.enabled) (eq .Values.splitMode.type "management")) }}
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:

charts/openstack-cloud-controller-manager/templates/clusterrolebinding-sm.yaml

@@ -1,3 +1,4 @@
+{{- if or (not .Values.splitMode.enabled) (eq .Values.splitMode.type "workload") }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
@@ -13,6 +14,12 @@ roleRef:
   kind: ClusterRole
   name: {{ .Values.clusterRoleName }}
 subjects:
+{{- if and .Values.splitMode.enabled (eq .Values.splitMode.type "workload") }}
+- kind: User
+  name: {{ .Values.splitMode.subject.name }}
+{{- else }}
 - kind: ServiceAccount
   name: {{ .Values.serviceAccountName }}
   namespace: {{ .Release.Namespace | quote }}
+{{- end }}
+{{- end }}

charts/openstack-cloud-controller-manager/templates/clusterrolebinding.yaml

@@ -1,5 +1,10 @@
+{{- if or (not .Values.splitMode.enabled) (eq .Values.splitMode.type "management") }}
 apiVersion: apps/v1
+{{- if .Values.splitMode.enabled }}
+kind: Deployment
+{{- else }}
 kind: DaemonSet
+{{- end }}
 metadata:
   name: {{ include "occm.name" . }}
   labels: {{- include "common.labels.standard" . | nindent 4 }}
@@ -9,11 +14,19 @@ metadata:
     {{- toYaml . | nindent 4 }}
     {{- end }}
 spec:
+  {{- if .Values.splitMode.enabled }}
+  replicas: {{ .Values.splitMode.replicas }}
+  {{- end }}
   selector:
     matchLabels:
       {{- include "occm.controllermanager.matchLabels" . | nindent 6 }}
+  {{- if .Values.splitMode.enabled }}
+  strategy:
+    type: RollingUpdate
+  {{- else }}
   updateStrategy:
     type: RollingUpdate
+  {{- end }}
   template:
     metadata:
       annotations:
@@ -26,10 +39,17 @@ spec:
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- if .Values.splitMode.enabled }}
+      {{- with .Values.splitMode.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- else }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- end }}
       {{- with .Values.podSecurityContext }}
       securityContext:
         {{- toYaml . | nindent 8 }}
@@ -42,7 +62,11 @@ spec:
       hostAliases:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- if .Values.splitMode.enabled }}
+      automountServiceAccountToken: false
+      {{- else }}
       serviceAccountName: {{ .Values.serviceAccountName }}
+      {{- end }}
       containers:
         - name: openstack-cloud-controller-manager
           image: "{{ .Values.image.repository }}:{{ default .Chart.AppVersion .Values.image.tag }}"
@@ -56,6 +80,10 @@ spec:
             - --cloud-config=$(CLOUD_CONFIG)
             - --cluster-name=$(CLUSTER_NAME)
             - --cloud-provider=openstack
+            {{- if .Values.splitMode.enabled }}
+            - --kubeconfig=/etc/kubernetes/kubeconfig
+            - --leader-elect=true
+            {{- end }}
             - --use-service-account-credentials=false
             - --controllers={{- trimAll "," (include "occm.enabledControllers" . ) -}}
             {{- if .Values.serviceMonitor.enabled }}
@@ -71,10 +99,23 @@ spec:
           {{- if .Values.serviceMonitor.enabled }}
           ports:
           - containerPort: 10258
+            {{- if not .Values.splitMode.enabled }}
             hostPort: 10258
+            {{- end }}
             name: http
             protocol: TCP
           {{- end }}
+          {{- if .Values.splitMode.enabled }}
+          volumeMounts: {{- toYaml .Values.splitMode.extraVolumeMounts | nindent 12 }}
+            - mountPath: /etc/kubernetes
+              name: kubeconfig-volume
+              readOnly: true
+          {{- if .Values.secret.enabled }}
+            - mountPath: /etc/config
+              name: cloud-config-volume
+              readOnly: true
+          {{- end }}
+          {{- else }}
           {{- if or (.Values.extraVolumeMounts) (.Values.secret.enabled) }}
           volumeMounts:
           {{- end }}
@@ -86,6 +127,7 @@ spec:
           {{- if .Values.extraVolumeMounts }}
             {{- toYaml .Values.extraVolumeMounts | nindent 12 }}
           {{- end }}
+          {{- end }}
           {{- if .Values.livenessProbe }}
           livenessProbe:
             {{- toYaml .Values.livenessProbe | nindent 12 }}
@@ -110,11 +152,27 @@ spec:
       initContainers: {{ toYaml .Values.extraInitContainers | nindent 6 }}
       {{- end }}
       dnsPolicy: {{ .Values.dnsPolicy }}
+      {{- if not .Values.splitMode.enabled }}
       hostNetwork: true
+      {{- end }}
       {{- if .Values.priorityClassName }}
       priorityClassName: {{ .Values.priorityClassName }}
       {{- end }}
 
+      {{- if .Values.splitMode.enabled }}
+      volumes: {{- toYaml .Values.splitMode.extraVolumes | nindent 6 }}
+      - name: kubeconfig-volume
+        secret:
+          secretName: {{ .Values.splitMode.kubeconfig.secretName }}
+          items:
+            - key: {{ .Values.splitMode.kubeconfig.secretKey }}
+              path: kubeconfig
+      {{- if .Values.secret.enabled }}
+      - name: cloud-config-volume
+        secret:
+          secretName: {{ .Values.secret.name }}
+      {{- end }}
+      {{- else }}
       {{- if or (.Values.extraVolumes) (.Values.secret.enabled) }}
       volumes:
       {{- end }}
@@ -126,3 +184,5 @@ spec:
       {{- if .Values.extraVolumes }}
         {{ toYaml .Values.extraVolumes | nindent 6 }}
       {{- end }}
+      {{- end }}
+{{- end }}

…troller-manager/templates/daemonset.yaml …roller-manager/templates/controller.yamlcharts/openstack-cloud-controller-manager/templates/daemonset.yaml renamed to charts/openstack-cloud-controller-manager/templates/controller.yaml charts/openstack-cloud-controller-manager/templates/daemonset.yaml renamed to charts/openstack-cloud-controller-manager/templates/controller.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.serviceMonitor.enabled }}
+{{- if and .Values.serviceMonitor.enabled (or (not .Values.splitMode.enabled) (eq .Values.splitMode.type "management")) }}
 apiVersion: v1
 kind: Service
 metadata:

charts/openstack-cloud-controller-manager/templates/service-sm.yaml

@@ -1,3 +1,4 @@
+{{- if not .Values.splitMode.enabled }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -8,3 +9,4 @@ metadata:
     {{- with .Values.commonAnnotations }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
+{{- end }}

charts/openstack-cloud-controller-manager/templates/serviceaccount.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.serviceMonitor.enabled }}
+{{- if and .Values.serviceMonitor.enabled (or (not .Values.splitMode.enabled) (eq .Values.splitMode.type "management")) }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata: