Rename operator image name to make it unique from resource & pulp operators

This commit is contained in:
Christian M. Adams
2021-10-25 14:02:59 -04:00
parent 670b1f7d40
commit 894b0ffa5f
11 changed files with 15 additions and 15 deletions

View File

@@ -21,7 +21,7 @@ spec:
- containerPort: 8443 - containerPort: 8443
protocol: TCP protocol: TCP
name: https name: https
- name: manager - name: awx-manager
args: args:
- "--health-probe-bind-address=:6789" - "--health-probe-bind-address=:6789"
- "--metrics-bind-address=127.0.0.1:8080" - "--metrics-bind-address=127.0.0.1:8080"

View File

@@ -8,14 +8,14 @@ spec:
template: template:
spec: spec:
containers: containers:
- name: manager - name: awx-manager
args: args:
- "--config=controller_manager_config.yaml" - "--config=controller_manager_config.yaml"
volumeMounts: volumeMounts:
- name: manager-config - name: awx-manager-config
mountPath: /controller_manager_config.yaml mountPath: /controller_manager_config.yaml
subPath: controller_manager_config.yaml subPath: controller_manager_config.yaml
volumes: volumes:
- name: manager-config - name: awx-manager-config
configMap: configMap:
name: manager-config name: awx-manager-config

View File

@@ -5,7 +5,7 @@ generatorOptions:
configMapGenerator: configMapGenerator:
- files: - files:
- controller_manager_config.yaml - controller_manager_config.yaml
name: manager-config name: awx-manager-config
apiVersion: kustomize.config.k8s.io/v1beta1 apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization kind: Kustomization
images: images:

View File

@@ -30,7 +30,7 @@ spec:
- --leader-elect - --leader-elect
- --leader-election-id=awx-operator - --leader-election-id=awx-operator
image: controller:latest image: controller:latest
name: manager name: awx-manager
env: env:
- name: ANSIBLE_GATHERING - name: ANSIBLE_GATHERING
value: explicit value: explicit

View File

@@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: Role kind: Role
metadata: metadata:
creationTimestamp: null creationTimestamp: null
name: manager-role name: awx-manager-role
rules: rules:
- apiGroups: - apiGroups:
- route.openshift.io - route.openshift.io

View File

@@ -2,11 +2,11 @@
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding kind: RoleBinding
metadata: metadata:
name: manager-rolebinding name: awx-manager-rolebinding
roleRef: roleRef:
apiGroup: rbac.authorization.k8s.io apiGroup: rbac.authorization.k8s.io
kind: Role kind: Role
name: manager-role name: awx-manager-role
subjects: subjects:
- kind: ServiceAccount - kind: ServiceAccount
name: controller-manager name: controller-manager

View File

@@ -8,7 +8,7 @@ spec:
template: template:
spec: spec:
containers: containers:
- name: manager - name: awx-manager
env: env:
- name: ANSIBLE_DEBUG_LOGS - name: ANSIBLE_DEBUG_LOGS
value: "TRUE" value: "TRUE"

View File

@@ -8,5 +8,5 @@ spec:
template: template:
spec: spec:
containers: containers:
- name: manager - name: awx-manager
image: testing image: testing

View File

@@ -8,5 +8,5 @@ spec:
template: template:
spec: spec:
containers: containers:
- name: manager - name: awx-manager
imagePullPolicy: Always imagePullPolicy: Always

View File

@@ -8,5 +8,5 @@ spec:
template: template:
spec: spec:
containers: containers:
- name: manager - name: awx-manager
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent

View File

@@ -8,5 +8,5 @@ spec:
template: template:
spec: spec:
containers: containers:
- name: manager - name: awx-manager
imagePullPolicy: Never imagePullPolicy: Never