Merge pull request #1144 from openshift-kni/remove-bundle-configmap

manifests: drop configmap support
openshift-kni · Jan 7, 2025 · 2cf6841 · 2cf6841
2 parents e96f12e + 1823c72
commit 2cf6841
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 57 deletions.
diff --git a/bundle/manifests/numaresources-manager-config_v1_configmap.yaml b/bundle/manifests/numaresources-manager-config_v1_configmap.yaml
diff --git a/bundle/manifests/numaresources-operator.clusterserviceversion.yaml b/bundle/manifests/numaresources-operator.clusterserviceversion.yaml
@@ -62,7 +62,7 @@ metadata:
         }
       ]
     capabilities: Basic Install
-    createdAt: "2025-01-01T17:56:52Z"
+    createdAt: "2025-01-07T13:18:55Z"
     olm.skipRange: '>=4.18.0 <4.19.0'
     operatorframework.io/cluster-monitoring: "true"
     operators.operatorframework.io/builder: operator-sdk-v1.36.1

diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml
@@ -30,10 +30,6 @@ patchesStrategicMerge:
 # endpoint w/o any authn/z, please comment the following line.
 #- 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
 #- manager_webhook_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/kustomization.yaml b/config/manager/kustomization.yaml
@@ -4,10 +4,6 @@ resources:
 generatorOptions:
   disableNameSuffixHash: true
 
-configMapGenerator:
-- files:
-  - controller_manager_config.yaml
-  name: manager-config
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 images: