summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
970079a)
Fixes in helmcharts which are not detected by helm, but kustomize in
common, CDS, POLICY, SDC, SO
Issue-ID: OOM-3200
Issue-ID: OOM-3201
Issue-ID: OOM-3202
Issue-ID: OOM-3203
Issue-ID: OOM-3204
Issue-ID: OOM-3205
Issue-ID: OOM-3206
Issue-ID: OOM-3207
Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de>
Change-Id: I8416726693d6606d936aaf4cfe2c097752689c29
13 files changed:
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
spec:
type: {{ .Values.service.http.type }}
ports:
spec:
type: {{ .Values.service.http.type }}
ports:
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
spec:
type: {{ .Values.service.grpc.type }}
ports:
spec:
type: {{ .Values.service.grpc.type }}
ports:
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
spec:
type: {{ .Values.service.cluster.type }}
ports:
spec:
type: {{ .Values.service.cluster.type }}
ports:
type: {{ .Values.updateStrategy.type }}
template:
metadata: {{- include "common.templateMetadata" . | nindent 6 }}
type: {{ .Values.updateStrategy.type }}
template:
metadata: {{- include "common.templateMetadata" . | nindent 6 }}
- {{- if or .Values.podAnnotations (and .Values.metrics.serviceMonitor.enabled .Values.metrics.podAnnotations) }}
- annotations:
- {{- if .Values.podAnnotations }}
- {{- include "common.tplValue" (dict "value" .Values.podAnnotations "context" $) | nindent 8 }}
- {{- end }}
- {{- if and .Values.metrics.serviceMonitor.enabled .Values.metrics.podAnnotations }}
- {{- include "common.tplValue" (dict "value" .Values.metrics.podAnnotations "context" $) | nindent 8 }}
- {{- end }}
- {{- end }}
spec:
hostNetwork: {{ .Values.hostNetwork }}
imagePullSecrets:
spec:
hostNetwork: {{ .Values.hostNetwork }}
imagePullSecrets:
traffic.sidecar.istio.io/excludeInboundPorts: "7000,7001"
traffic.sidecar.istio.io/includeInboundPorts: '*'
traffic.sidecar.istio.io/excludeOutboundPorts: "7000,7001"
traffic.sidecar.istio.io/excludeInboundPorts: "7000,7001"
traffic.sidecar.istio.io/includeInboundPorts: '*'
traffic.sidecar.istio.io/excludeOutboundPorts: "7000,7001"
+ prometheus.io/scrape: 'true'
+ prometheus.io/port: '8080'
+
podManagementPolicy: OrderedReady
updateStrategy:
type: RollingUpdate
podManagementPolicy: OrderedReady
updateStrategy:
type: RollingUpdate
metadata:
annotations:
service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
metadata:
annotations:
service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
name: {{ include "common.servicename" . }}
labels:
heritage: "{{ .Release.Service }}"
name: {{ include "common.servicename" . }}
labels:
heritage: "{{ .Release.Service }}"
matchLabels:
app.kubernetes.io/name: {{ include "common.servicename" . }}
portLevelMtls:
matchLabels:
app.kubernetes.io/name: {{ include "common.servicename" . }}
portLevelMtls:
- {{ .Values.service.internalPort }}:
+ '{{ .Values.service.internalPort }}':
mode: DISABLE
{{- end}}
{{- end}}
mode: DISABLE
{{- end}}
{{- end}}
value: "{{ .Values.config.pgDatabase }}"
- name: PG_ROOT_PASSWORD_INPUT
{{- include "common.secret.envFromSecretFast" (dict "global" . "uid" (include "common.postgres.secret.rootPassUID" .) "key" "password") | indent 10 }}
value: "{{ .Values.config.pgDatabase }}"
- name: PG_ROOT_PASSWORD_INPUT
{{- include "common.secret.envFromSecretFast" (dict "global" . "uid" (include "common.postgres.secret.rootPassUID" .) "key" "password") | indent 10 }}
- volumeMounts:
- - mountPath: /config-input/setup.sql
- name: config
- subPath: setup.sql
- - mountPath: /config
- name: pgconf
image: {{ include "repositoryGenerator.image.postgres" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-update-config
image: {{ include "repositoryGenerator.image.postgres" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-update-config
release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
data:
release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
data:
-{{ tpl (.Files.Glob "resources/config/*.{xml,yaml}").AsConfig . | indent 2 }}
{{- if .Values.a1pmsconfig }}
{{ tpl (.Files.Glob "resources/config/A1pmsParticipantParameters.yaml").AsConfig . | indent 2 }}
{{ toYaml .Values.a1pmsconfig | indent 4 }}
{{- if .Values.a1pmsconfig }}
{{ tpl (.Files.Glob "resources/config/A1pmsParticipantParameters.yaml").AsConfig . | indent 2 }}
{{ toYaml .Values.a1pmsconfig | indent 4 }}
-{{ tpl (.Files.Glob "resources/config/*.{json,xml,sh}").AsConfig . | indent 2 }}
+{{ tpl (.Files.Glob "resources/config/*.{json,xml,sh}").AsConfig . | indent 2 }}
release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
data:
release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
data:
-{{ tpl (.Files.Glob "resources/config/*.{xml,yaml}").AsConfig . | indent 2 }}
{{- if .Values.repoList }}
{{ tpl (.Files.Glob "resources/config/KubernetesParticipantParameters.yaml").AsConfig . | indent 2 }}
{{ toYaml .Values.repoList | indent 4 }}
{{- if .Values.repoList }}
{{ tpl (.Files.Glob "resources/config/KubernetesParticipantParameters.yaml").AsConfig . | indent 2 }}
{{ toYaml .Values.repoList | indent 4 }}
-{{ tpl (.Files.Glob "resources/config/*.{json,xml,sh}").AsConfig . | indent 2 }}
-{{- end }}
\ No newline at end of file
+{{- end }}
+{{ tpl (.Files.Glob "resources/config/*.{json,xml,sh}").AsConfig . | indent 2 }}
\ No newline at end of file
timeoutSeconds: {{ .Values.readiness.timeoutSeconds }}
successThreshold: {{ .Values.readiness.successThreshold }}
failureThreshold: {{ .Values.readiness.failureThreshold }}
timeoutSeconds: {{ .Values.readiness.timeoutSeconds }}
successThreshold: {{ .Values.readiness.successThreshold }}
failureThreshold: {{ .Values.readiness.failureThreshold }}
- resources: {{ include "common.resources" . | nindent 12 }}
startupProbe:
httpGet:
path: /sdc2/rest/healthCheck
startupProbe:
httpGet:
path: /sdc2/rest/healthCheck
emptyDir: {}
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
emptyDir: {}
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
name: {{ include "common.release" . }}-sdc-cqlshrc
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
name: {{ include "common.release" . }}-sdc-cqlshrc
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
name: {{ include "common.release" . }}-sdc-cqlshrc
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
name: {{ include "common.release" . }}-sdc-cqlshrc
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
- name: config
mountPath: /app/config
readOnly: true
- name: config
mountPath: /app/config
readOnly: true
- name: encoder
mountPath: /input
livenessProbe:
- name: encoder
mountPath: /input
livenessProbe: