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/templates/Ingress-Multi.yaml b/templates/Ingress-Multi.yaml new file mode 100644 index 0000000..a1a1f97 --- /dev/null +++ b/templates/Ingress-Multi.yaml @@ -0,0 +1,41 @@ +{{ if .Values.nfc_monitoring.alert_manager.ingress.enabled | default "false" -}} +--- +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: alertmanager + 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 }} + +{{ if .Values.nfc_monitoring.grafana.ingress.enabled | default "false" -}} +--- +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 }} + +{{ if .Values.nfc_monitoring.prometheus.ingress.enabled | default "false" -}} +--- +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/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 }}" diff --git a/values.yaml b/values.yaml index 5b4c1db..069a48d 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 @@ -51,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 @@ -60,6 +105,8 @@ nfc_monitoring: replicas: 1 + # storage_accessModes: ReadWriteMany + affinity: nodeAffinity: preferredDuringSchedulingIgnoredDuringExecution: @@ -204,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: