Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[ONAP-wide] Replace .Release.Name with common.release
[oom.git]
/
kubernetes
/
so
/
templates
/
deployment.yaml
diff --git
a/kubernetes/so/templates/deployment.yaml
b/kubernetes/so/templates/deployment.yaml
index
9211571
..
931a895
100755
(executable)
--- a/
kubernetes/so/templates/deployment.yaml
+++ b/
kubernetes/so/templates/deployment.yaml
@@
-19,7
+19,7
@@
metadata:
labels:
app: {{ include "common.fullname" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
labels:
app: {{ include "common.fullname" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{
.Release.Name
}}
+ release: {{
include "common.release" .
}}
spec:
replicas: {{ index .Values.replicaCount }}
minReadySeconds: {{ index .Values.minReadySeconds }}
spec:
replicas: {{ index .Values.replicaCount }}
minReadySeconds: {{ index .Values.minReadySeconds }}
@@
-32,14
+32,14
@@
spec:
metadata:
labels:
app: {{ include "common.name" . }}
metadata:
labels:
app: {{ include "common.name" . }}
- release: {{
.Release.Name
}}
+ release: {{
include "common.release" .
}}
spec:
initContainers:
- command:
- /root/job_complete.py
args:
- --job-name
spec:
initContainers:
- command:
- /root/job_complete.py
args:
- --job-name
- - {{
.Release.Name
}}-so-mariadb-config-job
+ - {{
include "common.release" .
}}-so-mariadb-config-job
env:
- name: NAMESPACE
valueFrom:
env:
- name: NAMESPACE
valueFrom:
@@
-58,32
+58,32
@@
spec:
- name: DB_HOST
valueFrom:
secretKeyRef:
- name: DB_HOST
valueFrom:
secretKeyRef:
- name: {{
.Release.Name
}}-so-db-secrets
+ name: {{
include "common.release" .
}}-so-db-secrets
key: mariadb.readwrite.host
- name: DB_PORT
valueFrom:
secretKeyRef:
key: mariadb.readwrite.host
- name: DB_PORT
valueFrom:
secretKeyRef:
- name: {{
.Release.Name
}}-so-db-secrets
+ name: {{
include "common.release" .
}}-so-db-secrets
key: mariadb.readwrite.port
- name: DB_USERNAME
valueFrom:
secretKeyRef:
key: mariadb.readwrite.port
- name: DB_USERNAME
valueFrom:
secretKeyRef:
- name: {{
.Release.Name
}}-so-db-secrets
+ name: {{
include "common.release" .
}}-so-db-secrets
key: mariadb.readwrite.rolename
- name: DB_PASSWORD
valueFrom:
secretKeyRef:
key: mariadb.readwrite.rolename
- name: DB_PASSWORD
valueFrom:
secretKeyRef:
- name: {{
.Release.Name
}}-so-db-secrets
+ name: {{
include "common.release" .
}}-so-db-secrets
key: mariadb.readwrite.password
- name: DB_ADMIN_USERNAME
valueFrom:
secretKeyRef:
key: mariadb.readwrite.password
- name: DB_ADMIN_USERNAME
valueFrom:
secretKeyRef:
- name: {{
.Release.Name
}}-so-db-secrets
+ name: {{
include "common.release" .
}}-so-db-secrets
key: mariadb.admin.rolename
- name: DB_ADMIN_PASSWORD
valueFrom:
secretKeyRef:
key: mariadb.admin.rolename
- name: DB_ADMIN_PASSWORD
valueFrom:
secretKeyRef:
- name: {{
.Release.Name
}}-so-db-secrets
+ name: {{
include "common.release" .
}}-so-db-secrets
key: mariadb.admin.password
envFrom:
- configMapRef:
key: mariadb.admin.password
envFrom:
- configMapRef: