Remove deprecated ControllerManagerConfig

kyma-project · Apr 18, 2024 · 8a592a3 · 8a592a3
1 parent 50d2b43
commit 8a592a3
Show file tree

Hide file tree

Showing 10 changed files with 2 additions and 102 deletions.
diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml
@@ -19,9 +19,6 @@ commonLabels:
 
 
 patches:
-# 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/default/manager_config_patch.yaml b/config/default/manager_config_patch.yaml
diff --git a/config/load_test/kustomization.yaml b/config/load_test/kustomization.yaml
@@ -146,9 +146,6 @@ patches:
     target:
       kind: Deployment
   - path: patches/adjust_resources_in_deployment.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/manager/controller_manager_config.yaml b/config/manager/controller_manager_config.yaml
diff --git 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
@@ -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/docs/technical-reference/api/moduleTemplate-cr.md b/docs/technical-reference/api/moduleTemplate-cr.md
@@ -87,7 +87,7 @@ In this scenario, the `Ready` state will only be reached if both `module.state.f
 
 ### **.spec.descriptor**
 
-The core of any ModuleTemplate CR, the descriptor can be one of the schemas mentioned in the latest version of the [OCM Software Specification](https://ocm.software/docs/cli/spec/). While it is a `runtime.RawExtension` in the Go types, it will be resolved via ValidatingWebhook into an internal descriptor with the help of the official [OCM library](https://github.com/open-component-model/ocm).
+The core of any ModuleTemplate CR, the descriptor can be one of the schemas mentioned in the latest version of the [OCM Software Specification](https://ocm.software/docs/cli/). While it is a `runtime.RawExtension` in the Go types, it will be resolved via ValidatingWebhook into an internal descriptor with the help of the official [OCM library](https://github.com/open-component-model/ocm).
 
 By default, it will most likely be easiest to use [Kyma CLI](https://github.com/kyma-project/cli/tree/main) and its `create module` command to create a template with a valid descriptor, but it can also be generated manually, for example using [OCM CLI](https://github.com/open-component-model/ocm/tree/main/cmds/ocm).
 

diff --git a/internal/util_test.go b/internal/util_test.go
@@ -28,7 +28,7 @@ func TestParseManifestToObjects(t *testing.T) {
 		{
 			"test template operator manifest, expect no error",
 			"template-operator-manifest.yaml",
-			14,
+			13,
 			assert.NoError,
 		},
 		{

diff --git 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
@@ -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:
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,7 +28,7 @@ func TestParseManifestToObjects(t *testing.T) { @@
     		{
     			"test template operator manifest, expect no error",
     			"template-operator-manifest.yaml",
-,
+,
     			assert.NoError,
     		},
     		{
@@ Expand Down @@