From: Andreas Geissler Date: Thu, 20 Jul 2023 06:36:08 +0000 (+0000) Subject: Merge "[POLICY] Correct container ports in Nexus and GUI" X-Git-Tag: 13.0.0-DOC~28 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=74ef268ceb0d9cb3361c5ed252a86ed9d30a7f0d;hp=fc55fbf5e322a8ba35b93cfc9af50b2ea3f52995;p=oom.git Merge "[POLICY] Correct container ports in Nexus and GUI" --- diff --git a/kubernetes/aai/components/aai-graphadmin/templates/deployment.yaml b/kubernetes/aai/components/aai-graphadmin/templates/deployment.yaml index afd0e779af..536fc9d1aa 100644 --- a/kubernetes/aai/components/aai-graphadmin/templates/deployment.yaml +++ b/kubernetes/aai/components/aai-graphadmin/templates/deployment.yaml @@ -30,9 +30,9 @@ metadata: app: {{ include "common.name" . }} app.kubernetes.io/name: {{ include "common.name" . }} {{- if .Chart.AppVersion }} - version: {{ .Chart.AppVersion | replace "+" "_" }} + version: "{{ .Chart.AppVersion | replace "+" "_" }}" {{- else }} - version: {{ .Chart.Version | replace "+" "_" }} + version: "{{ .Chart.Version | replace "+" "_" }}" {{- end }} chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} release: {{ include "common.release" . }} @@ -55,9 +55,9 @@ spec: release: {{ include "common.release" . }} app.kubernetes.io/name: {{ include "common.name" . }} {{- if .Chart.AppVersion }} - version: {{ .Chart.AppVersion | replace "+" "_" }} + version: "{{ .Chart.AppVersion | replace "+" "_" }}" {{- else }} - version: {{ .Chart.Version | replace "+" "_" }} + version: "{{ .Chart.Version | replace "+" "_" }}" {{- end }} name: {{ include "common.name" . }} annotations: diff --git a/kubernetes/aai/components/aai-modelloader/templates/deployment.yaml b/kubernetes/aai/components/aai-modelloader/templates/deployment.yaml index 78dd307b9f..b3fd237fb6 100644 --- a/kubernetes/aai/components/aai-modelloader/templates/deployment.yaml +++ b/kubernetes/aai/components/aai-modelloader/templates/deployment.yaml @@ -26,9 +26,9 @@ metadata: app: {{ include "common.name" . }} app.kubernetes.io/name: {{ include "common.name" . }} {{- if .Chart.AppVersion }} - version: {{ .Chart.AppVersion | replace "+" "_" }} + version: "{{ .Chart.AppVersion | replace "+" "_" }}" {{- else }} - version: {{ .Chart.Version | replace "+" "_" }} + version: "{{ .Chart.Version | replace "+" "_" }}" {{- end }} chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} release: {{ include "common.release" . }} @@ -52,9 +52,9 @@ spec: release: {{ include "common.release" . }} app.kubernetes.io/name: {{ include "common.name" . }} {{- if .Chart.AppVersion }} - version: {{ .Chart.AppVersion | replace "+" "_" }} + version: "{{ .Chart.AppVersion | replace "+" "_" }}" {{- else }} - version: {{ .Chart.Version | replace "+" "_" }} + version: "{{ .Chart.Version | replace "+" "_" }}" {{- end }} name: {{ include "common.name" . }} spec: diff --git a/kubernetes/aai/components/aai-resources/templates/deployment.yaml b/kubernetes/aai/components/aai-resources/templates/deployment.yaml index 724cb2d59f..2f60811331 100644 --- a/kubernetes/aai/components/aai-resources/templates/deployment.yaml +++ b/kubernetes/aai/components/aai-resources/templates/deployment.yaml @@ -27,9 +27,9 @@ metadata: app: {{ include "common.name" . }} app.kubernetes.io/name: {{ include "common.name" . }} {{- if .Chart.AppVersion }} - version: {{ .Chart.AppVersion | replace "+" "_" }} + version: "{{ .Chart.AppVersion | replace "+" "_" }}" {{- else }} - version: {{ .Chart.Version | replace "+" "_" }} + version: "{{ .Chart.Version | replace "+" "_" }}" {{- end }} chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} release: {{ include "common.release" . }} @@ -52,9 +52,9 @@ spec: release: {{ include "common.release" . }} app.kubernetes.io/name: {{ include "common.name" . }} {{- if .Chart.AppVersion }} - version: {{ .Chart.AppVersion | replace "+" "_" }} + version: "{{ .Chart.AppVersion | replace "+" "_" }}" {{- else }} - version: {{ .Chart.Version | replace "+" "_" }} + version: "{{ .Chart.Version | replace "+" "_" }}" {{- end }} name: {{ include "common.name" . }} annotations: diff --git a/kubernetes/aai/components/aai-schema-service/templates/deployment.yaml b/kubernetes/aai/components/aai-schema-service/templates/deployment.yaml index 5d558cfd30..d0b81492aa 100644 --- a/kubernetes/aai/components/aai-schema-service/templates/deployment.yaml +++ b/kubernetes/aai/components/aai-schema-service/templates/deployment.yaml @@ -26,9 +26,9 @@ metadata: app: {{ include "common.name" . }} app.kubernetes.io/name: {{ include "common.name" . }} {{- if .Chart.AppVersion }} - version: {{ .Chart.AppVersion | replace "+" "_" }} + version: "{{ .Chart.AppVersion | replace "+" "_" }}" {{- else }} - version: {{ .Chart.Version | replace "+" "_" }} + version: "{{ .Chart.Version | replace "+" "_" }}" {{- end }} chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} release: {{ include "common.release" . }} @@ -52,9 +52,9 @@ spec: release: {{ include "common.release" . }} app.kubernetes.io/name: {{ include "common.name" . }} {{- if .Chart.AppVersion }} - version: {{ .Chart.AppVersion | replace "+" "_" }} + version: "{{ .Chart.AppVersion | replace "+" "_" }}" {{- else }} - version: {{ .Chart.Version | replace "+" "_" }} + version: "{{ .Chart.Version | replace "+" "_" }}" {{- end }} name: {{ include "common.name" . }} annotations: diff --git a/kubernetes/aai/components/aai-traversal/templates/deployment.yaml b/kubernetes/aai/components/aai-traversal/templates/deployment.yaml index bf9743be55..a2c81cf673 100644 --- a/kubernetes/aai/components/aai-traversal/templates/deployment.yaml +++ b/kubernetes/aai/components/aai-traversal/templates/deployment.yaml @@ -27,9 +27,9 @@ metadata: app: {{ include "common.name" . }} app.kubernetes.io/name: {{ include "common.name" . }} {{- if .Chart.AppVersion }} - version: {{ .Chart.AppVersion | replace "+" "_" }} + version: "{{ .Chart.AppVersion | replace "+" "_" }}" {{- else }} - version: {{ .Chart.Version | replace "+" "_" }} + version: "{{ .Chart.Version | replace "+" "_" }}" {{- end }} chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} release: {{ include "common.release" . }} @@ -52,9 +52,9 @@ spec: release: {{ include "common.release" . }} app.kubernetes.io/name: {{ include "common.name" . }} {{- if .Chart.AppVersion }} - version: {{ .Chart.AppVersion | replace "+" "_" }} + version: "{{ .Chart.AppVersion | replace "+" "_" }}" {{- else }} - version: {{ .Chart.Version | replace "+" "_" }} + version: "{{ .Chart.Version | replace "+" "_" }}" {{- end }} name: {{ include "common.name" . }} annotations: diff --git a/kubernetes/aai/templates/deployment.yaml b/kubernetes/aai/templates/deployment.yaml index fa26837114..153947ebb1 100644 --- a/kubernetes/aai/templates/deployment.yaml +++ b/kubernetes/aai/templates/deployment.yaml @@ -25,9 +25,9 @@ metadata: app: {{ include "common.name" . }} app.kubernetes.io/name: {{ include "common.name" . }} {{- if .Chart.AppVersion }} - version: {{ .Chart.AppVersion | replace "+" "_" }} + version: "{{ .Chart.AppVersion | replace "+" "_" }}" {{- else }} - version: {{ .Chart.Version | replace "+" "_" }} + version: "{{ .Chart.Version | replace "+" "_" }}" {{- end }} chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} release: {{ include "common.release" . }} @@ -51,9 +51,9 @@ spec: release: {{ include "common.release" . }} app.kubernetes.io/name: {{ include "common.name" . }} {{- if .Chart.AppVersion }} - version: {{ .Chart.AppVersion | replace "+" "_" }} + version: "{{ .Chart.AppVersion | replace "+" "_" }}" {{- else }} - version: {{ .Chart.Version | replace "+" "_" }} + version: "{{ .Chart.Version | replace "+" "_" }}" {{- end }} name: {{ include "common.release" . }} annotations: