use DEMO and STACK parameter for labels etc.

xeniape · xeniape · commit decf8746eb51 · 2026-03-12T13:37:32.000+01:00
diff --git a/demos/argo-cd-git-ops/manifests/airflow-postgres/sealed-airflow-postgres-credentials.yaml b/demos/argo-cd-git-ops/manifests/airflow-postgres/sealed-airflow-postgres-credentials.yaml
@@ -18,5 +18,5 @@ spec:
       namespace: stackable-airflow
       labels:
         stackable.tech/vendor: Stackable
-        stackable.tech/demo: {{ demoLabel }}
+        stackable.tech/demo: {{ DEMO }}
     type: Opaque
diff --git a/demos/argo-cd-git-ops/manifests/airflow/airflow.yaml b/demos/argo-cd-git-ops/manifests/airflow/airflow.yaml
@@ -5,7 +5,7 @@ metadata:
   name: airflow
   labels:
     stackable.tech/vendor: Stackable
-    stackable.tech/demo: {{ demoLabel }}
+    stackable.tech/demo: {{ DEMO }}
 spec:
   image:
     productVersion: 3.1.6
diff --git a/demos/argo-cd-git-ops/manifests/airflow/sealed-airflow-credentials.yaml b/demos/argo-cd-git-ops/manifests/airflow/sealed-airflow-credentials.yaml
@@ -23,5 +23,5 @@ spec:
       namespace: stackable-airflow
       labels:
         stackable.tech/vendor: Stackable
-        stackable.tech/demo: {{ demoLabel }}
+        stackable.tech/demo: {{ DEMO }}
     type: Opaque
diff --git a/demos/argo-cd-git-ops/manifests/airflow/sealed-airflow-minio-connection.yaml b/demos/argo-cd-git-ops/manifests/airflow/sealed-airflow-minio-connection.yaml
@@ -15,5 +15,5 @@ spec:
       namespace: stackable-airflow
       labels:
         stackable.tech/vendor: Stackable
-        stackable.tech/demo: {{ demoLabel }}
+        stackable.tech/demo: {{ DEMO }}
     type: Opaque
diff --git a/demos/argo-cd-git-ops/manifests/minio/minio.yaml b/demos/argo-cd-git-ops/manifests/minio/minio.yaml
@@ -6,7 +6,7 @@ metadata:
   name: "minio-sa"
   labels:
     stackable.tech/vendor: Stackable
-    stackable.tech/demo: {{ demoLabel }}
+    stackable.tech/demo: {{ DEMO }}
 ---
 # Source: minio/templates/configmap.yaml
 apiVersion: v1
@@ -19,7 +19,7 @@ metadata:
     release: minio
     heritage: Helm
     stackable.tech/vendor: Stackable
-    stackable.tech/demo: {{ demoLabel }}
+    stackable.tech/demo: {{ DEMO }}
 data:
   initialize: |-
     #!/bin/sh
@@ -414,7 +414,7 @@ metadata:
     release: minio
     heritage: Helm
     stackable.tech/vendor: Stackable
-    stackable.tech/demo: {{ demoLabel }}
+    stackable.tech/demo: {{ DEMO }}
 spec:
   accessModes:
     - "ReadWriteOnce"
@@ -433,7 +433,7 @@ metadata:
     release: minio
     heritage: Helm
     stackable.tech/vendor: Stackable
-    stackable.tech/demo: {{ demoLabel }}
+    stackable.tech/demo: {{ DEMO }}
 spec:
   type: NodePort
   externalTrafficPolicy: "Cluster"
@@ -458,7 +458,7 @@ metadata:
     heritage: Helm
     monitoring: "true"
     stackable.tech/vendor: Stackable
-    stackable.tech/demo: {{ demoLabel }}
+    stackable.tech/demo: {{ DEMO }}
 spec:
   type: NodePort
   externalTrafficPolicy: "Cluster"
@@ -482,7 +482,7 @@ metadata:
     release: minio
     heritage: Helm
     stackable.tech/vendor: Stackable
-    stackable.tech/demo: {{ demoLabel }}
+    stackable.tech/demo: {{ DEMO }}
 spec:
   strategy:
     type: RollingUpdate
