diff --git a/kubernetes/helm/openslice/Chart.yaml b/kubernetes/helm/openslice/Chart.yaml
index b8ede110a2eb23dca2a96230c423432502cbdb33..49b95d193592a8e5ffb9bd050dae33f20f7289f9 100644
--- a/kubernetes/helm/openslice/Chart.yaml
+++ b/kubernetes/helm/openslice/Chart.yaml
@@ -21,3 +21,14 @@ version: 2.0.0
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
appVersion: 2025Q2-SNAPSHOT
+
+dependencies:
+ - name: grafana
+ version: "8.11.4"
+ repository: "https://grafana.github.io/helm-charts"
+ condition: grafana.enabled
+ - name: prometheus
+ version: "27.8.0"
+ repository: "https://prometheus-community.github.io/helm-charts"
+ condition: prometheus.enabled
+
diff --git a/kubernetes/helm/openslice/templates/artemis.yaml b/kubernetes/helm/openslice/templates/artemis.yaml
index 87c75ea00d59459c65d068fce3d7f8eb62fa71bc..ef55fcb01f05cb66d154aa5e0dd41883585f8e19 100644
--- a/kubernetes/helm/openslice/templates/artemis.yaml
+++ b/kubernetes/helm/openslice/templates/artemis.yaml
@@ -3,7 +3,7 @@ kind: Deployment
metadata:
namespace: {{ .Release.Namespace }}
labels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: artemis
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
{{- include "openslice.labels" . | nindent 4 }}
@@ -14,15 +14,19 @@ spec:
{{- end }}
selector:
matchLabels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: artemis
{{- include "openslice.selectorLabels" . | nindent 6 }}
template:
metadata:
labels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: artemis
{{- include "openslice.selectorLabels" . | nindent 8 }}
+ annotations:
+ {{- with .Values.artemis.podAnnotations }}
+ {{- toYaml . | nindent 4 }}
+ {{- end }}
spec:
containers:
- image: "{{ .Values.image.artemis.repository }}:{{ .Values.image.artemis.tag | default .Chart.AppVersion }}"
@@ -48,7 +52,7 @@ kind: Service
metadata:
namespace: {{ .Release.Namespace }}
labels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: artemis
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
{{- include "openslice.labels" . | nindent 4 }}
@@ -65,6 +69,6 @@ spec:
port: 61613
targetPort: 61613
selector:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: artemis
{{- include "openslice.selectorLabels" . | nindent 4 }}
diff --git a/kubernetes/helm/openslice/templates/blockdiag.yaml b/kubernetes/helm/openslice/templates/blockdiag.yaml
index 30b2025c27637392e801158d5ea496c11c8a03b2..bdfd691cbf5800ea9b527a77b5417088e3ff10f1 100644
--- a/kubernetes/helm/openslice/templates/blockdiag.yaml
+++ b/kubernetes/helm/openslice/templates/blockdiag.yaml
@@ -3,7 +3,7 @@ kind: Deployment
metadata:
namespace: {{ .Release.Namespace }}
labels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: blockdiag
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
{{- include "openslice.labels" . | nindent 4 }}
@@ -14,15 +14,19 @@ spec:
{{- end }}
selector:
matchLabels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: blockdiag
{{- include "openslice.selectorLabels" . | nindent 6 }}
template:
metadata:
labels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: blockdiag
{{- include "openslice.selectorLabels" . | nindent 8 }}
+ annotations:
+ {{- with .Values.blockdiag.podAnnotations }}
+ {{- toYaml . | nindent 4 }}
+ {{- end }}
spec:
containers:
- image: "{{ .Values.image.blockdiag.repository }}:{{ .Values.image.blockdiag.tag | default .Chart.AppVersion }}"
@@ -39,7 +43,7 @@ kind: Service
metadata:
namespace: {{ .Release.Namespace }}
labels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: blockdiag
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
{{- include "openslice.labels" . | nindent 4 }}
@@ -50,6 +54,6 @@ spec:
targetPort: 8001
port: 8001
selector:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: blockdiag
{{- include "openslice.selectorLabels" . | nindent 4 }}
diff --git a/kubernetes/helm/openslice/templates/bugzilla.yaml b/kubernetes/helm/openslice/templates/bugzilla.yaml
index d759a2554c42af2abf6e209f2207b92cfc9ef7cb..5f0d3398fe46df7d82a955a6939a0baecc12b6fc 100644
--- a/kubernetes/helm/openslice/templates/bugzilla.yaml
+++ b/kubernetes/helm/openslice/templates/bugzilla.yaml
@@ -3,7 +3,7 @@ kind: Deployment
metadata:
namespace: {{ .Release.Namespace }}
labels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: bugzilla
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
{{- include "openslice.labels" . | nindent 4 }}
@@ -14,15 +14,19 @@ spec:
{{- end }}
selector:
matchLabels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: bugzilla
{{- include "openslice.selectorLabels" . | nindent 6 }}
template:
metadata:
labels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: bugzilla
{{- include "openslice.selectorLabels" . | nindent 8 }}
+ annotations:
+ {{- with .Values.bugzilla.podAnnotations }}
+ {{- toYaml . | nindent 4 }}
+ {{- end }}
spec:
containers:
- image: "{{ .Values.image.bugzilla.repository }}:{{ .Values.image.bugzilla.tag | default .Chart.AppVersion }}"
@@ -50,7 +54,7 @@ kind: Service
metadata:
namespace: {{ .Release.Namespace }}
labels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: bugzilla
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
{{- include "openslice.labels" . | nindent 4 }}
@@ -61,6 +65,6 @@ spec:
port: 13010
targetPort: 13010
selector:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: bugzilla
{{- include "openslice.selectorLabels" . | nindent 4 }}
diff --git a/kubernetes/helm/openslice/templates/centrallog.yaml b/kubernetes/helm/openslice/templates/centrallog.yaml
index b8143fcd9f39869242c7192e96b1a55a08e94246..b2ab82307c3d9b26e70f6cdc10ff49ab4969cf27 100644
--- a/kubernetes/helm/openslice/templates/centrallog.yaml
+++ b/kubernetes/helm/openslice/templates/centrallog.yaml
@@ -3,7 +3,7 @@ kind: Deployment
metadata:
namespace: {{ .Release.Namespace }}
labels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: centrallog
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
{{- include "openslice.labels" . | nindent 4 }}
@@ -14,15 +14,19 @@ spec:
{{- end }}
selector:
matchLabels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: centrallog
{{- include "openslice.selectorLabels" . | nindent 6 }}
template:
metadata:
labels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: centrallog
{{- include "openslice.selectorLabels" . | nindent 8 }}
+ annotations:
+ {{- with .Values.centrallog.podAnnotations }}
+ {{- toYaml . | nindent 4 }}
+ {{- end }}
spec:
containers:
- image: "{{ .Values.image.centrallog.repository }}:{{ .Values.image.centrallog.tag | default .Chart.AppVersion }}"
@@ -48,7 +52,7 @@ kind: Service
metadata:
namespace: {{ .Release.Namespace }}
labels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: centrallog
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
{{- include "openslice.labels" . | nindent 4 }}
@@ -59,7 +63,7 @@ spec:
targetPort: 13013
port: 13013
selector:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: centrallog
{{- include "openslice.selectorLabels" . | nindent 4 }}
diff --git a/kubernetes/helm/openslice/templates/cridge-secret.yaml b/kubernetes/helm/openslice/templates/cridge-secret.yaml
index 4a32bff5cab0c141bfb250f1d8e5f1c9dc802feb..9838b73359aafbe0299db698a2d8d5907fca7d76 100644
--- a/kubernetes/helm/openslice/templates/cridge-secret.yaml
+++ b/kubernetes/helm/openslice/templates/cridge-secret.yaml
@@ -15,10 +15,14 @@ kind: Secret
metadata:
namespace: {{ .Release.Namespace }}
labels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: cridge
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
{{- include "openslice.labels" . | nindent 4 }}
+ annotations:
+ {{- with .Values.cridge.podAnnotations }}
+ {{- toYaml . | nindent 4 }}
+ {{- end }}
name: {{ include "openslice.fullname" . }}-kubeconfig
type: Opaque
data:
diff --git a/kubernetes/helm/openslice/templates/cridge.yaml b/kubernetes/helm/openslice/templates/cridge.yaml
index 10656390c474046f1bee83e9531b0cf87da57272..084c59dc4770fa93d9fd289479709b2b1b5ba376 100644
--- a/kubernetes/helm/openslice/templates/cridge.yaml
+++ b/kubernetes/helm/openslice/templates/cridge.yaml
@@ -4,7 +4,7 @@ kind: Deployment
metadata:
namespace: {{ .Release.Namespace }}
labels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: cridge
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
{{- include "openslice.labels" . | nindent 4 }}
@@ -13,15 +13,19 @@ spec:
replicas: {{ .Values.replicaCount }}
selector:
matchLabels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: cridge
{{- include "openslice.selectorLabels" . | nindent 6 }}
template:
metadata:
labels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: cridge
{{- include "openslice.selectorLabels" . | nindent 8 }}
+ annotations:
+ {{- with .Values.cridge.podAnnotations }}
+ {{- toYaml . | nindent 4 }}
+ {{- end }}
spec:
containers:
- image: "{{ .Values.image.cridge.repository }}:{{ .Values.image.cridge.tag | default .Chart.AppVersion }}"
diff --git a/kubernetes/helm/openslice/templates/keycloak-config.yaml b/kubernetes/helm/openslice/templates/keycloak-config.yaml
index 748008bbe0010d28024a746eeed9e485c8b5d3b5..3f2a8edaf1acdfbd3948220e48e0260aaf892235 100644
--- a/kubernetes/helm/openslice/templates/keycloak-config.yaml
+++ b/kubernetes/helm/openslice/templates/keycloak-config.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
labels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: keycloak
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
{{- include "openslice.labels" . | nindent 4 }}
diff --git a/kubernetes/helm/openslice/templates/keycloak.yaml b/kubernetes/helm/openslice/templates/keycloak.yaml
index fca2bdbe8782e30adda9e4a54e3b0aa455f5a573..fc1d2aeba2d60f2c734098ba49bd81a690d37943 100644
--- a/kubernetes/helm/openslice/templates/keycloak.yaml
+++ b/kubernetes/helm/openslice/templates/keycloak.yaml
@@ -3,7 +3,7 @@ kind: Deployment
metadata:
namespace: {{ .Release.Namespace }}
labels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: keycloak
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
{{- include "openslice.labels" . | nindent 4 }}
@@ -14,15 +14,19 @@ spec:
{{- end }}
selector:
matchLabels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: keycloak
{{- include "openslice.selectorLabels" . | nindent 6 }}
template:
metadata:
labels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: keycloak
{{- include "openslice.selectorLabels" . | nindent 8 }}
+ annotations:
+ {{- with .Values.keycloak.podAnnotations }}
+ {{- toYaml . | nindent 4 }}
+ {{- end }}
spec:
initContainers:
- name: init-mysql-portal
@@ -79,7 +83,7 @@ kind: Service
metadata:
namespace: {{ .Release.Namespace }}
labels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: keycloak
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
{{- include "openslice.labels" . | nindent 4 }}
@@ -93,6 +97,6 @@ spec:
port: 8443
targetPort: 8443
selector:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: keycloak
{{- include "openslice.selectorLabels" . | nindent 4 }}
diff --git a/kubernetes/helm/openslice/templates/kroki-ingress.yaml b/kubernetes/helm/openslice/templates/kroki-ingress.yaml
index c1467645d8ef1159f30a4db93d165a20e737a367..fc9b68108e3273f16833600babef3235b8f89710 100644
--- a/kubernetes/helm/openslice/templates/kroki-ingress.yaml
+++ b/kubernetes/helm/openslice/templates/kroki-ingress.yaml
@@ -3,7 +3,7 @@ kind: Ingress
metadata:
namespace: {{ .Release.Namespace }}
labels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
{{- include "openslice.labels" . | nindent 4 }}
annotations:
diff --git a/kubernetes/helm/openslice/templates/kroki.yaml b/kubernetes/helm/openslice/templates/kroki.yaml
index 5b34ae58df9ab87f202e7753f91e6423dc0beef3..3b5432511244db045251a9d9d35d3eb16acaa70e 100644
--- a/kubernetes/helm/openslice/templates/kroki.yaml
+++ b/kubernetes/helm/openslice/templates/kroki.yaml
@@ -3,7 +3,7 @@ kind: Deployment
metadata:
namespace: {{ .Release.Namespace }}
labels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: kroki
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
{{- include "openslice.labels" . | nindent 4 }}
@@ -14,15 +14,19 @@ spec:
{{- end }}
selector:
matchLabels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: kroki
{{- include "openslice.selectorLabels" . | nindent 6 }}
template:
metadata:
labels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: kroki
{{- include "openslice.selectorLabels" . | nindent 8 }}
+ annotations:
+ {{- with .Values.kroki.podAnnotations }}
+ {{- toYaml . | nindent 4 }}
+ {{- end }}
spec:
containers:
- image: "{{ .Values.image.kroki.repository }}:{{ .Values.image.kroki.tag | default .Chart.AppVersion }}"
@@ -42,7 +46,7 @@ kind: Service
metadata:
namespace: {{ .Release.Namespace }}
labels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: kroki
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
{{- include "openslice.labels" . | nindent 4 }}
@@ -53,6 +57,6 @@ spec:
targetPort: 8000
port: 8000
selector:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: kroki
{{- include "openslice.selectorLabels" . | nindent 4 }}
diff --git a/kubernetes/helm/openslice/templates/manoclient.yaml b/kubernetes/helm/openslice/templates/manoclient.yaml
index 064c0c18b043595834c087cdf909ba8a2111dcf8..751cacb87520e9748a828f68e5b8de7760bc583b 100644
--- a/kubernetes/helm/openslice/templates/manoclient.yaml
+++ b/kubernetes/helm/openslice/templates/manoclient.yaml
@@ -3,10 +3,14 @@ kind: Deployment
metadata:
namespace: {{ .Release.Namespace }}
labels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: manoclient
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
{{- include "openslice.labels" . | nindent 4 }}
+ annotations:
+ {{- with .Values.manoclient.annotations }}
+ {{- toYaml . | nindent 6 }}
+ {{- end }}
name: {{ include "openslice.fullname" . }}-manoclient
spec:
{{- if not .Values.autoscaling.enabled }}
@@ -14,15 +18,19 @@ spec:
{{- end }}
selector:
matchLabels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: manoclient
{{- include "openslice.selectorLabels" . | nindent 6 }}
template:
metadata:
labels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: manoclient
{{- include "openslice.selectorLabels" . | nindent 8 }}
+ annotations:
+ {{- with .Values.manoclient.podAnnotations }}
+ {{- toYaml . | nindent 4 }}
+ {{- end }}
spec:
containers:
- image: "{{ .Values.image.manoclient.repository }}:{{ .Values.image.manoclient.tag | default .Chart.AppVersion }}"
@@ -48,7 +56,7 @@ kind: Service
metadata:
namespace: {{ .Release.Namespace }}
labels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: manoclient
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
{{- include "openslice.labels" . | nindent 4 }}
@@ -59,6 +67,6 @@ spec:
port: 13011
targetPort: 13011
selector:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: manoclient
{{- include "openslice.selectorLabels" . | nindent 4 }}
diff --git a/kubernetes/helm/openslice/templates/metrico.yaml b/kubernetes/helm/openslice/templates/metrico.yaml
index 620ca0aa2146d38585535fbad658d42536ec7a53..674ba90798d802507fab7827d8f5ab47780d9106 100644
--- a/kubernetes/helm/openslice/templates/metrico.yaml
+++ b/kubernetes/helm/openslice/templates/metrico.yaml
@@ -4,7 +4,7 @@ kind: Deployment
metadata:
namespace: {{ .Release.Namespace }}
labels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: metrico
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
{{- include "openslice.labels" . | nindent 4 }}
@@ -15,15 +15,19 @@ spec:
{{- end }}
selector:
matchLabels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: metrico
{{- include "openslice.selectorLabels" . | nindent 6 }}
template:
metadata:
labels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: metrico
{{- include "openslice.selectorLabels" . | nindent 8 }}
+ annotations:
+ {{- with .Values.metrico.podAnnotations }}
+ {{- toYaml . | nindent 4 }}
+ {{- end }}
spec:
containers:
- image: "{{ .Values.image.metrico.repository }}:{{ .Values.image.metrico.tag | default .Chart.AppVersion }}"
diff --git a/kubernetes/helm/openslice/templates/mysql-config.yaml b/kubernetes/helm/openslice/templates/mysql-config.yaml
index 0de0e5277807c43e82193fa44c53a07e386b9470..2c207e1bb911cc137c404f379a74749d124f903f 100644
--- a/kubernetes/helm/openslice/templates/mysql-config.yaml
+++ b/kubernetes/helm/openslice/templates/mysql-config.yaml
@@ -3,7 +3,7 @@ kind: ConfigMap
metadata:
namespace: {{ .Release.Namespace }}
labels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: mysql
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
{{- include "openslice.labels" . | nindent 4 }}
diff --git a/kubernetes/helm/openslice/templates/mysql-pv-pvc.yaml b/kubernetes/helm/openslice/templates/mysql-pv-pvc.yaml
index 2746bcf4262e2ec8b1315c6f0e2294a7059ccca6..5c3298f7ac946e86c313c5081a3d0104c5e6bb4c 100644
--- a/kubernetes/helm/openslice/templates/mysql-pv-pvc.yaml
+++ b/kubernetes/helm/openslice/templates/mysql-pv-pvc.yaml
@@ -3,7 +3,7 @@ kind: PersistentVolumeClaim
metadata:
namespace: {{ .Release.Namespace }}
labels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: mysql
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
{{- include "openslice.labels" . | nindent 4 }}
@@ -22,7 +22,7 @@ kind: PersistentVolume
metadata:
namespace: {{ .Release.Namespace }}
labels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: mysql
type: local
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
diff --git a/kubernetes/helm/openslice/templates/mysql.yaml b/kubernetes/helm/openslice/templates/mysql.yaml
index b69a3f1e8cd3ecf222ed5aaa21f44feb52d2d950..e9b4391e058ecc9f3927320f79064796661d3198 100644
--- a/kubernetes/helm/openslice/templates/mysql.yaml
+++ b/kubernetes/helm/openslice/templates/mysql.yaml
@@ -3,7 +3,7 @@ kind: StatefulSet
metadata:
namespace: {{ .Release.Namespace }}
labels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: mysql
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
{{- include "openslice.labels" . | nindent 4 }}
@@ -15,15 +15,19 @@ spec:
serviceName: {{ include "openslice.fullname" . }}-mysql
selector:
matchLabels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: mysql
{{- include "openslice.selectorLabels" . | nindent 6 }}
template:
metadata:
labels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: mysql
{{- include "openslice.selectorLabels" . | nindent 8 }}
+ annotations:
+ {{- with .Values.mysql.podAnnotations }}
+ {{- toYaml . | nindent 4 }}
+ {{- end }}
spec:
containers:
- image: "{{ .Values.image.mysql.repository }}:{{ .Values.image.mysql.tag | default .Chart.AppVersion }}"
@@ -72,7 +76,7 @@ kind: Service
metadata:
namespace: {{ .Release.Namespace }}
labels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: mysql
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
{{- include "openslice.labels" . | nindent 4 }}
@@ -83,6 +87,6 @@ spec:
port: 3306
targetPort: 3306
selector:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: mysql
{{- include "openslice.selectorLabels" . | nindent 4 }}
diff --git a/kubernetes/helm/openslice/templates/oasapi.yaml b/kubernetes/helm/openslice/templates/oasapi.yaml
index bf78b5dd478c19f009fddd599d6537fb7b667c66..142ece0a18d6345617bd8f3483abd7c5692de704 100644
--- a/kubernetes/helm/openslice/templates/oasapi.yaml
+++ b/kubernetes/helm/openslice/templates/oasapi.yaml
@@ -3,7 +3,7 @@ kind: Deployment
metadata:
namespace: {{ .Release.Namespace }}
labels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: oasapi
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
{{- include "openslice.labels" . | nindent 4 }}
@@ -14,15 +14,19 @@ spec:
{{- end }}
selector:
matchLabels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: oasapi
{{- include "openslice.selectorLabels" . | nindent 6 }}
template:
metadata:
labels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: oasapi
{{- include "openslice.selectorLabels" . | nindent 8 }}
+ annotations:
+ {{- with .Values.oasapi.podAnnotations }}
+ {{- toYaml . | nindent 4 }}
+ {{- end }}
spec:
initContainers:
- name: init-keycloak
@@ -74,7 +78,7 @@ kind: Service
metadata:
namespace: {{ .Release.Namespace }}
labels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: oasapi
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
{{- include "openslice.labels" . | nindent 4 }}
@@ -85,6 +89,6 @@ spec:
targetPort: 13101
port: 13101
selector:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: oasapi
{{- include "openslice.selectorLabels" . | nindent 4 }}
diff --git a/kubernetes/helm/openslice/templates/openslice-ingress.yaml b/kubernetes/helm/openslice/templates/openslice-ingress.yaml
index 365ffc7a6caeeec3d9bc76c7740e7e0090d25989..92a295b939d0d9df3ad4f815958c574285c88fba 100644
--- a/kubernetes/helm/openslice/templates/openslice-ingress.yaml
+++ b/kubernetes/helm/openslice/templates/openslice-ingress.yaml
@@ -3,7 +3,7 @@ kind: Ingress
metadata:
namespace: {{ .Release.Namespace }}
labels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
{{- include "openslice.labels" . | nindent 4 }}
annotations:
diff --git a/kubernetes/helm/openslice/templates/osom.yaml b/kubernetes/helm/openslice/templates/osom.yaml
index 14c8d2d2cbae36b462156a9292e5582506a388a8..9674c9c2ef1b84526bc3500d915efb3cef626ce3 100644
--- a/kubernetes/helm/openslice/templates/osom.yaml
+++ b/kubernetes/helm/openslice/templates/osom.yaml
@@ -3,7 +3,7 @@ kind: Deployment
metadata:
namespace: {{ .Release.Namespace }}
labels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: osom
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
{{- include "openslice.labels" . | nindent 4 }}
@@ -14,15 +14,19 @@ spec:
{{- end }}
selector:
matchLabels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: osom
{{- include "openslice.selectorLabels" . | nindent 6 }}
template:
metadata:
labels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: osom
{{- include "openslice.selectorLabels" . | nindent 8 }}
+ annotations:
+ {{- with .Values.osom.podAnnotations }}
+ {{- toYaml . | nindent 4 }}
+ {{- end }}
spec:
containers:
- image: "{{ .Values.image.osom.repository }}:{{ .Values.image.osom.tag | default .Chart.AppVersion }}"
@@ -49,7 +53,7 @@ kind: Service
metadata:
namespace: {{ .Release.Namespace }}
labels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: osom
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
{{- include "openslice.labels" . | nindent 4 }}
@@ -60,6 +64,6 @@ spec:
targetPort: 13100
port: 13100
selector:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: osom
{{- include "openslice.selectorLabels" . | nindent 4 }}
diff --git a/kubernetes/helm/openslice/templates/osportalapi-pv-pvc.yaml b/kubernetes/helm/openslice/templates/osportalapi-pv-pvc.yaml
index cb3bc42eb2db961bccc9f98146178072b46db9c3..46409c6afa50d4e7996bd54278705088761dc70e 100644
--- a/kubernetes/helm/openslice/templates/osportalapi-pv-pvc.yaml
+++ b/kubernetes/helm/openslice/templates/osportalapi-pv-pvc.yaml
@@ -3,37 +3,37 @@ kind: PersistentVolumeClaim
metadata:
namespace: {{ .Release.Namespace }}
labels:
- app: {{ include "openslice.fullname" . }}
- org.etsi.osl.service: osportalapi
+ app: openslice
+ org.etsi.osl.service: portalapi
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
{{- include "openslice.labels" . | nindent 4 }}
- name: {{ include "openslice.fullname" . }}-osportalapi-claim0
+ name: {{ include "openslice.fullname" . }}-portalapi-claim0
spec:
- storageClassName: {{ .Values.storageClass | default "osportalapi-pv-volume" }}
+ storageClassName: {{ .Values.storageClass | default "portalapi-pv-volume" }}
accessModes:
- ReadWriteOnce
resources:
requests:
storage: "1Gi"
---
-{{- if or (not .Values.storageClass) (eq .Values.storageClass "osportalapi-pv-volume") }}
+{{- if or (not .Values.storageClass) (eq .Values.storageClass "portalapi-pv-volume") }}
apiVersion: v1
kind: PersistentVolume
metadata:
namespace: {{ .Release.Namespace }}
labels:
- app: {{ include "openslice.fullname" . }}
- org.etsi.osl.service: osportalapi
+ app: openslice
+ org.etsi.osl.service: portalapi
type: local
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
{{- include "openslice.labels" . | nindent 4 }}
- name: {{ include "openslice.fullname" . }}-osportalapi-pv-volume
+ name: {{ include "openslice.fullname" . }}-portalapi-pv-volume
spec:
- storageClassName: "osportalapi-pv-volume"
+ storageClassName: "portalapi-pv-volume"
capacity:
storage: "1Gi"
accessModes:
- ReadWriteOnce
hostPath:
- path: "/dockerdata-nfs/osportalapi-pv-volume"
+ path: "/dockerdata-nfs/portalapi-pv-volume"
{{- end }}
diff --git a/kubernetes/helm/openslice/templates/osportalapi.yaml b/kubernetes/helm/openslice/templates/osportalapi.yaml
index 6df11d4899aec82bc2f40444c8721ee57e94edce..4f8b668caf3943f9d369b60501b340d2b30cd672 100644
--- a/kubernetes/helm/openslice/templates/osportalapi.yaml
+++ b/kubernetes/helm/openslice/templates/osportalapi.yaml
@@ -4,26 +4,30 @@ kind: Deployment
metadata:
namespace: {{ .Release.Namespace }}
labels:
- app: {{ include "openslice.fullname" . }}
- org.etsi.osl.service: osportalapi
+ app: openslice
+ org.etsi.osl.service: portalapi
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
{{- include "openslice.labels" . | nindent 4 }}
- name: {{ include "openslice.fullname" . }}-osportalapi
+ name: {{ include "openslice.fullname" . }}-portalapi
spec:
{{- if not .Values.autoscaling.enabled }}
replicas: {{ .Values.replicaCount }}
{{- end }}
selector:
matchLabels:
- app: {{ include "openslice.fullname" . }}
- org.etsi.osl.service: osportalapi
+ app: openslice
+ org.etsi.osl.service: portalapi
{{- include "openslice.selectorLabels" . | nindent 6 }}
template:
metadata:
labels:
- app: {{ include "openslice.fullname" . }}
- org.etsi.osl.service: osportalapi
+ app: openslice
+ org.etsi.osl.service: portalapi
{{- include "openslice.selectorLabels" . | nindent 8 }}
+ annotations:
+ {{- with .Values.portalapi.podAnnotations }}
+ {{- toYaml . | nindent 4 }}
+ {{- end }}
spec:
hostNetwork: {{ .Values.hostNetwork }}
initContainers:
@@ -36,7 +40,7 @@ spec:
containers:
- image: "{{ .Values.image.portalapi.repository }}:{{ .Values.image.portalapi.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.image.portalapi.pullPolicy | default "Always" }}
- name: {{ include "openslice.fullname" . }}-osportalapi
+ name: {{ include "openslice.fullname" . }}-portalapi
env:
- name: SPRING_APPLICATION_JSON
value: >-
@@ -66,30 +70,30 @@ spec:
ports:
- containerPort: 13000
volumeMounts:
- - name: osportalapi-claim0
+ - name: portalapi-claim0
mountPath: /root
restartPolicy: Always
volumes:
- - name: osportalapi-claim0
+ - name: portalapi-claim0
persistentVolumeClaim:
- claimName: {{ include "openslice.fullname" . }}-osportalapi-claim0
+ claimName: {{ include "openslice.fullname" . }}-portalapi-claim0
---
apiVersion: v1
kind: Service
metadata:
namespace: {{ .Release.Namespace }}
labels:
- app: {{ include "openslice.fullname" . }}
- org.etsi.osl.service: osportalapi
+ app: openslice
+ org.etsi.osl.service: portalapi
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
{{- include "openslice.labels" . | nindent 4 }}
- name: {{ include "openslice.fullname" . }}-osportalapi
+ name: {{ include "openslice.fullname" . }}-portalapi
spec:
ports:
- name: "13000"
port: 13000
targetPort: 13000
selector:
- app: {{ include "openslice.fullname" . }}
- org.etsi.osl.service: osportalapi
+ app: openslice
+ org.etsi.osl.service: portalapi
{{- include "openslice.selectorLabels" . | nindent 4 }}
diff --git a/kubernetes/helm/openslice/templates/osscapi-pv-pvc.yaml b/kubernetes/helm/openslice/templates/osscapi-pv-pvc.yaml
index d8ce702d8723d359554be9e39f8ffdda0d91eb2a..2a7049dc5b8941f17347f0cbebdb170965b40d9b 100644
--- a/kubernetes/helm/openslice/templates/osscapi-pv-pvc.yaml
+++ b/kubernetes/helm/openslice/templates/osscapi-pv-pvc.yaml
@@ -3,7 +3,7 @@ kind: PersistentVolumeClaim
metadata:
namespace: {{ .Release.Namespace }}
labels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: osscapi
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
{{- include "openslice.labels" . | nindent 4 }}
@@ -22,7 +22,7 @@ kind: PersistentVolume
metadata:
namespace: {{ .Release.Namespace }}
labels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: osscapi
type: local
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
diff --git a/kubernetes/helm/openslice/templates/osscapi.yaml b/kubernetes/helm/openslice/templates/osscapi.yaml
index 758d5194bba9efd07fe9e9b5dcdcb91a17611667..5da9a634f0090d06f558a3397fcc2915a0f5b193 100644
--- a/kubernetes/helm/openslice/templates/osscapi.yaml
+++ b/kubernetes/helm/openslice/templates/osscapi.yaml
@@ -3,7 +3,7 @@ kind: Deployment
metadata:
namespace: {{ .Release.Namespace }}
labels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: osscapi
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
{{- include "openslice.labels" . | nindent 4 }}
@@ -14,15 +14,19 @@ spec:
{{- end }}
selector:
matchLabels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: osscapi
{{- include "openslice.selectorLabels" . | nindent 6 }}
template:
metadata:
labels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: osscapi
{{- include "openslice.selectorLabels" . | nindent 8 }}
+ annotations:
+ {{- with .Values.osscapi.podAnnotations }}
+ {{- toYaml . | nindent 4 }}
+ {{- end }}
spec:
hostNetwork: {{ .Values.hostNetwork }}
initContainers:
@@ -83,7 +87,7 @@ kind: Service
metadata:
namespace: {{ .Release.Namespace }}
labels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: osscapi
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
{{- include "openslice.labels" . | nindent 4 }}
@@ -94,6 +98,6 @@ spec:
targetPort: 13082
port: 13082
selector:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: osscapi
{{- include "openslice.selectorLabels" . | nindent 4 }}
diff --git a/kubernetes/helm/openslice/templates/portalweb-config.yaml b/kubernetes/helm/openslice/templates/portalweb-config.yaml
index 0ce4191dedd8d634c51cc0781e1afbf03ca6534e..f7b923f5372374f65c5f39c9eba5de57ec8ee387 100644
--- a/kubernetes/helm/openslice/templates/portalweb-config.yaml
+++ b/kubernetes/helm/openslice/templates/portalweb-config.yaml
@@ -4,7 +4,7 @@ metadata:
name: {{ include "openslice.fullname" . }}-portalweb-config
namespace: {{ .Release.Namespace }}
labels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: portalweb
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
{{- include "openslice.labels" . | nindent 4 }}
diff --git a/kubernetes/helm/openslice/templates/portalweb.yaml b/kubernetes/helm/openslice/templates/portalweb.yaml
index c2b22a10b01c00f22a850b9e951189c86e849fb4..629def64ae23307d58845c1c1e868e94d18f4aa9 100644
--- a/kubernetes/helm/openslice/templates/portalweb.yaml
+++ b/kubernetes/helm/openslice/templates/portalweb.yaml
@@ -3,7 +3,7 @@ kind: Deployment
metadata:
namespace: {{ .Release.Namespace }}
labels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: portalweb
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
{{- include "openslice.labels" . | nindent 4 }}
@@ -14,15 +14,19 @@ spec:
{{- end }}
selector:
matchLabels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: portalweb
{{- include "openslice.selectorLabels" . | nindent 6 }}
template:
metadata:
labels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: portalweb
{{- include "openslice.selectorLabels" . | nindent 8 }}
+ annotations:
+ {{- with .Values.portalweb.podAnnotations }}
+ {{- toYaml . | nindent 4 }}
+ {{- end }}
spec:
hostNetwork: {{ .Values.hostNetwork }}
containers:
@@ -53,7 +57,7 @@ kind: Service
metadata:
namespace: {{ .Release.Namespace }}
labels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: portalweb
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
{{- include "openslice.labels" . | nindent 4 }}
@@ -63,6 +67,6 @@ spec:
- name: "portalwebport"
port: 80
selector:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: portalweb
{{- include "openslice.selectorLabels" . | nindent 4 }}
diff --git a/kubernetes/helm/openslice/templates/tmfweb-config.yaml b/kubernetes/helm/openslice/templates/tmfweb-config.yaml
index badce4153c45a9aa610586a3b2b66bac6302fd46..b1853ad5e7c30746bf6eb902d601d5c08ae0e6c8 100644
--- a/kubernetes/helm/openslice/templates/tmfweb-config.yaml
+++ b/kubernetes/helm/openslice/templates/tmfweb-config.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
metadata:
namespace: {{ .Release.Namespace }}
labels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: tmfweb
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
{{- include "openslice.labels" . | nindent 4 }}
diff --git a/kubernetes/helm/openslice/templates/tmfweb.yaml b/kubernetes/helm/openslice/templates/tmfweb.yaml
index 2d324ec79f2f34379c10d8b12ae10d3ad1cd493f..70301e2241eb9674b86cbb670a546bd879890987 100644
--- a/kubernetes/helm/openslice/templates/tmfweb.yaml
+++ b/kubernetes/helm/openslice/templates/tmfweb.yaml
@@ -3,7 +3,7 @@ kind: Deployment
metadata:
namespace: {{ .Release.Namespace }}
labels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: tmfweb
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
{{- include "openslice.labels" . | nindent 4 }}
@@ -14,15 +14,19 @@ spec:
{{- end }}
selector:
matchLabels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: tmfweb
{{- include "openslice.selectorLabels" . | nindent 6 }}
template:
metadata:
labels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: tmfweb
{{- include "openslice.selectorLabels" . | nindent 8 }}
+ annotations:
+ {{- with .Values.tmfweb.podAnnotations }}
+ {{- toYaml . | nindent 4 }}
+ {{- end }}
spec:
hostNetwork: {{ .Values.hostNetwork }}
containers:
@@ -48,7 +52,7 @@ kind: Service
metadata:
namespace: {{ .Release.Namespace }}
labels:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: tmfweb
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
{{- include "openslice.labels" . | nindent 4 }}
@@ -58,6 +62,6 @@ spec:
- name: "tmwebport"
port: 80
selector:
- app: {{ include "openslice.fullname" . }}
+ app: openslice
org.etsi.osl.service: tmfweb
{{- include "openslice.selectorLabels" . | nindent 4 }}
diff --git a/kubernetes/helm/openslice/values.yaml b/kubernetes/helm/openslice/values.yaml
index e531b73b43b145f8c4c5da251c3733fa886c6e2d..b4334e8010d0db7fe7228ad152b31e3644a6e4a1 100644
--- a/kubernetes/helm/openslice/values.yaml
+++ b/kubernetes/helm/openslice/values.yaml
@@ -132,11 +132,35 @@ cridge:
raw: "" # Provide raw kubeconfig here if available
portalapi:
+
+ podAnnotations:
+ prometheus.io/scrape: "true"
+ prometheus.io/port: "13000"
+ prometheus.io/path: "/actuator/prometheus"
+
logLevel: INFO
spring:
loglevel: INFO
+portalweb:
+ podAnnotations:
+ prometheus.io/scrape: "true"
+ prometheus.io/port: "13000"
+ prometheus.io/path: "/actuator/prometheus"
+
+tmfweb:
+ podAnnotations:
+ prometheus.io/scrape: "true"
+ prometheus.io/port: "13000"
+ prometheus.io/path: "/actuator/prometheus"
+
manoclient:
+
+ podAnnotations:
+ prometheus.io/scrape: "true"
+ prometheus.io/port: "13011"
+ prometheus.io/path: "/actuator/prometheus"
+
spring:
loglevel: INFO
@@ -154,6 +178,42 @@ osscapi:
spring:
loglevel: INFO
+artemis:
+ podAnnotations:
+ prometheus.io/scrape: "true"
+ prometheus.io/port: "13011"
+ prometheus.io/path: "/actuator/prometheus"
+
+kroki:
+ podAnnotations:
+ prometheus.io/scrape: "true"
+ prometheus.io/port: "13011"
+ prometheus.io/path: "/actuator/prometheus"
+
+blockdiag:
+ podAnnotations:
+ prometheus.io/scrape: "true"
+ prometheus.io/port: "13011"
+ prometheus.io/path: "/actuator/prometheus"
+
+keycloak:
+ podAnnotations:
+ prometheus.io/scrape: "true"
+ prometheus.io/port: "13011"
+ prometheus.io/path: "/actuator/prometheus"
+
+centrallog:
+ podAnnotations:
+ prometheus.io/scrape: "true"
+ prometheus.io/port: "13011"
+ prometheus.io/path: "/actuator/prometheus"
+
+bugzilla:
+ podAnnotations:
+ prometheus.io/scrape: "true"
+ prometheus.io/port: "13011"
+ prometheus.io/path: "/actuator/prometheus"
+
# Storage class to be used for provisioning. Default is manual
# storageClass: ~
@@ -172,8 +232,6 @@ serviceAccount:
# If not set and create is true, a name is generated using the fullname template
name: ""
-podAnnotations: {}
-
podSecurityContext: {}
# fsGroup: 2000
@@ -213,13 +271,88 @@ ingress:
- path: "/"
service: "tmfweb"
port: 80
+ - path: "/grafana(/|$)(.*)"
+ service: "grafana"
+ port: 80
+ - path: "/prometheus(/|$)(.*)"
+ service: "prometheus-server"
+ port: 80
annotations: {}
+## Using default values from https://github.com/prometheus-community/helm-charts/tree/main/charts/prometheus
+##
+prometheus:
+ enabled: true
+
+ alertmanager:
+ enabled: false
- tls: []
- # - secretName: chart-example-tls
- # hosts:
- # - chart-example.local
+ kube-state-metrics:
+ enabled: false
+
+ prometheus-node-exporter:
+ enabled: false
+
+ prometheus-pushgateway:
+ enabled: false
+
+ commonMetaLabels:
+ app: openslice
+
+ server:
+ prefixURL: "/prometheus"
+
+
+ ingress:
+ enabled: false
+
+ persistentVolume:
+ enabled: false
+
+ podAnnotations:
+ prometheus.io/scrape: "true"
+ prometheus.io/path: /metrics
+ prometheus.io/port: "9090"
+
+ serverFiles:
+ prometheus.yml:
+ scrape_configs:
+ - job_name: 'openslice-apps'
+ kubernetes_sd_configs:
+ - role: pod
+ relabel_configs:
+ - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_scrape]
+ action: keep
+ regex: "true"
+ - source_labels: [__meta_kubernetes_pod_label_app]
+ action: keep
+ regex: openslice
+ - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_path]
+ action: replace
+ target_label: __metrics_path__
+ regex: (.+)
+ - source_labels: [__address__, __meta_kubernetes_pod_annotation_prometheus_io_port]
+ action: replace
+ regex: (.+):(?:\d+);(\d+)
+ replacement: ${1}:${2}
+ target_label: __address__
+
+## Using default values from https://github.com/grafana/helm-charts/blob/main/charts/grafana/values.yaml
+##
+grafana:
+ enabled: true
+ adminPassword: admin
+
+ testFramework:
+ enabled: false # Disable test pod
+
+ grafana.ini:
+ server:
+ root_url: "%(protocol)s://%(domain)s/grafana"
+ serve_from_sub_path: true
+
+ extraLabels:
+ app: openslice
resources: {}
# We usually recommend not to specify default resources and to leave this as a conscious
@@ -239,9 +372,3 @@ autoscaling:
maxReplicas: 100
targetCPUUtilizationPercentage: 80
targetMemoryUtilizationPercentage: 80
-
-nodeSelector: {}
-
-tolerations: []
-
-affinity: {}