Skip to content

Commit 1a8283d

Browse files
chore(helm): Exclude product image repository for core operators (#390)
chore: Generated commit to update templated files since the last template run up to stackabletech/operator-templating@95539aa Reference-to: stackabletech/operator-templating@95539aa (Part of stackabletech/issues#716)
1 parent ab770df commit 1a8283d

5 files changed

Lines changed: 16 additions & 10 deletions

File tree

Tiltfile

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,19 @@
22
meta = read_json('nix/meta.json')
33
operator_name = meta['operator']['name']
44

5-
# If tilt_options.json exists read it and load the default_registry and default_repository value from it
5+
# If tilt_options.json exists read it and load the default_registry, default_operator_repository,
6+
# and default_product_repository value from it
67
settings = read_json('tilt_options.json', default={})
78
registry = settings.get('default_registry', 'oci.stackable.tech')
8-
repository = settings.get('default_repository', registry + '/' + 'sdp')
9-
operator_image_name = repository + '/' + operator_name
109

11-
# Configure default registry either read from config file above, or with default value of "oci.stackable.tech"
10+
# Construct the operator image repository. It uses the "sandbox" instead of the "sdp" namespace to
11+
# separate "testing/local" images from official (published) images.
12+
operator_repository = settings.get('default_operator_repository', registry + '/' + 'sandbox')
13+
operator_image_name = operator_repository + '/' + operator_name
14+
15+
16+
# Configure default registry either read from config file above, or with default value of
17+
# "oci.stackable.tech"
1218
default_registry(registry)
1319

1420
custom_build(
@@ -31,14 +37,14 @@ k8s_kind('DaemonSet', image_json_path='{.spec.template.metadata.annotations.inte
3137
# supported by helm(set).
3238
helm_values = settings.get('helm_values', None)
3339

34-
helm_override_image_repository = 'image.repository=' + repository
40+
helm_override_operator_image_repository = 'image.repository=' + operator_repository
3541

3642
k8s_yaml(helm(
3743
'deploy/helm/' + operator_name,
3844
name=operator_name,
3945
namespace="stackable-operators",
4046
set=[
41-
helm_override_image_repository,
47+
helm_override_operator_image_repository,
4248
],
4349
values=helm_values,
4450
))

deploy/helm/listener-operator/templates/_helpers.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ helm.sh/test: {{ include "operator.chart" . }}
7979
{{- end }}
8080

8181
{{/*
82-
Build the full container image reference.
82+
Build the full operator container image reference.
8383
*/}}
8484
{{- define "operator.image" -}}
8585
{{- printf "%s/%s:%s" .Values.image.repository .Chart.Name (.Values.image.tag | default .Chart.AppVersion) -}}

docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ ARG STACKABLE_USER_NAME="stackable"
3737
# "-c": Allows the execution of commands passed as a string
3838
SHELL ["/bin/bash", "-euo", "pipefail", "-c"]
3939

40-
# These labels have mostly been superceded by the OpenContainer spec annotations below but it doesn't hurt to include them
40+
# These labels have mostly been superseded by the OpenContainer spec annotations below but it doesn't hurt to include them
4141
# http://label-schema.org/rc1/
4242
LABEL name="Stackable Operator for Stackable Listener Operator"
4343
LABEL maintainer="info@stackable.tech"

nix/meta.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rustfmt.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# This file includes unstable features, so you need to run "cargo +nightly fmt" to format your code.
2-
# It's also ok to use the stable toolchain by simple running "cargo fmt", but using the nigthly formatter is prefered.
2+
# It's also ok to use the stable toolchain by simple running "cargo fmt", but using the nightly formatter is preferred.
33

44
# https://doc.rust-lang.org/nightly/edition-guide/rust-2024/rustfmt-style-edition.html
55
style_edition = "2024"

0 commit comments

Comments
 (0)