@@ -501,7 +501,7 @@ spec:
         app: minio
         release: minio
         stackable.tech/vendor: Stackable
-        stackable.tech/demo: {{ demoLabel }}
+        stackable.tech/demo: {{ DEMO }}
       annotations:
         checksum/secrets: fa63e34a92c817c84057e2d452fa683e66462a57b0529388fb96a57e05f38e57
         checksum/config: ebea49cc4c1bfbd1b156a58bf770a776ff87fe199f642d31c2816b5515112e72
@@ -597,7 +597,7 @@ metadata:
     release: minio
     heritage: Helm
     stackable.tech/vendor: Stackable
-    stackable.tech/demo: {{ demoLabel }}
+    stackable.tech/demo: {{ DEMO }}
   annotations:
     "helm.sh/hook": post-install,post-upgrade
     "helm.sh/hook-delete-policy": hook-succeeded,before-hook-creation
diff --git a/demos/argo-cd-git-ops/manifests/minio/sealed-minio-credentials.yaml b/demos/argo-cd-git-ops/manifests/minio/sealed-minio-credentials.yaml
@@ -16,5 +16,5 @@ spec:
       namespace: minio
       labels:
         stackable.tech/vendor: Stackable
-        stackable.tech/demo: {{ demoLabel }}
+        stackable.tech/demo: {{ DEMO }}
     type: Opaque
diff --git a/demos/data-lakehouse-iceberg-trino-spark/create-spark-ingestion-job.yaml b/demos/data-lakehouse-iceberg-trino-spark/create-spark-ingestion-job.yaml
@@ -142,7 +142,7 @@ data:
       name: spark-ingest-into-lakehouse
       labels:
         stackable.tech/vendor: Stackable
-        stackable.tech/demo: {{ demoLabel }}
+        stackable.tech/demo: {{ DEMO }}
     spec:
       sparkImage:
         productVersion: 4.0.1
diff --git a/demos/demos-v2.yaml b/demos/demos-v2.yaml
@@ -33,9 +33,6 @@ demos:
       memory: 15Gi
       pvc: 15Gi
     parameters:
-      - name: demoLabel
-        description: Demo label to add to various components
-        default: argo-cd-git-ops
       - name: customGitUrl
         description: The URL to the Git repository (this can be adapted in case of forking the repository) to demonstrate syncing via Argo and Git.
         default: https://github.com/stackabletech/demos/
@@ -97,10 +94,7 @@ demos:
       cpu: 9000m
       memory: 19586Mi
       pvc: 40Gi
-    parameters:
-      - name: demoLabel
-        description: Demo label to add to various components
-        default: argo-cd-git-ops
+    parameters: []
   nifi-kafka-druid-earthquake-data:
     description: Demo ingesting earthquake data into Kafka using NiFi, streaming it into Druid and creating a Superset dashboard
     documentation: https://docs.stackable.tech/home/stable/demos/nifi-kafka-druid-earthquake-data
@@ -227,10 +221,7 @@ demos:
       cpu: "80"
       memory: 200Gi
       pvc: 300Gi
-    parameters:
-      - name: demoLabel
-        description: Demo label to add to various components
-        default: data-lakehouse-iceberg-trino-spark
+    parameters: []
   jupyterhub-pyspark-hdfs-anomaly-detection-taxi-data:
     description: Jupyterhub with PySpark and HDFS integration
     documentation: https://docs.stackable.tech/home/stable/demos/jupyterhub-pyspark-hdfs-anomaly-detection-taxi-data
diff --git a/demos/end-to-end-security/create-spark-report.yaml b/demos/end-to-end-security/create-spark-report.yaml
@@ -55,7 +55,7 @@ data:
       name: spark-report
       labels:
         stackable.tech/vendor: Stackable
-        stackable.tech/demo: {{ demoLabel }}
+        stackable.tech/demo: {{ DEMO }}
     spec:
       sparkImage:
         productVersion: 4.0.1
diff --git a/stacks/_templates/argo-cd.yaml b/stacks/_templates/argo-cd.yaml
@@ -9,7 +9,7 @@ options:
   global:
     additionalLabels:
       stackable.tech/vendor: Stackable
