Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "[DMAAP] Add logs to STDOUT"
[oom.git]
/
kubernetes
/
common
/
network-name-gen
/
templates
/
deployment.yaml
diff --git
a/kubernetes/common/network-name-gen/templates/deployment.yaml
b/kubernetes/common/network-name-gen/templates/deployment.yaml
index
b9550c7
..
c97c048
100644
(file)
--- a/
kubernetes/common/network-name-gen/templates/deployment.yaml
+++ b/
kubernetes/common/network-name-gen/templates/deployment.yaml
@@
-14,7
+14,7
@@
# limitations under the License.
*/}}
# limitations under the License.
*/}}
-apiVersion:
extensions/v1beta
1
+apiVersion:
apps/v
1
kind: Deployment
metadata:
name: {{ include "common.fullname" . }}
kind: Deployment
metadata:
name: {{ include "common.fullname" . }}
@@
-26,6
+26,9
@@
metadata:
heritage: {{ .Release.Service }}
spec:
replicas: {{ .Values.replicaCount }}
heritage: {{ .Release.Service }}
spec:
replicas: {{ .Values.replicaCount }}
+ selector:
+ matchLabels:
+ app: {{ include "common.name" . }}
template:
metadata:
labels:
template:
metadata:
labels:
@@
-33,16
+36,14
@@
spec:
release: {{ include "common.release" . }}
spec:
initContainers:
release: {{ include "common.release" . }}
spec:
initContainers:
-{{- if .Values.global.mariadbGalera.localCluster }}
-
-
command:
- - /
root
/ready.py
+ - name: {{ include "common.name" . }}-readiness
+
command:
+ - /
app
/ready.py
args:
args:
+{{- if .Values.global.mariadbGalera.localCluster }}
- --container-name
- {{ index .Values "mariadb-galera" "nameOverride" }}
{{- else }}
- --container-name
- {{ index .Values "mariadb-galera" "nameOverride" }}
{{- else }}
- - command:
- - /root/job_complete.py
- args:
- --job-name
- {{ include "common.release" . }}-{{ index .Values "mariadb-init" "nameOverride" }}-config-job
{{- end }}
- --job-name
- {{ include "common.release" . }}-{{ index .Values "mariadb-init" "nameOverride" }}-config-job
{{- end }}
@@
-52,9
+53,8
@@
spec:
fieldRef:
apiVersion: v1
fieldPath: metadata.namespace
fieldRef:
apiVersion: v1
fieldPath: metadata.namespace
- image: "{{
.Values.global.readinessRepository
}}/{{ .Values.global.readinessImage }}"
+ image: "{{
include "common.repository" .
}}/{{ .Values.global.readinessImage }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
- name: {{ include "common.name" . }}-readiness
containers:
- name: {{ include "common.name" . }}
command:
containers:
- name: {{ include "common.name" . }}
command: