Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions config/testing/manager_image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,3 @@ spec:
containers:
- name: galaxy-operator
image: testing
env:
- name: OPERATOR_SA_NAME
value: osdk-sa
36 changes: 0 additions & 36 deletions molecule/default/tasks/pulp_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,42 +7,6 @@
vars:
cr_file: 'pulpproject_v1beta1_pulp_cr.molecule.ci.yaml'

- name: Create role to allow patch/get on "{{ operator_service_account_name }}" serviceaccount
k8s:
state: present
namespace: '{{ namespace }}'
definition:
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
name: "{{ operator_service_account_name }}-role"
rules:
- apiGroups:
- ""
resourceNames:
- "{{ operator_service_account_name }}"
resources:
- serviceaccounts
verbs:
- patch
- get

- name: Bind "{{ operator_service_account_name }}-role" to "{{ operator_service_account_name }}" serviceaccount
k8s:
state: present
namespace: '{{ namespace }}'
definition:
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: "{{ operator_service_account_name }}-rolebinding"
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
name: "{{ operator_service_account_name }}-role"
subjects:
- kind: ServiceAccount
name: "{{ operator_service_account_name }}"

- name: Wait 5m for database reconciliation to run
k8s_info:
Expand Down
1 change: 0 additions & 1 deletion molecule/kind/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ provisioner:
group_vars:
all:
namespace: ${TEST_OPERATOR_NAMESPACE:-osdk-test}
operator_service_account_name: osdk-sa
host_vars:
localhost:
ansible_python_interpreter: '{{ ansible_playbook_python }}'
Expand Down
1 change: 0 additions & 1 deletion roles/common/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
---
image_pull_secret: ''
image_pull_secrets: []
operator_service_account_name: '{{ lookup("env","OPERATOR_SA_NAME") | default("galaxy-operator-sa",true) }}'
bundle_cacert_secret: ''

# Proxy environment variables for Galaxy containers.
Expand Down