internet/awx-operator
3
0
Fork 0
mirror of https://github.com/ansible/awx-operator.git synced 2026-05-07 22:02:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #297 from rooftopcellist/pg-labels

Browse Source 
Make postgres sts labels consistent with k8s recommendations & pulp-operator
This commit is contained in:
Christian Adams
2021-05-18 10:37:46 -04:00
committed by GitHub
parent 5fd86e07ce 406bbf90fa
commit e18ce59ea9
3 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
roles/installer/tasks/migrate_data.yml
View File

@@ -14,7 +14,7 @@
- name: Default label selector to custom resource generated postgres - name: Default label selector to custom resource generated postgres
set_fact: set_fact:
postgres_label_selector: "app.kubernetes.io/name={{ meta.name }}-postgres" postgres_label_selector: "app.kubernetes.io/instance=postgres-{{ meta.name }}"
when: postgres_label_selector is not defined when: postgres_label_selector is not defined
- name: Get the postgres pod information - name: Get the postgres pod information

24
roles/installer/templates/tower_postgres.yaml.j2
View File

@@ -6,7 +6,9 @@ metadata:
name: '{{ meta.name }}-postgres' name: '{{ meta.name }}-postgres'
namespace: '{{ meta.namespace }}' namespace: '{{ meta.namespace }}'
labels: labels:
app.kubernetes.io/name: '{{ meta.name }}-postgres' app.kubernetes.io/name: 'postgres'
app.kubernetes.io/instance: 'postgres-{{ meta.name }}'
app.kubernetes.io/component: 'database'
app.kubernetes.io/part-of: '{{ meta.name }}' app.kubernetes.io/part-of: '{{ meta.name }}'
app.kubernetes.io/managed-by: '{{ deployment_type }}-operator' app.kubernetes.io/managed-by: '{{ deployment_type }}-operator'
app.kubernetes.io/operator-version: '{{ lookup("env", "OPERATOR_VERSION") }}' app.kubernetes.io/operator-version: '{{ lookup("env", "OPERATOR_VERSION") }}'
@@ -14,9 +16,10 @@ metadata:
spec: spec:
selector: selector:
matchLabels: matchLabels:
app.kubernetes.io/name: '{{ meta.name }}-postgres' app.kubernetes.io/name: 'postgres'
app.kubernetes.io/instance: 'postgres-{{ meta.name }}'
app.kubernetes.io/component: 'database'
app.kubernetes.io/managed-by: '{{ deployment_type }}-operator' app.kubernetes.io/managed-by: '{{ deployment_type }}-operator'
app.kubernetes.io/component: database
serviceName: '{{ meta.name }}' serviceName: '{{ meta.name }}'
replicas: 1 replicas: 1
updateStrategy: updateStrategy:
@@ -24,10 +27,11 @@ spec:
template: template:
metadata: metadata:
labels: labels:
app.kubernetes.io/name: '{{ meta.name }}-postgres' app.kubernetes.io/name: 'postgres'
app.kubernetes.io/instance: 'postgres-{{ meta.name }}'
app.kubernetes.io/component: 'database'
app.kubernetes.io/part-of: '{{ meta.name }}' app.kubernetes.io/part-of: '{{ meta.name }}'
app.kubernetes.io/managed-by: '{{ deployment_type }}-operator' app.kubernetes.io/managed-by: '{{ deployment_type }}-operator'
app.kubernetes.io/component: database
spec: spec:
containers: containers:
- image: '{{ tower_postgres_image }}:{{ tower_postgres_image_version }}' - image: '{{ tower_postgres_image }}:{{ tower_postgres_image_version }}'
@@ -108,7 +112,9 @@ metadata:
name: '{{ meta.name }}-postgres' name: '{{ meta.name }}-postgres'
namespace: '{{ meta.namespace }}' namespace: '{{ meta.namespace }}'
labels: labels:
app.kubernetes.io/name: '{{ meta.name }}-postgres' app.kubernetes.io/name: 'postgres'
app.kubernetes.io/instance: 'postgres-{{ meta.name }}'
app.kubernetes.io/component: 'database'
app.kubernetes.io/part-of: '{{ meta.name }}' app.kubernetes.io/part-of: '{{ meta.name }}'
app.kubernetes.io/managed-by: '{{ deployment_type }}-operator' app.kubernetes.io/managed-by: '{{ deployment_type }}-operator'
app.kubernetes.io/operator-version: '{{ lookup("env", "OPERATOR_VERSION") }}' app.kubernetes.io/operator-version: '{{ lookup("env", "OPERATOR_VERSION") }}'
@@ -118,6 +124,8 @@ spec:
- port: 5432 - port: 5432
clusterIP: None clusterIP: None
selector: selector:
app.kubernetes.io/name: '{{ meta.name }}-postgres' app.kubernetes.io/name: 'postgres'
app.kubernetes.io/instance: 'postgres-{{ meta.name }}'
app.kubernetes.io/component: 'database'
app.kubernetes.io/part-of: '{{ meta.name }}'
app.kubernetes.io/managed-by: '{{ deployment_type }}-operator' app.kubernetes.io/managed-by: '{{ deployment_type }}-operator'
app.kubernetes.io/component: database

2
roles/restore/tasks/postgres.yml
View File

@@ -18,7 +18,7 @@
- name: Default label selector to custom resource generated postgres - name: Default label selector to custom resource generated postgres
set_fact: set_fact:
postgres_label_selector: "app.kubernetes.io/name={{ deployment_name }}-postgres" postgres_label_selector: "app.kubernetes.io/instance=postgres-{{ deployment_name }}"
when: postgres_label_selector is not defined when: postgres_label_selector is not defined
- name: Get the postgres pod information - name: Get the postgres pod information