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

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

This change is based on stackabletech/decisions#84

* chore(template): Update Tiltfile

* chore(template): Adjust Helm templates

Author: Techassi

template/Tiltfile

@@ -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')
+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],
@@ -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,

template/deploy/helm/[[operator]]/templates/_helpers.tpl

@@ -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 }}

template/deploy/helm/[[operator]]/templates/deployment.yaml.j2

@@ -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 }}
 

…ator]]/values/oci.stackable.tech.yaml.j2 …perator]]/values/oci.stackable.tech.yamltemplate/deploy/helm/[[operator]]/values/oci.stackable.tech.yaml.j2 renamed to template/deploy/helm/[[operator]]/values/oci.stackable.tech.yaml template/deploy/helm/[[operator]]/values/oci.stackable.tech.yaml.j2 renamed to template/deploy/helm/[[operator]]/values/oci.stackable.tech.yaml

@@ -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