From b407c6c12141050909030e2359fbb5d111097882 Mon Sep 17 00:00:00 2001 From: "Badr, Nesma" Date: Wed, 17 Apr 2024 12:34:09 +0200 Subject: [PATCH] Remove deprecated ControllerManagerConfig --- config/manager/controller_manager_config.yaml | 11 ---------- config/manager/kustomization.yaml | 5 ----- .../starting-operator-with-webhooks.md | 17 --------------- .../oci/template-operator-manifest.yaml | 21 ------------------- pkg/test_samples/raw-manifest.yaml | 21 ------------------- 5 files changed, 75 deletions(-) delete mode 100644 config/manager/controller_manager_config.yaml diff --git a/config/manager/controller_manager_config.yaml b/config/manager/controller_manager_config.yaml deleted file mode 100644 index 073d921a7d2..00000000000 --- a/config/manager/controller_manager_config.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: controller-runtime.sigs.k8s.io/v1alpha1 -kind: ControllerManagerConfig -health: - healthProbeBindAddress: :8081 -metrics: - bindAddress: 127.0.0.1:8080 -webhook: - port: 9443 -leaderElection: - leaderElect: true - resourceName: 893110f7.kyma-project.io diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index b086b114783..00ae86ff75d 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -8,11 +8,6 @@ resources: generatorOptions: disableNameSuffixHash: true -configMapGenerator: -- files: - - controller_manager_config.yaml - name: manager-config - images: - name: controller newName: europe-docker.pkg.dev/kyma-project/prod/lifecycle-manager diff --git a/docs/developer-tutorials/starting-operator-with-webhooks.md b/docs/developer-tutorials/starting-operator-with-webhooks.md index 6ed9aa7b252..2cdfd3019a3 100644 --- a/docs/developer-tutorials/starting-operator-with-webhooks.md +++ b/docs/developer-tutorials/starting-operator-with-webhooks.md @@ -17,20 +17,3 @@ For further information, read the [kubebuilder tutorial](https://book.kubebuilde ```bash go run ./main.go ./flags.go --enable-webhooks ``` - - You can also enable webhooks by updating `config/manager/controller_manager_config.yaml`: - - ```yaml - apiVersion: controller-runtime.sigs.k8s.io/v1alpha1 - kind: ControllerManagerConfig - health: - healthProbeBindAddress: :8081 - metrics: - bindAddress: 127.0.0.1:8080 - webhook: - port: 9443 - leaderElection: - leaderElect: true - resourceName: 893110f7.kyma-project.io - enableWebhooks: true - ``` diff --git a/pkg/test_samples/oci/template-operator-manifest.yaml b/pkg/test_samples/oci/template-operator-manifest.yaml index 7c5be19e89d..f25f44f8836 100644 --- a/pkg/test_samples/oci/template-operator-manifest.yaml +++ b/pkg/test_samples/oci/template-operator-manifest.yaml @@ -59,27 +59,6 @@ spec: serviceAccountName: template-operator-controller-manager terminationGracePeriodSeconds: 10 --- -apiVersion: v1 -data: - controller_manager_config.yaml: | - apiVersion: controller-runtime.sigs.k8s.io/v1alpha1 - kind: ControllerManagerConfig - health: - healthProbeBindAddress: :8081 - metrics: - bindAddress: 127.0.0.1:8080 - webhook: - port: 9443 - leaderElection: - leaderElect: true - resourceName: 76223278.kyma-project.io -kind: ConfigMap -metadata: - labels: - app.kubernetes.io/component: template-operator.kyma-project.io - name: template-operator-manager-config - namespace: template-operator-system ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: diff --git a/pkg/test_samples/raw-manifest.yaml b/pkg/test_samples/raw-manifest.yaml index 703c9feaef8..286e865a697 100644 --- a/pkg/test_samples/raw-manifest.yaml +++ b/pkg/test_samples/raw-manifest.yaml @@ -1,24 +1,3 @@ -apiVersion: v1 -data: - controller_manager_config.yaml: | - apiVersion: controller-runtime.sigs.k8s.io/v1alpha1 - kind: ControllerManagerConfig - health: - healthProbeBindAddress: :8081 - metrics: - bindAddress: 127.0.0.1:8080 - webhook: - port: 9443 - leaderElection: - leaderElect: true - resourceName: 76223278.kyma-project.io -kind: ConfigMap -metadata: - labels: - app.kubernetes.io/component: template-operator.kyma-project.io - name: template-operator-manager-config - namespace: kyma-system ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: