Run go-makefile-maker and helmify

Author: notandy

.golangci.yaml

@@ -145,6 +145,10 @@ linters:
       enable-all: true
     nolintlint:
       require-specific: true
+    modernize:
+      disable:
+        # omitzero requires removing omitempty tags in kubernetes api struct types which are nested, which is intepreted by controller-gen and breaks the CRDs.
+        - omitzero
     perfsprint:
       # modernize generates nicer fix code
       concat-loop: false

charts/openstack-hypervisor-operator/templates/deployment.yaml

@@ -60,7 +60,12 @@ spec:
           }}
         securityContext: {{- toYaml .Values.controllerManager.manager.containerSecurityContext
           | nindent 10 }}
+      nodeSelector: {{- toYaml .Values.controllerManager.nodeSelector | nindent 8 }}
       securityContext: {{- toYaml .Values.controllerManager.podSecurityContext | nindent
         8 }}
-      serviceAccountName: {{ include "openstack-hypervisor-operator.fullname" . }}-controller-manager
+      serviceAccountName: {{ include "openstack-hypervisor-operator.serviceAccountName"
+        . }}
       terminationGracePeriodSeconds: 10
+      tolerations: {{- toYaml .Values.controllerManager.tolerations | nindent 8 }}
+      topologySpreadConstraints: {{- toYaml .Values.controllerManager.topologySpreadConstraints
+        | nindent 8 }}

charts/openstack-hypervisor-operator/templates/leader-election-rbac.yaml

@@ -49,5 +49,5 @@ roleRef:
   name: '{{ include "openstack-hypervisor-operator.fullname" . }}-leader-election-role'
 subjects:
 - kind: ServiceAccount
-  name: '{{ include "openstack-hypervisor-operator.fullname" . }}-controller-manager'
+  name: '{{ include "openstack-hypervisor-operator.serviceAccountName" . }}'
   namespace: '{{ .Release.Namespace }}'

charts/openstack-hypervisor-operator/templates/manager-rbac.yaml

@@ -97,5 +97,5 @@ roleRef:
   name: '{{ include "openstack-hypervisor-operator.fullname" . }}-manager-role'
 subjects:
 - kind: ServiceAccount
-  name: '{{ include "openstack-hypervisor-operator.fullname" . }}-controller-manager'
+  name: '{{ include "openstack-hypervisor-operator.serviceAccountName" . }}'
   namespace: '{{ .Release.Namespace }}'

charts/openstack-hypervisor-operator/templates/metrics-auth-rbac.yaml

@@ -30,5 +30,5 @@ roleRef:
   name: '{{ include "openstack-hypervisor-operator.fullname" . }}-metrics-auth-role'
 subjects:
 - kind: ServiceAccount
-  name: '{{ include "openstack-hypervisor-operator.fullname" . }}-controller-manager'
+  name: '{{ include "openstack-hypervisor-operator.serviceAccountName" . }}'
   namespace: '{{ .Release.Namespace }}'

charts/openstack-hypervisor-operator/templates/serviceaccount.yaml

@@ -1,8 +1,13 @@
+{{ if .Values.serviceAccount.create }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ include "openstack-hypervisor-operator.fullname" . }}-controller-manager
+  name: {{ include "openstack-hypervisor-operator.serviceAccountName" . }}
   labels:
   {{- include "openstack-hypervisor-operator.labels" . | nindent 4 }}
+  {{- with .Values.serviceAccount.annotations }}
   annotations:
-    {{- toYaml .Values.controllerManager.serviceAccount.annotations | nindent 4 }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+automountServiceAccountToken: {{ .Values.serviceAccount.automount }}
+{{- end }}

charts/openstack-hypervisor-operator/values.yaml

@@ -26,11 +26,12 @@ controllerManager:
       requests:
         cpu: 10m
         memory: 64Mi
+  nodeSelector: {}
   podSecurityContext:
     runAsNonRoot: true
   replicas: 1
-  serviceAccount:
-    annotations: {}
+  tolerations: []
+  topologySpreadConstraints: []
 kubernetesClusterDomain: cluster.local
 metricsService:
   ports:
@@ -41,3 +42,8 @@ metricsService:
   type: ClusterIP
 secret:
   servicePassword: ""
+serviceAccount:
+  annotations: {}
+  automount: true
+  create: true
+  name: ""