-      stackable.tech/stack: {{ stackLabel }}
+      stackable.tech/stack: {{ STACK }}
   configs:
     secret:
       argocdServerAdminPassword: "{{ argocdAdminPassword }}"
diff --git a/stacks/_templates/keycloak.yaml b/stacks/_templates/keycloak.yaml
@@ -66,16 +66,14 @@ spec:
                   KEYCLOAK_HOSTNAME="$(echo $KEYCLOAK_ADDRESS | grep -oP '^[^:]+')"
                   KEYCLOAK_PORT="$(echo $KEYCLOAK_ADDRESS | grep -oP '[0-9]+$')"
 
-                  STACK_LABEL=$(kubectl get svc keycloak -n {{ NAMESPACE }} -o json | jq '.metadata.labels."stackable.tech/stack"')
-
                   cat << EOF | kubectl apply -f -
                     apiVersion: authentication.stackable.tech/v1alpha1
                     kind: AuthenticationClass
                     metadata:
                       name: keycloak
                       labels:
                         stackable.tech/vendor: Stackable
-                        stackable.tech/stack: $STACK_LABEL
+                        stackable.tech/stack: {{ STACK }}
                     spec:
                       provider:
                         oidc:
diff --git a/stacks/_templates/minio-distributed-tls/values.yaml b/stacks/_templates/minio-distributed-tls/values.yaml
@@ -1,9 +1,9 @@
 additionalLabels:
   stackable.tech/vendor: Stackable
-  stackable.tech/stack: {{ stackLabel }}
+  stackable.tech/stack: {{ STACK }}
 podLabels:
   stackable.tech/vendor: Stackable
-  stackable.tech/stack: {{ stackLabel }}
+  stackable.tech/stack: {{ STACK }}
 rootUser: admin
 rootPassword: adminadmin
 mode: distributed
diff --git a/stacks/_templates/minio.yaml b/stacks/_templates/minio.yaml
@@ -8,10 +8,10 @@ version: 5.4.0 # RELEASE.2024-12-18T13-15-44Z
 options:
   additionalLabels:
     stackable.tech/vendor: Stackable
-    stackable.tech/stack: {{ stackLabel }}
+    stackable.tech/stack: {{ STACK }}
   podLabels:
     stackable.tech/vendor: Stackable
-    stackable.tech/stack: {{ stackLabel }}
+    stackable.tech/stack: {{ STACK }}
   rootUser: admin
   rootPassword: {{ minioAdminPassword }}
   mode: standalone
diff --git a/stacks/_templates/opensearch-dashboards.yaml b/stacks/_templates/opensearch-dashboards.yaml
@@ -11,7 +11,7 @@ options:
     tag: "{{ opensearchVersion }}-stackable{{ stackableReleaseVersion }}"
   labels:
     stackable.tech/vendor: Stackable
-    stackable.tech/stack: {{ stackLabel }}
+    stackable.tech/stack: {{ STACK }}
   service:
     type: NodePort
     port: 5601
@@ -20,7 +20,7 @@ options:
       stackable.tech/logging-credentials-secret: opensearch-user
     labels:
       stackable.tech/vendor: Stackable
-      stackable.tech/stack: {{ stackLabel }}
+      stackable.tech/stack: {{ STACK }}
   opensearchHosts: null # Use the discovery ConfigMap instead
   extraEnvs:
     - name: OPENSEARCH_HOSTS
diff --git a/stacks/_templates/postgresql-airflow.yaml b/stacks/_templates/postgresql-airflow.yaml
@@ -8,7 +8,7 @@ version: 18.1.3 # 18.0.0
 options:
   commonLabels:
     stackable.tech/vendor: Stackable
-    stackable.tech/stack: {{ stackLabel }}
+    stackable.tech/stack: {{ STACK }}
   auth:
     username: airflow
     password: airflow
diff --git a/stacks/_templates/postgresql-druid.yaml b/stacks/_templates/postgresql-druid.yaml
@@ -8,7 +8,7 @@ version: 18.1.3 # 18.0.0
 options:
   commonLabels:
     stackable.tech/vendor: Stackable
