updated charts

gardener · Sep 28, 2023 · aca6601 · aca6601
1 parent 885b4c9
commit aca6601
Show file tree

Hide file tree

Showing 19 changed files with 176 additions and 17 deletions.
diff --git a/.landscaper/landscaper-instance/blueprint/landscaper/deploy-execution.yaml b/.landscaper/landscaper-instance/blueprint/landscaper/deploy-execution.yaml
@@ -215,6 +215,7 @@ deployItems:
           name: helm-{{ .imports.hostingClusterNamespace }}-helm-deployer
           identity: helm-{{ .imports.hostingClusterNamespace }}
           containerName: helm-deployer
+          serviceAccountName: helm-deployer
 
           {{- if (dig "landscaperConfig" "landscaper" "verbosity" false .imports) }}
           verbosity: {{ .imports.landscaperConfig.landscaper.verbosity }}
@@ -292,7 +293,8 @@ deployItems:
         deployer:
           name: manifest-{{ .imports.hostingClusterNamespace }}-manifest-deployer
           identity: manifest-{{ .imports.hostingClusterNamespace }}
-          containerName: manifest-deployer
+          container-name: manifest-deployer
+          serviceAccountName: manifest-deployer
 
           {{- if (dig "landscaperConfig" "landscaper" "verbosity" false .imports) }}
           verbosity: {{ .imports.landscaperConfig.landscaper.verbosity }}
@@ -371,6 +373,7 @@ deployItems:
           name: container-{{ .imports.hostingClusterNamespace }}-container-deployer
           identity: container-{{ .imports.hostingClusterNamespace }}
           containerName: container-deployer
+          serviceAccountName: container-deployer
 
           {{- if (dig "landscaperConfig" "landscaper" "verbosity" false .imports) }}
           verbosity: {{ .imports.landscaperConfig.landscaper.verbosity }}

diff --git a/charts/landscaper-instance/target-cluster/container-deployer/templates/hpa.yaml b/charts/landscaper-instance/target-cluster/container-deployer/templates/hpa.yaml
@@ -22,10 +22,10 @@ spec:
         name: cpu
         target:
           type: Utilization
-          averageUtilization: 80
+          averageUtilization: {{ .Values.deployer.hpa.averageCpuUtilization }}
     - type: Resource
       resource:
         name: memory
         target:
           type: Utilization
-          averageUtilization: 80
+          averageUtilization: {{ .Values.deployer.hpa.averageMemoryUtilization }}
diff --git a/...r-deployer/templates/service-account.yaml → ...er-deployer/templates/serviceaccount.yaml b/...r-deployer/templates/service-account.yaml → ...er-deployer/templates/serviceaccount.yaml
diff --git a/charts/landscaper-instance/target-cluster/container-deployer/values.yaml b/charts/landscaper-instance/target-cluster/container-deployer/values.yaml
@@ -23,6 +23,8 @@ deployer:
   hpa:
     minReplicas: 1
     maxReplicas: 1
+    averageCpuUtilization: 80
+    averageMemoryUtilization: 80
 
   controller:
     workers: 30

diff --git a/charts/landscaper-instance/target-cluster/helm-deployer/templates/deployment.yaml b/charts/landscaper-instance/target-cluster/helm-deployer/templates/deployment.yaml
@@ -31,14 +31,14 @@ spec:
         landscaper.gardener.cloud/topology: helm-deployer
         landscaper.gardener.cloud/topology-ns: {{ .Release.Namespace }}
     spec:
-      automountServiceAccountToken: false
+      serviceAccountName: {{ .Values.deployer.serviceAccountName }}
       containers:
         - name: {{ .Values.deployer.containerName }}
           image: "{{ include "deployer-image" . }}"
           imagePullPolicy: {{ .Values.deployer.image.pullPolicy }}
           args:
             - "--config=/app/ls/config/config.yaml"
-            - "--kubeconfig=/app/ls/resource-cluster-kubeconfig/kubeconfig"
+            - "--landscaper-kubeconfig=/app/ls/resource-cluster-kubeconfig/kubeconfig"
             - "-v={{ .Values.deployer.verbosity }}"
           volumeMounts:
             - name: config

