From 1be0e7117fed2c2a248ce4ddeccd5b9931818ff6 Mon Sep 17 00:00:00 2001
From: Sven Ketelsen <sven.ketelsen@arxes-tolina.de>
Date: Tue, 9 Nov 2021 20:41:14 +0100
Subject: [PATCH] cleanup

---
 .../ingress-controller/tasks/main.yml         | 20 ++++++++-----
 .../echoserver__fullobjects.yaml}             | 30 +++++++++----------
 2 files changed, 28 insertions(+), 22 deletions(-)
 rename roles/kubernetes/ingress-controller/{files/hello-node__fullobjects.yaml => templates/echoserver__fullobjects.yaml} (69%)

diff --git a/roles/kubernetes/ingress-controller/tasks/main.yml b/roles/kubernetes/ingress-controller/tasks/main.yml
index 0a9306f..411470b 100644
--- a/roles/kubernetes/ingress-controller/tasks/main.yml
+++ b/roles/kubernetes/ingress-controller/tasks/main.yml
@@ -2,6 +2,7 @@
 
 ### tags:
 ###   ingress-controller
+###   ingress-echoserver
 
 - name: Install ingress via helm
   kubernetes.core.helm:
@@ -17,19 +18,24 @@
   tags:
     - ingress-controller
 
-- set_fact:
-    ingress_demo_app: "{{ lookup('file','hello-node__fullobjects.yaml') }}"
+- name: Setting present state for testing namespace
+  kubernetes.core.k8s:
+    name: "{{ k8s_echoserver_helm__release_namespace | default('testing') }}"
+    api_version: v1
+    kind: Namespace
+    state: "{{ k8s_echoserver_helm__enable_demoapp | default('absent') }}"
   when: 
   - inventory_hostname == groups['kube-master'][0]
   tags:
-    - ingress-controller
+    - ingress-echoserver
 
-- name: Adding hello-node test app
+- name: Setting present state for echoserver
   kubernetes.core.k8s:
-    state: "{{ k8s_ingress_helm__enable_demoapp | default('absent') }}"
-    definition: "{{ ingress_demo_app }}"
+    state: "{{ k8s_echoserver_helm__enable_demoapp | default('absent') }}"
+    definition:  "{{ lookup('template','echoserver__fullobjects.yaml') }}"
+    namespace: "{{ k8s_echoserver_helm__release_namespace | default('testing') }}"
     wait: yes
   when: 
   - inventory_hostname == groups['kube-master'][0]
   tags:
-    - ingress-controller
+    - ingress-echoserver
diff --git a/roles/kubernetes/ingress-controller/files/hello-node__fullobjects.yaml b/roles/kubernetes/ingress-controller/templates/echoserver__fullobjects.yaml
similarity index 69%
rename from roles/kubernetes/ingress-controller/files/hello-node__fullobjects.yaml
rename to roles/kubernetes/ingress-controller/templates/echoserver__fullobjects.yaml
index 8e7c771..da287da 100644
--- a/roles/kubernetes/ingress-controller/files/hello-node__fullobjects.yaml
+++ b/roles/kubernetes/ingress-controller/templates/echoserver__fullobjects.yaml
@@ -3,18 +3,18 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    app: hello-node
-  name: hello-node
-  namespace: default
+    app: echoserver
+  name: echoserver
+  namespace: testing
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: hello-node
+      app: echoserver
   template:
     metadata:
       labels:
-        app: hello-node
+        app: echoserver
     spec:
       containers:
       - image: k8s.gcr.io/echoserver:1.4
@@ -24,16 +24,16 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    app: hello-node
-  name: hello-node
-  namespace: default
+    app: echoserver
+  name: echoserver
+  namespace: testing
 spec:
   ports:
   - port: 80
     protocol: TCP
     targetPort: 8080
   selector:
-    app: hello-node
+    app: echoserver
 ---
 apiVersion: networking.k8s.io/v1
 kind: Ingress
@@ -45,21 +45,21 @@ metadata:
     nginx.ingress.kubernetes.io/preserve-trailing-slash: "true"
     nginx.ingress.kubernetes.io/rewrite-target: /
     nginx.ingress.kubernetes.io/ssl-redirect: "false"
-  name: ingress-nginx-helloworld
-  namespace: default
+  name: "{{ stage }}-echoserver-ingress"
+  namespace: testing
 spec:
   rules:
-  - host: microservice.smardigo.digital
+  - host: "{{ stage }}-echoserver.smardigo.digital"
     http:
       paths:
       - backend:
           service:
-            name: hello-node
+            name: echoserver
             port:
               number: 80
         path: /
         pathType: Prefix
   tls:
   - hosts:
-    - microservice.smardigo.digital
-    secretName: myingress-cert
+    - "{{ stage }}-echoserver.smardigo.digital"
+    secretName: "{{ stage }}-echoserver-cert"