-    stackable.tech/stack: {{ stackLabel }}
+    stackable.tech/stack: {{ STACK }}
   auth:
     username: druid
     password: druid
diff --git a/stacks/_templates/postgresql-hive-iceberg.yaml b/stacks/_templates/postgresql-hive-iceberg.yaml
@@ -8,7 +8,7 @@ version: 18.1.3 # 18.0.0
 options:
   commonLabels:
     stackable.tech/vendor: Stackable
-    stackable.tech/stack: {{ stackLabel }}
+    stackable.tech/stack: {{ STACK }}
   auth:
     username: hive
     password: hive
diff --git a/stacks/_templates/postgresql-hive.yaml b/stacks/_templates/postgresql-hive.yaml
@@ -8,7 +8,7 @@ version: 18.1.3 # 18.0.0
 options:
   commonLabels:
     stackable.tech/vendor: Stackable
-    stackable.tech/stack: {{ stackLabel }}
+    stackable.tech/stack: {{ STACK }}
   auth:
     username: hive
     password: hive
diff --git a/stacks/_templates/postgresql-superset.yaml b/stacks/_templates/postgresql-superset.yaml
@@ -8,7 +8,7 @@ version: 18.1.3 # 18.0.0
 options:
   commonLabels:
     stackable.tech/vendor: Stackable
-    stackable.tech/stack: {{ stackLabel }}
+    stackable.tech/stack: {{ STACK }}
   auth:
     username: superset
     password: superset
diff --git a/stacks/_templates/postgresql-timescaledb.yaml b/stacks/_templates/postgresql-timescaledb.yaml
@@ -8,7 +8,7 @@ version: 0.33.1
 options:
   podLabels:
     stackable.tech/vendor: Stackable
-    stackable.tech/stack: {{ stackLabel }}
+    stackable.tech/stack: {{ STACK }}
   replicaCount: 1
   secrets:
     credentials:
diff --git a/stacks/_templates/vector-aggregator.yaml b/stacks/_templates/vector-aggregator.yaml
@@ -8,10 +8,10 @@ version: 0.49.0 # app version 0.52.0
 options:
   commonLabels:
     stackable.tech/vendor: Stackable
-    stackable.tech/stack: {{ stackLabel }}
+    stackable.tech/stack: {{ STACK }}
   podLabels:
     stackable.tech/vendor: Stackable
-    stackable.tech/stack: {{ stackLabel }}
+    stackable.tech/stack: {{ STACK }}
   role: Aggregator
   customConfig:
     sources:
diff --git a/stacks/argo-cd-git-ops/secrets/sealed-secrets-key.yaml b/stacks/argo-cd-git-ops/secrets/sealed-secrets-key.yaml
@@ -5,7 +5,7 @@ metadata:
   name: sealed-secrets-key
   labels:
     stackable.tech/vendor: Stackable
-    stackable.tech/stack: {{ stackLabel }}
+    stackable.tech/stack: {{ STACK }}
 stringData:
   # Generated on 2025/04/12
   # openssl req -x509 -nodes -newkey rsa:4096 -keyout tls.key -out tls.crt -subj "/CN=sealed-secrets" -days 3650
diff --git a/stacks/end-to-end-security/krb5.yaml b/stacks/end-to-end-security/krb5.yaml
@@ -79,7 +79,7 @@ spec:
         name: data
         labels:
           stackable.tech/vendor: Stackable
-          stackable.tech/stack: {{ stackLabel }}
+          stackable.tech/stack: {{ STACK }}
       spec:
         accessModes:
           - ReadWriteOnce
diff --git a/stacks/jupyterhub-keycloak/jupyterhub-native-auth.yaml b/stacks/jupyterhub-keycloak/jupyterhub-native-auth.yaml
@@ -40,7 +40,7 @@ options:
       enabled: false
     extraLabels:
       stackable.tech/vendor: Stackable
-      stackable.tech/stack: {{ stackLabel }}
+      stackable.tech/stack: {{ STACK }}
     profileList:
       - display_name: "Default"
         description: "Default profile"
diff --git a/stacks/jupyterhub-keycloak/jupyterhub.yaml b/stacks/jupyterhub-keycloak/jupyterhub.yaml
@@ -149,7 +149,7 @@ options:
       enabled: false
     extraLabels:
       stackable.tech/vendor: Stackable
