Performance Configuration (#220)

* Performance config * Test (run-int-tests)
gardener · Sep 22, 2023 · 604dd01 · 604dd01
1 parent cfce734
commit 604dd01
Show file tree

Hide file tree

Showing 20 changed files with 3,568 additions and 308 deletions.
diff --git a/.landscaper/landscaper-instance/blueprint/landscaper/deploy-execution.yaml b/.landscaper/landscaper-instance/blueprint/landscaper/deploy-execution.yaml
@@ -39,16 +39,22 @@ deployItems:
 
         landscaper:
           verbosity: {{ .imports.landscaperConfig.landscaper.verbosity | default "info" }}
+
+          {{- if (dig "landscaperConfig" "landscaper" "controllers" false .imports) }}
+          controllers:
+          {{- toYaml .imports.landscaperConfig.landscaper.controllers | nindent 12 }}
+          {{- end }}
+
           crdManagement:
             deployCrd: true
             forceUpdate: true
           registryConfig:
 {{ toYaml .imports.registryConfig | indent 12 }}
 
-          {{ if .imports.landscaperConfig.k8sClientSettings }}
+          {{- if (dig "landscaperConfig" "landscaper" "k8sClientSettings" false .imports) }}
           k8sClientSettings:
-{{ toYaml .imports.landscaperConfig.k8sClientSettings | indent 12 }}
-          {{ end }}
+          {{- toYaml .imports.landscaperConfig.landscaper.k8sClientSettings | nindent 12 }}
+          {{- end }}
 
           deployers: []
 
@@ -59,6 +65,11 @@ deployItems:
 
           deployersConfig: {}
 
+          {{- if (dig "landscaperConfig" "landscaper" "deployItemTimeouts" false .imports) }}
+          deployItemTimeouts:
+          {{- toYaml .imports.landscaperConfig.landscaper.deployItemTimeouts | nindent 12 }}
+          {{- end }}
+
           healthCheck:
             name: landscaper-{{ .imports.hostingClusterNamespace }}
             additionalDeployments:
@@ -120,6 +131,24 @@ deployItems:
             dns:
               class: garden
 
+          {{- if (dig "landscaperConfig" "webhooksServer" "resources" false .imports) }}
+          resources:
+          {{- toYaml .imports.landscaperConfig.webhooksServer.resources | nindent 12 }}
+          {{- end }}
+
+          {{- if (dig "landscaperConfig" "webhooksServer" "hpa" false .imports) }}
+          hpa:
+            {{- if (dig "landscaperConfig" "webhooksServer" "hpa" "maxReplicas" false .imports) }}
+            maxReplicas: {{ .imports.landscaperConfig.webhooksServer.hpa.maxReplicas }}
+            {{- end }}
+            {{- if (dig "landscaperConfig" "webhooksServer" "hpa" "averageCpuUtilization" false .imports) }}
+            averageCpuUtilization: {{ .imports.landscaperConfig.webhooksServer.hpa.averageCpuUtilization }}
+            {{- end }}
+            {{- if (dig "landscaperConfig" "webhooksServer" "hpa" "averageMemoryUtilization" false .imports) }}
+            averageMemoryUtilization: {{ .imports.landscaperConfig.webhooksServer.hpa.averageMemoryUtilization }}
+            {{- end }}
+          {{- end }}
+
         service:
           type: ClusterIP
           port: 80
@@ -133,10 +162,28 @@ deployItems:
             webhooksServer:
               name: landscaper-webhooks
 
+        {{- if (dig "landscaperConfig" "resources" false .imports) }}
         resources:
-          requests:
-            cpu: 100m
-            memory: 100Mi
+        {{- toYaml .imports.landscaperConfig.resources | nindent 10 }}
+        {{- end }}
+
+        {{- if (dig "landscaperConfig" "resourcesMain" false .imports) }}
+        resourcesMain:
+        {{- toYaml .imports.landscaperConfig.resourcesMain | nindent 10 }}
+        {{- end }}
+
+        {{- if (dig "landscaperConfig" "hpaMain" false .imports) }}
+        hpaMain:
+          {{- if (dig "landscaperConfig" "hpaMain" "maxReplicas" false .imports) }}
+          maxReplicas: {{ .imports.landscaperConfig.hpaMain.maxReplicas }}
+          {{- end }}
+          {{- if (dig "landscaperConfig" "hpaMain" "averageCpuUtilization" false .imports) }}
+          averageCpuUtilization: {{ .imports.landscaperConfig.hpaMain.averageCpuUtilization }}
+          {{- end }}
+          {{- if (dig "landscaperConfig" "hpaMain" "averageMemoryUtilization" false .imports) }}
+          averageMemoryUtilization: {{ .imports.landscaperConfig.hpaMain.averageMemoryUtilization }}
+          {{- end }}
+        {{- end }}
 
 {{ if has "helm" .imports.landscaperConfig.deployers }}
   - name: helm-deployer
@@ -171,14 +218,17 @@ deployItems:
 
         deployer:
           verbosityLevel: {{ .imports.landscaperConfig.landscaper.verbosity | default "info" }}
+          {{- if (dig "landscaperConfig" "deployersConfig" "helm" "deployer" "controller" false .imports) }}
           controller:
-            workers: 30
+          {{- toYaml .imports.landscaperConfig.deployersConfig.helm.deployer.controller | nindent 12 }}
+          {{- end }}
           landscaperClusterKubeconfig:
             kubeconfig: |
 {{ .imports.landscaperControllerKubeconfigYaml | indent 14 }}
+
           {{- if (dig "landscaperConfig" "deployersConfig" "helm" "deployer" "k8sClientSettings" false .imports) }}
           k8sClientSettings:
-{{ toYaml .imports.landscaperConfig.deployersConfig.helm.deployer.k8sClientSettings | indent 14 }}
+          {{- toYaml .imports.landscaperConfig.deployersConfig.helm.deployer.k8sClientSettings | nindent 12 }}
           {{- end }}
 
         image:
@@ -189,12 +239,23 @@ deployItems:
           tag: {{ $imageTag }}
           pullPolicy: IfNotPresent
 
-        replicaCount: 1
-
+        {{- if (dig "landscaperConfig" "deployersConfig" "helm" "resources" false .imports) }}
         resources:
-          requests:
-            cpu: 300m
-            memory: 300Mi
+        {{- toYaml .imports.landscaperConfig.deployersConfig.helm.resources | nindent 10 }}
+        {{- end }}
+
+        {{- if (dig "landscaperConfig" "deployersConfig" "helm" "hpa" false .imports) }}
+        hpa:
+          {{- if (dig "landscaperConfig" "deployersConfig" "helm" "hpa" "maxReplicas" false .imports) }}
+          maxReplicas: {{ .imports.landscaperConfig.deployersConfig.helm.hpa.maxReplicas }}
+          {{- end }}
+          {{- if (dig "landscaperConfig" "deployersConfig" "helm" "hpa" "averageCpuUtilization" false .imports) }}
+          averageCpuUtilization: {{ .imports.landscaperConfig.deployersConfig.helm.hpa.averageCpuUtilization }}
+          {{- end }}
+          {{- if (dig "landscaperConfig" "deployersConfig" "helm" "hpa" "averageMemoryUtilization" false .imports) }}
+          averageMemoryUtilization: {{ .imports.landscaperConfig.deployersConfig.helm.hpa.averageMemoryUtilization }}
+          {{- end }}
+        {{- end }}
 {{ end }}
 
 {{ if has "manifest" .imports.landscaperConfig.deployers }}
@@ -230,14 +291,17 @@ deployItems:
 
         deployer:
           verbosityLevel: {{ .imports.landscaperConfig.landscaper.verbosity | default "info" }}
+          {{- if (dig "landscaperConfig" "deployersConfig" "manifest" "deployer" "controller" false .imports) }}
           controller:
-            workers: 30
+          {{- toYaml .imports.landscaperConfig.deployersConfig.manifest.deployer.controller | nindent 12 }}
+          {{- end }}
           landscaperClusterKubeconfig:
             kubeconfig: |
 {{ .imports.landscaperControllerKubeconfigYaml | indent 14 }}
+
           {{- if (dig "landscaperConfig" "deployersConfig" "manifest" "deployer" "k8sClientSettings" false .imports) }}
           k8sClientSettings:
-{{ toYaml .imports.landscaperConfig.deployersConfig.manifest.deployer.k8sClientSettings | indent 14 }}
+          {{- toYaml .imports.landscaperConfig.deployersConfig.manifest.deployer.k8sClientSettings | nindent 12 }}
           {{- end }}
 
         image:
@@ -248,12 +312,23 @@ deployItems:
           tag: {{ $imageTag }}
           pullPolicy: IfNotPresent
 
-        replicaCount: 1
-
+        {{- if (dig "landscaperConfig" "deployersConfig" "manifest" "resources" false .imports) }}
         resources:
-          requests:
-            cpu: 10m
-            memory: 100Mi
+        {{- toYaml .imports.landscaperConfig.deployersConfig.manifest.resources | nindent 10 }}
+        {{- end }}
+
+        {{- if (dig "landscaperConfig" "deployersConfig" "manifest" "hpa" false .imports) }}
+        hpa:
+          {{- if (dig "landscaperConfig" "deployersConfig" "manifest" "hpa" "maxReplicas" false .imports) }}
+          maxReplicas: {{ .imports.landscaperConfig.deployersConfig.manifest.hpa.maxReplicas }}
+          {{- end }}
+          {{- if (dig "landscaperConfig" "deployersConfig" "manifest" "hpa" "averageCpuUtilization" false .imports) }}
+          averageCpuUtilization: {{ .imports.landscaperConfig.deployersConfig.manifest.hpa.averageCpuUtilization }}
+          {{- end }}
+          {{- if (dig "landscaperConfig" "deployersConfig" "manifest" "hpa" "averageMemoryUtilization" false .imports) }}
+          averageMemoryUtilization: {{ .imports.landscaperConfig.deployersConfig.manifest.hpa.averageMemoryUtilization }}
+          {{- end }}
+        {{- end }}
 {{ end }}
 
 {{ if has "container" .imports.landscaperConfig.deployers }}
@@ -289,14 +364,17 @@ deployItems:
 
         deployer:
           verbosityLevel: {{ .imports.landscaperConfig.landscaper.verbosity | default "info" }}
+          {{- if (dig "landscaperConfig" "deployersConfig" "container" "deployer" "controller" false .imports) }}
           controller:
-            workers: 30
+          {{- toYaml .imports.landscaperConfig.deployersConfig.container.deployer.controller | nindent 12 }}
+          {{- end }}
           landscaperClusterKubeconfig:
             kubeconfig: |
 {{ .imports.landscaperControllerKubeconfigYaml | indent 14 }}
+
           {{- if (dig "landscaperConfig" "deployersConfig" "container" "deployer" "k8sClientSettings" false .imports) }}
           k8sClientSettings:
-{{ toYaml .imports.landscaperConfig.deployersConfig.container.deployer.k8sClientSettings | indent 14 }}
+          {{- toYaml .imports.landscaperConfig.deployersConfig.container.deployer.k8sClientSettings | nindent 12 }}
           {{- end }}
 
         image:
@@ -307,10 +385,21 @@ deployItems:
           tag: {{ $imageTag }}
           pullPolicy: IfNotPresent
 
-        replicaCount: 1
-
+        {{- if (dig "landscaperConfig" "deployersConfig" "container" "resources" false .imports) }}
         resources:
-          requests:
-            cpu: 10m
-            memory: 100Mi
+        {{- toYaml .imports.landscaperConfig.deployersConfig.container.resources | nindent 10 }}
+        {{- end }}
+
+        {{- if (dig "landscaperConfig" "deployersConfig" "container" "hpa" false .imports) }}
+        hpa:
+          {{- if (dig "landscaperConfig" "deployersConfig" "container" "hpa" "maxReplicas" false .imports) }}
+          maxReplicas: {{ .imports.landscaperConfig.deployersConfig.container.hpa.maxReplicas }}
+          {{- end }}
+          {{- if (dig "landscaperConfig" "deployersConfig" "container" "hpa" "averageCpuUtilization" false .imports) }}
+          averageCpuUtilization: {{ .imports.landscaperConfig.deployersConfig.container.hpa.averageCpuUtilization }}
+          {{- end }}
+          {{- if (dig "landscaperConfig" "deployersConfig" "container" "hpa" "averageMemoryUtilization" false .imports) }}
+          averageMemoryUtilization: {{ .imports.landscaperConfig.deployersConfig.container.hpa.averageMemoryUtilization }}
+          {{- end }}
+        {{- end }}
 {{ end }}
diff --git a/.landscaper/landscaper-instance/definition/landscaper-configuration.json b/.landscaper/landscaper-instance/definition/landscaper-configuration.json
@@ -6,11 +6,20 @@
   "type": "object",
   "properties": {
     "landscaper": {
-      "$ref": "#definitions/landscaperConfig"
+      "$ref": "#definitions/landscaper"
     },
     "webhooksServer": {
       "$ref": "#definitions/webhooksConfig"
     },
+    "resources": {
+      "type": "object"
+    },
+    "resourcesMain": {
+      "type": "object"
+    },
+    "hpaMain": {
+      "type": "object"
+    },
     "deployers": {
       "type": "array",
       "items": {
@@ -19,13 +28,10 @@
     },
     "deployersConfig": {
       "$ref": "#definitions/deployerConfig"
-    },
-    "k8sClientSettings": {
-      "type": "object"
     }
   },
   "definitions": {
-    "landscaperConfig" : {
+    "landscaper" : {
       "properties": {
         "verbosity": {
           "type": "string",
@@ -35,14 +41,17 @@
           "type:": "integer",
           "format": "int32"
         },
-        "resources": {
-          "$ref": "#definitions/landscaperResources"
+        "controllers": {
+          "type": "object"
+        },
+        "k8sClientSettings": {
+          "type": "object"
+        },
+        "deployItemTimeouts": {
+          "type": "object"
         }
       }
     },
-    "landscaperResources": {
-      "properties": {}
-    },
     "webhooksConfig": {
       "properties": {
         "servicePort": {

diff --git a/integration-test/vendor/github.com/gardener/landscaper-service/pkg/apis/core/types_shared.go b/integration-test/vendor/github.com/gardener/landscaper-service/pkg/apis/core/types_shared.go