diff --git a/deploy/base/kustomization.yaml b/deploy/base/kustomization.yaml index eb8f435..1b3aa9d 100644 --- a/deploy/base/kustomization.yaml +++ b/deploy/base/kustomization.yaml @@ -44,16 +44,6 @@ resources: - inflated/prometheus/templates/deploy.yaml - inflated/prometheus/templates/clusterrolebinding.yaml - inflated/prometheus/templates/pvc.yaml -# Grafana -- inflated/grafana/templates/serviceaccount.yaml -- inflated/grafana/templates/dashboards-json-configmap.yaml -- inflated/grafana/templates/rolebinding.yaml -- inflated/grafana/templates/deployment.yaml -- inflated/grafana/templates/role.yaml -- inflated/grafana/templates/service.yaml -- inflated/grafana/templates/clusterrole.yaml -- inflated/grafana/templates/configmap.yaml -- inflated/grafana/templates/clusterrolebinding.yaml # kubernetes-replicator - inflated/kubernetes-replicator/templates/deployment.yaml - inflated/kubernetes-replicator/templates/rbac.yaml diff --git a/deploy/base/inflated/grafana/templates/clusterrole.yaml b/deploy/minimal-base/inflated/grafana/templates/clusterrole.yaml similarity index 100% rename from deploy/base/inflated/grafana/templates/clusterrole.yaml rename to deploy/minimal-base/inflated/grafana/templates/clusterrole.yaml diff --git a/deploy/base/inflated/grafana/templates/clusterrolebinding.yaml b/deploy/minimal-base/inflated/grafana/templates/clusterrolebinding.yaml similarity index 100% rename from deploy/base/inflated/grafana/templates/clusterrolebinding.yaml rename to deploy/minimal-base/inflated/grafana/templates/clusterrolebinding.yaml diff --git a/deploy/base/inflated/grafana/templates/configmap.yaml b/deploy/minimal-base/inflated/grafana/templates/configmap.yaml similarity index 100% rename from deploy/base/inflated/grafana/templates/configmap.yaml rename to deploy/minimal-base/inflated/grafana/templates/configmap.yaml diff --git a/deploy/base/inflated/grafana/templates/dashboards-json-configmap.yaml b/deploy/minimal-base/inflated/grafana/templates/dashboards-json-configmap.yaml similarity index 100% rename from deploy/base/inflated/grafana/templates/dashboards-json-configmap.yaml rename to deploy/minimal-base/inflated/grafana/templates/dashboards-json-configmap.yaml diff --git a/deploy/base/inflated/grafana/templates/deployment.yaml b/deploy/minimal-base/inflated/grafana/templates/deployment.yaml similarity index 100% rename from deploy/base/inflated/grafana/templates/deployment.yaml rename to deploy/minimal-base/inflated/grafana/templates/deployment.yaml diff --git a/deploy/base/inflated/grafana/templates/role.yaml b/deploy/minimal-base/inflated/grafana/templates/role.yaml similarity index 100% rename from deploy/base/inflated/grafana/templates/role.yaml rename to deploy/minimal-base/inflated/grafana/templates/role.yaml diff --git a/deploy/base/inflated/grafana/templates/rolebinding.yaml b/deploy/minimal-base/inflated/grafana/templates/rolebinding.yaml similarity index 100% rename from deploy/base/inflated/grafana/templates/rolebinding.yaml rename to deploy/minimal-base/inflated/grafana/templates/rolebinding.yaml diff --git a/deploy/base/inflated/grafana/templates/service.yaml b/deploy/minimal-base/inflated/grafana/templates/service.yaml similarity index 100% rename from deploy/base/inflated/grafana/templates/service.yaml rename to deploy/minimal-base/inflated/grafana/templates/service.yaml diff --git a/deploy/base/inflated/grafana/templates/serviceaccount.yaml b/deploy/minimal-base/inflated/grafana/templates/serviceaccount.yaml similarity index 100% rename from deploy/base/inflated/grafana/templates/serviceaccount.yaml rename to deploy/minimal-base/inflated/grafana/templates/serviceaccount.yaml diff --git a/deploy/minimal-base/kustomization.yaml b/deploy/minimal-base/kustomization.yaml index 3d44b3d..0faa738 100644 --- a/deploy/minimal-base/kustomization.yaml +++ b/deploy/minimal-base/kustomization.yaml @@ -12,5 +12,16 @@ resources: - inflated/metrics-server/templates/clusterrole.yaml - inflated/metrics-server/templates/clusterrolebinding.yaml +# Grafana +- inflated/grafana/templates/serviceaccount.yaml +- inflated/grafana/templates/dashboards-json-configmap.yaml +- inflated/grafana/templates/rolebinding.yaml +- inflated/grafana/templates/deployment.yaml +- inflated/grafana/templates/role.yaml +- inflated/grafana/templates/service.yaml +- inflated/grafana/templates/clusterrole.yaml +- inflated/grafana/templates/configmap.yaml +- inflated/grafana/templates/clusterrolebinding.yaml + - deploy-netflux-homepage.yaml - svc-netflux-homepage.yaml diff --git a/deploy/base/values/grafana.yaml b/deploy/minimal-base/values/grafana.yaml similarity index 100% rename from deploy/base/values/grafana.yaml rename to deploy/minimal-base/values/grafana.yaml diff --git a/deploy/prod-ovh/cert-ingress-tls.yaml b/deploy/prod-ovh/cert-ingress-tls.yaml index b21eb25..b857723 100644 --- a/deploy/prod-ovh/cert-ingress-tls.yaml +++ b/deploy/prod-ovh/cert-ingress-tls.yaml @@ -11,3 +11,4 @@ spec: commonName: k3s.netflux.io dnsNames: - k3s.netflux.io + - grafana-k3s.netflux.io diff --git a/deploy/prod-ovh/ingress.yaml b/deploy/prod-ovh/ingress.yaml index c804eca..0ab445c 100644 --- a/deploy/prod-ovh/ingress.yaml +++ b/deploy/prod-ovh/ingress.yaml @@ -30,7 +30,18 @@ spec: name: netflux-homepage port: name: http + - host: grafana-k3s.netflux.io + http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: grafana + port: + name: service tls: - hosts: - k3s.netflux.io + - grafana-k3s.netflux.io secretName: prod-ingress-tls