From 466938444d5d4bd860fc1d564a8ebb628c36e1b3 Mon Sep 17 00:00:00 2001 From: Stacky McStackface Date: Wed, 22 Oct 2025 08:54:20 +0000 Subject: [PATCH] chore: Generated commit to update templated files since the last template run up to stackabletech/operator-templating@b85dfd3f41085a3cff3a518c7658c7eede378550 Reference-to: stackabletech/operator-templating@b85dfd3 (Helm values for EOS checker, Tilt allows custom helm values via file) --- .github/workflows/integration-test.yml | 3 ++- .vscode/launch.json | 8 ++----- Tiltfile | 11 ++++++++- .../kafka-operator/templates/_maintenance.tpl | 23 +++++++++++++++++++ 4 files changed, 37 insertions(+), 8 deletions(-) create mode 100644 deploy/helm/kafka-operator/templates/_maintenance.tpl diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index c3aa54ff..4bb90cc0 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -15,7 +15,8 @@ on: - profile - custom test-mode-input: - description: The profile or the runner used + description: | + The profile or the runner used. Eg: `smoke-latest` or `amd64` (see test/interu.yaml) required: true test-suite: description: Name of the test-suite. Only used if test-mode is `custom` diff --git a/.vscode/launch.json b/.vscode/launch.json index 8c151dc2..e2a19cfd 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -6,17 +6,13 @@ "request": "launch", "name": "Debug operator binary", "cargo": { - "args": [ - "build" - ], + "args": ["build"], "filter": { "name": "stackable-{[ operator.name }]", "kind": "bin" } }, - "args": [ - "run" - ], + "args": ["run"], "cwd": "${workspaceFolder}" } ] diff --git a/Tiltfile b/Tiltfile index fb84bcc0..ee0941c3 100644 --- a/Tiltfile +++ b/Tiltfile @@ -26,6 +26,14 @@ if os.path.exists('result'): # oci.stackable.tech/sandbox/opa-operator:7y19m3d8clwxlv34v5q2x4p7v536s00g instead of # oci.stackable.tech/sandbox/opa-operator:0.0.0-dev (which does not exist) k8s_kind('Deployment', image_json_path='{.spec.template.metadata.annotations.internal\\.stackable\\.tech/image}') +k8s_kind('DaemonSet', image_json_path='{.spec.template.metadata.annotations.internal\\.stackable\\.tech/image}') + +# Optionally specify a custom Helm values file to be passed to the Helm deployment below. +# This file can for example be used to set custom telemetry options (like log level) which is not +# supported by helm(set). +helm_values = settings.get('helm_values', None) + +helm_override_image_repository = 'image.repository=' + registry + '/' + operator_name # Exclude stale CRDs from Helm chart, and apply the rest helm_crds, helm_non_crds = filter_yaml( @@ -34,8 +42,9 @@ helm_crds, helm_non_crds = filter_yaml( name=operator_name, namespace="stackable-operators", set=[ - 'image.repository=' + registry + '/' + operator_name, + helm_override_image_repository, ], + values=helm_values, ), api_version = "^apiextensions\\.k8s\\.io/.*$", kind = "^CustomResourceDefinition$", diff --git a/deploy/helm/kafka-operator/templates/_maintenance.tpl b/deploy/helm/kafka-operator/templates/_maintenance.tpl new file mode 100644 index 00000000..85afd7f2 --- /dev/null +++ b/deploy/helm/kafka-operator/templates/_maintenance.tpl @@ -0,0 +1,23 @@ +{{/* +Create a list of maintenance related env vars. +*/}} +{{- define "maintenance.envVars" -}} +{{- with .Values.maintenance }} +{{- if not .endOfSupportCheck.enabled }} +- name: EOS_DISABLED + value: "true" +{{- end }} +{{- if and .endOfSupportCheck.enabled .endOfSupportCheck.mode }} +- name: EOS_CHECK_MODE + value: {{ .endOfSupportCheck.mode }} +{{ end }} +{{- if and .endOfSupportCheck.enabled .endOfSupportCheck.interval }} +- name: EOS_INTERVAL + value: {{ .endOfSupportCheck.interval }} +{{ end }} +{{- if not .customResourceDefinitions.maintain }} +- name: DISABLE_CRD_MAINTENANCE + value: "true" +{{- end }} +{{- end }} +{{- end }}