Skip to content

Commit 0d8cd90

Browse files
feat: Helm and Tilt improvements (#647)
chore: Generated commit to update templated files since the last template run up to stackabletech/operator-templating@b85dfd3 Reference-to: stackabletech/operator-templating@b85dfd3 (Helm values for EOS checker, Tilt allows custom helm values via file)
1 parent 3ec75d8 commit 0d8cd90

File tree

3 files changed

+34
-2
lines changed

3 files changed

+34
-2
lines changed

.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: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,23 @@ if os.path.exists('result'):
2828
k8s_kind('Deployment', image_json_path='{.spec.template.metadata.annotations.internal\\.stackable\\.tech/image}')
2929
k8s_kind('DaemonSet', image_json_path='{.spec.template.metadata.annotations.internal\\.stackable\\.tech/image}')
3030

31+
# Optionally specify a custom Helm values file to be passed to the Helm deployment below.
32+
# This file can for example be used to set custom telemetry options (like log level) which is not
33+
# supported by helm(set).
34+
helm_values = settings.get('helm_values', None)
35+
36+
helm_override_image_repository = 'image.repository=' + registry + '/' + operator_name
37+
3138
# Exclude stale CRDs from Helm chart, and apply the rest
3239
helm_crds, helm_non_crds = filter_yaml(
3340
helm(
3441
'deploy/helm/' + operator_name,
3542
name=operator_name,
3643
namespace="stackable-operators",
3744
set=[
38-
'image.repository=' + registry + '/' + operator_name,
45+
helm_override_image_repository,
3946
],
47+
values=helm_values,
4048
),
4149
api_version = "^apiextensions\\.k8s\\.io/.*$",
4250
kind = "^CustomResourceDefinition$",
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)