From 87c8763a6283bc41f64a1ddcb7146f4e457bc306 Mon Sep 17 00:00:00 2001 From: Zhiwei Huang Date: Thu, 28 Nov 2024 10:53:24 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=8C=B1=20Remove=20deprecated=20Controller?= =?UTF-8?q?ManagerConfig?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The ComponentConfig has been deprecated in the controller-runtime since v0.15.0. Signed-off-by: Zhiwei Huang --- config/base/controller_manager_config.yaml | 11 ----------- config/base/kustomization.yaml | 9 --------- config/base/manager_config_patch.yaml | 20 -------------------- config/render/capm3.yaml | 19 ------------------- 4 files changed, 59 deletions(-) delete mode 100644 config/base/controller_manager_config.yaml delete mode 100644 config/base/manager_config_patch.yaml diff --git a/config/base/controller_manager_config.yaml b/config/base/controller_manager_config.yaml deleted file mode 100644 index 43be936600..0000000000 --- a/config/base/controller_manager_config.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: controller-runtime.sigs.k8s.io/v1alpha1 -kind: ControllerManagerConfig -health: - healthProbeBindAddress: :9440 -metrics: - bindAddress: 127.0.0.1:8085 -webhook: - port: 9443 -leaderElection: - leaderElect: true - resourceName: a9498140.metal3.io diff --git a/config/base/kustomization.yaml b/config/base/kustomization.yaml index 42ad44afab..433849c26c 100644 --- a/config/base/kustomization.yaml +++ b/config/base/kustomization.yaml @@ -27,21 +27,12 @@ resources: generatorOptions: disableNameSuffixHash: true -configMapGenerator: -- name: manager-config - files: - - controller_manager_config.yaml - patches: # Protect the /metrics endpoint by putting it behind auth. # If you want your controller-manager to expose the /metrics # endpoint w/o any authn/z, please comment the following line. - path: manager_auth_proxy_patch.yaml -# Mount the controller config file for loading manager configurations -# through a ComponentConfig type -#- manager_config_patch.yaml - # [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix including the one in # crd/kustomization.yaml - path: manager_webhook_patch.yaml diff --git a/config/base/manager_config_patch.yaml b/config/base/manager_config_patch.yaml deleted file mode 100644 index 6c400155cf..0000000000 --- a/config/base/manager_config_patch.yaml +++ /dev/null @@ -1,20 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: controller-manager - namespace: system -spec: - template: - spec: - containers: - - name: manager - args: - - "--config=controller_manager_config.yaml" - volumeMounts: - - name: manager-config - mountPath: /controller_manager_config.yaml - subPath: controller_manager_config.yaml - volumes: - - name: manager-config - configMap: - name: manager-config diff --git a/config/render/capm3.yaml b/config/render/capm3.yaml index 85758df0d5..99e1adf256 100644 --- a/config/render/capm3.yaml +++ b/config/render/capm3.yaml @@ -2502,25 +2502,6 @@ subjects: namespace: baremetal-operator-system --- apiVersion: v1 -data: - controller_manager_config.yaml: | - apiVersion: controller-runtime.sigs.k8s.io/v1alpha1 - kind: ControllerManagerConfig - health: - healthProbeBindAddress: :9440 - metrics: - bindAddress: 127.0.0.1:8085 - webhook: - port: 9443 - leaderElection: - leaderElect: true - resourceName: a9498140.metal3.io -kind: ConfigMap -metadata: - name: baremetal-operator-manager-config - namespace: baremetal-operator-system ---- -apiVersion: v1 data: CACHEURL: http://172.22.0.1/images DEPLOY_KERNEL_URL: http://172.22.0.2:6180/images/ironic-python-agent.kernel