fix: clean up manager config

Leaseweb · Sep 6, 2024 · 834a308 · 834a308
1 parent 0889d09
commit 834a308
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 131 deletions.
diff --git a/Makefile b/Makefile
@@ -390,7 +390,7 @@ $(RELEASE_DIR)/%: $(RELEASE_MANIFEST_INPUTS)
 
 .PHONY: release-manifests-metrics-port
 release-manifests-metrics-port:
-	make release-manifests RELEASE_MANIFEST_SOURCE_BASE=config/default-with-metrics-port
+	make release-manifests RELEASE_MANIFEST_SOURCE_BASE=config/default
 
 .PHONY: release-staging
 release-staging: ## Builds and push container images and manifests to the staging bucket.

diff --git a/config/default-with-metrics-port/auth_proxy_client_clusterrole.yaml b/config/default-with-metrics-port/auth_proxy_client_clusterrole.yaml
diff --git a/config/default-with-metrics-port/auth_proxy_role.yaml b/config/default-with-metrics-port/auth_proxy_role.yaml
diff --git a/config/default-with-metrics-port/auth_proxy_role_binding.yaml b/config/default-with-metrics-port/auth_proxy_role_binding.yaml
diff --git a/config/default-with-metrics-port/auth_proxy_service.yaml b/config/default-with-metrics-port/auth_proxy_service.yaml
diff --git a/config/default-with-metrics-port/kustomization.yaml b/config/default-with-metrics-port/kustomization.yaml
diff --git a/config/default-with-metrics-port/manager_auth_proxy_patch.yaml b/config/default-with-metrics-port/manager_auth_proxy_patch.yaml
diff --git a/config/default/manager_config_patch.yaml b/config/default/manager_config_patch.yaml
diff --git a/config/manager/controller_manager_config.yaml b/config/manager/controller_manager_config.yaml
diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
@@ -24,18 +24,22 @@ spec:
         - /manager
         args:
         - "--leader-elect"
-        - "--diagnostics-address=127.0.0.1:8080"
-        - "--insecure-diagnostics=true"
+        - "--v=${CAPC_LOGLEVEL:=0}"
+        - "--diagnostics-address=${CAPC_DIAGNOSTICS_ADDRESS:=:8443}"
+        - "--insecure-diagnostics=${CAPC_INSECURE_DIAGNOSTICS:=false}"
+        - "--cloudstackcluster-concurrency=${CAPC_CLOUDSTACKCLUSTER_CONCURRENCY:=10}"
+        - "--cloudstackmachine-concurrency=${CAPC_CLOUDSTACKMACHINE_CONCURRENCY:=10}"
+        - "--cloudstackaffinitygroup-concurrency=${CAPC_CLOUDSTACKAFFINITYGROUP_CONCURRENCY:=5}"
+        - "--cloudstackfailuredomain-concurrency=${CAPC_CLOUDSTACKFAILUREDOMAIN_CONCURRENCY:=5}"
         image: controller:latest
         name: manager
-        securityContext:
-          allowPrivilegeEscalation: false
-          capabilities:
-            drop:
-              - ALL
-          privileged: false
-          runAsUser: 65532
-          runAsGroup: 65532
+        ports:
+          - containerPort: 9440
+            name: healthz
+            protocol: TCP
+          - containerPort: 8443
+            name: metrics
+            protocol: TCP
         livenessProbe:
           httpGet:
             path: /healthz
@@ -48,6 +52,14 @@ spec:
             port: 9440
           initialDelaySeconds: 5
           periodSeconds: 10
+        securityContext:
+          allowPrivilegeEscalation: false
+          capabilities:
+            drop:
+              - ALL
+          privileged: false
+          runAsUser: 65532
+          runAsGroup: 65532
         resources:
           limits:
             cpu: 100m