Skip to content

chore(template): Combine keys in registry-specific values file #587

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Techassi merged 3 commits into from
Apr 23, 2026
Merged

chore(template): Combine keys in registry-specific values file #587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6315b28
chore(template): Combine keys in registry-specific values file
Techassi Apr 22, 2026
c910153
chore(template): Update Tiltfile
Techassi Apr 22, 2026
2e8c341
chore(template): Adjust Helm templates
Techassi Apr 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions template/Tiltfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,18 @@
meta = read_json('nix/meta.json')
operator_name = meta['operator']['name']

# If tilt_options.json exists read it and load the default_registry value from it
# If tilt_options.json exists read it and load the default_registry and default_repository value from it
settings = read_json('tilt_options.json', default={})
registry = settings.get('default_registry', 'oci.stackable.tech')
repository = settings.get('default_repository', 'sandbox' + '/' + operator_name)
repository = settings.get('default_repository', registry + '/' + 'sdp')
Copy link
Copy Markdown
Member

@NickLarsenNZ NickLarsenNZ May 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It turns out this breaks local development.

We don't want to push the operator image to sdp, but instead sandbox, but when I change it locally to sandbox the the product images fail to pull because they get set to: oci.stackable.tech/sandbox/kafka:3.9.1-stackable0.0.0-dev - but I want them to be at sdp.

I think we need to separate the concept of the operator image prefix/repo and the product prefix/repo.

operator_image_name = repository + '/' + operator_name

# Configure default registry either read from config file above, or with default value of "oci.stackable.tech/sandbox"
# Configure default registry either read from config file above, or with default value of "oci.stackable.tech"
default_registry(registry)

custom_build(
registry + '/' + repository,
'make regenerate-nix && nix-build . -A docker --argstr dockerName "${EXPECTED_REGISTRY}/' + repository + '" && ./result/load-image | docker load',
operator_image_name,
'make regenerate-nix && nix-build . -A docker --argstr dockerName "' + operator_image_name + '" && ./result/load-image | docker load',
deps=['rust', 'Cargo.toml', 'Cargo.lock', 'default.nix', "nix", 'build.rs', 'vendor'],
ignore=['*.~undo-tree~'],
# ignore=['result*', 'Cargo.nix', 'target', *.yaml],
Expand All @@ -30,15 +31,13 @@ k8s_kind('DaemonSet', image_json_path='{.spec.template.metadata.annotations.inte
# supported by helm(set).
helm_values = settings.get('helm_values', None)

helm_override_image_registry = 'image.registry=' + registry
helm_override_image_repository = 'image.repository=' + repository

k8s_yaml(helm(
'deploy/helm/' + operator_name,
name=operator_name,
namespace="stackable-operators",
set=[
helm_override_image_registry,
helm_override_image_repository,
],
values=helm_values,
Expand Down
2 changes: 1 addition & 1 deletion template/deploy/helm/[[operator]]/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,5 +82,5 @@ helm.sh/test: {{ include "operator.chart" . }}
Build the full container image reference.
*/}}
{{- define "operator.image" -}}
{{- printf "%s/%s:%s" .Values.image.registry .Values.image.repository (.Values.image.tag | default .Chart.AppVersion) -}}
{{- printf "%s/%s:%s" .Values.image.repository .Chart.Name (.Values.image.tag | default .Chart.AppVersion) -}}
{{- end }}
7 changes: 1 addition & 6 deletions template/deploy/helm/[[operator]]/templates/deployment.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,7 @@ spec:
- name: OPERATOR_SERVICE_NAME
value: {{ include "operator.fullname" . }}

# The URI of the image registry, like "oci.stackable.tech". Used to derive product image
# name.
- name: IMAGE_REGISTRY_URI
value: {{ .Values.image.registry }}

# The image repository, like "sdp/airflow-operator"
# The image repository, like "oci.stackable.tech/sdp"
- name: IMAGE_REPOSITORY
value: {{ .Values.image.repository }}

Expand Down
3 changes: 1 addition & 2 deletions ...rator]]/values/oci.stackable.tech.yaml.j2 → ...operator]]/values/oci.stackable.tech.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
---
# Values overlay for chart packages published to oci.stackable.tech.
image:
registry: oci.stackable.tech
repository: sdp/{[ operator.name }]
repository: oci.stackable.tech/sdp