diff --git a/charts/landscaper-instance/target-cluster/helm-deployer/templates/hpa.yaml b/charts/landscaper-instance/target-cluster/helm-deployer/templates/hpa.yaml
@@ -22,10 +22,10 @@ spec:
         name: cpu
         target:
           type: Utilization
-          averageUtilization: 80
+          averageUtilization: {{ .Values.deployer.hpa.averageCpuUtilization }}
     - type: Resource
       resource:
         name: memory
         target:
           type: Utilization
-          averageUtilization: 80
+          averageUtilization: {{ .Values.deployer.hpa.averageMemoryUtilization }}
diff --git a/charts/landscaper-instance/target-cluster/helm-deployer/templates/role.yaml b/charts/landscaper-instance/target-cluster/helm-deployer/templates/role.yaml
@@ -0,0 +1,20 @@
+{{/* SPDX-FileCopyrightText: 2023 SAP SE or an SAP affiliate company and Gardener contributors
+
+ SPDX-License-Identifier: Apache-2.0
+*/}}
+
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: {{ .Values.deployer.name }}
+  labels:
+    {{- include "deployer.labels" . | nindent 4 }}
+rules:
+  - apiGroups:
+      - ""
+    resources:
+      - pods
+    verbs:
+      - get
+      - list
+      - watch
diff --git a/charts/landscaper-instance/target-cluster/helm-deployer/templates/rolebinding.yaml b/charts/landscaper-instance/target-cluster/helm-deployer/templates/rolebinding.yaml
@@ -0,0 +1,19 @@
+{{/* SPDX-FileCopyrightText: 2023 SAP SE or an SAP affiliate company and Gardener contributors
+
+ SPDX-License-Identifier: Apache-2.0
+*/}}
+
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: {{ .Values.deployer.name }}
+  labels:
+    {{- include "deployer.labels" . | nindent 4 }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: {{ .Values.deployer.name }}
+subjects:
+  - kind: ServiceAccount
+    name: {{ .Values.deployer.serviceAccountName }}
+    namespace: {{ .Release.Namespace }}
diff --git a/charts/landscaper-instance/target-cluster/helm-deployer/templates/serviceaccount.yaml b/charts/landscaper-instance/target-cluster/helm-deployer/templates/serviceaccount.yaml
@@ -0,0 +1,11 @@
+{{/* SPDX-FileCopyrightText: 2023 SAP SE or an SAP affiliate company and Gardener contributors
+
+ SPDX-License-Identifier: Apache-2.0
+*/}}
+
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ .Values.deployer.serviceAccountName }}
+  labels:
+    {{- include "deployer.labels" . | nindent 4 }}
diff --git a/charts/landscaper-instance/target-cluster/helm-deployer/values.yaml b/charts/landscaper-instance/target-cluster/helm-deployer/values.yaml
@@ -2,6 +2,7 @@ deployer:
   name: helm-deployer
   identity: helm-deployer-default
   containerName: helm-deployer
+  serviceAccountName: helm-deployer
   verbosity: info
 
   registryConfig:
@@ -22,6 +23,8 @@ deployer:
   hpa:
     minReplicas: 1
     maxReplicas: 1
+    averageCpuUtilization: 80
+    averageMemoryUtilization: 80
 
   controller:
     workers: 30

diff --git a/charts/landscaper-instance/target-cluster/landscaper/templates/_helpers.tpl b/charts/landscaper-instance/target-cluster/landscaper/templates/_helpers.tpl
@@ -79,6 +79,11 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 apiVersion: config.landscaper.gardener.cloud/v1alpha1
 kind: LandscaperConfiguration
 
+{{- if .Values.landscaper.controllers }}
+controllers:
+{{ .Values.landscaper.controllers | toYaml | indent 2 }}
+{{- end }}
+
 registry:
   oci:
     allowPlainHttp: {{ .Values.landscaper.registryConfig.allowPlainHttpRegistries }}
@@ -105,6 +110,13 @@ deployerManagement:
   agent:
     disable: true
 
