From 2913a3cac0cc2256016f86f51b90f5f7b4997f6d Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Fri, 8 Jul 2022 02:19:10 +0200
Subject: k8s-emc: fix matomo,mysql and graphite

---
 contrib/k8s-emc/graphite-statefulset.yml |  2 +-
 contrib/k8s-emc/matomo-deploy.yml        |  2 +-
 contrib/k8s-emc/matomo-ingress.yml       | 10 +++++++---
 contrib/k8s-emc/mysql-statefulset.yml    |  2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/contrib/k8s-emc/graphite-statefulset.yml b/contrib/k8s-emc/graphite-statefulset.yml
index 5bd376e..3ee1b02 100644
--- a/contrib/k8s-emc/graphite-statefulset.yml
+++ b/contrib/k8s-emc/graphite-statefulset.yml
@@ -21,7 +21,7 @@ spec:
         app: graphite
         tier: stats
     spec:
-      nodeName: emc-master
+      nodeName: emc-ctrl
       securityContext:
         runAsUser: 998
         fsGroup: 998
diff --git a/contrib/k8s-emc/matomo-deploy.yml b/contrib/k8s-emc/matomo-deploy.yml
index 4c0f4ad..37fff0c 100644
--- a/contrib/k8s-emc/matomo-deploy.yml
+++ b/contrib/k8s-emc/matomo-deploy.yml
@@ -21,7 +21,7 @@ spec:
         app: matomo
         tier: stats
     spec:
-      nodeName: emc-master
+      nodeName: emc-ctrl
       securityContext:
         runAsUser: 998
         fsGroup: 998
diff --git a/contrib/k8s-emc/matomo-ingress.yml b/contrib/k8s-emc/matomo-ingress.yml
index 2396854..0ad283c 100644
--- a/contrib/k8s-emc/matomo-ingress.yml
+++ b/contrib/k8s-emc/matomo-ingress.yml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   namespace: emc
@@ -9,6 +9,7 @@ metadata:
 #  annotations:
 #    nginx.ingress.kubernetes.io/rewrite-target: /
 spec:
+  ingressClassName: nginx
   tls:
   - secretName: emc-stats-tls
     hosts:
@@ -19,6 +20,9 @@ spec:
       paths:
 #      - path: /matomo
       - path: /
+        pathType: Prefix
         backend:
-          serviceName: stats-matomo
-          servicePort: 8080
+          service:
+            name: stats-matomo
+            port:
+              number: 8080
diff --git a/contrib/k8s-emc/mysql-statefulset.yml b/contrib/k8s-emc/mysql-statefulset.yml
index 6922c40..e02979e 100644
--- a/contrib/k8s-emc/mysql-statefulset.yml
+++ b/contrib/k8s-emc/mysql-statefulset.yml
@@ -21,7 +21,7 @@ spec:
         app: mysql
         tier: stats
     spec:
-      nodeName: emc-master
+      nodeName: emc-ctrl
       securityContext:
         runAsUser: 27
         fsGroup: 27
-- 
cgit v1.2.3