From e78a11d43197b3cc102237bf8f97954063cca33c Mon Sep 17 00:00:00 2001
From: Sven Ketelsen <sven.ketelsen@arxes-tolina.de>
Date: Mon, 15 Nov 2021 20:44:54 +0100
Subject: [PATCH] cleanup:

- removed echo server
- stick cert manager to 1.5.4
---
 .../kubernetes/cert-manager/defaults/main.yml |  2 +-
 .../ingress-controller/defaults/main.yml      |  2 +-
 .../ingress-controller/tasks/main.yml         | 23 -------
 .../templates/echoserver__fullobjects.yaml    | 65 -------------------
 4 files changed, 2 insertions(+), 90 deletions(-)
 delete mode 100644 roles/kubernetes/ingress-controller/templates/echoserver__fullobjects.yaml

diff --git a/roles/kubernetes/cert-manager/defaults/main.yml b/roles/kubernetes/cert-manager/defaults/main.yml
index 9b8938f..b02fa4c 100644
--- a/roles/kubernetes/cert-manager/defaults/main.yml
+++ b/roles/kubernetes/cert-manager/defaults/main.yml
@@ -2,7 +2,7 @@
 
 k8s_certmanager_helm__chart_ref: cert-manager
 k8s_certmanager_helm__chart_repo_url: https://charts.jetstack.io
-k8s_certmanager_helm__chart_version: v1.6.1
+k8s_certmanager_helm__chart_version: v1.5.4
 k8s_certmanager_helm__release_namespace: cert-manager
 
 k8s_certmanager_helm__release_values:
diff --git a/roles/kubernetes/ingress-controller/defaults/main.yml b/roles/kubernetes/ingress-controller/defaults/main.yml
index 919b9e4..8e36e27 100644
--- a/roles/kubernetes/ingress-controller/defaults/main.yml
+++ b/roles/kubernetes/ingress-controller/defaults/main.yml
@@ -41,4 +41,4 @@ k8s_ingress_helm__release_values:
   defaultBackend:
     enabled: true
 
-# TODO nginx ingress dashboard 9614
+# TODO automate installation of nginx ingress grafana dashboard 9614
diff --git a/roles/kubernetes/ingress-controller/tasks/main.yml b/roles/kubernetes/ingress-controller/tasks/main.yml
index ad9974c..a8471f2 100644
--- a/roles/kubernetes/ingress-controller/tasks/main.yml
+++ b/roles/kubernetes/ingress-controller/tasks/main.yml
@@ -2,7 +2,6 @@
 
 ### tags:
 ###   ingress-controller
-###   ingress-echoserver
 
 - name: Install ingress via helm
   kubernetes.core.helm:
@@ -17,25 +16,3 @@
   - inventory_hostname == groups['kube_control_plane'][0]
   tags:
     - ingress-controller
-
-- 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_control_plane'][0]
-  tags:
-    - ingress-echoserver
-
-- name: Setting present state for echoserver
-  kubernetes.core.k8s:
-    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_control_plane'][0]
-  tags:
-    - ingress-echoserver
diff --git a/roles/kubernetes/ingress-controller/templates/echoserver__fullobjects.yaml b/roles/kubernetes/ingress-controller/templates/echoserver__fullobjects.yaml
deleted file mode 100644
index da287da..0000000
--- a/roles/kubernetes/ingress-controller/templates/echoserver__fullobjects.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app: echoserver
-  name: echoserver
-  namespace: testing
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: echoserver
-  template:
-    metadata:
-      labels:
-        app: echoserver
-    spec:
-      containers:
-      - image: k8s.gcr.io/echoserver:1.4
-        name: echoserver
----
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    app: echoserver
-  name: echoserver
-  namespace: testing
-spec:
-  ports:
-  - port: 80
-    protocol: TCP
-    targetPort: 8080
-  selector:
-    app: echoserver
----
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  annotations:
-    cert-manager.io/cluster-issuer: letsencrypt-prod
-    cert-manager.io/issue-temporary-certificate: "true"
-    kubernetes.io/ingress.class: nginx
-    nginx.ingress.kubernetes.io/preserve-trailing-slash: "true"
-    nginx.ingress.kubernetes.io/rewrite-target: /
-    nginx.ingress.kubernetes.io/ssl-redirect: "false"
-  name: "{{ stage }}-echoserver-ingress"
-  namespace: testing
-spec:
-  rules:
-  - host: "{{ stage }}-echoserver.smardigo.digital"
-    http:
-      paths:
-      - backend:
-          service:
-            name: echoserver
-            port:
-              number: 80
-        path: /
-        pathType: Prefix
-  tls:
-  - hosts:
-    - "{{ stage }}-echoserver.smardigo.digital"
-    secretName: "{{ stage }}-echoserver-cert"