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 "[COMMON/elasticsearch] Avoid 'Warning: Merging destination map for chart'"
[oom.git]
/
kubernetes
/
appc
/
templates
/
statefulset.yaml
diff --git
a/kubernetes/appc/templates/statefulset.yaml
b/kubernetes/appc/templates/statefulset.yaml
index
3480e63
..
23aef1d
100644
(file)
--- a/
kubernetes/appc/templates/statefulset.yaml
+++ b/
kubernetes/appc/templates/statefulset.yaml
@@
-12,7
+12,7
@@
# See the License for the specific language governing permissions and
# limitations under the License.
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: apps/v1
beta1
+apiVersion: apps/v1
kind: StatefulSet
metadata:
name: {{ include "common.fullname" . }}
kind: StatefulSet
metadata:
name: {{ include "common.fullname" . }}
@@
-23,6
+23,9
@@
metadata:
release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
spec:
release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
spec:
+ selector:
+ matchLabels:
+ app: {{ include "common.name" . }}
serviceName: "{{ .Values.service.name }}-cluster"
replicas: {{ .Values.replicaCount }}
podManagementPolicy: Parallel
serviceName: "{{ .Values.service.name }}-cluster"
replicas: {{ .Values.replicaCount }}
podManagementPolicy: Parallel
@@
-70,7
+73,7
@@
spec:
- name: {{ include "common.name" . }}-readiness
command:
- name: {{ include "common.name" . }}-readiness
command:
- - /
root
/ready.py
+ - /
app
/ready.py
args:
- --container-name
- {{.Values.config.mariadbGaleraContName}}
args:
- --container-name
- {{.Values.config.mariadbGaleraContName}}
@@
-80,7
+83,7
@@
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 }}
- name: {{ include "common.name" . }}-chown
image: "busybox"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
- name: {{ include "common.name" . }}-chown
image: "busybox"