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 "create K8S cluster by TOSCA"
[oom.git]
/
kubernetes
/
policy
/
templates
/
dep-maria.yaml
diff --git
a/kubernetes/policy/templates/dep-maria.yaml
b/kubernetes/policy/templates/dep-maria.yaml
index
30d0db3
..
c921e8c
100644
(file)
--- a/
kubernetes/policy/templates/dep-maria.yaml
+++ b/
kubernetes/policy/templates/dep-maria.yaml
@@
-1,10
+1,10
@@
+#{{ if not .Values.disablePolicyMariadb }}
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: mariadb
namespace: "{{ .Values.nsPrefix }}-policy"
spec:
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: mariadb
namespace: "{{ .Values.nsPrefix }}-policy"
spec:
- replicas: 1
selector:
matchLabels:
app: mariadb
selector:
matchLabels:
app: mariadb
@@
-15,26
+15,24
@@
spec:
spec:
hostname: mariadb
containers:
spec:
hostname: mariadb
containers:
- - command:
- - /bin/bash
- - -c
- - exec bash /tmp/do-start.sh
- image: "{{ .Values.image.policyDb }}:{{ .Values.image.policyDbVersion }}"
+ - image: "{{ .Values.image.policyDb }}:{{ .Values.image.policyDbVersion }}"
imagePullPolicy: {{ .Values.pullPolicy }}
name: mariadb
ports:
- containerPort: 3306
volumeMounts:
imagePullPolicy: {{ .Values.pullPolicy }}
name: mariadb
ports:
- containerPort: 3306
volumeMounts:
- - mountPath: /var/lib/mysql
- name: policy-mariadb-data
+ - mountPath: /etc/localtime
+ name: localtime
+ readOnly: true
readinessProbe:
tcpSocket:
port: 3306
initialDelaySeconds: 5
periodSeconds: 10
volumes:
readinessProbe:
tcpSocket:
port: 3306
initialDelaySeconds: 5
periodSeconds: 10
volumes:
- - name:
policy-mariadb-data
-
persistentVolumeClaim
:
- claimName: policy-db
+ - name:
localtime
+
hostPath
:
+ path: /etc/localtime
imagePullSecrets:
- name: "{{ .Values.nsPrefix }}-docker-registry-key"
imagePullSecrets:
- name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
\ No newline at end of file