From d43521bb77932c0366dd34b656f8d0137523ea82 Mon Sep 17 00:00:00 2001 From: Fabrice Flore-Thebault Date: Mon, 14 Jan 2019 10:24:41 +0100 Subject: [PATCH 1/5] fix #2991 - make Helm creation of postgreql succeed when installing multiple AWX on different namespaces on same kubernetes Signed-off-by: Fabrice Flore-Thebault --- installer/roles/kubernetes/tasks/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/installer/roles/kubernetes/tasks/main.yml b/installer/roles/kubernetes/tasks/main.yml index ec857ab2e4..c21b128e17 100644 --- a/installer/roles/kubernetes/tasks/main.yml +++ b/installer/roles/kubernetes/tasks/main.yml @@ -80,7 +80,8 @@ - name: Deploy and Activate Postgres (Kubernetes) shell: | - helm install --name {{ kubernetes_deployment_name }} --namespace {{ kubernetes_namespace }} \ + helm upgrade --install --name {{ kubernetes_namespace }}-{{ kubernetes_deployment_name }} \ + --namespace {{ kubernetes_namespace }} \ --set postgresqlUsername={{ pg_username }} \ --set postgresqlPassword={{ pg_password }} \ --set postgresqlDatabase={{ pg_database }} \ From ef3aab1357d0a57dfa15973f42bd4e2f87803d37 Mon Sep 17 00:00:00 2001 From: Fabrice Flore-Thebault Date: Tue, 15 Jan 2019 11:44:08 +0100 Subject: [PATCH 2/5] related #2991 - unify postgresql_service_name Signed-off-by: Fabrice Flore-Thebault --- installer/roles/kubernetes/tasks/main.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/installer/roles/kubernetes/tasks/main.yml b/installer/roles/kubernetes/tasks/main.yml index c21b128e17..4dc78d4ac3 100644 --- a/installer/roles/kubernetes/tasks/main.yml +++ b/installer/roles/kubernetes/tasks/main.yml @@ -53,13 +53,13 @@ - name: Deploy PostgreSQL (OpenShift) block: - - name: Template PostgreSQL Deployment + - name: Template PostgreSQL Deployment (OpenShift) template: src: postgresql-persistent.yml.j2 dest: "{{ kubernetes_base_path }}/postgresql-persistent.yml" mode: '0600' - - name: Deploy and Activate Postgres + - name: Deploy and Activate Postgres (OpenShift) shell: | {{ openshift_oc_bin }} new-app --file={{ kubernetes_base_path }}/postgresql-persistent.yml \ -e MEMORY_LIMIT={{ pg_memory_limit|default('512') }}Mi \ @@ -80,7 +80,7 @@ - name: Deploy and Activate Postgres (Kubernetes) shell: | - helm upgrade --install --name {{ kubernetes_namespace }}-{{ kubernetes_deployment_name }} \ + helm upgrade --install --name {{ postgresql_service_name }} \ --namespace {{ kubernetes_namespace }} \ --set postgresqlUsername={{ pg_username }} \ --set postgresqlPassword={{ pg_password }} \ @@ -95,9 +95,9 @@ register: kubernetes_pg_activate no_log: yes -- name: Set postgresql hostname to helm package service +- name: Set postgresql hostname to helm package service (Kubernetes) set_fact: - pg_hostname: "{{ kubernetes_deployment_name }}-postgresql" + pg_hostname: "{{ postgresql_service_name }}" when: - pg_hostname is not defined or pg_hostname == '' - kubernetes_context is defined From d69f6acf64537b9fdaa71cc01f1870eec577a7e8 Mon Sep 17 00:00:00 2001 From: Fabrice Flore-Thebault Date: Tue, 15 Jan 2019 14:47:59 +0100 Subject: [PATCH 3/5] add helm repo update and fix helm upgrade Signed-off-by: Fabrice Flore-Thebault --- installer/roles/kubernetes/tasks/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/installer/roles/kubernetes/tasks/main.yml b/installer/roles/kubernetes/tasks/main.yml index 4dc78d4ac3..1893b8cb22 100644 --- a/installer/roles/kubernetes/tasks/main.yml +++ b/installer/roles/kubernetes/tasks/main.yml @@ -80,7 +80,8 @@ - name: Deploy and Activate Postgres (Kubernetes) shell: | - helm upgrade --install --name {{ postgresql_service_name }} \ + helm repo update --tiller-namespace={{ tiller_namespace | default('kube-system') }} + helm upgrade {{ postgresql_service_name }} --install \ --namespace {{ kubernetes_namespace }} \ --set postgresqlUsername={{ pg_username }} \ --set postgresqlPassword={{ pg_password }} \ From 7b32262f7597ace806430c45a9cf09801dd08cb3 Mon Sep 17 00:00:00 2001 From: Fabrice Flore-Thebault Date: Tue, 15 Jan 2019 14:59:17 +0100 Subject: [PATCH 4/5] revert pg_hostname Signed-off-by: Fabrice Flore-Thebault --- installer/roles/kubernetes/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installer/roles/kubernetes/tasks/main.yml b/installer/roles/kubernetes/tasks/main.yml index 1893b8cb22..0d8266671b 100644 --- a/installer/roles/kubernetes/tasks/main.yml +++ b/installer/roles/kubernetes/tasks/main.yml @@ -98,7 +98,7 @@ - name: Set postgresql hostname to helm package service (Kubernetes) set_fact: - pg_hostname: "{{ postgresql_service_name }}" + pg_hostname: "{{ postgresql_service_name }}-postgresql" when: - pg_hostname is not defined or pg_hostname == '' - kubernetes_context is defined From c434d3887663710ea65562919466e4d221af6370 Mon Sep 17 00:00:00 2001 From: Fabrice Flore-Thebault Date: Wed, 16 Jan 2019 09:40:49 +0100 Subject: [PATCH 5/5] adding helm chart version for postgresql Signed-off-by: Fabrice Flore-Thebault --- installer/roles/kubernetes/tasks/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/installer/roles/kubernetes/tasks/main.yml b/installer/roles/kubernetes/tasks/main.yml index 0d8266671b..7018b4cbc7 100644 --- a/installer/roles/kubernetes/tasks/main.yml +++ b/installer/roles/kubernetes/tasks/main.yml @@ -87,6 +87,7 @@ --set postgresqlPassword={{ pg_password }} \ --set postgresqlDatabase={{ pg_database }} \ --set persistence.size={{ pg_volume_capacity|default('5')}}Gi \ + --version="2.0.0" \ --tiller-namespace={{ tiller_namespace | default('kube-system') }} \ stable/postgresql when: