Skip to content

Commit 6c2685d

Browse files
committed
feat(helm): Set image registry and repository env vars on Deployment
1 parent bb3ff8d commit 6c2685d

2 files changed

Lines changed: 21 additions & 8 deletions

File tree

Tiltfile

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
1-
# If tilt_options.json exists read it and load the default_registry value from it
1+
# Load the metadata first, so that we immediately get access to the operator name
2+
meta = read_json('nix/meta.json')
3+
operator_name = meta['operator']['name']
4+
5+
# If tilt_options.json exists read it and load the default_registry and default_repository value from it
26
settings = read_json('tilt_options.json', default={})
3-
registry = settings.get('default_registry', 'oci.stackable.tech/sandbox')
7+
registry = settings.get('default_registry', 'oci.stackable.tech')
8+
repository = settings.get('default_repository', 'sandbox' + '/' + operator_name)
49

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

8-
meta = read_json('nix/meta.json')
9-
operator_name = meta['operator']['name']
10-
1113
custom_build(
12-
registry + '/' + operator_name,
13-
'make regenerate-nix && nix-build . -A docker --argstr dockerName "${EXPECTED_REGISTRY}/' + operator_name + '" && ./result/load-image | docker load',
14+
registry + '/' + repository,
15+
'make regenerate-nix && nix-build . -A docker --argstr dockerName "${EXPECTED_REGISTRY}/' + repository + '" && ./result/load-image | docker load',
1416
deps=['rust', 'Cargo.toml', 'Cargo.lock', 'default.nix', "nix", 'build.rs', 'vendor'],
1517
ignore=['*.~undo-tree~'],
1618
# ignore=['result*', 'Cargo.nix', 'target', *.yaml],
@@ -28,13 +30,15 @@ k8s_kind('DaemonSet', image_json_path='{.spec.template.metadata.annotations.inte
2830
# supported by helm(set).
2931
helm_values = settings.get('helm_values', None)
3032

31-
helm_override_image_repository = 'image.repository=' + registry + '/' + operator_name
33+
helm_override_image_registry = 'image.registry=' + registry
34+
helm_override_image_repository = 'image.repository=' + repository
3235

3336
k8s_yaml(helm(
3437
'deploy/helm/' + operator_name,
3538
name=operator_name,
3639
namespace="stackable-operators",
3740
set=[
41+
helm_override_image_registry,
3842
helm_override_image_repository,
3943
],
4044
values=helm_values,

deploy/helm/airflow-operator/templates/deployment.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,15 @@ spec:
7070
- name: OPERATOR_SERVICE_NAME
7171
value: {{ include "operator.fullname" . }}
7272

73+
# The URI of the image registry, like "oci.stackable.tech". Used to derive product image
74+
# name.
75+
- name: IMAGE_REGISTRY_URI
76+
value: {{ .Values.image.registry }}
77+
78+
# The image repository, like "sdp/airflow-operator"
79+
- name: IMAGE_REPOSITORY
80+
value: {{ .Values.image.repository }}
81+
7382
# Operators need to know the node name they are running on, to e.g. discover the
7483
# Kubernetes domain name from the kubelet API.
7584
- name: KUBERNETES_NODE_NAME

0 commit comments

Comments
 (0)