Skip to content

Commit c910153

Browse files
committed
chore(template): Update Tiltfile
1 parent 6315b28 commit c910153

1 file changed

Lines changed: 6 additions & 7 deletions

File tree

template/Tiltfile

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,18 @@
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 value from it
5+
# If tilt_options.json exists read it and load the default_registry and default_repository value from it
66
settings = read_json('tilt_options.json', default={})
77
registry = settings.get('default_registry', 'oci.stackable.tech')
8-
repository = settings.get('default_repository', 'sandbox' + '/' + operator_name)
8+
repository = settings.get('default_repository', registry + '/' + 'sdp')
9+
operator_image_name = repository + '/' + operator_name
910

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

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

33-
helm_override_image_registry = 'image.registry=' + registry
3434
helm_override_image_repository = 'image.repository=' + repository
3535

3636
k8s_yaml(helm(
3737
'deploy/helm/' + operator_name,
3838
name=operator_name,
3939
namespace="stackable-operators",
4040
set=[
41-
helm_override_image_registry,
4241
helm_override_image_repository,
4342
],
4443
values=helm_values,

0 commit comments

Comments
 (0)