summaryrefslogtreecommitdiffstats
path: root/components/aai-resources/templates
diff options
context:
space:
mode:
Diffstat (limited to 'components/aai-resources/templates')
-rw-r--r--components/aai-resources/templates/configmap.yaml12
-rw-r--r--components/aai-resources/templates/deployment.yaml8
-rw-r--r--components/aai-resources/templates/service.yaml4
3 files changed, 12 insertions, 12 deletions
diff --git a/components/aai-resources/templates/configmap.yaml b/components/aai-resources/templates/configmap.yaml
index a4c2e31..ccbeae3 100644
--- a/components/aai-resources/templates/configmap.yaml
+++ b/components/aai-resources/templates/configmap.yaml
@@ -20,7 +20,7 @@ metadata:
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
data:
{{ tpl (.Files.Glob "resources/config/logback.xml").AsConfig . | indent 2 }}
@@ -39,7 +39,7 @@ metadata:
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
data:
{{ tpl (.Files.Glob "resources/config/aaf/org.osaaf.location.props").AsConfig . | indent 2 }}
@@ -56,7 +56,7 @@ metadata:
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
type: Opaque
data:
@@ -74,7 +74,7 @@ metadata:
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
data:
{{ tpl (.Files.Glob "resources/config/auth/aai_policy.json").AsConfig . | indent 2 }}
@@ -95,7 +95,7 @@ metadata:
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
data:
{{ tpl (.Files.Glob "resources/fproxy/config/logback-spring.xml").AsConfig . | indent 2 }}
@@ -125,7 +125,7 @@ metadata:
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
data:
{{ tpl (.Files.Glob "resources/rproxy/config/logback-spring.xml").AsConfig . | indent 2 }}
diff --git a/components/aai-resources/templates/deployment.yaml b/components/aai-resources/templates/deployment.yaml
index b2db730..3eccd1a 100644
--- a/components/aai-resources/templates/deployment.yaml
+++ b/components/aai-resources/templates/deployment.yaml
@@ -21,7 +21,7 @@ metadata:
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
spec:
replicas: {{ .Values.replicaCount }}
@@ -32,7 +32,7 @@ spec:
metadata:
labels:
app: {{ include "common.name" . }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
name: {{ include "common.name" . }}
annotations:
checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
@@ -1187,12 +1187,12 @@ spec:
- /root/job_complete.py
args:
- --job-name
- - {{ .Release.Name }}-aai-graphadmin-migration
+ - {{ include "common.release" . }}-aai-graphadmin-migration
{{ else if .Values.global.jobs.createSchema.enabled }}
- /root/job_complete.py
args:
- --job-name
- - {{ .Release.Name }}-aai-graphadmin-create-db-schema
+ - {{ include "common.release" . }}-aai-graphadmin-create-db-schema
{{ else }}
- /root/ready.py
args:
diff --git a/components/aai-resources/templates/service.yaml b/components/aai-resources/templates/service.yaml
index d119912..68d767b 100644
--- a/components/aai-resources/templates/service.yaml
+++ b/components/aai-resources/templates/service.yaml
@@ -20,7 +20,7 @@ metadata:
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
spec:
type: {{ .Values.service.type }}
@@ -40,5 +40,5 @@ spec:
{{- end}}
selector:
app: {{ include "common.name" . }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
clusterIP: None