diff --git a/kubernetes/helm/openslice/templates/artemis.yaml b/kubernetes/helm/openslice/templates/artemis.yaml index 1cd8f4fe1cedef2e00e77c07a89c741b46d59405..66913926be3c4555da353227679bd759f719ced7 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 bba2c80dfb98e092602ef16fc0d3bec111eda03c..ec961ea2f963e79739087200f06c3e947227b2c2 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 66fabb52505d4976d0d66a989d58ee2630a60931..b9d9fefae35bb7ea9849ee74c34991e88b78ed94 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 4ee9d4501dba9699eec6dc4184c19b794fedce29..2ad48cf0a6f25aaaffc0b76c3dcce61df14945a2 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 9838b73359aafbe0299db698a2d8d5907fca7d76..8b2811d9d280ed764a5bdfd86af0ab94527f44b4 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 5a095e354ba71298d46f0e65f0956dd3b56911e9..c83e52662d3438d746227a349ed002bf69e43dce 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 3fa36e5c0f332ae7f0369717e86f93bde6efa44f..5ee1274080ae5f0b51d068796e5b8ded91536c61 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 6015ba2471650b3466b28ca38694dfea93217647..197f572d6b5a1747f2e0517f114d172990218917 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 0a06b4ca0398d317e75a2cc3452b1940e9f4847f..4e3fba3033fab57a85f1512d6d196e0d9086d12c 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 46616dae792bd6dd74ad248471b800676c60a642..0047feeca7375d6937018221e26f678900bef16a 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 4af7091b153da1f37f9e4dca5146452e9788e206..62955ceedbdcd1026c7dc3d8ecd752fd356a0e65 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 142ece0a18d6345617bd8f3483abd7c5692de704..b5a710315a6827b6e8e3813e52332272400c7a5c 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 b920913a6b0d1c7b9e08c35bcb0612c7a8fcda7d..a8221bc167c25315d4bab85a83e81bbd1f31641d 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 246c35130ac85c5a7e1d965497bca29717730991..df894f2000b7ac3fed64427d276026cf41f791d0 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 ca88bb6b9ef08254edf69e139fbc64a1cc09fb34..0adf86d80b5358cf00598bbd759493fde979165c 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 88c77064ce7940f30dac8978510168f2800687cd..e492c6513f0fd97965433088abf2b9f6968ebcf9 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 60df5f9edd65d136ee55feeac806102e725ec180..854ac5a9c908795421a3533541678d0e999b1156 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 b0300672622b1c339c268fbcceb4565bf19ac482..fac3528dc8257f28c9c743f61ad0b630f96440aa 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: ~