feat(template/helm): Don't include product repo in core operators

config/repositories.yaml

@@ -6,72 +6,91 @@ repositories:
     pretty_string: Apache Airflow
     product_string: airflow
     url: stackabletech/airflow-operator.git
+
   - name: commons-operator
-    include_productconfig: false
-    has_product: false
     pretty_string: Stackable Commons
     product_string: commons
     url: stackabletech/commons-operator.git
+    config:
+      include_productconfig: false
+      has_product: false
+
   - name: druid-operator
     pretty_string: Apache Druid
     product_string: druid
     url: stackabletech/druid-operator.git
+
   - name: hbase-operator
     pretty_string: Apache HBase
     product_string: hbase
     url: stackabletech/hbase-operator.git
+
   - name: hdfs-operator
     pretty_string: Apache HDFS
     product_string: hdfs
     url: stackabletech/hdfs-operator.git
+
   - name: hive-operator
     pretty_string: Apache Hive
     product_string: hive
     url: stackabletech/hive-operator.git
+
   - name: kafka-operator
     pretty_string: Apache Kafka
     product_string: kafka
     url: stackabletech/kafka-operator.git
+
   - name: nifi-operator
     pretty_string: Apache NiFi
     product_string: nifi
     url: stackabletech/nifi-operator.git
+
   - name: listener-operator
-    include_productconfig: false
-    has_product: false
     pretty_string: Stackable Listener Operator
     product_string: listener-operator
-    run_as: custom
     url: stackabletech/listener-operator.git
+    config:
+      include_productconfig: false
+      has_product: false
+      run_as: custom
+
   - name: opa-operator
-    extra_crates:
-      - stackable-opa-bundle-builder
     pretty_string: OpenPolicyAgent
     product_string: opa
     url: stackabletech/opa-operator.git
+    config:
+      extra_crates:
+        - stackable-opa-bundle-builder
+
   - name: opensearch-operator
     pretty_string: OpenSearch
     product_string: opensearch
     url: stackabletech/opensearch-operator.git
+
   - name: secret-operator
-    include_productconfig: false
-    has_product: false
     pretty_string: Stackable Secret Operator
     product_string: secret-operator
-    run_as: custom
     url: stackabletech/secret-operator.git
+    config:
+      include_productconfig: false
+      has_product: false
+      run_as: custom
+
   - name: spark-k8s-operator
     pretty_string: Apache Spark-on-Kubernetes
     product_string: spark-k8s
     url: stackabletech/spark-k8s-operator.git
+
   - name: superset-operator
     pretty_string: Apache Superset
     product_string: superset
     url: stackabletech/superset-operator.git
+
   - name: trino-operator
     pretty_string: Trino
     product_string: trino
     url: stackabletech/trino-operator.git
+
   - name: zookeeper-operator
     pretty_string: Apache ZooKeeper
     product_string: zookeeper

template/.github/ISSUE_TEMPLATE/02-bug_report.yml.j2

@@ -12,7 +12,7 @@ body:
       label: Affected Stackable version
       description: Which version of the Stackable Operator do you see this bug in?
 
-  # {[%- if operator.has_product | default(true) +%}]
+  # {[%- if operator.config.has_product | default(true) +%}]
   - type: input
     attributes:
       label: Affected {[ operator.pretty_string }] version

template/Tiltfile → template/Tiltfile.j2

@@ -12,9 +12,11 @@ registry = settings.get('default_registry', 'oci.stackable.tech')
 operator_repository = settings.get('default_operator_repository', registry + '/' + 'sandbox')
 operator_image_name = operator_repository + '/' + operator_name
 
+{[% if operator.config.has_product | default(true) %}]
 # 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')
+{[%- endif %}]
 
 # Configure default registry either read from config file above, or with default value of
 # "oci.stackable.tech"
@@ -41,15 +43,19 @@ 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
+{[% if operator.config.has_product | default(true) %}]
 helm_override_product_image_repository = 'image.productRepository=' + product_repository
+{[% endif %}]
 
 k8s_yaml(helm(
    'deploy/helm/' + operator_name,
    name=operator_name,
    namespace="stackable-operators",
    set=[
       helm_override_operator_image_repository,
+{[% if operator.config.has_product | default(true) %}]
       helm_override_product_image_repository,
+{[% endif %}]
    ],
    values=helm_values,
 ))

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

@@ -1,4 +1,4 @@
-{[% if operator.run_as is undefined or operator.run_as == "deployment" %}]
+{[% if operator.config.run_as is undefined or operator.config.run_as == "deployment" %}]
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -71,9 +71,15 @@ spec:
             - name: OPERATOR_SERVICE_NAME
               value: {{ include "operator.fullname" . }}
 
+{[% if operator.config.has_product | default(true) %}]
             # The product image repository, like "oci.stackable.tech/sdp".
             - name: IMAGE_REPOSITORY
               value: {{ .Values.image.productRepository | default .Values.image.repository }}
+{[% else %}]
+            # The image repository, like "oci.stackable.tech/sdp".
+            - name: IMAGE_REPOSITORY
+              value: {{ .Values.image.repository }}
+{[% endif %}]
 
             # Operators need to know the node name they are running on, to e.g. discover the
             # Kubernetes domain name from the kubelet API.

template/docker/Dockerfile.j2

@@ -191,7 +191,7 @@ COPY LICENSE /licenses/LICENSE
 
 COPY --from=builder --chown=${STACKABLE_USER_UID}:0 /app/* /usr/local/bin/
 
-{[% if operator.include_productconfig is undefined or operator.include_productconfig == true %}]
+{[% if operator.config.include_productconfig is undefined or operator.config.include_productconfig == true %}]
 COPY deploy/config-spec/properties.yaml /etc/stackable/{[ operator.name }]/config-spec/properties.yaml
 {[% endif %}]