From 48ef163d25cddcfb5e16d42a6884e092d35e5707 Mon Sep 17 00:00:00 2001 From: Domenico Francesco Bruscino Date: Fri, 6 Oct 2023 09:42:35 +0200 Subject: [PATCH] [#702] Remove ControllerManagerConfig --- ...emq-artemis-manager-config_v1_configmap.yaml | 17 ----------------- config/manager/controller_manager_config.yaml | 11 ----------- config/manager/kustomization.yaml | 4 ---- controllers/suite_test.go | 1 - deploy/README.md | 2 -- deploy/cluster_wide_install_opr.sh | 1 - deploy/install_opr.sh | 1 - deploy/operator_config.yaml | 17 ----------------- deploy/undeploy_all.sh | 1 - hack/static_manifest_gen.sh | 4 ---- 10 files changed, 59 deletions(-) delete mode 100644 bundle/manifests/activemq-artemis-manager-config_v1_configmap.yaml delete mode 100644 config/manager/controller_manager_config.yaml delete mode 100644 deploy/operator_config.yaml diff --git a/bundle/manifests/activemq-artemis-manager-config_v1_configmap.yaml b/bundle/manifests/activemq-artemis-manager-config_v1_configmap.yaml deleted file mode 100644 index b17a2a83e..000000000 --- a/bundle/manifests/activemq-artemis-manager-config_v1_configmap.yaml +++ /dev/null @@ -1,17 +0,0 @@ -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: d864aab0.amq.io -kind: ConfigMap -metadata: - name: activemq-artemis-manager-config diff --git a/config/manager/controller_manager_config.yaml b/config/manager/controller_manager_config.yaml deleted file mode 100644 index 2c1324513..000000000 --- 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: d864aab0.amq.io diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index f23c1b046..a5c2ca8c9 100644 --- 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 index 23a102241..e268ef25a 100644 --- 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 index b9f0a3a77..bb9241892 100644 --- 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 index 956fc9d24..f5ce519c7 100755 --- 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 index 37e4712b0..3a89e4c6e 100755 --- 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 deleted file mode 100644 index b17a2a83e..000000000 --- a/deploy/operator_config.yaml +++ /dev/null @@ -1,17 +0,0 @@ -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: d864aab0.amq.io -kind: ConfigMap -metadata: - name: activemq-artemis-manager-config diff --git a/deploy/undeploy_all.sh b/deploy/undeploy_all.sh index ebc58bc06..2cce0c968 100755 --- 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 index 485a09504..d89c0ae15 100755 --- 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}" ;;