Expose logging configuration in provider deployment (#1623)

* refactor helm-chart templates

for provider-extension deployment and machineclass:
- make indentation consistent and follow usual indentation
  scheme
- avoid implicit yaml-merges

also rm redundant label-block in machineclass values

* fix configmap backup config

* expose logging config

* refactor: rm whitespace

* run make generate

* add new config example and make generate

Author: AndreasBurger

charts/gardener-extension-provider-aws/templates/configmap-custom-mtu.yaml

@@ -3,8 +3,7 @@ kind: ConfigMap
 metadata:
   name: custom-mtu-configmap
   namespace: {{ .Release.Namespace }}
-  labels:
-{{ include "labels" . | indent 4 }}
+  labels: {{ include "labels" . | nindent 4 }}
 data:
   mtu-customizer.sh: |
     #!/bin/sh

charts/gardener-extension-provider-aws/templates/configmap-imagevector-overwrite.yaml

@@ -4,9 +4,8 @@ kind: ConfigMap
 metadata:
   name: {{ include "name" . }}-imagevector-overwrite
   namespace: {{ .Release.Namespace }}
-  labels:
-{{ include "labels" . | indent 4 }}
+  labels: {{- include "labels" . | nindent 4 }}
 data:
   images_overwrite.yaml: |
-{{ .Values.imageVectorOverwrite | indent 4 }}
+  {{- .Values.imageVectorOverwrite | nindent 4 }}
 {{- end }}

charts/gardener-extension-provider-aws/templates/configmap.yaml

@@ -3,8 +3,7 @@ kind: ConfigMap
 metadata:
   name: {{ include "name" . }}-configmap
   namespace: {{ .Release.Namespace }}
-  labels:
-{{ include "labels" . | indent 4 }}
+  labels: {{- include "labels" . | nindent 4 }}
 data:
   config.yaml: |
     ---
@@ -22,5 +21,5 @@ data:
         className: {{ .Values.config.etcd.storage.className }}
         capacity: {{ .Values.config.etcd.storage.capacity }}
 {{- if .Values.config.etcd.backup }}
-{{ toYaml .Values.config.etcd.backup | indent 6 }}
+      backup: {{- toYaml .Values.config.etcd.backup | nindent 8 }}
 {{- end }}

charts/gardener-extension-provider-aws/templates/deployment.yaml

@@ -8,44 +8,43 @@ metadata:
     resources.gardener.cloud/ignore: "true"
 {{- end }}
   labels:
-{{ include "labels" . | indent 4 }}
+    {{- include "labels" . | nindent 4 }} {{/* indented for legibility */}}
     high-availability-config.resources.gardener.cloud/type: server
 spec:
   revisionHistoryLimit: 5
   replicas: {{ .Values.replicaCount }}
   selector:
-    matchLabels:
-{{ include "labels" . | indent 6 }}
+    matchLabels: {{- include "labels" . | nindent 6 }}
   strategy:
     rollingUpdate:
       maxUnavailable: {{ .Values.maxUnavailable }}
       maxSurge: {{ .Values.maxSurge }}
   template:
     metadata:
       annotations:
-        {{- if .Values.imageVectorOverwrite }}
+{{- if .Values.imageVectorOverwrite }}
         checksum/configmap-aws-imagevector-overwrite: {{ include (print $.Template.BasePath "/configmap-imagevector-overwrite.yaml") . | sha256sum }}
-        {{- end }}
+{{- end }}
         checksum/configmap-{{ include "name" . }}-config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
-        {{- if and .Values.metrics.enableScraping }}
+{{- if and .Values.metrics.enableScraping }}
         prometheus.io/name: "{{ .Release.Name }}"
         prometheus.io/scrape: "true"
         # default metrics endpoint in controller-runtime
         prometheus.io/port: "{{ tpl .Values.metricsPort . }}"
-        {{- end }}
+{{- end }}
       labels:
         networking.gardener.cloud/to-runtime-apiserver: allowed
         networking.gardener.cloud/to-dns: allowed
         networking.gardener.cloud/to-public-networks: allowed
         networking.gardener.cloud/to-private-networks: allowed
         networking.resources.gardener.cloud/to-all-shoots-kube-apiserver-tcp-443: allowed
-{{ include "labels" . | indent 8 }}
+        {{- include "labels" . | nindent 8 }} {{/* indented for legibility */}}
     spec:
-      {{- if (include "runtimeCluster.enabled" .) }}
+{{- if (include "runtimeCluster.enabled" .) }}
       priorityClassName: {{ .Values.gardener.runtimeCluster.priorityClassName }}
-      {{- else }}
+{{- else }}
       priorityClassName: gardener-system-900
-      {{- end }}
+{{- end }}
       serviceAccountName: {{ include "name" . }}
       containers:
       - name: {{ include "name" . }}
@@ -63,37 +62,45 @@ spec:
         - --dnsrecord-provider-client-burst={{ .Values.controllers.dnsrecord.providerClientBurst }}
         - --dnsrecord-provider-client-wait-timeout={{ .Values.controllers.dnsrecord.providerClientWaitTimeout }}
         - --healthcheck-max-concurrent-reconciles={{ .Values.controllers.healthcheck.concurrentSyncs }}
-        - --heartbeat-namespace={{ .Release.Namespace }} 
-        - --heartbeat-renew-interval-seconds={{ .Values.controllers.heartbeat.renewIntervalSeconds }} 
+        - --heartbeat-namespace={{ .Release.Namespace }}
+        - --heartbeat-renew-interval-seconds={{ .Values.controllers.heartbeat.renewIntervalSeconds }}
         - --infrastructure-max-concurrent-reconciles={{ .Values.controllers.infrastructure.concurrentSyncs }}
         - --ignore-operation-annotation={{ .Values.controllers.ignoreOperationAnnotation }}
         - --worker-max-concurrent-reconciles={{ .Values.controllers.worker.concurrentSyncs }}
         - --webhook-config-namespace={{ .Release.Namespace }}
         - --webhook-config-service-port={{ .Values.webhookConfig.servicePort }}
         - --webhook-config-server-port={{ tpl .Values.webhookConfig.serverPort . }}
-        {{- if (include "runtimeCluster.enabled" .) }}
+{{- if (include "runtimeCluster.enabled" .) }}
         - --controllers=backupbucket,dnsrecord
         - --disable-webhooks="*"
         - --extension-class=garden
-        {{- else }}
+{{- else }}
         - --disable-controllers={{ .Values.disableControllers | join "," }}
         - --disable-webhooks={{ .Values.disableWebhooks | join "," }}
-        {{- end }}
+{{- end }}
         - --metrics-bind-address=:{{ tpl .Values.metricsPort . }}
         - --health-bind-address=:{{ tpl .Values.healthPort . }}
         - --gardener-version={{ .Values.gardener.version }}
-        {{- if .Values.gardener.selfHostedShootCluster }}
+{{- if .Values.gardener.selfHostedShootCluster }}
         - --self-hosted-shoot-cluster={{ .Values.gardener.selfHostedShootCluster }}
-        {{- end }}
+{{- end }}
+{{- if .Values.logging }}
+  {{- if .Values.logging.level }}
+        - --log-level={{ .Values.logging.level }}
+  {{- end }}
+  {{- if .Values.logging.format }}
+        - --log-format={{ .Values.logging.format }}
+  {{- end }}
+{{- end }}
         env:
         - name: LEADER_ELECTION_NAMESPACE
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
-        {{- if .Values.imageVectorOverwrite }}
+{{- if .Values.imageVectorOverwrite }}
         - name: IMAGEVECTOR_OVERWRITE
           value: /charts_overwrite/images_overwrite.yaml
-        {{- end }}
+{{- end }}
         securityContext:
           allowPrivilegeEscalation: false
         livenessProbe:
@@ -113,25 +120,24 @@ spec:
           containerPort: {{ tpl .Values.webhookConfig.serverPort . }}
           protocol: TCP
 {{- if .Values.resources }}
-        resources:
-{{ toYaml .Values.resources | nindent 10 }}
+        resources: {{- toYaml .Values.resources | nindent 10 }}
 {{- end }}
         volumeMounts:
         - name: config
           mountPath: /etc/{{ include "name" . }}/config
-        {{- if .Values.imageVectorOverwrite }}
+{{- if .Values.imageVectorOverwrite }}
         - name: imagevector-overwrite
           mountPath: /charts_overwrite/
           readOnly: true
-        {{- end }}
+{{- end }}
       volumes:
       - name: config
         configMap:
           name: {{ include "name" . }}-configmap
           defaultMode: 420
-      {{- if .Values.imageVectorOverwrite }}
+{{- if .Values.imageVectorOverwrite }}
       - name: imagevector-overwrite
         configMap:
           name: {{ include "name" . }}-imagevector-overwrite
           defaultMode: 420
-      {{- end }}
+{{- end }}

charts/gardener-extension-provider-aws/templates/poddisruptionbudget.yaml

@@ -3,11 +3,9 @@ kind: PodDisruptionBudget
 metadata:
   name: {{ include "name" . }}
   namespace: {{ .Release.Namespace }}
-  labels:
-{{ include "labels" . | indent 4 }}
+  labels: {{ include "labels" . | nindent 4 }}
 spec:
   maxUnavailable: 1
   selector:
-    matchLabels:
-{{ include "labels" . | indent 6 }}
+    matchLabels: {{ include "labels" . | nindent 6 }}
   unhealthyPodEvictionPolicy: AlwaysAllow

charts/gardener-extension-provider-aws/templates/rbac-runtime.yaml

@@ -4,8 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: {{ include "name" . }}-runtime
-  labels:
-{{ include "labels" . | indent 4 }}
+  labels: {{ include "labels" . | nindent 4 }}
 rules:
 - apiGroups:
   - extensions.gardener.cloud
@@ -26,8 +25,8 @@ rules:
   - leases
   verbs:
   - create
-  - list 
-  - watch 
+  - list
+  - watch
 - apiGroups:
   - coordination.k8s.io
   resources:
@@ -55,8 +54,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: {{ include "name" . }}-runtime
-  labels:
-{{ include "labels" . | indent 4 }}
+  labels: {{- include "labels" . | nindent 4 }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole

charts/gardener-extension-provider-aws/templates/rbac.yaml

@@ -4,8 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: {{ include "name" . }}
-  labels:
-{{ include "labels" . | indent 4 }}
+  labels: {{- include "labels" . | nindent 4 }}
 rules:
 - apiGroups:
   - extensions.gardener.cloud
@@ -49,8 +48,8 @@ rules:
   - leases
   verbs:
   - create
-  - list 
-  - watch 
+  - list
+  - watch
 - apiGroups:
   - coordination.k8s.io
   resources:
@@ -148,8 +147,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: {{ include "name" . }}
-  labels:
-{{ include "labels" . | indent 4 }}
+  labels: {{- include "labels" . | nindent 4 }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole

charts/gardener-extension-provider-aws/templates/service.yaml

@@ -9,25 +9,24 @@ metadata:
     networking.resources.gardener.cloud/from-all-webhook-targets-allowed-ports: '[{"protocol":"TCP","port":{{ tpl .Values.webhookConfig.serverPort . }}}]'
     networking.resources.gardener.cloud/namespace-selectors: '[{"matchLabels":{"kubernetes.io/metadata.name":"garden"}},{"matchLabels":{"gardener.cloud/role":"shoot"}}]'
     networking.resources.gardener.cloud/pod-label-selector-namespace-alias: extensions
-    {{- if .Values.ignoreResources }}
+{{- if .Values.ignoreResources }}
     resources.gardener.cloud/ignore: "true"
-    {{- end }}
-    {{- if and (include "topologyAwareRouting.enabled" .) (semverCompare "< 1.31-0" .Capabilities.KubeVersion.Version) }}
+{{- end }}
+{{- if and (include "topologyAwareRouting.enabled" .) (semverCompare "< 1.31-0" .Capabilities.KubeVersion.Version) }}
     service.kubernetes.io/topology-mode: "auto"
-    {{- end }}
+{{- end }}
   labels:
-{{ include "labels" . | indent 4 }}
-    {{- if and (include "topologyAwareRouting.enabled" .) (semverCompare "< 1.32-0" .Capabilities.KubeVersion.Version) }}
+    {{- include "labels" . | nindent 4 }} {{/* indented for legibility */}}
+{{- if and (include "topologyAwareRouting.enabled" .) (semverCompare "< 1.32-0" .Capabilities.KubeVersion.Version) }}
     endpoint-slice-hints.resources.gardener.cloud/consider: "true"
-    {{- end }}
+{{- end }}
 spec:
   type: ClusterIP
-  selector:
-{{ include "labels" . | indent 4 }}
+  selector: {{- include "labels" . | nindent 4 }}
   ports:
   - port: {{ .Values.webhookConfig.servicePort }}
     protocol: TCP
     targetPort: {{ tpl .Values.webhookConfig.serverPort . }}
-  {{- if and (include "topologyAwareRouting.enabled" .) (semverCompare ">= 1.31-0" .Capabilities.KubeVersion.Version) }}
+{{- if and (include "topologyAwareRouting.enabled" .) (semverCompare ">= 1.31-0" .Capabilities.KubeVersion.Version) }}
   trafficDistribution: PreferClose
-  {{- end }}
+{{- end }}

charts/gardener-extension-provider-aws/templates/serviceaccount.yaml

@@ -3,6 +3,5 @@ kind: ServiceAccount
 metadata:
   name: {{ include "name" . }}
   namespace: {{ .Release.Namespace }}
-  labels:
-{{ include "labels" . | indent 4 }}
+  labels: {{- include "labels" . | nindent 4 }}
 automountServiceAccountToken: false

charts/gardener-extension-provider-aws/templates/storageclass.yaml

@@ -3,8 +3,7 @@ apiVersion: storage.k8s.io/v1
 kind: StorageClass
 metadata:
   name: {{ .Values.config.etcd.storage.className }}
-  labels:
-{{ include "labels" . | indent 4 }}
+  labels: {{- include "labels" . | nindent 4 }}
   annotations:
     resources.gardener.cloud/delete-on-invalid-update: "true"
 allowVolumeExpansion: true