Skip to content

Commit

Permalink
Merge pull request #28 from rooftopcellist/unique-manager-refs
Browse files Browse the repository at this point in the history
Name operator container eda-manager instead of manager for uniqueness
  • Loading branch information
rooftopcellist authored Apr 2, 2023
2 parents b80b2de + af42de6 commit 6740dad
Show file tree
Hide file tree
Showing 11 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion config/default/manager_auth_proxy_patch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ spec:
requests:
cpu: 5m
memory: 64Mi
- name: manager
- name: eda-manager
args:
- "--health-probe-bind-address=:6789"
- "--metrics-bind-address=127.0.0.1:8080"
Expand Down
2 changes: 1 addition & 1 deletion config/default/manager_config_patch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ spec:
template:
spec:
containers:
- name: manager
- name: eda-manager
8 changes: 4 additions & 4 deletions config/manager/manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
control-plane: controller-manager
app.kubernetes.io/name: namespace
app.kubernetes.io/instance: system
app.kubernetes.io/component: manager
app.kubernetes.io/component: eda-manager
app.kubernetes.io/created-by: eda-server-operator
app.kubernetes.io/part-of: eda-server-operator
app.kubernetes.io/managed-by: kustomize
Expand All @@ -20,7 +20,7 @@ metadata:
control-plane: controller-manager
app.kubernetes.io/name: deployment
app.kubernetes.io/instance: controller-manager
app.kubernetes.io/component: manager
app.kubernetes.io/component: eda-manager
app.kubernetes.io/created-by: eda-server-operator
app.kubernetes.io/part-of: eda-server-operator
app.kubernetes.io/managed-by: kustomize
Expand All @@ -32,7 +32,7 @@ spec:
template:
metadata:
annotations:
kubectl.kubernetes.io/default-container: manager
kubectl.kubernetes.io/default-container: eda-manager
labels:
control-plane: controller-manager
spec:
Expand Down Expand Up @@ -66,7 +66,7 @@ spec:
- --leader-election-id=eda-server-operator
image: controller:latest
imagePullPolicy: IfNotPresent
name: manager
name: eda-manager
env:
- name: ANSIBLE_GATHERING
value: explicit
Expand Down
2 changes: 1 addition & 1 deletion config/rbac/role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: manager-role
name: eda-manager-role
rules:
##
## Base operator rules
Expand Down
6 changes: 3 additions & 3 deletions config/rbac/role_binding.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ kind: ClusterRoleBinding
metadata:
labels:
app.kubernetes.io/name: clusterrolebinding
app.kubernetes.io/instance: manager-rolebinding
app.kubernetes.io/instance: eda-manager-rolebinding
app.kubernetes.io/component: rbac
app.kubernetes.io/created-by: eda-server-operator
app.kubernetes.io/part-of: eda-server-operator
app.kubernetes.io/managed-by: kustomize
name: manager-rolebinding
name: eda-manager-rolebinding
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: manager-role
name: eda-manager-role
subjects:
- kind: ServiceAccount
name: controller-manager
Expand Down
2 changes: 1 addition & 1 deletion config/testing/debug_logs_patch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ spec:
template:
spec:
containers:
- name: manager
- name: eda-manager
env:
- name: ANSIBLE_DEBUG_LOGS
value: "TRUE"
2 changes: 1 addition & 1 deletion config/testing/manager_image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ spec:
template:
spec:
containers:
- name: manager
- name: eda-manager
image: testing
2 changes: 1 addition & 1 deletion config/testing/pull_policy/Always.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ spec:
template:
spec:
containers:
- name: manager
- name: eda-manager
imagePullPolicy: Always
2 changes: 1 addition & 1 deletion config/testing/pull_policy/IfNotPresent.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ spec:
template:
spec:
containers:
- name: manager
- name: eda-manager
imagePullPolicy: IfNotPresent
2 changes: 1 addition & 1 deletion config/testing/pull_policy/Never.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ spec:
template:
spec:
containers:
- name: manager
- name: eda-manager
imagePullPolicy: Never
2 changes: 1 addition & 1 deletion molecule/default/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
k8s_log:
name: '{{ item.metadata.name }}'
namespace: '{{ namespace }}'
container: manager
container: eda-manager
loop: "{{ q('k8s', api_version='v1', kind='Pod', namespace=namespace, label_selector=ctrl_label) }}"
register: debug_logs

Expand Down

0 comments on commit 6740dad

Please sign in to comment.