Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[GENERAL] Use readiness container v3.0.1
[oom.git]
/
kubernetes
/
clamp
/
charts
/
clamp-dash-kibana
/
templates
/
deployment.yaml
diff --git
a/kubernetes/clamp/charts/clamp-dash-kibana/templates/deployment.yaml
b/kubernetes/clamp/charts/clamp-dash-kibana/templates/deployment.yaml
index
31752fc
..
0e5f65c
100644
(file)
--- a/
kubernetes/clamp/charts/clamp-dash-kibana/templates/deployment.yaml
+++ b/
kubernetes/clamp/charts/clamp-dash-kibana/templates/deployment.yaml
@@
-13,7
+13,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:
extensions/v1beta
1
+apiVersion:
apps/v
1
kind: Deployment
metadata:
name: {{ include "common.fullname" . }}
kind: Deployment
metadata:
name: {{ include "common.fullname" . }}
@@
-21,19
+21,22
@@
metadata:
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
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 }}
heritage: {{ .Release.Service }}
spec:
replicas: {{ .Values.replicaCount }}
+ selector:
+ matchLabels:
+ app: {{ include "common.name" . }}
template:
metadata:
labels:
app: {{ include "common.name" . }}
template:
metadata:
labels:
app: {{ include "common.name" . }}
- release: {{
.Release.Name
}}
+ release: {{
include "common.release" .
}}
spec:
initContainers:
- command:
spec:
initContainers:
- command:
- - /
root
/ready.py
+ - /
app
/ready.py
args:
- --container-name
- clamp-dash-es
args:
- --container-name
- clamp-dash-es
@@
-43,7
+46,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" . }}-readiness
containers:
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-readiness
containers:
@@
-68,6
+71,8
@@
spec:
periodSeconds: {{ .Values.liveness.periodSeconds }}
{{ end -}}
env:
periodSeconds: {{ .Values.liveness.periodSeconds }}
{{ end -}}
env:
+ - name: elasticsearch_base_url
+ value: "{{ternary "https" "http" .Values.security.ssl.enabled}}://{{.Values.config.elasticsearchServiceName}}.{{.Release.Namespace}}.svc.cluster.local:{{.Values.config.elasticsearchPort}}"
volumeMounts:
- mountPath: /etc/localtime
name: localtime
volumeMounts:
- mountPath: /etc/localtime
name: localtime
@@
-75,8
+80,6
@@
spec:
- mountPath: /usr/share/kibana/config/kibana.yml
name: {{ include "common.fullname" . }}
subPath: kibana.yml
- mountPath: /usr/share/kibana/config/kibana.yml
name: {{ include "common.fullname" . }}
subPath: kibana.yml
- - name: {{ include "common.fullname" . }}-aaf-pem-certs
- mountPath: /usr/share/kibana/config/keystore/
resources:
{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
resources:
{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
@@
-97,8
+100,5
@@
spec:
items:
- key: kibana.yml
path: kibana.yml
items:
- key: kibana.yml
path: kibana.yml
- - name: {{ include "common.fullname" . }}-aaf-pem-certs
- secret:
- secretName: {{ include "common.fullname" . }}-aaf-pem-keys
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"