Skip to content

Commit fe17308

Browse files
committed
chore: Merge branch 'main' into feat/crd-versioning
2 parents b5ed105 + 0d8cd90 commit fe17308

3 files changed

Lines changed: 29 additions & 3 deletions

File tree

.github/workflows/integration-test.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ on:
1515
- profile
1616
- custom
1717
test-mode-input:
18-
description: The profile or the runner used
18+
description: |
19+
The profile or the runner used. Eg: `smoke-latest` or `amd64` (see test/interu.yaml)
1920
required: true
2021
test-suite:
2122
description: Name of the test-suite. Only used if test-mode is `custom`

Tiltfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,14 @@ k8s_kind('DaemonSet', image_json_path='{.spec.template.metadata.annotations.inte
2828
# supported by helm(set).
2929
helm_values = settings.get('helm_values', None)
3030

31+
helm_override_image_repository = 'image.repository=' + registry + '/' + operator_name
32+
3133
k8s_yaml(helm(
3234
'deploy/helm/' + operator_name,
3335
name=operator_name,
3436
namespace="stackable-operators",
3537
set=[
36-
'image.repository=' + registry + '/' + operator_name,
38+
helm_override_image_repository,
3739
],
38-
values=helm_values
40+
values=helm_values,
3941
))
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{{/*
2+
Create a list of maintenance related env vars.
3+
*/}}
4+
{{- define "maintenance.envVars" -}}
5+
{{- with .Values.maintenance }}
6+
{{- if not .endOfSupportCheck.enabled }}
7+
- name: EOS_DISABLED
8+
value: "true"
9+
{{- end }}
10+
{{- if and .endOfSupportCheck.enabled .endOfSupportCheck.mode }}
11+
- name: EOS_CHECK_MODE
12+
value: {{ .endOfSupportCheck.mode }}
13+
{{ end }}
14+
{{- if and .endOfSupportCheck.enabled .endOfSupportCheck.interval }}
15+
- name: EOS_INTERVAL
16+
value: {{ .endOfSupportCheck.interval }}
17+
{{ end }}
18+
{{- if not .customResourceDefinitions.maintain }}
19+
- name: DISABLE_CRD_MAINTENANCE
20+
value: "true"
21+
{{- end }}
22+
{{- end }}
23+
{{- end }}

0 commit comments

Comments
 (0)