From 4e29b6ed37631dd6d39de16b189b13721cd91525 Mon Sep 17 00:00:00 2001 From: Mrika Llabani Date: Mon, 3 Feb 2025 16:59:45 +0100 Subject: [PATCH 1/5] update tasks --- ansible/roles/shd-client-core/tasks/main.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ansible/roles/shd-client-core/tasks/main.yml b/ansible/roles/shd-client-core/tasks/main.yml index 2eedffd..632f1b1 100644 --- a/ansible/roles/shd-client-core/tasks/main.yml +++ b/ansible/roles/shd-client-core/tasks/main.yml @@ -3,6 +3,7 @@ kubeconfig: ~/.kube/config namespace: "{{ NAMESPACE }}" template: svc.yml.j2 + state: "{{ 'present' if WITH_SHD_CLIENT is defined and WITH_SHD_CLIENT|bool else 'absent' }}" tags: - service @@ -12,6 +13,7 @@ namespace: "{{ NAMESPACE }}" template: configmap.yml.j2 apply: yes + state: "{{ 'present' if WITH_SHD_CLIENT is defined and WITH_SHD_CLIENT|bool else 'absent' }}" tags: - configmap @@ -20,6 +22,7 @@ kubeconfig: ~/.kube/config namespace: "{{ NAMESPACE }}" template: deployment.yml.j2 + state: "{{ 'present' if WITH_SHD_CLIENT is defined and WITH_SHD_CLIENT|bool else 'absent' }}" tags: - deployment @@ -28,5 +31,6 @@ kubeconfig: ~/.kube/config namespace: "{{ NAMESPACE }}" template: ingress.yml.j2 + state: "{{ 'present' if WITH_SHD_CLIENT is defined and WITH_SHD_CLIENT|bool else 'absent' }}" tags: - ingress From f0c1861514ab5d78ee84cdccfacfd5ef362d81f8 Mon Sep 17 00:00:00 2001 From: Mrika Llabani Date: Mon, 3 Feb 2025 17:14:09 +0100 Subject: [PATCH 2/5] add default --- ansible/roles/shd-client-core/defaults/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/ansible/roles/shd-client-core/defaults/main.yml b/ansible/roles/shd-client-core/defaults/main.yml index a1ef41b..8c1c263 100644 --- a/ansible/roles/shd-client-core/defaults/main.yml +++ b/ansible/roles/shd-client-core/defaults/main.yml @@ -1,3 +1,4 @@ --- SHD_CLIENT_IMAGE: quay.io/schulcloudverbund/shd-client SHD_CLIENT_PREFIX: superhero. +WITH_SHD_CLIENT: false From cdca4b2a1c1da5f8ba1554d78af2fa578964fdc8 Mon Sep 17 00:00:00 2001 From: Steliyan Dinkov Date: Mon, 3 Feb 2025 17:49:43 +0100 Subject: [PATCH 3/5] update ansible deployment task --- ansible/roles/shd-client-core/tasks/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ansible/roles/shd-client-core/tasks/main.yml b/ansible/roles/shd-client-core/tasks/main.yml index 632f1b1..10b3098 100644 --- a/ansible/roles/shd-client-core/tasks/main.yml +++ b/ansible/roles/shd-client-core/tasks/main.yml @@ -3,7 +3,7 @@ kubeconfig: ~/.kube/config namespace: "{{ NAMESPACE }}" template: svc.yml.j2 - state: "{{ 'present' if WITH_SHD_CLIENT is defined and WITH_SHD_CLIENT|bool else 'absent' }}" + state: "{{ WITH_SHD_CLIENT|bool else 'absent' }}" tags: - service @@ -13,7 +13,7 @@ namespace: "{{ NAMESPACE }}" template: configmap.yml.j2 apply: yes - state: "{{ 'present' if WITH_SHD_CLIENT is defined and WITH_SHD_CLIENT|bool else 'absent' }}" + state: "{{ WITH_SHD_CLIENT|bool else 'absent' }}" tags: - configmap @@ -22,7 +22,7 @@ kubeconfig: ~/.kube/config namespace: "{{ NAMESPACE }}" template: deployment.yml.j2 - state: "{{ 'present' if WITH_SHD_CLIENT is defined and WITH_SHD_CLIENT|bool else 'absent' }}" + state: "{{ WITH_SHD_CLIENT|bool else 'absent' }}" tags: - deployment @@ -31,6 +31,6 @@ kubeconfig: ~/.kube/config namespace: "{{ NAMESPACE }}" template: ingress.yml.j2 - state: "{{ 'present' if WITH_SHD_CLIENT is defined and WITH_SHD_CLIENT|bool else 'absent' }}" + state: "{{ WITH_SHD_CLIENT|bool else 'absent' }}" tags: - ingress From b9376ff17ea89bc15c91b8c0663e097a8e31d758 Mon Sep 17 00:00:00 2001 From: Steliyan Dinkov Date: Tue, 4 Feb 2025 10:28:54 +0100 Subject: [PATCH 4/5] update ansible role tasks to delete existing resourses --- ansible/roles/shd-client-core/tasks/main.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/ansible/roles/shd-client-core/tasks/main.yml b/ansible/roles/shd-client-core/tasks/main.yml index 10b3098..1438f53 100644 --- a/ansible/roles/shd-client-core/tasks/main.yml +++ b/ansible/roles/shd-client-core/tasks/main.yml @@ -3,7 +3,8 @@ kubeconfig: ~/.kube/config namespace: "{{ NAMESPACE }}" template: svc.yml.j2 - state: "{{ WITH_SHD_CLIENT|bool else 'absent' }}" + state: absent + when: WITH_SHD_CLIENT is not defined or not WITH_SHD_CLIENT | bool tags: - service @@ -13,7 +14,8 @@ namespace: "{{ NAMESPACE }}" template: configmap.yml.j2 apply: yes - state: "{{ WITH_SHD_CLIENT|bool else 'absent' }}" + state: absent + when: WITH_SHD_CLIENT is not defined or not WITH_SHD_CLIENT | bool tags: - configmap @@ -22,7 +24,8 @@ kubeconfig: ~/.kube/config namespace: "{{ NAMESPACE }}" template: deployment.yml.j2 - state: "{{ WITH_SHD_CLIENT|bool else 'absent' }}" + state: absent + when: WITH_SHD_CLIENT is not defined or not WITH_SHD_CLIENT | bool tags: - deployment @@ -31,6 +34,7 @@ kubeconfig: ~/.kube/config namespace: "{{ NAMESPACE }}" template: ingress.yml.j2 - state: "{{ WITH_SHD_CLIENT|bool else 'absent' }}" + state: absent + when: WITH_SHD_CLIENT is not defined or not WITH_SHD_CLIENT | bool tags: - ingress From a87d4074bec6b32efdc8f24f3177c20b2f5759ad Mon Sep 17 00:00:00 2001 From: Mrika Llabani Date: Tue, 4 Feb 2025 12:45:14 +0100 Subject: [PATCH 5/5] fix --- ansible/roles/shd-client-core/tasks/main.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/ansible/roles/shd-client-core/tasks/main.yml b/ansible/roles/shd-client-core/tasks/main.yml index 1438f53..d4512db 100644 --- a/ansible/roles/shd-client-core/tasks/main.yml +++ b/ansible/roles/shd-client-core/tasks/main.yml @@ -3,8 +3,7 @@ kubeconfig: ~/.kube/config namespace: "{{ NAMESPACE }}" template: svc.yml.j2 - state: absent - when: WITH_SHD_CLIENT is not defined or not WITH_SHD_CLIENT | bool + state: "{{ 'present' if WITH_SHD_CLIENT else 'absent'}}" tags: - service @@ -14,8 +13,7 @@ namespace: "{{ NAMESPACE }}" template: configmap.yml.j2 apply: yes - state: absent - when: WITH_SHD_CLIENT is not defined or not WITH_SHD_CLIENT | bool + state: "{{ 'present' if WITH_SHD_CLIENT else 'absent'}}" tags: - configmap @@ -24,8 +22,7 @@ kubeconfig: ~/.kube/config namespace: "{{ NAMESPACE }}" template: deployment.yml.j2 - state: absent - when: WITH_SHD_CLIENT is not defined or not WITH_SHD_CLIENT | bool + state: "{{ 'present' if WITH_SHD_CLIENT else 'absent'}}" tags: - deployment @@ -34,7 +31,6 @@ kubeconfig: ~/.kube/config namespace: "{{ NAMESPACE }}" template: ingress.yml.j2 - state: absent - when: WITH_SHD_CLIENT is not defined or not WITH_SHD_CLIENT | bool + state: "{{ 'present' if WITH_SHD_CLIENT else 'absent'}}" tags: - ingress