Skip to content

Commit 84b44f8

Browse files
nicolasparadagithub-actions[bot]
authored andcommitted
ci: update Core Operator chart from latest version internally
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
1 parent 1f30601 commit 84b44f8

File tree

3 files changed

+58
-15
lines changed

3 files changed

+58
-15
lines changed

charts/core-instance/templates/deployment.yaml

+22
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ metadata:
99
{{- end }}
1010
labels:
1111
app.kubernetes.io/instance: {{ .Values.coreInstance }}
12+
app.kubernetes.io/part-of: calyptia
13+
calyptia.core: core-instance
1214
spec:
1315
replicas: {{ default 1 .Values.replicas }}
1416
selector:
@@ -23,6 +25,7 @@ spec:
2325
{{- end }}
2426
labels:
2527
app.kubernetes.io/part-of: calyptia
28+
calyptia.core: core-instance
2629
spec:
2730
serviceAccount: {{ template "instance.serviceAccountName" . }}
2831
containers:
@@ -80,6 +83,13 @@ spec:
8083
{{- if .Values.fromCloud.resources }}
8184
resources: {{- toYaml .Values.fromCloud.resources | nindent 12 }}
8285
{{- end }}
86+
volumeMounts:
87+
{{- if .Values.extraVolumeMounts }}
88+
{{- include "common.tplvalues.render" (dict "value" .Values.extraVolumeMounts "context" $) | nindent 12 }}
89+
{{- end }}
90+
{{- if .Values.fromCloud.extraVolumeMounts }}
91+
{{- include "common.tplvalues.render" (dict "value" .Values.fromCloud.extraVolumeMounts "context" $) | nindent 12 }}
92+
{{- end }}
8393
- env:
8494
- name: CORE_INSTANCE
8595
value: {{ default .Release.Name .Values.coreInstance | quote }}
@@ -121,6 +131,13 @@ spec:
121131
ports:
122132
- containerPort: {{ .Values.metricsPort | int }}
123133
name: metrics
134+
volumeMounts:
135+
{{- if .Values.extraVolumeMounts }}
136+
{{- include "common.tplvalues.render" (dict "value" .Values.extraVolumeMounts "context" $) | nindent 12 }}
137+
{{- end }}
138+
{{- if .Values.toCloud.extraVolumeMounts }}
139+
{{- include "common.tplvalues.render" (dict "value" .Values.toCloud.extraVolumeMounts "context" $) | nindent 12 }}
140+
{{- end }}
124141
{{- if .Values.calyptiaTolerations }}
125142
tolerations:
126143
{{- $tolerations := .Values.calyptiaTolerations | split "," }}
@@ -136,4 +153,9 @@ spec:
136153
{{- end }}
137154
{{- end }}
138155
{{- end }}
156+
volumes:
157+
{{- if .Values.extraVolumes }}
158+
{{- include "common.tplvalues.render" (dict "value" .Values.extraVolumes "context" $) | nindent 8 }}
159+
{{- end }}
160+
restartPolicy: {{ default "Always" .Values.restartPolicy }}
139161
{{- end }}

charts/core-operator/templates/manager.yaml

+22-14
Original file line numberDiff line numberDiff line change
@@ -42,26 +42,28 @@ spec:
4242
- /manager
4343
image: {{ template "operator.image" . }}
4444
imagePullPolicy: {{ .Values.global.pullPolicy | quote }}
45-
livenessProbe:
46-
httpGet:
47-
path: /healthz
48-
port: 8081
49-
initialDelaySeconds: 15
50-
periodSeconds: 20
45+
volumeMounts:
46+
{{- if .Values.extraVolumeMounts }}
47+
{{- include "common.tplvalues.render" (dict "value" .Values.extraVolumeMounts "context" $) | nindent 12 }}
48+
{{- end }}
49+
{{- if .Values.startupProbe }}
50+
startupProbe: {{- toYaml .Values.startupProbe | nindent 12 }}
51+
{{- end }}
52+
{{- if .Values.readinessProbe }}
53+
readinessProbe: {{- toYaml .Values.readinessProbe | nindent 12 }}
54+
{{- end }}
55+
{{- if .Values.livenessProbe }}
56+
livenessProbe: {{- toYaml .Values.livenessProbe | nindent 12 }}
57+
{{- end }}
5158
name: manager
5259
ports:
5360
- containerPort: 8443
5461
name: https
5562
- containerPort: 8081
5663
name: http
57-
readinessProbe:
58-
httpGet:
59-
path: /readyz
60-
port: 8081
61-
initialDelaySeconds: 5
62-
periodSeconds: 10
63-
resources:
64-
{{- toYaml .Values.resources | nindent 12 }}
64+
{{- if .Values.resources }}
65+
resources: {{- toYaml .Values.resources | nindent 12 }}
66+
{{- end }}
6567
securityContext:
6668
allowPrivilegeEscalation: false
6769
capabilities:
@@ -72,4 +74,10 @@ spec:
7274
serviceAccount: {{ template "operator.serviceAccountName" . }}
7375
{{- include "operator.imagePullSecrets" . | nindent 6 }}
7476
terminationGracePeriodSeconds: 10
77+
volumes:
78+
{{- if .Values.extraVolumes }}
79+
{{- include "common.tplvalues.render" (dict "value" .Values.extraVolumes "context" $) | nindent 8 }}
80+
{{- end }}
81+
restartPolicy: {{ default "Always" .Values.restartPolicy }}
82+
7583
{{- end }}

charts/core-operator/values.yaml

+14-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ images:
44
operator:
55
registry: ghcr.io
66
repository: calyptia/core-operator
7-
tag: 3.2.1
7+
tag: 3.3.0
88
pullSecrets: []
99
hotReload:
1010
registry: ghcr.io
@@ -64,3 +64,16 @@ resources:
6464
requests:
6565
cpu: 10m
6666
memory: 64Mi
67+
readinessProbe:
68+
httpGet:
69+
path: /readyz
70+
port: 8081
71+
initialDelaySeconds: 5
72+
periodSeconds: 10
73+
livenessProbe:
74+
httpGet:
75+
path: /healthz
76+
port: 8081
77+
initialDelaySeconds: 15
78+
periodSeconds: 20
79+
restartPolicy: Always

0 commit comments

Comments
 (0)