diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2022-07-08 02:22:48 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2022-07-08 02:22:48 +0200 |
| commit | a3f60cdef33b30c1e54de4a2bba227a28a3c1ccf (patch) | |
| tree | 75f98cc4fb5ed6705814936b142fe384b9495d88 | |
| parent | k8s-emc: fix matomo,mysql and graphite (diff) | |
k8s-emc: fix gafana
| -rw-r--r-- | contrib/k8s-emc/grafana-ingress.yml | 14 | ||||
| -rw-r--r-- | contrib/k8s-emc/grafana-statefulset.yml | 2 |
2 files changed, 10 insertions, 6 deletions
diff --git a/contrib/k8s-emc/grafana-ingress.yml b/contrib/k8s-emc/grafana-ingress.yml index 8724a1d..df9dce3 100644 --- a/contrib/k8s-emc/grafana-ingress.yml +++ b/contrib/k8s-emc/grafana-ingress.yml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: networking.k8s.io/v1 kind: Ingress metadata: namespace: emc @@ -7,8 +7,9 @@ metadata: app: grafana tier: stats annotations: - nginx.ingress.kubernetes.io/rewrite-target: / + nginx.ingress.kubernetes.io/rewrite-target: /$2 spec: + ingressClassName: nginx tls: - secretName: emc-stats-tls hosts: @@ -17,7 +18,10 @@ spec: - host: emc-stats.elev8.at http: paths: - - path: /grafana + - path: /grafana(/|$)(.*) + pathType: Prefix backend: - serviceName: stats-grafana - servicePort: 3000 + service: + name: stats-grafana + port: + number: 3000 diff --git a/contrib/k8s-emc/grafana-statefulset.yml b/contrib/k8s-emc/grafana-statefulset.yml index b0c8632..3251fa6 100644 --- a/contrib/k8s-emc/grafana-statefulset.yml +++ b/contrib/k8s-emc/grafana-statefulset.yml @@ -21,7 +21,7 @@ spec: app: grafana tier: stats spec: - nodeName: emc-master + nodeName: emc-ctrl initContainers: - name: prepare-grafana-data image: busybox |