+{{- if .Values.landscaper.deployItemTimeouts }}
+deployItemTimeouts:
+  {{- range $key, $value := .Values.landscaper.deployItemTimeouts }}
+  {{ $key }}: {{ $value }}
+  {{- end }}
+{{- end }}
+
 lsDeployments:
   lsController: "{{- .Values.landscaper.name }}"
   webHook: "{{- include "landscaper.webhooks.name" . }}"

diff --git a/charts/landscaper-instance/target-cluster/landscaper/templates/hpa.yaml b/charts/landscaper-instance/target-cluster/landscaper/templates/hpa.yaml
@@ -23,13 +23,13 @@ spec:
         name: cpu
         target:
           type: Utilization
-          averageUtilization: 80
+          averageUtilization: {{ .Values.controller.hpa.averageCpuUtilization }}
     - type: Resource
       resource:
         name: memory
         target:
           type: Utilization
-          averageUtilization: 80
+          averageUtilization: {{ .Values.controller.hpa.averageMemoryUtilization }}
 ...
 ---
 apiVersion: autoscaling/v2
@@ -51,13 +51,13 @@ spec:
         name: cpu
         target:
           type: Utilization
-          averageUtilization: 80
+          averageUtilization: {{ .Values.controller.main.hpa.averageCpuUtilization }}
     - type: Resource
       resource:
         name: memory
         target:
           type: Utilization
-          averageUtilization: 80
+          averageUtilization: {{ .Values.controller.main.hpa.averageMemoryUtilization }}
 ...
 ---
 apiVersion: autoscaling/v2
@@ -79,11 +79,11 @@ spec:
         name: cpu
         target:
           type: Utilization
-          averageUtilization: 80
+          averageUtilization: {{ .Values.webhooksServer.hpa.averageCpuUtilization }}
     - type: Resource
       resource:
         name: memory
         target:
           type: Utilization
-          averageUtilization: 80
+          averageUtilization: {{ .Values.webhooksServer.hpa.averageMemoryUtilization }}
 ...
diff --git a/charts/landscaper-instance/target-cluster/landscaper/values.yaml b/charts/landscaper-instance/target-cluster/landscaper/values.yaml
@@ -3,6 +3,36 @@ landscaper:
 
   verbosity: "info"
 
+  controllers:
+    # syncPeriod: 10h
+    installations:
+      workers: 30
+      # cacheSyncTimeout: 2m
+    executions:
+      workers: 30
+      # cacheSyncTimeout: 2m
+    deployItems:
+      workers: 5
+      # cacheSyncTimeout: 2m
+    componentOverwrites:
+      workers: 5
+      # cacheSyncTimeout: 2m
+    context:
+      workers: 5
+      # cacheSyncTimeout: 2m
+
+      config:
+        default:
+          disable: false
+          excludeNamespaces:
+            - kube-system
+
+  deployItemTimeouts:
+    # how long deployers may take to react on changes to deploy items
+    pickup: 60m
+    # default for how long deployers may take to process a deploy item before failing, can be overwritten via the deploy item's 'spec.timeout' field
+    progressingDefault: 10m
+
   registryConfig:
     allowPlainHttpRegistries: false
     insecureSkipVerify: false
@@ -63,6 +93,8 @@ controller:
   hpa:
     minReplicas: 1
     maxReplicas: 1
+    averageCpuUtilization: 80
+    averageMemoryUtilization: 80
 
   service:
     type: ClusterIP
@@ -81,6 +113,8 @@ controller:
     hpa:
       minReplicas: 1
       maxReplicas: 1
+      averageCpuUtilization: 80
+      averageMemoryUtilization: 80
 
 webhooksServer:
   containerName: landscaper-webhooks
@@ -113,6 +147,8 @@ webhooksServer:
   hpa:
     minReplicas: 2
     maxReplicas: 10
+    averageCpuUtilization: 80
+    averageMemoryUtilization: 80
 
   service:
     type: ClusterIP

diff --git a/charts/landscaper-instance/target-cluster/manifest-deployer/templates/deployment.yaml b/charts/landscaper-instance/target-cluster/manifest-deployer/templates/deployment.yaml
@@ -31,14 +31,14 @@ spec:
         landscaper.gardener.cloud/topology: manifest-deployer
         landscaper.gardener.cloud/topology-ns: {{ .Release.Namespace }}
     spec:
