diff --git a/README.md b/README.md index 064c1b58..368fa7ce 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ The following components will be installed in your [k3s](https://k3s.io/) cluste - [ingress-nginx](https://kubernetes.github.io/ingress-nginx/) - Kubernetes ingress controller used for a HTTP reverse proxy of Kubernetes ingresses - [local-path-provisioner](https://github.com/rancher/local-path-provisioner) - provision persistent local storage with Kubernetes -_Additional applications include [hajimari](https://github.com/toboshii/hajimari), [echo-server](https://github.com/Ealenn/Echo-Server), [system-upgrade-controller](https://github.com/rancher/system-upgrade-controller), [reloader](https://github.com/stakater/Reloader), and [kured](https://github.com/weaveworks/kured)_ +_Additional applications include [grafana](https://github.com/grafana/grafana), [kube-prometheus-stack](https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack), [hajimari](https://github.com/toboshii/hajimari), [echo-server](https://github.com/Ealenn/Echo-Server), [system-upgrade-controller](https://github.com/rancher/system-upgrade-controller), and [reloader](https://github.com/stakater/Reloader) ## 📝 Prerequisites diff --git a/kubernetes/apps/default/echo-server/app/helmrelease.yaml b/kubernetes/apps/default/echo-server/app/helmrelease.yaml index 74d594d5..f79ea0a3 100644 --- a/kubernetes/apps/default/echo-server/app/helmrelease.yaml +++ b/kubernetes/apps/default/echo-server/app/helmrelease.yaml @@ -25,6 +25,9 @@ spec: retries: 3 uninstall: keepHistory: false + dependsOn: + - name: ingress-nginx + namespace: networking values: controller: strategy: RollingUpdate diff --git a/kubernetes/apps/default/hajimari/app/helmrelease.yaml b/kubernetes/apps/default/hajimari/app/helmrelease.yaml index 8ac30d39..7c9868cb 100644 --- a/kubernetes/apps/default/hajimari/app/helmrelease.yaml +++ b/kubernetes/apps/default/hajimari/app/helmrelease.yaml @@ -25,6 +25,9 @@ spec: retries: 3 uninstall: keepHistory: false + dependsOn: + - name: ingress-nginx + namespace: networking values: hajimari: title: Apps diff --git a/kubernetes/apps/monitoring/grafana/app/helmrelease.yaml b/kubernetes/apps/monitoring/grafana/app/helmrelease.yaml index aebb34df..2c1ce032 100644 --- a/kubernetes/apps/monitoring/grafana/app/helmrelease.yaml +++ b/kubernetes/apps/monitoring/grafana/app/helmrelease.yaml @@ -28,6 +28,8 @@ spec: dependsOn: - name: local-path-provisioner namespace: kube-system + - name: ingress-nginx + namespace: networking values: admin: existingSecret: grafana-admin-secret diff --git a/kubernetes/apps/monitoring/kube-prometheus-stack/app/helmrelease.yaml b/kubernetes/apps/monitoring/kube-prometheus-stack/app/helmrelease.yaml index 8b8928b3..fefb69e4 100644 --- a/kubernetes/apps/monitoring/kube-prometheus-stack/app/helmrelease.yaml +++ b/kubernetes/apps/monitoring/kube-prometheus-stack/app/helmrelease.yaml @@ -31,6 +31,8 @@ spec: dependsOn: - name: local-path-provisioner namespace: kube-system + - name: ingress-nginx + namespace: networking values: cleanPrometheusOperatorObjectNames: true alertmanager: diff --git a/kubernetes/apps/monitoring/kubernetes-dashboard/app/helmrelease.yaml b/kubernetes/apps/monitoring/kubernetes-dashboard/app/helmrelease.yaml index bc663459..432ff396 100644 --- a/kubernetes/apps/monitoring/kubernetes-dashboard/app/helmrelease.yaml +++ b/kubernetes/apps/monitoring/kubernetes-dashboard/app/helmrelease.yaml @@ -25,6 +25,9 @@ spec: retries: 3 uninstall: keepHistory: false + dependsOn: + - name: ingress-nginx + namespace: networking values: env: TZ: "${TIMEZONE}" diff --git a/kubernetes/apps/networking/ingress-nginx/app/helmrelease.yaml b/kubernetes/apps/networking/ingress-nginx/app/helmrelease.yaml index 9e4a2866..e582d4ad 100644 --- a/kubernetes/apps/networking/ingress-nginx/app/helmrelease.yaml +++ b/kubernetes/apps/networking/ingress-nginx/app/helmrelease.yaml @@ -25,6 +25,9 @@ spec: retries: 3 uninstall: keepHistory: false + dependsOn: + - name: cloudflared + namespace: networking values: controller: extraEnvs: