Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[#702] Remove ControllerManagerConfig #703

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 0 additions & 17 deletions bundle/manifests/activemq-artemis-manager-config_v1_configmap.yaml

This file was deleted.

11 changes: 0 additions & 11 deletions config/manager/controller_manager_config.yaml

This file was deleted.

4 changes: 0 additions & 4 deletions config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 0 additions & 1 deletion controllers/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{}
Expand Down
2 changes: 0 additions & 2 deletions deploy/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```

Expand Down Expand Up @@ -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
```
1 change: 0 additions & 1 deletion deploy/cluster_wide_install_opr.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 -
1 change: 0 additions & 1 deletion deploy/install_opr.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
17 changes: 0 additions & 17 deletions deploy/operator_config.yaml

This file was deleted.

1 change: 0 additions & 1 deletion deploy/undeploy_all.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 0 additions & 4 deletions hack/static_manifest_gen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,6 @@ function writeFile() {
createFile "$destdir/service_account.yaml"
;;

ConfigMap)
createFile "$destdir/operator_config.yaml"
;;

Namespace)
echo "Skipping ${resource_kind}:${resource_name}"
;;
Expand Down