-      automountServiceAccountToken: false
+      serviceAccountName: {{ .Values.deployer.serviceAccountName }}
       containers:
         - name: {{ .Values.deployer.containerName }}
           image: "{{ include "deployer-image" . }}"
           imagePullPolicy: {{ .Values.deployer.image.pullPolicy }}
           args:
             - "--config=/app/ls/config/config.yaml"
-            - "--kubeconfig=/app/ls/resource-cluster-kubeconfig/kubeconfig"
+            - "--landscaper-kubeconfig=/app/ls/resource-cluster-kubeconfig/kubeconfig"
             - "-v={{ .Values.deployer.verbosity }}"
           volumeMounts:
             - name: config

diff --git a/charts/landscaper-instance/target-cluster/manifest-deployer/templates/hpa.yaml b/charts/landscaper-instance/target-cluster/manifest-deployer/templates/hpa.yaml
@@ -22,10 +22,10 @@ spec:
         name: cpu
         target:
           type: Utilization
-          averageUtilization: 80
+          averageUtilization: {{ .Values.deployer.hpa.averageCpuUtilization }}
     - type: Resource
       resource:
         name: memory
         target:
           type: Utilization
-          averageUtilization: 80
+          averageUtilization: {{ .Values.deployer.hpa.averageMemoryUtilization }}
diff --git a/charts/landscaper-instance/target-cluster/manifest-deployer/templates/role.yaml b/charts/landscaper-instance/target-cluster/manifest-deployer/templates/role.yaml
@@ -0,0 +1,20 @@
+{{/* SPDX-FileCopyrightText: 2023 SAP SE or an SAP affiliate company and Gardener contributors
+
+ SPDX-License-Identifier: Apache-2.0
+*/}}
+
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: {{ .Values.deployer.name }}
+  labels:
+    {{- include "deployer.labels" . | nindent 4 }}
+rules:
+  - apiGroups:
+      - ""
+    resources:
+      - pods
+    verbs:
+      - get
+      - list
+      - watch
diff --git a/charts/landscaper-instance/target-cluster/manifest-deployer/templates/rolebinding.yaml b/charts/landscaper-instance/target-cluster/manifest-deployer/templates/rolebinding.yaml
@@ -0,0 +1,19 @@
+{{/* SPDX-FileCopyrightText: 2023 SAP SE or an SAP affiliate company and Gardener contributors
+
+ SPDX-License-Identifier: Apache-2.0
+*/}}
+
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: {{ .Values.deployer.name }}
+  labels:
+    {{- include "deployer.labels" . | nindent 4 }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: {{ .Values.deployer.name }}
+subjects:
+  - kind: ServiceAccount
+    name: {{ .Values.deployer.serviceAccountName }}
+    namespace: {{ .Release.Namespace }}
diff --git a/charts/landscaper-instance/target-cluster/manifest-deployer/templates/serviceaccount.yaml b/charts/landscaper-instance/target-cluster/manifest-deployer/templates/serviceaccount.yaml
@@ -0,0 +1,11 @@
+{{/* SPDX-FileCopyrightText: 2023 SAP SE or an SAP affiliate company and Gardener contributors
+
+ SPDX-License-Identifier: Apache-2.0
+*/}}
+
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ .Values.deployer.serviceAccountName }}
+  labels:
+    {{- include "deployer.labels" . | nindent 4 }}
diff --git a/charts/landscaper-instance/target-cluster/manifest-deployer/values.yaml b/charts/landscaper-instance/target-cluster/manifest-deployer/values.yaml
@@ -2,6 +2,7 @@ deployer:
   name: manifest-deployer
   identity: manifest-deployer-default
   containerName: manifest-deployer
+  serviceAccountName: manifest-deployer
   verbosity: info
 
   registryConfig:
@@ -22,6 +23,8 @@ deployer:
   hpa:
     minReplicas: 1
     maxReplicas: 1
+    averageCpuUtilization: 80
+    averageMemoryUtilization: 80
 
   controller:
     workers: 30