From e9990134bd33211d72a19cf6c8ded5bef62762a4 Mon Sep 17 00:00:00 2001 From: Dimitrios Giannopoulos Date: Mon, 19 May 2025 12:20:10 +0300 Subject: [PATCH] feat: reverted pod annotation changes --- .../helm/openslice/templates/artemis.yaml | 4 -- .../helm/openslice/templates/blockdiag.yaml | 4 -- .../helm/openslice/templates/bugzilla.yaml | 4 -- .../helm/openslice/templates/centrallog.yaml | 4 -- .../openslice/templates/cridge-secret.yaml | 4 -- .../helm/openslice/templates/cridge.yaml | 4 -- .../helm/openslice/templates/keycloak.yaml | 4 -- .../helm/openslice/templates/kroki.yaml | 4 -- .../helm/openslice/templates/manoclient.yaml | 8 --- .../helm/openslice/templates/metrico.yaml | 4 -- .../helm/openslice/templates/mysql.yaml | 4 -- .../helm/openslice/templates/oasapi.yaml | 4 -- kubernetes/helm/openslice/templates/osom.yaml | 4 -- .../helm/openslice/templates/osportalapi.yaml | 4 -- .../helm/openslice/templates/osscapi.yaml | 4 -- .../helm/openslice/templates/portalweb.yaml | 4 -- .../helm/openslice/templates/tmfweb.yaml | 4 -- kubernetes/helm/openslice/values.yaml | 60 ------------------- 18 files changed, 132 deletions(-) diff --git a/kubernetes/helm/openslice/templates/artemis.yaml b/kubernetes/helm/openslice/templates/artemis.yaml index 1cd8f4f..6691392 100644 --- a/kubernetes/helm/openslice/templates/artemis.yaml +++ b/kubernetes/helm/openslice/templates/artemis.yaml @@ -23,10 +23,6 @@ spec: app: openslice org.etsi.osl.service: artemis {{- include "openslice.selectorLabels" . | nindent 8 }} - annotations: - {{- with .Values.artemis.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} spec: containers: - image: "{{ .Values.image.artemis.repository }}:{{ .Values.image.artemis.tag | default .Chart.AppVersion }}" diff --git a/kubernetes/helm/openslice/templates/blockdiag.yaml b/kubernetes/helm/openslice/templates/blockdiag.yaml index bba2c80..ec961ea 100644 --- a/kubernetes/helm/openslice/templates/blockdiag.yaml +++ b/kubernetes/helm/openslice/templates/blockdiag.yaml @@ -23,10 +23,6 @@ spec: app: openslice org.etsi.osl.service: blockdiag {{- include "openslice.selectorLabels" . | nindent 8 }} - annotations: - {{- with .Values.blockdiag.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} spec: containers: - image: "{{ .Values.image.blockdiag.repository }}:{{ .Values.image.blockdiag.tag | default .Chart.AppVersion }}" diff --git a/kubernetes/helm/openslice/templates/bugzilla.yaml b/kubernetes/helm/openslice/templates/bugzilla.yaml index 66fabb5..b9d9fef 100644 --- a/kubernetes/helm/openslice/templates/bugzilla.yaml +++ b/kubernetes/helm/openslice/templates/bugzilla.yaml @@ -23,10 +23,6 @@ spec: app: openslice org.etsi.osl.service: bugzilla {{- include "openslice.selectorLabels" . | nindent 8 }} - annotations: - {{- with .Values.bugzilla.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} spec: containers: - image: "{{ .Values.image.bugzilla.repository }}:{{ .Values.image.bugzilla.tag | default .Chart.AppVersion }}" diff --git a/kubernetes/helm/openslice/templates/centrallog.yaml b/kubernetes/helm/openslice/templates/centrallog.yaml index 4ee9d45..2ad48cf 100644 --- a/kubernetes/helm/openslice/templates/centrallog.yaml +++ b/kubernetes/helm/openslice/templates/centrallog.yaml @@ -23,10 +23,6 @@ spec: app: openslice org.etsi.osl.service: centrallog {{- include "openslice.selectorLabels" . | nindent 8 }} - annotations: - {{- with .Values.centrallog.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} spec: containers: - image: "{{ .Values.image.centrallog.repository }}:{{ .Values.image.centrallog.tag | default .Chart.AppVersion }}" diff --git a/kubernetes/helm/openslice/templates/cridge-secret.yaml b/kubernetes/helm/openslice/templates/cridge-secret.yaml index 9838b73..8b2811d 100644 --- a/kubernetes/helm/openslice/templates/cridge-secret.yaml +++ b/kubernetes/helm/openslice/templates/cridge-secret.yaml @@ -19,10 +19,6 @@ metadata: 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 5a095e3..c83e526 100644 --- a/kubernetes/helm/openslice/templates/cridge.yaml +++ b/kubernetes/helm/openslice/templates/cridge.yaml @@ -22,10 +22,6 @@ spec: app: openslice org.etsi.osl.service: cridge {{- include "openslice.selectorLabels" . | nindent 8 }} - annotations: - {{- with .Values.cridge.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} spec: containers: - image: "{{ .Values.image.cridge.repository }}:{{ .Values.image.cridge.tag | default .Chart.AppVersion }}" diff --git a/kubernetes/helm/openslice/templates/keycloak.yaml b/kubernetes/helm/openslice/templates/keycloak.yaml index 3fa36e5..5ee1274 100644 --- a/kubernetes/helm/openslice/templates/keycloak.yaml +++ b/kubernetes/helm/openslice/templates/keycloak.yaml @@ -23,10 +23,6 @@ spec: app: openslice org.etsi.osl.service: keycloak {{- include "openslice.selectorLabels" . | nindent 8 }} - annotations: - {{- with .Values.keycloak.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} spec: initContainers: - name: init-mysql-portal diff --git a/kubernetes/helm/openslice/templates/kroki.yaml b/kubernetes/helm/openslice/templates/kroki.yaml index 6015ba2..197f572 100644 --- a/kubernetes/helm/openslice/templates/kroki.yaml +++ b/kubernetes/helm/openslice/templates/kroki.yaml @@ -23,10 +23,6 @@ spec: app: openslice org.etsi.osl.service: kroki {{- include "openslice.selectorLabels" . | nindent 8 }} - annotations: - {{- with .Values.kroki.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} spec: containers: - image: "{{ .Values.image.kroki.repository }}:{{ .Values.image.kroki.tag | default .Chart.AppVersion }}" diff --git a/kubernetes/helm/openslice/templates/manoclient.yaml b/kubernetes/helm/openslice/templates/manoclient.yaml index 0a06b4c..4e3fba3 100644 --- a/kubernetes/helm/openslice/templates/manoclient.yaml +++ b/kubernetes/helm/openslice/templates/manoclient.yaml @@ -7,10 +7,6 @@ metadata: 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 }} @@ -27,10 +23,6 @@ spec: app: openslice org.etsi.osl.service: manoclient {{- include "openslice.selectorLabels" . | nindent 8 }} - annotations: - {{- with .Values.manoclient.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} spec: containers: - image: "{{ .Values.image.manoclient.repository }}:{{ .Values.image.manoclient.tag | default .Chart.AppVersion }}" diff --git a/kubernetes/helm/openslice/templates/metrico.yaml b/kubernetes/helm/openslice/templates/metrico.yaml index 46616da..0047fee 100644 --- a/kubernetes/helm/openslice/templates/metrico.yaml +++ b/kubernetes/helm/openslice/templates/metrico.yaml @@ -24,10 +24,6 @@ spec: app: openslice org.etsi.osl.service: metrico {{- include "openslice.selectorLabels" . | nindent 8 }} - annotations: - {{- with .Values.metrico.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} spec: containers: - image: "{{ .Values.image.metrico.repository }}:{{ .Values.image.metrico.tag | default .Chart.AppVersion }}" diff --git a/kubernetes/helm/openslice/templates/mysql.yaml b/kubernetes/helm/openslice/templates/mysql.yaml index 4af7091..62955ce 100644 --- a/kubernetes/helm/openslice/templates/mysql.yaml +++ b/kubernetes/helm/openslice/templates/mysql.yaml @@ -24,10 +24,6 @@ spec: app: openslice org.etsi.osl.service: mysql {{- include "openslice.selectorLabels" . | nindent 8 }} - annotations: - {{- with .Values.mysql.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} spec: containers: - image: "{{ .Values.image.mysql.repository }}:{{ .Values.image.mysql.tag | default .Chart.AppVersion }}" diff --git a/kubernetes/helm/openslice/templates/oasapi.yaml b/kubernetes/helm/openslice/templates/oasapi.yaml index 142ece0..b5a7103 100644 --- a/kubernetes/helm/openslice/templates/oasapi.yaml +++ b/kubernetes/helm/openslice/templates/oasapi.yaml @@ -23,10 +23,6 @@ spec: 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 diff --git a/kubernetes/helm/openslice/templates/osom.yaml b/kubernetes/helm/openslice/templates/osom.yaml index b920913..a8221bc 100644 --- a/kubernetes/helm/openslice/templates/osom.yaml +++ b/kubernetes/helm/openslice/templates/osom.yaml @@ -23,10 +23,6 @@ spec: app: openslice org.etsi.osl.service: osom {{- include "openslice.selectorLabels" . | nindent 8 }} - annotations: - {{- with .Values.osom.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} spec: containers: - image: "{{ .Values.image.osom.repository }}:{{ .Values.image.osom.tag | default .Chart.AppVersion }}" diff --git a/kubernetes/helm/openslice/templates/osportalapi.yaml b/kubernetes/helm/openslice/templates/osportalapi.yaml index 246c351..df894f2 100644 --- a/kubernetes/helm/openslice/templates/osportalapi.yaml +++ b/kubernetes/helm/openslice/templates/osportalapi.yaml @@ -24,10 +24,6 @@ spec: app: openslice org.etsi.osl.service: portalapi {{- include "openslice.selectorLabels" . | nindent 8 }} - annotations: - {{- with .Values.portalapi.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} spec: hostNetwork: {{ .Values.hostNetwork }} initContainers: diff --git a/kubernetes/helm/openslice/templates/osscapi.yaml b/kubernetes/helm/openslice/templates/osscapi.yaml index ca88bb6..0adf86d 100644 --- a/kubernetes/helm/openslice/templates/osscapi.yaml +++ b/kubernetes/helm/openslice/templates/osscapi.yaml @@ -23,10 +23,6 @@ spec: app: openslice org.etsi.osl.service: osscapi {{- include "openslice.selectorLabels" . | nindent 8 }} - annotations: - {{- with .Values.osscapi.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} spec: hostNetwork: {{ .Values.hostNetwork }} initContainers: diff --git a/kubernetes/helm/openslice/templates/portalweb.yaml b/kubernetes/helm/openslice/templates/portalweb.yaml index 88c7706..e492c65 100644 --- a/kubernetes/helm/openslice/templates/portalweb.yaml +++ b/kubernetes/helm/openslice/templates/portalweb.yaml @@ -23,10 +23,6 @@ spec: app: openslice org.etsi.osl.service: portalweb {{- include "openslice.selectorLabels" . | nindent 8 }} - annotations: - {{- with .Values.portalweb.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} spec: hostNetwork: {{ .Values.hostNetwork }} containers: diff --git a/kubernetes/helm/openslice/templates/tmfweb.yaml b/kubernetes/helm/openslice/templates/tmfweb.yaml index 60df5f9..854ac5a 100644 --- a/kubernetes/helm/openslice/templates/tmfweb.yaml +++ b/kubernetes/helm/openslice/templates/tmfweb.yaml @@ -23,10 +23,6 @@ spec: app: openslice org.etsi.osl.service: tmfweb {{- include "openslice.selectorLabels" . | nindent 8 }} - annotations: - {{- with .Values.tmfweb.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} spec: hostNetwork: {{ .Values.hostNetwork }} containers: diff --git a/kubernetes/helm/openslice/values.yaml b/kubernetes/helm/openslice/values.yaml index b030067..fac3528 100644 --- a/kubernetes/helm/openslice/values.yaml +++ b/kubernetes/helm/openslice/values.yaml @@ -132,35 +132,11 @@ 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 @@ -178,42 +154,6 @@ 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: ~ -- GitLab