Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 0 additions & 5 deletions Tiltfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ registry = settings.get('default_registry', 'oci.stackable.tech')
operator_repository = settings.get('default_operator_repository', registry + '/' + 'sandbox')
operator_image_name = operator_repository + '/' + operator_name

# For the product image, we wanna use the images in the "sdp" namespace, because "sandbox" doesn't
# contain those images (by default).
product_repository = settings.get('default_product_repository', registry + '/' + 'sdp')

# Configure default registry either read from config file above, or with default value of
# "oci.stackable.tech"
Expand All @@ -41,15 +38,13 @@ k8s_kind('DaemonSet', image_json_path='{.spec.template.metadata.annotations.inte
helm_values = settings.get('helm_values', None)

helm_override_operator_image_repository = 'image.repository=' + operator_repository
helm_override_product_image_repository = 'image.productRepository=' + product_repository

k8s_yaml(helm(
'deploy/helm/' + operator_name,
name=operator_name,
namespace="stackable-operators",
set=[
helm_override_operator_image_repository,
helm_override_product_image_repository,
],
values=helm_values,
))
4 changes: 2 additions & 2 deletions deploy/helm/commons-operator/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@ spec:
- name: OPERATOR_SERVICE_NAME
value: {{ include "operator.fullname" . }}

# The product image repository, like "oci.stackable.tech/sdp".
# The image repository, like "oci.stackable.tech/sdp".
- name: IMAGE_REPOSITORY
value: {{ .Values.image.productRepository | default .Values.image.repository }}
value: {{ .Values.image.repository }}

# Operators need to know the node name they are running on, to e.g. discover the
# Kubernetes domain name from the kubelet API.
Expand Down
2 changes: 1 addition & 1 deletion nix/meta.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading