From 64f9d7934c7ff2dd35cfac8a6459c12a45c37289 Mon Sep 17 00:00:00 2001 From: Dimitrios Giannopoulos <dimit.giannopoulos@upnet.gr> Date: Mon, 14 Apr 2025 16:15:23 +0300 Subject: [PATCH] feat: added prometheus and grafana chart configuration --- kubernetes/helm/openslice/Chart.yaml | 11 ++ .../helm/openslice/templates/artemis.yaml | 14 +- .../helm/openslice/templates/blockdiag.yaml | 14 +- .../helm/openslice/templates/bugzilla.yaml | 14 +- .../helm/openslice/templates/centrallog.yaml | 14 +- .../openslice/templates/cridge-secret.yaml | 6 +- .../helm/openslice/templates/cridge.yaml | 10 +- .../openslice/templates/keycloak-config.yaml | 2 +- .../helm/openslice/templates/keycloak.yaml | 14 +- .../openslice/templates/kroki-ingress.yaml | 2 +- .../helm/openslice/templates/kroki.yaml | 14 +- .../helm/openslice/templates/manoclient.yaml | 18 ++- .../helm/openslice/templates/metrico.yaml | 10 +- .../openslice/templates/mysql-config.yaml | 2 +- .../openslice/templates/mysql-pv-pvc.yaml | 4 +- .../helm/openslice/templates/mysql.yaml | 14 +- .../helm/openslice/templates/oasapi.yaml | 14 +- .../templates/openslice-ingress.yaml | 2 +- kubernetes/helm/openslice/templates/osom.yaml | 14 +- .../templates/osportalapi-pv-pvc.yaml | 20 +-- .../helm/openslice/templates/osportalapi.yaml | 36 +++-- .../openslice/templates/osscapi-pv-pvc.yaml | 4 +- .../helm/openslice/templates/osscapi.yaml | 14 +- .../openslice/templates/portalweb-config.yaml | 2 +- .../helm/openslice/templates/portalweb.yaml | 14 +- .../openslice/templates/tmfweb-config.yaml | 2 +- .../helm/openslice/templates/tmfweb.yaml | 14 +- kubernetes/helm/openslice/values.yaml | 151 ++++++++++++++++-- 28 files changed, 330 insertions(+), 120 deletions(-) diff --git a/kubernetes/helm/openslice/Chart.yaml b/kubernetes/helm/openslice/Chart.yaml index b8ede11..49b95d1 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 87c75ea..ef55fcb 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 30b2025..bdfd691 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 d759a25..5f0d339 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 b8143fc..b2ab823 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 4a32bff..9838b73 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 1065639..084c59d 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 748008b..3f2a8ed 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 fca2bdb..fc1d2ae 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 c146764..fc9b681 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 5b34ae5..3b54325 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 064c0c1..751cacb 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 620ca0a..674ba90 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 0de0e52..2c207e1 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 2746bcf..5c3298f 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 b69a3f1..e9b4391 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 bf78b5d..142ece0 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 365ffc7..92a295b 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 14c8d2d..9674c9c 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 cb3bc42..46409c6 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 6df11d4..4f8b668 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 d8ce702..2a7049d 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 758d519..5da9a63 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 0ce4191..f7b923f 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 c2b22a1..629def6 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 badce41..b1853ad 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 2d324ec..70301e2 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 e531b73..b4334e8 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: {} -- GitLab