From b6d0b18ece17dcd2733c6892cba7e8e83575fab0 Mon Sep 17 00:00:00 2001 From: Jon Date: Sun, 19 Nov 2023 13:24:49 +0930 Subject: [PATCH 1/7] fix(prometheus): use correct variable for storage values !5 nofusscomputing/infrastructure/configuration-management/project-production!4 --- templates/Prometheus-prometheus.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/Prometheus-prometheus.yaml b/templates/Prometheus-prometheus.yaml index 6011033..7c292af 100644 --- a/templates/Prometheus-prometheus.yaml +++ b/templates/Prometheus-prometheus.yaml @@ -46,7 +46,7 @@ spec: serviceMonitorNamespaceSelector: {} serviceMonitorSelector: {} storage: - {{- toYaml .Values.nfc_monitoring.prometheus.affinity | nindent 4 }} + {{- toYaml .Values.nfc_monitoring.prometheus.storage | nindent 4 }} {{ if .Values.nfc_monitoring.thanos.sidecar.enabled }} thanos: image: "{{ .Values.nfc_monitoring.thanos.image.name }}:{{ .Values.nfc_monitoring.thanos.image.tag }}" From 593d73e4c6e5c029d592adc8af5173c92d6a6fb0 Mon Sep 17 00:00:00 2001 From: Jon Date: Sun, 19 Nov 2023 13:36:26 +0930 Subject: [PATCH 2/7] fix(grafana): PVC access mode default to ReadWriteOnce option is also configurable !5 nofusscomputing/infrastructure/configuration-management/project-production!4 --- templates/Grafana-Grafana.yaml | 2 +- values.yaml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/templates/Grafana-Grafana.yaml b/templates/Grafana-Grafana.yaml index 2a59f6c..257a3d2 100644 --- a/templates/Grafana-Grafana.yaml +++ b/templates/Grafana-Grafana.yaml @@ -143,7 +143,7 @@ spec: app.kubernetes.io/part-of: {{ $.Chart.Name }} spec: accessModes: - - "ReadWriteMany" + - {{ .Values.nfc_monitoring.grafana.storage_accessModes | default "ReadWriteOnce" }} resources: requests: storage: "5Gi" diff --git a/values.yaml b/values.yaml index 5b4c1db..6cbe580 100644 --- a/values.yaml +++ b/values.yaml @@ -60,6 +60,8 @@ nfc_monitoring: replicas: 1 + # storage_accessModes: ReadWriteMany + affinity: nodeAffinity: preferredDuringSchedulingIgnoredDuringExecution: From 65534660dda9b10761bf6067abc3297bec75a182 Mon Sep 17 00:00:00 2001 From: Jon Date: Sun, 19 Nov 2023 18:00:22 +0930 Subject: [PATCH 3/7] feat(alert_manager): added config for ingress !5 nofusscomputing/infrastructure/configuration-management/inventory-production!3 --- templates/Ingress-Multi.yaml | 14 ++++++++++++++ values.yaml | 23 +++++++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 templates/Ingress-Multi.yaml diff --git a/templates/Ingress-Multi.yaml b/templates/Ingress-Multi.yaml new file mode 100644 index 0000000..a787441 --- /dev/null +++ b/templates/Ingress-Multi.yaml @@ -0,0 +1,14 @@ +{{ if .Values.nfc_monitoring.alert_manager.ingress.enabled | default "false" | bool -}} +--- +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: alert_manager + namespace: "{{ .Values.nfc_monitoring.alert_manager.namespace }}" + annotations: + {{ toYaml $.Values.nfc_monitoring.alert_manager.ingress.annotations | nindent 4 }} +spec: + {{ toYaml $.Values.nfc_monitoring.alert_manager.ingress.spec | nindent 2 }} + +{{ end }} + diff --git a/values.yaml b/values.yaml index 6cbe580..4c11006 100644 --- a/values.yaml +++ b/values.yaml @@ -15,6 +15,29 @@ nfc_monitoring: image: name: quay.io/prometheus/alertmanager tag: 'v0.26.0' + + + ingress: + annotations: + cert-manager.io/cluster-issuer: "selfsigned-issuer" + nginx.ingress.kubernetes.io/ssl-redirect: "true" + # enabled: false # Optional, boolean. + spec: + tls: + - hosts: + - alert-manager.local + secretName: certificate-tls-alert-manager + rules: + - host: alert-manager.local + http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: alertmanager-main + port: + name: web labels: app.kubernetes.io/instance: main From 26a78bdb3373cbed1d78785ded47e3dfae28c853 Mon Sep 17 00:00:00 2001 From: Jon Date: Sun, 19 Nov 2023 18:02:38 +0930 Subject: [PATCH 4/7] feat(grafana): added config for ingress !5 nofusscomputing/infrastructure/configuration-management/inventory-production!3 --- templates/Ingress-Multi.yaml | 15 +++++++++++++++ values.yaml | 22 ++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/templates/Ingress-Multi.yaml b/templates/Ingress-Multi.yaml index a787441..ed13b1d 100644 --- a/templates/Ingress-Multi.yaml +++ b/templates/Ingress-Multi.yaml @@ -12,3 +12,18 @@ spec: {{ end }} +{{ if .Values.nfc_monitoring.grafana.ingress.enabled | default "false" | bool -}} +--- +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: grafana + namespace: "{{ .Values.nfc_monitoring.grafana.namespace }}" + annotations: + {{ toYaml $.Values.nfc_monitoring.grafana.ingress.annotations | nindent 4 }} +spec: + {{ toYaml $.Values.nfc_monitoring.grafana.ingress.spec | nindent 2 }} + +{{ end }} + + diff --git a/values.yaml b/values.yaml index 4c11006..548463c 100644 --- a/values.yaml +++ b/values.yaml @@ -74,6 +74,28 @@ nfc_monitoring: name: grafana/grafana tag: '10.1.2' # '10.0.5' + ingress: + annotations: + cert-manager.io/cluster-issuer: "selfsigned-issuer" + nginx.ingress.kubernetes.io/ssl-redirect: "true" + # enabled: false # Optional, boolean. + spec: + tls: + - hosts: + - grafana.local + secretName: certificate-tls-grafana + rules: + - host: grafana.local + http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: grafana + port: + name: grafana-http + labels: app.kubernetes.io/component: graphing app.kubernetes.io/instance: k8s From 562bb7d6f57f52b3cf4fcaf19a15a8eed492d15e Mon Sep 17 00:00:00 2001 From: Jon Date: Sun, 19 Nov 2023 18:03:17 +0930 Subject: [PATCH 5/7] feat(prometheus): added config for ingress !5 nofusscomputing/infrastructure/configuration-management/inventory-production!3 --- templates/Ingress-Multi.yaml | 12 ++++++++++++ values.yaml | 22 ++++++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/templates/Ingress-Multi.yaml b/templates/Ingress-Multi.yaml index ed13b1d..5bec81c 100644 --- a/templates/Ingress-Multi.yaml +++ b/templates/Ingress-Multi.yaml @@ -26,4 +26,16 @@ spec: {{ end }} +{{ if .Values.nfc_monitoring.prometheus.ingress.enabled | default "false" | bool -}} +--- +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: prometheus + namespace: "{{ .Values.nfc_monitoring.prometheus.namespace }}" + annotations: + {{ toYaml $.Values.nfc_monitoring.prometheus.ingress.annotations | nindent 4 }} +spec: + {{ toYaml $.Values.nfc_monitoring.prometheus.ingress.spec | nindent 2 }} +{{ end }} diff --git a/values.yaml b/values.yaml index 548463c..069a48d 100644 --- a/values.yaml +++ b/values.yaml @@ -251,6 +251,28 @@ nfc_monitoring: image: name: prom/prometheus tag: 'v2.47.0' + + ingress: + annotations: + cert-manager.io/cluster-issuer: "selfsigned-issuer" + nginx.ingress.kubernetes.io/ssl-redirect: "true" + # enabled: false # Optional, boolean. + spec: + tls: + - hosts: + - prometheus.local + secretName: certificate-tls-prometheus + rules: + - host: prometheus.local + http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: prometheus-k8s + port: + name: web # These labels are appended to all Prometheus items and are also the selector labels labels: From 33883ec64025d8a2ab81fec50019d2605776ea07 Mon Sep 17 00:00:00 2001 From: Jon Date: Sun, 19 Nov 2023 18:31:28 +0930 Subject: [PATCH 6/7] fix(ingress): function bool not defined !5 nofusscomputing/infrastructure/configuration-management/inventory-production!3 --- templates/Ingress-Multi.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/Ingress-Multi.yaml b/templates/Ingress-Multi.yaml index 5bec81c..f648446 100644 --- a/templates/Ingress-Multi.yaml +++ b/templates/Ingress-Multi.yaml @@ -1,4 +1,4 @@ -{{ if .Values.nfc_monitoring.alert_manager.ingress.enabled | default "false" | bool -}} +{{ if .Values.nfc_monitoring.alert_manager.ingress.enabled | default "false" -}} --- apiVersion: networking.k8s.io/v1 kind: Ingress @@ -12,7 +12,7 @@ spec: {{ end }} -{{ if .Values.nfc_monitoring.grafana.ingress.enabled | default "false" | bool -}} +{{ if .Values.nfc_monitoring.grafana.ingress.enabled | default "false" -}} --- apiVersion: networking.k8s.io/v1 kind: Ingress @@ -26,7 +26,7 @@ spec: {{ end }} -{{ if .Values.nfc_monitoring.prometheus.ingress.enabled | default "false" | bool -}} +{{ if .Values.nfc_monitoring.prometheus.ingress.enabled | default "false" -}} --- apiVersion: networking.k8s.io/v1 kind: Ingress From 11563741a90dc81ddf043cc529fa13916bee9082 Mon Sep 17 00:00:00 2001 From: Jon Date: Sun, 19 Nov 2023 18:40:37 +0930 Subject: [PATCH 7/7] fix(ingress): underscore removed from ingress name !5 nofusscomputing/infrastructure/configuration-management/inventory-production!3 --- templates/Ingress-Multi.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/Ingress-Multi.yaml b/templates/Ingress-Multi.yaml index f648446..a1a1f97 100644 --- a/templates/Ingress-Multi.yaml +++ b/templates/Ingress-Multi.yaml @@ -3,7 +3,7 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: - name: alert_manager + name: alertmanager namespace: "{{ .Values.nfc_monitoring.alert_manager.namespace }}" annotations: {{ toYaml $.Values.nfc_monitoring.alert_manager.ingress.annotations | nindent 4 }}