-      stackable.tech/stack: {{ stackLabel }}
+      stackable.tech/stack: {{ STACK }}
     initContainers:
       - name: download-notebook
         image: oci.stackable.tech/sdp/tools:1.0.0-stackable0.0.0-dev
diff --git a/stacks/jupyterhub-keycloak/keycloak.yaml b/stacks/jupyterhub-keycloak/keycloak.yaml
@@ -68,16 +68,14 @@ spec:
                   KEYCLOAK_HOSTNAME="$(echo $KEYCLOAK_ADDRESS | grep -oP '^[^:]+')"
                   KEYCLOAK_PORT="$(echo $KEYCLOAK_ADDRESS | grep -oP '[0-9]+$')"
 
-                  STACK_LABEL=$(kubectl get svc keycloak -n {{ NAMESPACE }} -o json | jq '.metadata.labels."stackable.tech/stack"')
-
                   cat << EOF | kubectl apply -f -
                     apiVersion: v1
                     kind: ConfigMap
                     metadata:
                       name: keycloak-address
                       labels:
                         stackable.tech/vendor: Stackable
-                        stackable.tech/stack: $STACK_LABEL
+                        stackable.tech/stack: {{ STACK }}
                     data:
                       keycloakAddress: "$KEYCLOAK_HOSTNAME:$KEYCLOAK_PORT"
                       keycloakNodeIp: "$KEYCLOAK_HOSTNAME"
diff --git a/stacks/monitoring/prometheus.yaml b/stacks/monitoring/prometheus.yaml
@@ -8,7 +8,7 @@ version: 77.12.0 # 0.85.0
 options:
   commonLabels:
     stackable.tech/vendor: Stackable
-    stackable.tech/stack: {{ stackLabel }}
+    stackable.tech/stack: {{ STACK }}
   prometheusOperator:
     kubeletService:
       namespace: {{ NAMESPACE }}
diff --git a/stacks/observability/grafana-tempo.yaml b/stacks/observability/grafana-tempo.yaml
@@ -15,7 +15,7 @@ options:
   global:
     commonLabels:
       stackable.tech/vendor: Stackable
-      stackable.tech/stack: {{ stackLabel }}
+      stackable.tech/stack: {{ STACK }}
   tempo:
     receivers:
       otlp:
diff --git a/stacks/observability/grafana.yaml b/stacks/observability/grafana.yaml
@@ -13,7 +13,7 @@ version: 10.1.4 # 12.2.1
 options:
   extraLabels:
     stackable.tech/vendor: Stackable
-    stackable.tech/stack: {{ stackLabel }}
+    stackable.tech/stack: {{ STACK }}
   admin:
     existingSecret: grafana-admin-credentials
   service:
diff --git a/stacks/observability/jaeger.yaml b/stacks/observability/jaeger.yaml
@@ -13,7 +13,7 @@ version: 3.4.1 # 1.53.0
 options:
   commonLabels:
     stackable.tech/vendor: Stackable
-    stackable.tech/stack: {{ stackLabel }}
+    stackable.tech/stack: {{ STACK }}
   provisionDataStore:
     cassandra: false
   allInOne:
diff --git a/stacks/observability/opentelemetry-operator.yaml b/stacks/observability/opentelemetry-operator.yaml
@@ -10,7 +10,7 @@ version: 0.99.0 # 0.138.0
 options:
   additionalLabels:
     stackable.tech/vendor: Stackable
-    stackable.tech/stack: {{ stackLabel }}
+    stackable.tech/stack: {{ STACK }}
   admissionWebhooks:
     certManager:
       enabled: false
diff --git a/stacks/opensearch-rag/jupyterlab.yaml b/stacks/opensearch-rag/jupyterlab.yaml
diff --git a/stacks/signal-processing/grafana.yaml b/stacks/signal-processing/grafana.yaml
diff --git a/stacks/signal-processing/jupyterhub.yaml b/stacks/signal-processing/jupyterhub.yaml
diff --git a/stacks/stacks-v2.yaml b/stacks/stacks-v2.yaml
