[#702] Remove ControllerManagerConfig

artemiscloud · Oct 11, 2023 · 4a83282 · 4a83282
1 parent 5a6f1d6
commit 4a83282
Show file tree

Hide file tree

Showing 10 changed files with 0 additions and 59 deletions.
diff --git a/bundle/manifests/activemq-artemis-manager-config_v1_configmap.yaml b/bundle/manifests/activemq-artemis-manager-config_v1_configmap.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
@@ -9,10 +9,6 @@ patches:
   target:
     kind: Deployment
 
-configMapGenerator:
-- files:
-  - controller_manager_config.yaml
-  name: manager-config
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 images:

diff --git a/controllers/suite_test.go b/controllers/suite_test.go
@@ -115,7 +115,6 @@ var (
 		"../deploy/role_binding.yaml",
 		"../deploy/election_role.yaml",
 		"../deploy/election_role_binding.yaml",
-		"../deploy/operator_config.yaml",
 		"../deploy/operator.yaml",
 	}
 	managerChannel chan struct{}

diff --git a/deploy/README.md b/deploy/README.md
@@ -32,7 +32,6 @@ kubectl create -f ./deploy/role.yaml
 kubectl create -f ./deploy/role_binding.yaml
 kubectl create -f ./deploy/election_role.yaml
 kubectl create -f ./deploy/election_role_binding.yaml
-kubectl create -f ./deploy/operator_config.yaml
 kubectl create -f ./deploy/operator.yaml
 ```
 
@@ -70,6 +69,5 @@ kubectl create -f ./deploy/cluster_role.yaml
 kubectl create -f ./deploy/cluster_role_binding.yaml
 kubectl create -f ./deploy/election_role.yaml
 kubectl create -f ./deploy/election_role_binding.yaml
-kubectl create -f ./deploy/operator_config.yaml
 kubectl create -f ./deploy/operator.yaml
 ```
diff --git a/deploy/cluster_wide_install_opr.sh b/deploy/cluster_wide_install_opr.sh
@@ -22,5 +22,4 @@ SERVICE_ACCOUNT_NS="$($KUBE_CLI get -f $DEPLOY_PATH/service_account.yaml -o json
 sed "s/namespace:.*/namespace: ${SERVICE_ACCOUNT_NS}/" $DEPLOY_PATH/cluster_role_binding.yaml | $KUBE_CLI apply -f -
 $KUBE_CLI create -f $DEPLOY_PATH/election_role.yaml
 $KUBE_CLI create -f $DEPLOY_PATH/election_role_binding.yaml
-$KUBE_CLI create -f $DEPLOY_PATH/operator_config.yaml
 sed -e "/WATCH_NAMESPACE/,/- name/ { /WATCH_NAMESPACE/b; /valueFrom:/bx; /- name/b; d; :x s/valueFrom:/value: '${WATCH_NAMESPACE}'/}" $DEPLOY_PATH/operator.yaml | $KUBE_CLI apply -f -
diff --git a/deploy/install_opr.sh b/deploy/install_opr.sh
@@ -16,5 +16,4 @@ $KUBE_CLI create -f $DEPLOY_PATH/role.yaml
 $KUBE_CLI create -f $DEPLOY_PATH/role_binding.yaml
 $KUBE_CLI create -f $DEPLOY_PATH/election_role.yaml
 $KUBE_CLI create -f $DEPLOY_PATH/election_role_binding.yaml
-$KUBE_CLI create -f $DEPLOY_PATH/operator_config.yaml
 $KUBE_CLI create -f $DEPLOY_PATH/operator.yaml
diff --git a/deploy/operator_config.yaml b/deploy/operator_config.yaml
diff --git a/deploy/undeploy_all.sh b/deploy/undeploy_all.sh
@@ -18,5 +18,4 @@ $KUBE_CLI delete -f $DEPLOY_PATH/cluster_role.yaml
 $KUBE_CLI delete -f $DEPLOY_PATH/cluster_role_binding.yaml
 $KUBE_CLI delete -f $DEPLOY_PATH/election_role.yaml
 $KUBE_CLI delete -f $DEPLOY_PATH/election_role_binding.yaml
-$KUBE_CLI delete -f $DEPLOY_PATH/operator_config.yaml
 $KUBE_CLI delete -f $DEPLOY_PATH/operator.yaml
diff --git a/hack/static_manifest_gen.sh b/hack/static_manifest_gen.sh
@@ -74,10 +74,6 @@ function writeFile() {
       createFile "$destdir/service_account.yaml"
       ;;
 
-    ConfigMap)
-      createFile "$destdir/operator_config.yaml"
-      ;;
-
     Namespace)
       echo "Skipping ${resource_kind}:${resource_name}"
       ;;