From e0e54bb7d88cc153580daac9548ee11b3a263a16 Mon Sep 17 00:00:00 2001 From: Techassi Date: Mon, 18 Dec 2023 16:34:36 +0100 Subject: [PATCH 1/8] Add static label to deployed resources --- .../01-airflow-spark-clusterrole.yaml | 2 ++ .../02-airflow-spark-clusterrolebinding.yaml | 2 ++ .../03-enable-and-run-spark-dag.yaml | 2 ++ .../04-enable-and-run-date-dag.yaml | 2 ++ .../create-nifi-ingestion-job.yaml | 4 ++++ .../create-spark-ingestion-job.yaml | 6 ++++++ .../create-trino-tables.yaml | 4 ++++ .../load-test-data.yaml | 2 ++ .../serviceaccount.yaml | 6 ++++++ .../setup-superset.yaml | 5 ++++- .../create-hfile-and-import-to-hbase.yaml | 2 ++ .../distcp-cycling-data.yaml | 2 ++ .../load-test-data.yaml | 2 ++ demos/logging/zookeeper.yaml | 2 ++ .../create-druid-ingestion-job.yaml | 4 ++++ .../create-nifi-ingestion-job.yaml | 4 ++++ .../setup-superset.yaml | 4 ++++ .../create-druid-ingestion-job.yaml | 4 ++++ .../create-nifi-ingestion-job.yaml | 4 ++++ .../setup-superset.yaml | 4 ++++ .../create-nifi-ingestion-job.yaml | 4 ++++ .../signal-processing/create-timescale-tables.yaml | 4 ++++ demos/signal-processing/serviceaccount.yaml | 6 ++++++ .../create-spark-anomaly-detection-job.yaml | 6 ++++++ .../load-test-data.yaml | 2 ++ .../serviceaccount.yaml | 4 ++++ .../setup-superset.yaml | 4 ++++ demos/trino-taxi-data/create-table-in-trino.yaml | 4 ++++ demos/trino-taxi-data/load-test-data.yaml | 2 ++ demos/trino-taxi-data/setup-superset.yaml | 4 ++++ stacks/_templates/jupyterhub.yaml | 2 ++ stacks/_templates/minio-distributed-small.yaml | 4 ++++ stacks/_templates/minio-distributed.yaml | 4 ++++ stacks/_templates/minio.yaml | 4 ++++ stacks/_templates/opensearch-dashboards.yaml | 2 ++ stacks/_templates/opensearch.yaml | 2 ++ stacks/_templates/postgresql-airflow.yaml | 2 ++ stacks/_templates/postgresql-druid.yaml | 2 ++ stacks/_templates/postgresql-hive-iceberg.yaml | 2 ++ stacks/_templates/postgresql-hive.yaml | 2 ++ stacks/_templates/postgresql-hivehdfs.yaml | 2 ++ stacks/_templates/postgresql-hives3.yaml | 2 ++ stacks/_templates/postgresql-superset.yaml | 2 ++ stacks/_templates/postgresql-timescaledb.yaml | 2 ++ stacks/_templates/prometheus-service-monitor.yaml | 2 ++ stacks/_templates/prometheus.yaml | 2 ++ stacks/_templates/redis-airflow.yaml | 2 ++ stacks/_templates/vector-aggregator-discovery.yaml | 2 ++ stacks/_templates/vector-aggregator.yaml | 4 ++++ stacks/airflow/airflow.yaml | 6 ++++++ .../openldap-tls-authenticationclass.yaml | 5 +++++ stacks/authentication/openldap-tls.yaml | 4 ++++ .../hive-metastores.yaml | 4 ++++ .../data-lakehouse-iceberg-trino-spark/kafka.yaml | 6 ++++++ stacks/data-lakehouse-iceberg-trino-spark/nifi.yaml | 8 ++++++++ .../s3-connection.yaml | 5 +++++ .../data-lakehouse-iceberg-trino-spark/trino.yaml | 13 +++++++++++++ .../zookeeper.yaml | 2 ++ stacks/dual-hive-hdfs-s3/hdfs.yaml | 6 ++++++ stacks/dual-hive-hdfs-s3/hive.yaml | 9 +++++++++ stacks/dual-hive-hdfs-s3/trino.yaml | 9 +++++++++ stacks/hdfs-hbase/hbase.yaml | 2 ++ stacks/hdfs-hbase/hdfs.yaml | 2 ++ stacks/hdfs-hbase/zookeeper.yaml | 6 ++++++ stacks/jupyterhub-pyspark-hdfs/hdfs.yaml | 4 ++++ stacks/jupyterhub-pyspark-hdfs/serviceaccount.yaml | 6 ++++++ .../spark_driver_service.yaml | 2 ++ stacks/jupyterhub-pyspark-hdfs/zookeeper.yaml | 2 ++ stacks/keycloak-opa-poc/druid.yaml | 2 ++ stacks/keycloak-opa-poc/hdfs.yaml | 2 ++ stacks/keycloak-opa-poc/keycloak.yaml | 7 +++++++ stacks/keycloak-opa-poc/opa.yaml | 2 ++ stacks/keycloak-opa-poc/policies.yaml | 2 ++ stacks/keycloak-opa-poc/serviceaccount.yaml | 6 ++++++ stacks/keycloak-opa-poc/setup-keycloak.yaml | 6 ++++++ stacks/keycloak-opa-poc/superset.yaml | 4 ++++ stacks/keycloak-opa-poc/trino.yaml | 2 ++ stacks/keycloak-opa-poc/zookeeper.yaml | 6 ++++++ stacks/logging/setup-opensearch-dashboards.yaml | 2 ++ stacks/monitoring/grafana-dashboards.yaml | 2 ++ stacks/nifi-kafka-druid-superset-s3/druid.yaml | 7 +++++++ stacks/nifi-kafka-druid-superset-s3/kafka.yaml | 6 ++++++ stacks/nifi-kafka-druid-superset-s3/nifi.yaml | 8 ++++++++ stacks/nifi-kafka-druid-superset-s3/superset.yaml | 8 ++++++++ stacks/nifi-kafka-druid-superset-s3/zookeeper.yaml | 2 ++ stacks/signal-processing/grafana-dashboards.yaml | 2 ++ stacks/signal-processing/grafana.yaml | 2 ++ stacks/signal-processing/jupyterhub.yaml | 2 ++ stacks/signal-processing/nifi.yaml | 8 ++++++++ stacks/signal-processing/secrets.yaml | 2 ++ stacks/spark-trino-superset-s3/hive-metastore.yaml | 4 ++++ .../trino-prediction-catalog.yaml | 1 + stacks/trino-iceberg/hive-metastores.yaml | 2 ++ stacks/trino-iceberg/s3-connection.yaml | 5 +++++ stacks/trino-iceberg/trino.yaml | 12 ++++++++++++ stacks/trino-superset-s3/hive-metastore.yaml | 2 ++ stacks/trino-superset-s3/s3-connection.yaml | 5 +++++ stacks/trino-superset-s3/superset.yaml | 6 ++++++ stacks/trino-superset-s3/trino.yaml | 10 ++++++++++ 99 files changed, 390 insertions(+), 1 deletion(-) diff --git a/demos/airflow-scheduled-job/01-airflow-spark-clusterrole.yaml b/demos/airflow-scheduled-job/01-airflow-spark-clusterrole.yaml index d63b6ec9..1527b3c7 100644 --- a/demos/airflow-scheduled-job/01-airflow-spark-clusterrole.yaml +++ b/demos/airflow-scheduled-job/01-airflow-spark-clusterrole.yaml @@ -3,6 +3,8 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: name: airflow-spark-clusterrole + labels: + stackable.tech/vendor: Stackable rules: - apiGroups: - spark.stackable.tech diff --git a/demos/airflow-scheduled-job/02-airflow-spark-clusterrolebinding.yaml b/demos/airflow-scheduled-job/02-airflow-spark-clusterrolebinding.yaml index d3441a4c..51027c7b 100644 --- a/demos/airflow-scheduled-job/02-airflow-spark-clusterrolebinding.yaml +++ b/demos/airflow-scheduled-job/02-airflow-spark-clusterrolebinding.yaml @@ -3,6 +3,8 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: name: airflow-spark-clusterrole-binding + labels: + stackable.tech/vendor: Stackable roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole diff --git a/demos/airflow-scheduled-job/03-enable-and-run-spark-dag.yaml b/demos/airflow-scheduled-job/03-enable-and-run-spark-dag.yaml index 677d266f..be26090e 100644 --- a/demos/airflow-scheduled-job/03-enable-and-run-spark-dag.yaml +++ b/demos/airflow-scheduled-job/03-enable-and-run-spark-dag.yaml @@ -3,6 +3,8 @@ apiVersion: batch/v1 kind: Job metadata: name: start-pyspark-job + labels: + stackable.tech/vendor: Stackable spec: template: spec: diff --git a/demos/airflow-scheduled-job/04-enable-and-run-date-dag.yaml b/demos/airflow-scheduled-job/04-enable-and-run-date-dag.yaml index 04857028..5691bdaa 100644 --- a/demos/airflow-scheduled-job/04-enable-and-run-date-dag.yaml +++ b/demos/airflow-scheduled-job/04-enable-and-run-date-dag.yaml @@ -3,6 +3,8 @@ apiVersion: batch/v1 kind: Job metadata: name: start-date-job + labels: + stackable.tech/vendor: Stackable spec: template: spec: diff --git a/demos/data-lakehouse-iceberg-trino-spark/create-nifi-ingestion-job.yaml b/demos/data-lakehouse-iceberg-trino-spark/create-nifi-ingestion-job.yaml index 23514095..48dc643a 100644 --- a/demos/data-lakehouse-iceberg-trino-spark/create-nifi-ingestion-job.yaml +++ b/demos/data-lakehouse-iceberg-trino-spark/create-nifi-ingestion-job.yaml @@ -3,6 +3,8 @@ apiVersion: batch/v1 kind: Job metadata: name: create-nifi-ingestion-job + labels: + stackable.tech/vendor: Stackable spec: template: spec: @@ -39,6 +41,8 @@ apiVersion: v1 kind: ConfigMap metadata: name: create-nifi-ingestion-job-script + labels: + stackable.tech/vendor: Stackable data: script.py: | from nipyapi.canvas import get_root_pg_id, schedule_process_group, list_all_controllers, schedule_controller 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 index 90fd3ffa..50d034fa 100644 --- a/demos/data-lakehouse-iceberg-trino-spark/create-spark-ingestion-job.yaml +++ b/demos/data-lakehouse-iceberg-trino-spark/create-spark-ingestion-job.yaml @@ -6,6 +6,8 @@ apiVersion: batch/v1 kind: Job metadata: name: create-spark-ingestion-job + labels: + stackable.tech/vendor: Stackable spec: template: spec: @@ -32,6 +34,8 @@ apiVersion: v1 kind: ConfigMap metadata: name: create-spark-ingestion-job-manifest + labels: + stackable.tech/vendor: Stackable data: spark-ingestion-job.yaml: | --- @@ -123,6 +127,8 @@ apiVersion: v1 kind: ConfigMap metadata: name: write-iceberg-table-script + labels: + stackable.tech/vendor: Stackable data: spark-ingest-into-lakehouse.py: | from pyspark.sql import SparkSession diff --git a/demos/data-lakehouse-iceberg-trino-spark/create-trino-tables.yaml b/demos/data-lakehouse-iceberg-trino-spark/create-trino-tables.yaml index 6e13f211..9175c141 100644 --- a/demos/data-lakehouse-iceberg-trino-spark/create-trino-tables.yaml +++ b/demos/data-lakehouse-iceberg-trino-spark/create-trino-tables.yaml @@ -3,6 +3,8 @@ apiVersion: batch/v1 kind: Job metadata: name: create-tables-in-trino + labels: + stackable.tech/vendor: Stackable spec: template: spec: @@ -34,6 +36,8 @@ apiVersion: v1 kind: ConfigMap metadata: name: create-tables-in-trino-script + labels: + stackable.tech/vendor: Stackable data: script.py: | import sys diff --git a/demos/data-lakehouse-iceberg-trino-spark/load-test-data.yaml b/demos/data-lakehouse-iceberg-trino-spark/load-test-data.yaml index b3271969..57a0544a 100644 --- a/demos/data-lakehouse-iceberg-trino-spark/load-test-data.yaml +++ b/demos/data-lakehouse-iceberg-trino-spark/load-test-data.yaml @@ -3,6 +3,8 @@ apiVersion: batch/v1 kind: Job metadata: name: load-test-data + labels: + stackable.tech/vendor: Stackable spec: template: spec: diff --git a/demos/data-lakehouse-iceberg-trino-spark/serviceaccount.yaml b/demos/data-lakehouse-iceberg-trino-spark/serviceaccount.yaml index cb3ea626..05ab03b5 100644 --- a/demos/data-lakehouse-iceberg-trino-spark/serviceaccount.yaml +++ b/demos/data-lakehouse-iceberg-trino-spark/serviceaccount.yaml @@ -4,11 +4,15 @@ kind: ServiceAccount metadata: name: demo-serviceaccount namespace: default + labels: + stackable.tech/vendor: Stackable --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: name: demo-clusterrolebinding + labels: + stackable.tech/vendor: Stackable subjects: - kind: ServiceAccount name: demo-serviceaccount @@ -22,6 +26,8 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: name: demo-clusterrole + labels: + stackable.tech/vendor: Stackable rules: - apiGroups: - "" diff --git a/demos/data-lakehouse-iceberg-trino-spark/setup-superset.yaml b/demos/data-lakehouse-iceberg-trino-spark/setup-superset.yaml index a8e8e0bf..d173af77 100644 --- a/demos/data-lakehouse-iceberg-trino-spark/setup-superset.yaml +++ b/demos/data-lakehouse-iceberg-trino-spark/setup-superset.yaml @@ -3,6 +3,8 @@ apiVersion: batch/v1 kind: Job metadata: name: setup-superset + labels: + stackable.tech/vendor: Stackable spec: template: spec: @@ -34,6 +36,8 @@ apiVersion: v1 kind: ConfigMap metadata: name: setup-superset-script + labels: + stackable.tech/vendor: Stackable data: script.py: | import logging @@ -70,7 +74,6 @@ data: # with open("superset-assets.zip", "wb") as f: # f.write(result.content) - ######################### # IMPORTANT ######################### diff --git a/demos/hbase-hdfs-load-cycling-data/create-hfile-and-import-to-hbase.yaml b/demos/hbase-hdfs-load-cycling-data/create-hfile-and-import-to-hbase.yaml index 92ad7b0d..d4aa0dc1 100644 --- a/demos/hbase-hdfs-load-cycling-data/create-hfile-and-import-to-hbase.yaml +++ b/demos/hbase-hdfs-load-cycling-data/create-hfile-and-import-to-hbase.yaml @@ -4,6 +4,8 @@ apiVersion: batch/v1 kind: Job metadata: name: create-hfile-and-import-to-hbase + labels: + stackable.tech/vendor: Stackable spec: template: spec: diff --git a/demos/hbase-hdfs-load-cycling-data/distcp-cycling-data.yaml b/demos/hbase-hdfs-load-cycling-data/distcp-cycling-data.yaml index a204c3ff..4f4c5488 100644 --- a/demos/hbase-hdfs-load-cycling-data/distcp-cycling-data.yaml +++ b/demos/hbase-hdfs-load-cycling-data/distcp-cycling-data.yaml @@ -3,6 +3,8 @@ apiVersion: batch/v1 kind: Job metadata: name: distcp-cycling-data + labels: + stackable.tech/vendor: Stackable spec: template: spec: diff --git a/demos/jupyterhub-pyspark-hdfs-anomaly-detection-taxi-data/load-test-data.yaml b/demos/jupyterhub-pyspark-hdfs-anomaly-detection-taxi-data/load-test-data.yaml index 7daa673f..80610d24 100644 --- a/demos/jupyterhub-pyspark-hdfs-anomaly-detection-taxi-data/load-test-data.yaml +++ b/demos/jupyterhub-pyspark-hdfs-anomaly-detection-taxi-data/load-test-data.yaml @@ -3,6 +3,8 @@ apiVersion: batch/v1 kind: Job metadata: name: load-test-data + labels: + stackable.tech/vendor: Stackable spec: template: spec: diff --git a/demos/logging/zookeeper.yaml b/demos/logging/zookeeper.yaml index fe1187ae..4d8e2f82 100644 --- a/demos/logging/zookeeper.yaml +++ b/demos/logging/zookeeper.yaml @@ -3,6 +3,8 @@ apiVersion: zookeeper.stackable.tech/v1alpha1 kind: ZookeeperCluster metadata: name: simple-zk + labels: + stackable.tech/vendor: Stackable spec: image: productVersion: 3.8.3 diff --git a/demos/nifi-kafka-druid-earthquake-data/create-druid-ingestion-job.yaml b/demos/nifi-kafka-druid-earthquake-data/create-druid-ingestion-job.yaml index 5ff18136..6ef45f43 100644 --- a/demos/nifi-kafka-druid-earthquake-data/create-druid-ingestion-job.yaml +++ b/demos/nifi-kafka-druid-earthquake-data/create-druid-ingestion-job.yaml @@ -3,6 +3,8 @@ apiVersion: batch/v1 kind: Job metadata: name: create-druid-ingestion-job + labels: + stackable.tech/vendor: Stackable spec: template: spec: @@ -24,6 +26,8 @@ apiVersion: v1 kind: ConfigMap metadata: name: create-druid-ingestion-job-spec + labels: + stackable.tech/vendor: Stackable data: ingestion-job-spec.json: | { diff --git a/demos/nifi-kafka-druid-earthquake-data/create-nifi-ingestion-job.yaml b/demos/nifi-kafka-druid-earthquake-data/create-nifi-ingestion-job.yaml index dc2267ae..8f50ec91 100644 --- a/demos/nifi-kafka-druid-earthquake-data/create-nifi-ingestion-job.yaml +++ b/demos/nifi-kafka-druid-earthquake-data/create-nifi-ingestion-job.yaml @@ -3,6 +3,8 @@ apiVersion: batch/v1 kind: Job metadata: name: create-nifi-ingestion-job + labels: + stackable.tech/vendor: Stackable spec: template: spec: @@ -34,6 +36,8 @@ apiVersion: v1 kind: ConfigMap metadata: name: create-nifi-ingestion-job-script + labels: + stackable.tech/vendor: Stackable data: script.py: | from nipyapi.canvas import get_root_pg_id, schedule_process_group, list_all_controllers, schedule_controller diff --git a/demos/nifi-kafka-druid-earthquake-data/setup-superset.yaml b/demos/nifi-kafka-druid-earthquake-data/setup-superset.yaml index 66f0d78c..5fc78cb9 100644 --- a/demos/nifi-kafka-druid-earthquake-data/setup-superset.yaml +++ b/demos/nifi-kafka-druid-earthquake-data/setup-superset.yaml @@ -3,6 +3,8 @@ apiVersion: batch/v1 kind: Job metadata: name: setup-superset + labels: + stackable.tech/vendor: Stackable spec: template: spec: @@ -29,6 +31,8 @@ apiVersion: v1 kind: ConfigMap metadata: name: setup-superset-script + labels: + stackable.tech/vendor: Stackable data: script.py: | import logging diff --git a/demos/nifi-kafka-druid-water-level-data/create-druid-ingestion-job.yaml b/demos/nifi-kafka-druid-water-level-data/create-druid-ingestion-job.yaml index e4e05ff8..8eaecdb6 100644 --- a/demos/nifi-kafka-druid-water-level-data/create-druid-ingestion-job.yaml +++ b/demos/nifi-kafka-druid-water-level-data/create-druid-ingestion-job.yaml @@ -3,6 +3,8 @@ apiVersion: batch/v1 kind: Job metadata: name: create-druid-ingestion-job + labels: + stackable.tech/vendor: Stackable spec: template: spec: @@ -24,6 +26,8 @@ apiVersion: v1 kind: ConfigMap metadata: name: create-druid-ingestion-job-spec + labels: + stackable.tech/vendor: Stackable data: stations-ingestion-job-spec.json: | { diff --git a/demos/nifi-kafka-druid-water-level-data/create-nifi-ingestion-job.yaml b/demos/nifi-kafka-druid-water-level-data/create-nifi-ingestion-job.yaml index 9367d263..a76c3e2f 100644 --- a/demos/nifi-kafka-druid-water-level-data/create-nifi-ingestion-job.yaml +++ b/demos/nifi-kafka-druid-water-level-data/create-nifi-ingestion-job.yaml @@ -3,6 +3,8 @@ apiVersion: batch/v1 kind: Job metadata: name: create-nifi-ingestion-job + labels: + stackable.tech/vendor: Stackable spec: template: spec: @@ -34,6 +36,8 @@ apiVersion: v1 kind: ConfigMap metadata: name: create-nifi-ingestion-job-script + labels: + stackable.tech/vendor: Stackable data: script.py: | from nipyapi.canvas import get_root_pg_id, schedule_process_group, list_all_controllers, schedule_controller diff --git a/demos/nifi-kafka-druid-water-level-data/setup-superset.yaml b/demos/nifi-kafka-druid-water-level-data/setup-superset.yaml index 5a654ddc..c84cb976 100644 --- a/demos/nifi-kafka-druid-water-level-data/setup-superset.yaml +++ b/demos/nifi-kafka-druid-water-level-data/setup-superset.yaml @@ -3,6 +3,8 @@ apiVersion: batch/v1 kind: Job metadata: name: setup-superset + labels: + stackable.tech/vendor: Stackable spec: template: spec: @@ -29,6 +31,8 @@ apiVersion: v1 kind: ConfigMap metadata: name: setup-superset-script + labels: + stackable.tech/vendor: Stackable data: script.py: | import logging diff --git a/demos/signal-processing/create-nifi-ingestion-job.yaml b/demos/signal-processing/create-nifi-ingestion-job.yaml index 70e9e861..7713bae6 100644 --- a/demos/signal-processing/create-nifi-ingestion-job.yaml +++ b/demos/signal-processing/create-nifi-ingestion-job.yaml @@ -3,6 +3,8 @@ apiVersion: batch/v1 kind: Job metadata: name: create-nifi-ingestion-job + labels: + stackable.tech/vendor: Stackable spec: template: spec: @@ -49,6 +51,8 @@ apiVersion: v1 kind: ConfigMap metadata: name: create-nifi-ingestion-job-script + labels: + stackable.tech/vendor: Stackable data: script.py: | from nipyapi.canvas import get_root_pg_id, schedule_process_group, list_all_controllers, schedule_controller diff --git a/demos/signal-processing/create-timescale-tables.yaml b/demos/signal-processing/create-timescale-tables.yaml index 3757c701..679e7aff 100644 --- a/demos/signal-processing/create-timescale-tables.yaml +++ b/demos/signal-processing/create-timescale-tables.yaml @@ -3,6 +3,8 @@ apiVersion: batch/v1 kind: Job metadata: name: create-timescale-tables-job + labels: + stackable.tech/vendor: Stackable spec: template: spec: @@ -40,6 +42,8 @@ apiVersion: v1 kind: ConfigMap metadata: name: create-timescale-tables-job-script + labels: + stackable.tech/vendor: Stackable data: timescaledb.sql: | CREATE TABLE conditions ( diff --git a/demos/signal-processing/serviceaccount.yaml b/demos/signal-processing/serviceaccount.yaml index 30e4ada9..995fc30c 100644 --- a/demos/signal-processing/serviceaccount.yaml +++ b/demos/signal-processing/serviceaccount.yaml @@ -4,11 +4,15 @@ kind: ServiceAccount metadata: name: demo-serviceaccount namespace: default + labels: + stackable.tech/vendor: Stackable --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: name: demo-clusterrolebinding + labels: + stackable.tech/vendor: Stackable subjects: - kind: ServiceAccount name: demo-serviceaccount @@ -22,6 +26,8 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: name: demo-clusterrole + labels: + stackable.tech/vendor: Stackable rules: - apiGroups: - "" diff --git a/demos/spark-k8s-anomaly-detection-taxi-data/create-spark-anomaly-detection-job.yaml b/demos/spark-k8s-anomaly-detection-taxi-data/create-spark-anomaly-detection-job.yaml index 9d485797..4f38b518 100644 --- a/demos/spark-k8s-anomaly-detection-taxi-data/create-spark-anomaly-detection-job.yaml +++ b/demos/spark-k8s-anomaly-detection-taxi-data/create-spark-anomaly-detection-job.yaml @@ -3,6 +3,8 @@ apiVersion: batch/v1 kind: Job metadata: name: create-spark-anomaly-detection-job + labels: + stackable.tech/vendor: Stackable spec: template: spec: @@ -28,6 +30,8 @@ apiVersion: v1 kind: ConfigMap metadata: name: create-spark-ad-job-manifest + labels: + stackable.tech/vendor: Stackable data: spark-ad-job.yaml: | --- @@ -95,6 +99,8 @@ apiVersion: v1 kind: ConfigMap metadata: name: cm-spark + labels: + stackable.tech/vendor: Stackable data: spark-ad.py: | from pyspark.sql import SparkSession diff --git a/demos/spark-k8s-anomaly-detection-taxi-data/load-test-data.yaml b/demos/spark-k8s-anomaly-detection-taxi-data/load-test-data.yaml index 395249eb..7a4fb0c2 100644 --- a/demos/spark-k8s-anomaly-detection-taxi-data/load-test-data.yaml +++ b/demos/spark-k8s-anomaly-detection-taxi-data/load-test-data.yaml @@ -3,6 +3,8 @@ apiVersion: batch/v1 kind: Job metadata: name: load-ny-taxi-data + labels: + stackable.tech/vendor: Stackable spec: template: spec: diff --git a/demos/spark-k8s-anomaly-detection-taxi-data/serviceaccount.yaml b/demos/spark-k8s-anomaly-detection-taxi-data/serviceaccount.yaml index 56908c9b..5a2fcde7 100644 --- a/demos/spark-k8s-anomaly-detection-taxi-data/serviceaccount.yaml +++ b/demos/spark-k8s-anomaly-detection-taxi-data/serviceaccount.yaml @@ -3,6 +3,8 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: name: demo-clusterrolebinding + labels: + stackable.tech/vendor: Stackable subjects: - apiGroup: rbac.authorization.k8s.io kind: Group @@ -16,6 +18,8 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: name: demo-clusterrole + labels: + stackable.tech/vendor: Stackable rules: - apiGroups: - "" diff --git a/demos/spark-k8s-anomaly-detection-taxi-data/setup-superset.yaml b/demos/spark-k8s-anomaly-detection-taxi-data/setup-superset.yaml index f0ed4486..3955c759 100644 --- a/demos/spark-k8s-anomaly-detection-taxi-data/setup-superset.yaml +++ b/demos/spark-k8s-anomaly-detection-taxi-data/setup-superset.yaml @@ -3,6 +3,8 @@ apiVersion: batch/v1 kind: Job metadata: name: setup-superset + labels: + stackable.tech/vendor: Stackable spec: template: spec: @@ -34,6 +36,8 @@ apiVersion: v1 kind: ConfigMap metadata: name: setup-superset-script + labels: + stackable.tech/vendor: Stackable data: script.py: | import logging diff --git a/demos/trino-taxi-data/create-table-in-trino.yaml b/demos/trino-taxi-data/create-table-in-trino.yaml index 524875f1..6b96649e 100644 --- a/demos/trino-taxi-data/create-table-in-trino.yaml +++ b/demos/trino-taxi-data/create-table-in-trino.yaml @@ -3,6 +3,8 @@ apiVersion: batch/v1 kind: Job metadata: name: create-ny-taxi-data-table-in-trino + labels: + stackable.tech/vendor: Stackable spec: template: spec: @@ -29,6 +31,8 @@ apiVersion: v1 kind: ConfigMap metadata: name: create-ny-taxi-data-table-in-trino-script + labels: + stackable.tech/vendor: Stackable data: script.py: | import sys diff --git a/demos/trino-taxi-data/load-test-data.yaml b/demos/trino-taxi-data/load-test-data.yaml index 31c8e0af..2537fcd2 100644 --- a/demos/trino-taxi-data/load-test-data.yaml +++ b/demos/trino-taxi-data/load-test-data.yaml @@ -3,6 +3,8 @@ apiVersion: batch/v1 kind: Job metadata: name: load-ny-taxi-data + labels: + stackable.tech/vendor: Stackable spec: template: spec: diff --git a/demos/trino-taxi-data/setup-superset.yaml b/demos/trino-taxi-data/setup-superset.yaml index 761a044b..1614f960 100644 --- a/demos/trino-taxi-data/setup-superset.yaml +++ b/demos/trino-taxi-data/setup-superset.yaml @@ -3,6 +3,8 @@ apiVersion: batch/v1 kind: Job metadata: name: setup-superset + labels: + stackable.tech/vendor: Stackable spec: template: spec: @@ -34,6 +36,8 @@ apiVersion: v1 kind: ConfigMap metadata: name: setup-superset-script + labels: + stackable.tech/vendor: Stackable data: script.py: | import logging diff --git a/stacks/_templates/jupyterhub.yaml b/stacks/_templates/jupyterhub.yaml index 3a96f3a5..67fc9d3c 100644 --- a/stacks/_templates/jupyterhub.yaml +++ b/stacks/_templates/jupyterhub.yaml @@ -5,6 +5,8 @@ repo: url: https://jupyterhub.github.io/helm-chart/ version: 3.0.0 options: + labels: + stackable.tech/vendor: Stackable hub: config: Authenticator: diff --git a/stacks/_templates/minio-distributed-small.yaml b/stacks/_templates/minio-distributed-small.yaml index 96398439..9c5ea823 100644 --- a/stacks/_templates/minio-distributed-small.yaml +++ b/stacks/_templates/minio-distributed-small.yaml @@ -5,6 +5,10 @@ repo: url: https://charts.min.io/ version: 5.0.14 options: + additionalLabels: + stackable.tech/vendor: Stackable + podLabels: + stackable.tech/vendor: Stackable rootUser: admin rootPassword: {{ minioAdminPassword }} mode: distributed diff --git a/stacks/_templates/minio-distributed.yaml b/stacks/_templates/minio-distributed.yaml index 7a9d821f..c357d5c8 100644 --- a/stacks/_templates/minio-distributed.yaml +++ b/stacks/_templates/minio-distributed.yaml @@ -5,6 +5,10 @@ repo: url: https://charts.min.io/ version: 5.0.14 options: + additionalLabels: + stackable.tech/vendor: Stackable + podLabels: + stackable.tech/vendor: Stackable rootUser: admin rootPassword: {{ minioAdminPassword }} mode: distributed diff --git a/stacks/_templates/minio.yaml b/stacks/_templates/minio.yaml index af51aaeb..7937eb4a 100644 --- a/stacks/_templates/minio.yaml +++ b/stacks/_templates/minio.yaml @@ -5,6 +5,10 @@ repo: url: https://charts.min.io/ version: 5.0.14 options: + additionalLabels: + stackable.tech/vendor: Stackable + podLabels: + stackable.tech/vendor: Stackable rootUser: admin rootPassword: {{ minioAdminPassword }} mode: standalone diff --git a/stacks/_templates/opensearch-dashboards.yaml b/stacks/_templates/opensearch-dashboards.yaml index d8761af8..2af79be9 100644 --- a/stacks/_templates/opensearch-dashboards.yaml +++ b/stacks/_templates/opensearch-dashboards.yaml @@ -5,6 +5,8 @@ repo: url: https://opensearch-project.github.io/helm-charts version: 2.14.0 options: + labels: + stackable.tech/vendor: Stackable service: type: NodePort port: 5601 diff --git a/stacks/_templates/opensearch.yaml b/stacks/_templates/opensearch.yaml index e49c5fe8..b2f3d195 100644 --- a/stacks/_templates/opensearch.yaml +++ b/stacks/_templates/opensearch.yaml @@ -5,6 +5,8 @@ repo: url: https://opensearch-project.github.io/helm-charts version: 2.16.1 options: + labels: + stackable.tech/vendor: Stackable config: opensearch.yml: | plugins: diff --git a/stacks/_templates/postgresql-airflow.yaml b/stacks/_templates/postgresql-airflow.yaml index bb129930..77b23187 100644 --- a/stacks/_templates/postgresql-airflow.yaml +++ b/stacks/_templates/postgresql-airflow.yaml @@ -5,6 +5,8 @@ repo: url: https://charts.bitnami.com/bitnami/ version: 13.2.18 options: + commonLabels: + stackable.tech/vendor: Stackable auth: username: airflow password: airflow diff --git a/stacks/_templates/postgresql-druid.yaml b/stacks/_templates/postgresql-druid.yaml index c1ac7881..fec0f4ad 100644 --- a/stacks/_templates/postgresql-druid.yaml +++ b/stacks/_templates/postgresql-druid.yaml @@ -5,6 +5,8 @@ repo: url: https://charts.bitnami.com/bitnami/ version: 13.2.18 options: + commonLabels: + stackable.tech/vendor: Stackable auth: username: druid password: druid diff --git a/stacks/_templates/postgresql-hive-iceberg.yaml b/stacks/_templates/postgresql-hive-iceberg.yaml index a9f6c4fe..a0b9d631 100644 --- a/stacks/_templates/postgresql-hive-iceberg.yaml +++ b/stacks/_templates/postgresql-hive-iceberg.yaml @@ -5,6 +5,8 @@ repo: url: https://charts.bitnami.com/bitnami/ version: 13.2.18 options: + commonLabels: + stackable.tech/vendor: Stackable auth: username: hive password: hive diff --git a/stacks/_templates/postgresql-hive.yaml b/stacks/_templates/postgresql-hive.yaml index 8fe03d68..2958339b 100644 --- a/stacks/_templates/postgresql-hive.yaml +++ b/stacks/_templates/postgresql-hive.yaml @@ -5,6 +5,8 @@ repo: url: https://charts.bitnami.com/bitnami/ version: 13.2.18 options: + commonLabels: + stackable.tech/vendor: Stackable auth: username: hive password: hive diff --git a/stacks/_templates/postgresql-hivehdfs.yaml b/stacks/_templates/postgresql-hivehdfs.yaml index 61c83ee3..67504d96 100644 --- a/stacks/_templates/postgresql-hivehdfs.yaml +++ b/stacks/_templates/postgresql-hivehdfs.yaml @@ -5,6 +5,8 @@ repo: url: https://charts.bitnami.com/bitnami/ version: 13.2.18 options: + commonLabels: + stackable.tech/vendor: Stackable auth: username: hive password: hive diff --git a/stacks/_templates/postgresql-hives3.yaml b/stacks/_templates/postgresql-hives3.yaml index 1aba0799..e73aeb62 100644 --- a/stacks/_templates/postgresql-hives3.yaml +++ b/stacks/_templates/postgresql-hives3.yaml @@ -5,6 +5,8 @@ repo: url: https://charts.bitnami.com/bitnami/ version: 13.2.18 options: + commonLabels: + stackable.tech/vendor: Stackable auth: username: hive password: hive diff --git a/stacks/_templates/postgresql-superset.yaml b/stacks/_templates/postgresql-superset.yaml index f90b2043..4d9d1b4e 100644 --- a/stacks/_templates/postgresql-superset.yaml +++ b/stacks/_templates/postgresql-superset.yaml @@ -5,6 +5,8 @@ repo: url: https://charts.bitnami.com/bitnami/ version: 13.2.18 options: + commonLabels: + stackable.tech/vendor: Stackable auth: username: superset password: superset diff --git a/stacks/_templates/postgresql-timescaledb.yaml b/stacks/_templates/postgresql-timescaledb.yaml index 69b830e4..6870576b 100644 --- a/stacks/_templates/postgresql-timescaledb.yaml +++ b/stacks/_templates/postgresql-timescaledb.yaml @@ -5,6 +5,8 @@ repo: url: https://charts.timescale.com/ version: 0.33.1 options: + commonLabels: + stackable.tech/vendor: Stackable replicaCount: 1 secrets: credentials: diff --git a/stacks/_templates/prometheus-service-monitor.yaml b/stacks/_templates/prometheus-service-monitor.yaml index 15e919c5..5e470cf1 100644 --- a/stacks/_templates/prometheus-service-monitor.yaml +++ b/stacks/_templates/prometheus-service-monitor.yaml @@ -3,6 +3,7 @@ kind: ServiceMonitor metadata: name: scrape-label labels: + stackable.tech/vendor: Stackable release: prometheus spec: endpoints: @@ -19,6 +20,7 @@ kind: ServiceMonitor metadata: name: scrape-minio labels: + stackable.tech/vendor: Stackable release: prometheus spec: endpoints: diff --git a/stacks/_templates/prometheus.yaml b/stacks/_templates/prometheus.yaml index a5d42302..bd796d78 100644 --- a/stacks/_templates/prometheus.yaml +++ b/stacks/_templates/prometheus.yaml @@ -5,6 +5,8 @@ repo: url: https://prometheus-community.github.io/helm-charts version: 54.2.2 options: + commonMetaLabels: + stackable.tech/vendor: Stackable prometheus: prometheusSpec: storageSpec: diff --git a/stacks/_templates/redis-airflow.yaml b/stacks/_templates/redis-airflow.yaml index 04e56e19..2381f61f 100644 --- a/stacks/_templates/redis-airflow.yaml +++ b/stacks/_templates/redis-airflow.yaml @@ -5,6 +5,8 @@ repo: url: https://charts.bitnami.com/bitnami/ version: 18.1.6 options: + commonLabels: + stackable.tech/vendor: Stackable auth: password: airflow replica: diff --git a/stacks/_templates/vector-aggregator-discovery.yaml b/stacks/_templates/vector-aggregator-discovery.yaml index daba2720..0c8fee1e 100644 --- a/stacks/_templates/vector-aggregator-discovery.yaml +++ b/stacks/_templates/vector-aggregator-discovery.yaml @@ -2,5 +2,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: vector-aggregator-discovery + labels: + stackable.tech/vendor: Stackable data: ADDRESS: vector-aggregator:6000 diff --git a/stacks/_templates/vector-aggregator.yaml b/stacks/_templates/vector-aggregator.yaml index 47d8113d..2b05dfdb 100644 --- a/stacks/_templates/vector-aggregator.yaml +++ b/stacks/_templates/vector-aggregator.yaml @@ -5,6 +5,10 @@ repo: url: https://helm.vector.dev version: 0.26.0 options: + commonLabels: + stackable.tech/vendor: Stackable + podLabels: # Doesn't seem to work? + stackable.tech/vendor: Stackable role: Aggregator customConfig: sources: diff --git a/stacks/airflow/airflow.yaml b/stacks/airflow/airflow.yaml index e6767b79..57b85186 100644 --- a/stacks/airflow/airflow.yaml +++ b/stacks/airflow/airflow.yaml @@ -4,6 +4,8 @@ apiVersion: airflow.stackable.tech/v1alpha1 kind: AirflowCluster metadata: name: airflow + labels: + stackable.tech/vendor: Stackable spec: image: productVersion: 2.7.2 @@ -65,6 +67,8 @@ apiVersion: v1 kind: ConfigMap metadata: name: airflow-dags + labels: + stackable.tech/vendor: Stackable data: date_demo.py: | """Example DAG returning the current date""" @@ -306,6 +310,8 @@ apiVersion: v1 kind: Secret metadata: name: airflow-credentials + labels: + stackable.tech/vendor: Stackable type: Opaque stringData: adminUser.username: admin diff --git a/stacks/authentication/openldap-tls-authenticationclass.yaml b/stacks/authentication/openldap-tls-authenticationclass.yaml index fb69a52d..1f782048 100644 --- a/stacks/authentication/openldap-tls-authenticationclass.yaml +++ b/stacks/authentication/openldap-tls-authenticationclass.yaml @@ -3,6 +3,8 @@ apiVersion: authentication.stackable.tech/v1alpha1 kind: AuthenticationClass metadata: name: openldap + labels: + stackable.tech/vendor: Stackable spec: provider: ldap: @@ -23,6 +25,8 @@ apiVersion: secrets.stackable.tech/v1alpha1 kind: SecretClass metadata: name: openldap-bind-credentials + labels: + stackable.tech/vendor: Stackable spec: backend: k8sSearch: @@ -36,6 +40,7 @@ metadata: name: openldap-bind-credentials labels: secrets.stackable.tech/class: openldap-bind-credentials + stackable.tech/vendor: Stackable stringData: # User and password are defined in the OpenLDAP StatefulSet user: cn=ldapadmin,dc=example,dc=org diff --git a/stacks/authentication/openldap-tls.yaml b/stacks/authentication/openldap-tls.yaml index 0f61f417..5b1492f1 100644 --- a/stacks/authentication/openldap-tls.yaml +++ b/stacks/authentication/openldap-tls.yaml @@ -3,6 +3,8 @@ apiVersion: secrets.stackable.tech/v1alpha1 kind: SecretClass metadata: name: openldap-tls + labels: + stackable.tech/vendor: Stackable spec: backend: autoTls: @@ -17,6 +19,7 @@ kind: StatefulSet metadata: name: openldap labels: + stackable.tech/vendor: Stackable app.kubernetes.io/name: openldap spec: selector: @@ -82,6 +85,7 @@ kind: Service metadata: name: openldap labels: + stackable.tech/vendor: Stackable app.kubernetes.io/name: openldap spec: type: ClusterIP diff --git a/stacks/data-lakehouse-iceberg-trino-spark/hive-metastores.yaml b/stacks/data-lakehouse-iceberg-trino-spark/hive-metastores.yaml index 82e9f5c1..c00d76e3 100644 --- a/stacks/data-lakehouse-iceberg-trino-spark/hive-metastores.yaml +++ b/stacks/data-lakehouse-iceberg-trino-spark/hive-metastores.yaml @@ -3,6 +3,8 @@ apiVersion: hive.stackable.tech/v1alpha1 kind: HiveCluster metadata: name: hive + labels: + stackable.tech/vendor: Stackable spec: image: productVersion: 3.1.3 @@ -23,6 +25,8 @@ apiVersion: hive.stackable.tech/v1alpha1 kind: HiveCluster metadata: name: hive-iceberg + labels: + stackable.tech/vendor: Stackable spec: image: productVersion: 3.1.3 diff --git a/stacks/data-lakehouse-iceberg-trino-spark/kafka.yaml b/stacks/data-lakehouse-iceberg-trino-spark/kafka.yaml index 85be5393..2e63798a 100644 --- a/stacks/data-lakehouse-iceberg-trino-spark/kafka.yaml +++ b/stacks/data-lakehouse-iceberg-trino-spark/kafka.yaml @@ -3,6 +3,8 @@ apiVersion: zookeeper.stackable.tech/v1alpha1 kind: ZookeeperZnode metadata: name: kafka-znode + labels: + stackable.tech/vendor: Stackable spec: clusterRef: name: zookeeper @@ -11,6 +13,8 @@ apiVersion: kafka.stackable.tech/v1alpha1 kind: KafkaCluster metadata: name: kafka + labels: + stackable.tech/vendor: Stackable spec: image: productVersion: 3.5.1 @@ -42,6 +46,8 @@ apiVersion: authentication.stackable.tech/v1alpha1 kind: AuthenticationClass metadata: name: kafka-client-tls + labels: + stackable.tech/vendor: Stackable spec: provider: tls: diff --git a/stacks/data-lakehouse-iceberg-trino-spark/nifi.yaml b/stacks/data-lakehouse-iceberg-trino-spark/nifi.yaml index 9b5a3e4c..36aef35a 100644 --- a/stacks/data-lakehouse-iceberg-trino-spark/nifi.yaml +++ b/stacks/data-lakehouse-iceberg-trino-spark/nifi.yaml @@ -3,6 +3,8 @@ apiVersion: nifi.stackable.tech/v1alpha1 kind: NifiCluster metadata: name: nifi + labels: + stackable.tech/vendor: Stackable spec: image: productVersion: 1.23.2 @@ -41,6 +43,8 @@ apiVersion: authentication.stackable.tech/v1alpha1 kind: AuthenticationClass metadata: name: nifi-admin-credentials + labels: + stackable.tech/vendor: Stackable spec: provider: static: @@ -51,6 +55,8 @@ apiVersion: v1 kind: Secret metadata: name: nifi-admin-credentials-secret + labels: + stackable.tech/vendor: Stackable stringData: admin: {{ nifiAdminPassword }} --- @@ -58,6 +64,8 @@ apiVersion: zookeeper.stackable.tech/v1alpha1 kind: ZookeeperZnode metadata: name: nifi-znode + labels: + stackable.tech/vendor: Stackable spec: clusterRef: name: zookeeper diff --git a/stacks/data-lakehouse-iceberg-trino-spark/s3-connection.yaml b/stacks/data-lakehouse-iceberg-trino-spark/s3-connection.yaml index 7e026539..f52cb8bb 100644 --- a/stacks/data-lakehouse-iceberg-trino-spark/s3-connection.yaml +++ b/stacks/data-lakehouse-iceberg-trino-spark/s3-connection.yaml @@ -3,6 +3,8 @@ apiVersion: s3.stackable.tech/v1alpha1 kind: S3Connection metadata: name: minio + labels: + stackable.tech/vendor: Stackable spec: host: minio port: 9000 @@ -14,6 +16,8 @@ apiVersion: secrets.stackable.tech/v1alpha1 kind: SecretClass metadata: name: minio-s3-credentials + labels: + stackable.tech/vendor: Stackable spec: backend: k8sSearch: @@ -26,6 +30,7 @@ metadata: name: minio-s3-credentials labels: secrets.stackable.tech/class: minio-s3-credentials + stackable.tech/vendor: Stackable stringData: accessKey: admin secretKey: {{ minioAdminPassword }} diff --git a/stacks/data-lakehouse-iceberg-trino-spark/trino.yaml b/stacks/data-lakehouse-iceberg-trino-spark/trino.yaml index eb487c8f..2991b4f8 100644 --- a/stacks/data-lakehouse-iceberg-trino-spark/trino.yaml +++ b/stacks/data-lakehouse-iceberg-trino-spark/trino.yaml @@ -3,6 +3,8 @@ apiVersion: trino.stackable.tech/v1alpha1 kind: TrinoCluster metadata: name: trino + labels: + stackable.tech/vendor: Stackable spec: image: productVersion: "428" @@ -46,6 +48,8 @@ apiVersion: authentication.stackable.tech/v1alpha1 kind: AuthenticationClass metadata: name: trino-users + labels: + stackable.tech/vendor: Stackable spec: provider: static: @@ -56,6 +60,8 @@ apiVersion: v1 kind: Secret metadata: name: trino-users + labels: + stackable.tech/vendor: Stackable type: kubernetes.io/opaque stringData: admin: "{{ trinoAdminPassword }}" @@ -65,6 +71,7 @@ kind: TrinoCatalog metadata: name: staging labels: + stackable.tech/vendor: Stackable trino: trino spec: connector: @@ -79,6 +86,7 @@ kind: TrinoCatalog metadata: name: lakehouse labels: + stackable.tech/vendor: Stackable trino: trino spec: connector: @@ -93,6 +101,7 @@ kind: TrinoCatalog metadata: name: tpcds labels: + stackable.tech/vendor: Stackable trino: trino spec: connector: @@ -103,6 +112,7 @@ kind: TrinoCatalog metadata: name: tpch labels: + stackable.tech/vendor: Stackable trino: trino spec: connector: @@ -112,6 +122,8 @@ apiVersion: opa.stackable.tech/v1alpha1 kind: OpaCluster metadata: name: opa + labels: + stackable.tech/vendor: Stackable spec: image: productVersion: 0.57.0 @@ -125,6 +137,7 @@ metadata: name: trino-opa-bundle labels: opa.stackable.tech/bundle: "trino" + stackable.tech/vendor: Stackable data: trino.rego: | package trino diff --git a/stacks/data-lakehouse-iceberg-trino-spark/zookeeper.yaml b/stacks/data-lakehouse-iceberg-trino-spark/zookeeper.yaml index 58735314..9a46a7e8 100644 --- a/stacks/data-lakehouse-iceberg-trino-spark/zookeeper.yaml +++ b/stacks/data-lakehouse-iceberg-trino-spark/zookeeper.yaml @@ -3,6 +3,8 @@ apiVersion: zookeeper.stackable.tech/v1alpha1 kind: ZookeeperCluster metadata: name: zookeeper + labels: + stackable.tech/vendor: Stackable spec: image: productVersion: 3.8.3 diff --git a/stacks/dual-hive-hdfs-s3/hdfs.yaml b/stacks/dual-hive-hdfs-s3/hdfs.yaml index db840268..285a8284 100644 --- a/stacks/dual-hive-hdfs-s3/hdfs.yaml +++ b/stacks/dual-hive-hdfs-s3/hdfs.yaml @@ -3,6 +3,8 @@ apiVersion: zookeeper.stackable.tech/v1alpha1 kind: ZookeeperCluster metadata: name: hdfs-zk + labels: + stackable.tech/vendor: Stackable spec: image: productVersion: 3.8.1 @@ -15,6 +17,8 @@ apiVersion: zookeeper.stackable.tech/v1alpha1 kind: ZookeeperZnode metadata: name: hdfs-znode + labels: + stackable.tech/vendor: Stackable spec: clusterRef: name: hdfs-zk @@ -23,6 +27,8 @@ apiVersion: hdfs.stackable.tech/v1alpha1 kind: HdfsCluster metadata: name: hdfs + labels: + stackable.tech/vendor: Stackable spec: image: productVersion: 3.3.4 diff --git a/stacks/dual-hive-hdfs-s3/hive.yaml b/stacks/dual-hive-hdfs-s3/hive.yaml index 6b9cd982..c2a119c6 100644 --- a/stacks/dual-hive-hdfs-s3/hive.yaml +++ b/stacks/dual-hive-hdfs-s3/hive.yaml @@ -3,6 +3,8 @@ apiVersion: secrets.stackable.tech/v1alpha1 kind: SecretClass metadata: name: hive-s3-secret-class + labels: + stackable.tech/vendor: Stackable spec: backend: k8sSearch: @@ -13,6 +15,8 @@ apiVersion: s3.stackable.tech/v1alpha1 kind: S3Connection metadata: name: minio + labels: + stackable.tech/vendor: Stackable spec: host: minio port: 9000 @@ -26,6 +30,7 @@ metadata: name: hive-s3-secret labels: secrets.stackable.tech/class: hive-s3-secret-class + stackable.tech/vendor: Stackable stringData: accessKey: trino secretKey: trinotrino @@ -34,6 +39,8 @@ apiVersion: hive.stackable.tech/v1alpha1 kind: HiveCluster metadata: name: hive-hdfs + labels: + stackable.tech/vendor: Stackable spec: image: productVersion: 3.1.3 @@ -54,6 +61,8 @@ apiVersion: hive.stackable.tech/v1alpha1 kind: HiveCluster metadata: name: hive-s3 + labels: + stackable.tech/vendor: Stackable spec: image: productVersion: 3.1.3 diff --git a/stacks/dual-hive-hdfs-s3/trino.yaml b/stacks/dual-hive-hdfs-s3/trino.yaml index 1bfb6010..1c40c5f1 100644 --- a/stacks/dual-hive-hdfs-s3/trino.yaml +++ b/stacks/dual-hive-hdfs-s3/trino.yaml @@ -4,6 +4,7 @@ kind: TrinoCatalog metadata: name: hivehdfs labels: + stackable.tech/vendor: Stackable trino: trino spec: connector: @@ -18,6 +19,7 @@ kind: TrinoCatalog metadata: name: hives3 labels: + stackable.tech/vendor: Stackable trino: trino spec: connector: @@ -34,6 +36,7 @@ kind: TrinoCatalog metadata: name: iceberg labels: + stackable.tech/vendor: Stackable trino: trino spec: connector: @@ -50,6 +53,7 @@ kind: TrinoCatalog metadata: name: tpcds labels: + stackable.tech/vendor: Stackable trino: trino spec: connector: @@ -59,6 +63,8 @@ apiVersion: trino.stackable.tech/v1alpha1 kind: TrinoCluster metadata: name: trino + labels: + stackable.tech/vendor: Stackable spec: image: productVersion: "414" @@ -84,6 +90,8 @@ apiVersion: opa.stackable.tech/v1alpha1 kind: OpaCluster metadata: name: opa + labels: + stackable.tech/vendor: Stackable spec: image: productVersion: 0.51.0 @@ -98,6 +106,7 @@ metadata: name: trino-opa-bundle labels: opa.stackable.tech/bundle: "trino" + stackable.tech/vendor: Stackable data: trino.rego: | package trino diff --git a/stacks/hdfs-hbase/hbase.yaml b/stacks/hdfs-hbase/hbase.yaml index 5d6d6041..af45f184 100644 --- a/stacks/hdfs-hbase/hbase.yaml +++ b/stacks/hdfs-hbase/hbase.yaml @@ -3,6 +3,8 @@ apiVersion: hbase.stackable.tech/v1alpha1 kind: HbaseCluster metadata: name: hbase + labels: + stackable.tech/vendor: Stackable spec: image: productVersion: 2.4.17 diff --git a/stacks/hdfs-hbase/hdfs.yaml b/stacks/hdfs-hbase/hdfs.yaml index 78594a6c..61f9f831 100644 --- a/stacks/hdfs-hbase/hdfs.yaml +++ b/stacks/hdfs-hbase/hdfs.yaml @@ -2,6 +2,8 @@ apiVersion: hdfs.stackable.tech/v1alpha1 kind: HdfsCluster metadata: name: hdfs + labels: + stackable.tech/vendor: Stackable spec: image: productVersion: 3.3.6 diff --git a/stacks/hdfs-hbase/zookeeper.yaml b/stacks/hdfs-hbase/zookeeper.yaml index 9ef234fa..a0f60860 100644 --- a/stacks/hdfs-hbase/zookeeper.yaml +++ b/stacks/hdfs-hbase/zookeeper.yaml @@ -3,6 +3,8 @@ apiVersion: zookeeper.stackable.tech/v1alpha1 kind: ZookeeperCluster metadata: name: zookeeper + labels: + stackable.tech/vendor: Stackable spec: image: productVersion: 3.8.3 @@ -15,6 +17,8 @@ apiVersion: zookeeper.stackable.tech/v1alpha1 kind: ZookeeperZnode metadata: name: hdfs-znode + labels: + stackable.tech/vendor: Stackable spec: clusterRef: name: zookeeper @@ -23,6 +27,8 @@ apiVersion: zookeeper.stackable.tech/v1alpha1 kind: ZookeeperZnode metadata: name: hbase-znode + labels: + stackable.tech/vendor: Stackable spec: clusterRef: name: zookeeper diff --git a/stacks/jupyterhub-pyspark-hdfs/hdfs.yaml b/stacks/jupyterhub-pyspark-hdfs/hdfs.yaml index 27e3331c..ac863e5c 100644 --- a/stacks/jupyterhub-pyspark-hdfs/hdfs.yaml +++ b/stacks/jupyterhub-pyspark-hdfs/hdfs.yaml @@ -3,6 +3,8 @@ apiVersion: zookeeper.stackable.tech/v1alpha1 kind: ZookeeperZnode metadata: name: hdfs-znode + labels: + stackable.tech/vendor: Stackable spec: clusterRef: name: zookeeper @@ -11,6 +13,8 @@ apiVersion: hdfs.stackable.tech/v1alpha1 kind: HdfsCluster metadata: name: hdfs + labels: + stackable.tech/vendor: Stackable spec: image: productVersion: 3.3.6 diff --git a/stacks/jupyterhub-pyspark-hdfs/serviceaccount.yaml b/stacks/jupyterhub-pyspark-hdfs/serviceaccount.yaml index f8298b4b..3f7a589a 100644 --- a/stacks/jupyterhub-pyspark-hdfs/serviceaccount.yaml +++ b/stacks/jupyterhub-pyspark-hdfs/serviceaccount.yaml @@ -3,11 +3,15 @@ apiVersion: v1 kind: ServiceAccount metadata: name: spark + labels: + stackable.tech/vendor: Stackable --- apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: name: spark + labels: + stackable.tech/vendor: Stackable subjects: - kind: ServiceAccount name: spark @@ -20,6 +24,8 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: name: spark-role + labels: + stackable.tech/vendor: Stackable rules: - apiGroups: [""] resources: [pods] diff --git a/stacks/jupyterhub-pyspark-hdfs/spark_driver_service.yaml b/stacks/jupyterhub-pyspark-hdfs/spark_driver_service.yaml index 1f52c726..f6d08e0b 100644 --- a/stacks/jupyterhub-pyspark-hdfs/spark_driver_service.yaml +++ b/stacks/jupyterhub-pyspark-hdfs/spark_driver_service.yaml @@ -3,6 +3,8 @@ apiVersion: v1 kind: Service metadata: name: driver-service + labels: + stackable.tech/vendor: Stackable spec: selector: app: jupyterhub diff --git a/stacks/jupyterhub-pyspark-hdfs/zookeeper.yaml b/stacks/jupyterhub-pyspark-hdfs/zookeeper.yaml index 2f93fb8d..4bf3577c 100644 --- a/stacks/jupyterhub-pyspark-hdfs/zookeeper.yaml +++ b/stacks/jupyterhub-pyspark-hdfs/zookeeper.yaml @@ -3,6 +3,8 @@ apiVersion: zookeeper.stackable.tech/v1alpha1 kind: ZookeeperCluster metadata: name: zookeeper + labels: + stackable.tech/vendor: Stackable spec: image: productVersion: 3.8.3 diff --git a/stacks/keycloak-opa-poc/druid.yaml b/stacks/keycloak-opa-poc/druid.yaml index 4e395136..c4562795 100644 --- a/stacks/keycloak-opa-poc/druid.yaml +++ b/stacks/keycloak-opa-poc/druid.yaml @@ -3,6 +3,8 @@ apiVersion: druid.stackable.tech/v1alpha1 kind: DruidCluster metadata: name: druid + labels: + stackable.tech/vendor: Stackable spec: image: productVersion: 27.0.0 diff --git a/stacks/keycloak-opa-poc/hdfs.yaml b/stacks/keycloak-opa-poc/hdfs.yaml index 5252196b..6268a94d 100644 --- a/stacks/keycloak-opa-poc/hdfs.yaml +++ b/stacks/keycloak-opa-poc/hdfs.yaml @@ -3,6 +3,8 @@ apiVersion: hdfs.stackable.tech/v1alpha1 kind: HdfsCluster metadata: name: hdfs + labels: + stackable.tech/vendor: Stackable spec: image: productVersion: 3.3.6 diff --git a/stacks/keycloak-opa-poc/keycloak.yaml b/stacks/keycloak-opa-poc/keycloak.yaml index a1b9ac35..ad7d715f 100644 --- a/stacks/keycloak-opa-poc/keycloak.yaml +++ b/stacks/keycloak-opa-poc/keycloak.yaml @@ -4,6 +4,7 @@ kind: Deployment metadata: name: keycloak labels: + stackable.tech/vendor: Stackable app: keycloak spec: replicas: 1 @@ -13,6 +14,7 @@ spec: template: metadata: labels: + stackable.tech/vendor: Stackable app: keycloak spec: containers: @@ -43,6 +45,7 @@ kind: Service metadata: name: keycloak labels: + stackable.tech/vendor: Stackable app: keycloak spec: type: NodePort @@ -57,6 +60,8 @@ apiVersion: v1 kind: Secret metadata: name: keycloak-admin-credentials + labels: + stackable.tech/vendor: Stackable stringData: admin: "{{ keycloakAdminPassword }}" --- @@ -65,6 +70,8 @@ apiVersion: batch/v1 kind: Job metadata: name: propagate-keycloak-address + labels: + stackable.tech/vendor: Stackable spec: template: spec: diff --git a/stacks/keycloak-opa-poc/opa.yaml b/stacks/keycloak-opa-poc/opa.yaml index bbf66ea3..92de590e 100644 --- a/stacks/keycloak-opa-poc/opa.yaml +++ b/stacks/keycloak-opa-poc/opa.yaml @@ -3,6 +3,8 @@ apiVersion: opa.stackable.tech/v1alpha1 kind: OpaCluster metadata: name: opa + labels: + stackable.tech/vendor: Stackable spec: image: productVersion: 0.57.0 diff --git a/stacks/keycloak-opa-poc/policies.yaml b/stacks/keycloak-opa-poc/policies.yaml index 6ba37fc1..afc40f2f 100644 --- a/stacks/keycloak-opa-poc/policies.yaml +++ b/stacks/keycloak-opa-poc/policies.yaml @@ -5,6 +5,7 @@ metadata: name: opa-bundle-trino labels: opa.stackable.tech/bundle: "true" + stackable.tech/vendor: Stackable data: trino.rego: | package trino @@ -27,6 +28,7 @@ metadata: name: opa-bundle-druid labels: opa.stackable.tech/bundle: "true" + stackable.tech/vendor: Stackable data: druid.rego: | package druid diff --git a/stacks/keycloak-opa-poc/serviceaccount.yaml b/stacks/keycloak-opa-poc/serviceaccount.yaml index b29d205b..de782fd2 100644 --- a/stacks/keycloak-opa-poc/serviceaccount.yaml +++ b/stacks/keycloak-opa-poc/serviceaccount.yaml @@ -4,11 +4,15 @@ kind: ServiceAccount metadata: name: demo-serviceaccount namespace: default + labels: + stackable.tech/vendor: Stackable --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: name: demo-clusterrolebinding + labels: + stackable.tech/vendor: Stackable subjects: - kind: ServiceAccount name: demo-serviceaccount @@ -22,6 +26,8 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: name: demo-clusterrole + labels: + stackable.tech/vendor: Stackable rules: - apiGroups: - "" diff --git a/stacks/keycloak-opa-poc/setup-keycloak.yaml b/stacks/keycloak-opa-poc/setup-keycloak.yaml index e8ac9d7b..856e8269 100644 --- a/stacks/keycloak-opa-poc/setup-keycloak.yaml +++ b/stacks/keycloak-opa-poc/setup-keycloak.yaml @@ -2,6 +2,8 @@ apiVersion: v1 kind: Secret metadata: name: keycloak-client-secrets + labels: + stackable.tech/vendor: Stackable stringData: superset: "{{ keycloakSupersetClientSecret }}" trino: "{{ keycloakTrinoClientSecret }}" @@ -13,6 +15,8 @@ apiVersion: v1 kind: Secret metadata: name: keycloak-users + labels: + stackable.tech/vendor: Stackable stringData: alice: "{{ alicePassword }}" bob: "{{ bobPassword }}" @@ -23,6 +27,8 @@ apiVersion: batch/v1 kind: Job metadata: name: setup-keycloak + labels: + stackable.tech/vendor: Stackable spec: template: spec: diff --git a/stacks/keycloak-opa-poc/superset.yaml b/stacks/keycloak-opa-poc/superset.yaml index a9ac38d0..74972af1 100644 --- a/stacks/keycloak-opa-poc/superset.yaml +++ b/stacks/keycloak-opa-poc/superset.yaml @@ -3,6 +3,8 @@ apiVersion: v1 kind: Secret metadata: name: superset-credentials + labels: + stackable.tech/vendor: Stackable type: Opaque stringData: adminUser.username: admin @@ -17,6 +19,8 @@ apiVersion: superset.stackable.tech/v1alpha1 kind: SupersetCluster metadata: name: superset + labels: + stackable.tech/vendor: Stackable spec: image: productVersion: 3.0.1 diff --git a/stacks/keycloak-opa-poc/trino.yaml b/stacks/keycloak-opa-poc/trino.yaml index af941163..2968e49d 100644 --- a/stacks/keycloak-opa-poc/trino.yaml +++ b/stacks/keycloak-opa-poc/trino.yaml @@ -3,6 +3,8 @@ apiVersion: trino.stackable.tech/v1alpha1 kind: TrinoCluster metadata: name: trino + labels: + stackable.tech/vendor: Stackable spec: image: productVersion: "428" diff --git a/stacks/keycloak-opa-poc/zookeeper.yaml b/stacks/keycloak-opa-poc/zookeeper.yaml index 48e864ee..2aff25f8 100644 --- a/stacks/keycloak-opa-poc/zookeeper.yaml +++ b/stacks/keycloak-opa-poc/zookeeper.yaml @@ -3,6 +3,8 @@ apiVersion: zookeeper.stackable.tech/v1alpha1 kind: ZookeeperCluster metadata: name: zk + labels: + stackable.tech/vendor: Stackable spec: image: productVersion: 3.8.3 @@ -15,6 +17,8 @@ apiVersion: zookeeper.stackable.tech/v1alpha1 kind: ZookeeperZnode metadata: name: druid-znode + labels: + stackable.tech/vendor: Stackable spec: clusterRef: name: zk @@ -23,6 +27,8 @@ apiVersion: zookeeper.stackable.tech/v1alpha1 kind: ZookeeperZnode metadata: name: hdfs-znode + labels: + stackable.tech/vendor: Stackable spec: clusterRef: name: zk \ No newline at end of file diff --git a/stacks/logging/setup-opensearch-dashboards.yaml b/stacks/logging/setup-opensearch-dashboards.yaml index b503b766..36d2a477 100644 --- a/stacks/logging/setup-opensearch-dashboards.yaml +++ b/stacks/logging/setup-opensearch-dashboards.yaml @@ -3,6 +3,8 @@ apiVersion: batch/v1 kind: Job metadata: name: setup-opensearch-dashboards + labels: + stackable.tech/vendor: Stackable spec: template: spec: diff --git a/stacks/monitoring/grafana-dashboards.yaml b/stacks/monitoring/grafana-dashboards.yaml index 0df74960..3567bb1d 100644 --- a/stacks/monitoring/grafana-dashboards.yaml +++ b/stacks/monitoring/grafana-dashboards.yaml @@ -3,6 +3,8 @@ apiVersion: v1 kind: ConfigMap metadata: name: stackable-grafana-dashboards + labels: + stackable.tech/vendor: Stackable data: trino.json: | { diff --git a/stacks/nifi-kafka-druid-superset-s3/druid.yaml b/stacks/nifi-kafka-druid-superset-s3/druid.yaml index c455ee8a..8c8e5897 100644 --- a/stacks/nifi-kafka-druid-superset-s3/druid.yaml +++ b/stacks/nifi-kafka-druid-superset-s3/druid.yaml @@ -3,6 +3,8 @@ apiVersion: druid.stackable.tech/v1alpha1 kind: DruidCluster metadata: name: druid + labels: + stackable.tech/vendor: Stackable spec: image: productVersion: 27.0.0 @@ -72,6 +74,8 @@ apiVersion: zookeeper.stackable.tech/v1alpha1 kind: ZookeeperZnode metadata: name: druid-znode + labels: + stackable.tech/vendor: Stackable spec: clusterRef: name: zookeeper @@ -80,6 +84,8 @@ apiVersion: secrets.stackable.tech/v1alpha1 kind: SecretClass metadata: name: druid-s3-credentials + labels: + stackable.tech/vendor: Stackable spec: backend: k8sSearch: @@ -92,6 +98,7 @@ metadata: name: druid-s3-credentials labels: secrets.stackable.tech/class: druid-s3-credentials + stackable.tech/vendor: Stackable stringData: accessKey: admin secretKey: {{ minioAdminPassword }} diff --git a/stacks/nifi-kafka-druid-superset-s3/kafka.yaml b/stacks/nifi-kafka-druid-superset-s3/kafka.yaml index f0fb70d2..a76cb10f 100644 --- a/stacks/nifi-kafka-druid-superset-s3/kafka.yaml +++ b/stacks/nifi-kafka-druid-superset-s3/kafka.yaml @@ -3,6 +3,8 @@ apiVersion: zookeeper.stackable.tech/v1alpha1 kind: ZookeeperZnode metadata: name: kafka-znode + labels: + stackable.tech/vendor: Stackable spec: clusterRef: name: zookeeper @@ -11,6 +13,8 @@ apiVersion: kafka.stackable.tech/v1alpha1 kind: KafkaCluster metadata: name: kafka + labels: + stackable.tech/vendor: Stackable spec: image: productVersion: 3.5.1 @@ -47,6 +51,8 @@ apiVersion: authentication.stackable.tech/v1alpha1 kind: AuthenticationClass metadata: name: kafka-client-tls + labels: + stackable.tech/vendor: Stackable spec: provider: tls: diff --git a/stacks/nifi-kafka-druid-superset-s3/nifi.yaml b/stacks/nifi-kafka-druid-superset-s3/nifi.yaml index 91b3ce0b..00bf9d36 100644 --- a/stacks/nifi-kafka-druid-superset-s3/nifi.yaml +++ b/stacks/nifi-kafka-druid-superset-s3/nifi.yaml @@ -3,6 +3,8 @@ apiVersion: nifi.stackable.tech/v1alpha1 kind: NifiCluster metadata: name: nifi + labels: + stackable.tech/vendor: Stackable spec: image: productVersion: 1.23.2 @@ -41,6 +43,8 @@ apiVersion: authentication.stackable.tech/v1alpha1 kind: AuthenticationClass metadata: name: nifi-admin-credentials + labels: + stackable.tech/vendor: Stackable spec: provider: static: @@ -51,6 +55,8 @@ apiVersion: v1 kind: Secret metadata: name: nifi-admin-credentials-secret + labels: + stackable.tech/vendor: Stackable stringData: admin: {{ nifiAdminPassword }} --- @@ -58,6 +64,8 @@ apiVersion: zookeeper.stackable.tech/v1alpha1 kind: ZookeeperZnode metadata: name: nifi-znode + labels: + stackable.tech/vendor: Stackable spec: clusterRef: name: zookeeper diff --git a/stacks/nifi-kafka-druid-superset-s3/superset.yaml b/stacks/nifi-kafka-druid-superset-s3/superset.yaml index 7e382252..f2441d2a 100644 --- a/stacks/nifi-kafka-druid-superset-s3/superset.yaml +++ b/stacks/nifi-kafka-druid-superset-s3/superset.yaml @@ -3,6 +3,8 @@ apiVersion: superset.stackable.tech/v1alpha1 kind: SupersetCluster metadata: name: superset + labels: + stackable.tech/vendor: Stackable spec: image: productVersion: 3.0.1 @@ -19,6 +21,8 @@ apiVersion: v1 kind: Secret metadata: name: superset-credentials + labels: + stackable.tech/vendor: Stackable type: Opaque stringData: adminUser.username: admin @@ -33,6 +37,8 @@ apiVersion: v1 kind: Secret metadata: name: superset-mapbox-api-key + labels: + stackable.tech/vendor: Stackable type: Opaque stringData: connections.mapboxApiKey: "pk.eyJ1IjoibXVlbGxlcmNlbGluZSIsImEiOiJjbDZwM3llMTAwNGpmM2psdHU0Y21wZHJwIn0.kXFJKBbeyhbwf0z460JcTQ" @@ -41,6 +47,8 @@ apiVersion: superset.stackable.tech/v1alpha1 kind: DruidConnection metadata: name: superset-druid-connection + labels: + stackable.tech/vendor: Stackable spec: superset: name: superset diff --git a/stacks/nifi-kafka-druid-superset-s3/zookeeper.yaml b/stacks/nifi-kafka-druid-superset-s3/zookeeper.yaml index 2f93fb8d..4bf3577c 100644 --- a/stacks/nifi-kafka-druid-superset-s3/zookeeper.yaml +++ b/stacks/nifi-kafka-druid-superset-s3/zookeeper.yaml @@ -3,6 +3,8 @@ apiVersion: zookeeper.stackable.tech/v1alpha1 kind: ZookeeperCluster metadata: name: zookeeper + labels: + stackable.tech/vendor: Stackable spec: image: productVersion: 3.8.3 diff --git a/stacks/signal-processing/grafana-dashboards.yaml b/stacks/signal-processing/grafana-dashboards.yaml index 24ac2427..03ab7a49 100644 --- a/stacks/signal-processing/grafana-dashboards.yaml +++ b/stacks/signal-processing/grafana-dashboards.yaml @@ -3,6 +3,8 @@ apiVersion: v1 kind: ConfigMap metadata: name: stackable-grafana-dashboards + labels: + stackable.tech/vendor: Stackable data: gas_measurements.json: | { diff --git a/stacks/signal-processing/grafana.yaml b/stacks/signal-processing/grafana.yaml index b98bfea7..b5b83a56 100644 --- a/stacks/signal-processing/grafana.yaml +++ b/stacks/signal-processing/grafana.yaml @@ -5,6 +5,8 @@ repo: url: https://grafana.github.io/helm-charts version: 6.56.1 options: + extraLabels: + stackable.tech/vendor: Stackable grafana.ini: analytics: check_for_updates: false diff --git a/stacks/signal-processing/jupyterhub.yaml b/stacks/signal-processing/jupyterhub.yaml index 8b1eeb90..a3166f98 100644 --- a/stacks/signal-processing/jupyterhub.yaml +++ b/stacks/signal-processing/jupyterhub.yaml @@ -5,6 +5,8 @@ repo: url: https://jupyterhub.github.io/helm-chart/ version: 2.0.0 options: + labels: + stackable.tech/vendor: Stackable hub: config: Authenticator: diff --git a/stacks/signal-processing/nifi.yaml b/stacks/signal-processing/nifi.yaml index 9bae5364..8c8bcb2b 100644 --- a/stacks/signal-processing/nifi.yaml +++ b/stacks/signal-processing/nifi.yaml @@ -3,6 +3,8 @@ apiVersion: nifi.stackable.tech/v1alpha1 kind: NifiCluster metadata: name: nifi + labels: + stackable.tech/vendor: Stackable spec: image: productVersion: 1.21.0 @@ -42,6 +44,8 @@ apiVersion: authentication.stackable.tech/v1alpha1 kind: AuthenticationClass metadata: name: nifi-users + labels: + stackable.tech/vendor: Stackable spec: provider: static: @@ -52,6 +56,8 @@ apiVersion: v1 kind: Secret metadata: name: nifi-admin-credentials + labels: + stackable.tech/vendor: Stackable stringData: admin: {{ nifiAdminPassword }} --- @@ -59,6 +65,8 @@ apiVersion: zookeeper.stackable.tech/v1alpha1 kind: ZookeeperZnode metadata: name: nifi-znode + labels: + stackable.tech/vendor: Stackable spec: clusterRef: name: zookeeper diff --git a/stacks/signal-processing/secrets.yaml b/stacks/signal-processing/secrets.yaml index d2d41668..35d35236 100644 --- a/stacks/signal-processing/secrets.yaml +++ b/stacks/signal-processing/secrets.yaml @@ -3,6 +3,8 @@ apiVersion: v1 kind: Secret metadata: name: timescale-admin-credentials + labels: + stackable.tech/vendor: Stackable stringData: username: admin password: {{ postgresAdminPassword }} \ No newline at end of file diff --git a/stacks/spark-trino-superset-s3/hive-metastore.yaml b/stacks/spark-trino-superset-s3/hive-metastore.yaml index 82e9f5c1..c00d76e3 100644 --- a/stacks/spark-trino-superset-s3/hive-metastore.yaml +++ b/stacks/spark-trino-superset-s3/hive-metastore.yaml @@ -3,6 +3,8 @@ apiVersion: hive.stackable.tech/v1alpha1 kind: HiveCluster metadata: name: hive + labels: + stackable.tech/vendor: Stackable spec: image: productVersion: 3.1.3 @@ -23,6 +25,8 @@ apiVersion: hive.stackable.tech/v1alpha1 kind: HiveCluster metadata: name: hive-iceberg + labels: + stackable.tech/vendor: Stackable spec: image: productVersion: 3.1.3 diff --git a/stacks/spark-trino-superset-s3/trino-prediction-catalog.yaml b/stacks/spark-trino-superset-s3/trino-prediction-catalog.yaml index 0410fa17..ca5bf0c6 100644 --- a/stacks/spark-trino-superset-s3/trino-prediction-catalog.yaml +++ b/stacks/spark-trino-superset-s3/trino-prediction-catalog.yaml @@ -4,6 +4,7 @@ kind: TrinoCatalog metadata: name: prediction labels: + stackable.tech/vendor: Stackable trino: trino spec: connector: diff --git a/stacks/trino-iceberg/hive-metastores.yaml b/stacks/trino-iceberg/hive-metastores.yaml index 446618dd..fc8e2b8c 100644 --- a/stacks/trino-iceberg/hive-metastores.yaml +++ b/stacks/trino-iceberg/hive-metastores.yaml @@ -3,6 +3,8 @@ apiVersion: hive.stackable.tech/v1alpha1 kind: HiveCluster metadata: name: hive-iceberg + labels: + stackable.tech/vendor: Stackable spec: image: productVersion: 3.1.3 diff --git a/stacks/trino-iceberg/s3-connection.yaml b/stacks/trino-iceberg/s3-connection.yaml index 7e026539..f52cb8bb 100644 --- a/stacks/trino-iceberg/s3-connection.yaml +++ b/stacks/trino-iceberg/s3-connection.yaml @@ -3,6 +3,8 @@ apiVersion: s3.stackable.tech/v1alpha1 kind: S3Connection metadata: name: minio + labels: + stackable.tech/vendor: Stackable spec: host: minio port: 9000 @@ -14,6 +16,8 @@ apiVersion: secrets.stackable.tech/v1alpha1 kind: SecretClass metadata: name: minio-s3-credentials + labels: + stackable.tech/vendor: Stackable spec: backend: k8sSearch: @@ -26,6 +30,7 @@ metadata: name: minio-s3-credentials labels: secrets.stackable.tech/class: minio-s3-credentials + stackable.tech/vendor: Stackable stringData: accessKey: admin secretKey: {{ minioAdminPassword }} diff --git a/stacks/trino-iceberg/trino.yaml b/stacks/trino-iceberg/trino.yaml index 41a5e739..9356dc2a 100644 --- a/stacks/trino-iceberg/trino.yaml +++ b/stacks/trino-iceberg/trino.yaml @@ -3,6 +3,8 @@ apiVersion: trino.stackable.tech/v1alpha1 kind: TrinoCluster metadata: name: trino + labels: + stackable.tech/vendor: Stackable spec: image: productVersion: "428" @@ -46,6 +48,8 @@ apiVersion: authentication.stackable.tech/v1alpha1 kind: AuthenticationClass metadata: name: trino-users + labels: + stackable.tech/vendor: Stackable spec: provider: static: @@ -56,6 +60,8 @@ apiVersion: v1 kind: Secret metadata: name: trino-users + labels: + stackable.tech/vendor: Stackable type: kubernetes.io/opaque stringData: admin: "{{ trinoAdminPassword }}" @@ -65,6 +71,7 @@ kind: TrinoCatalog metadata: name: lakehouse labels: + stackable.tech/vendor: Stackable trino: trino spec: connector: @@ -79,6 +86,7 @@ kind: TrinoCatalog metadata: name: tpcds labels: + stackable.tech/vendor: Stackable trino: trino spec: connector: @@ -89,6 +97,7 @@ kind: TrinoCatalog metadata: name: tpch labels: + stackable.tech/vendor: Stackable trino: trino spec: connector: @@ -98,6 +107,8 @@ apiVersion: opa.stackable.tech/v1alpha1 kind: OpaCluster metadata: name: opa + labels: + stackable.tech/vendor: Stackable spec: image: productVersion: 0.57.0 @@ -114,6 +125,7 @@ metadata: name: trino-opa-bundle labels: opa.stackable.tech/bundle: "trino" + stackable.tech/vendor: Stackable data: trino.rego: | package trino diff --git a/stacks/trino-superset-s3/hive-metastore.yaml b/stacks/trino-superset-s3/hive-metastore.yaml index 397e5207..8a0b9e06 100644 --- a/stacks/trino-superset-s3/hive-metastore.yaml +++ b/stacks/trino-superset-s3/hive-metastore.yaml @@ -3,6 +3,8 @@ apiVersion: hive.stackable.tech/v1alpha1 kind: HiveCluster metadata: name: hive + labels: + stackable.tech/vendor: Stackable spec: image: productVersion: 3.1.3 diff --git a/stacks/trino-superset-s3/s3-connection.yaml b/stacks/trino-superset-s3/s3-connection.yaml index 7e026539..f52cb8bb 100644 --- a/stacks/trino-superset-s3/s3-connection.yaml +++ b/stacks/trino-superset-s3/s3-connection.yaml @@ -3,6 +3,8 @@ apiVersion: s3.stackable.tech/v1alpha1 kind: S3Connection metadata: name: minio + labels: + stackable.tech/vendor: Stackable spec: host: minio port: 9000 @@ -14,6 +16,8 @@ apiVersion: secrets.stackable.tech/v1alpha1 kind: SecretClass metadata: name: minio-s3-credentials + labels: + stackable.tech/vendor: Stackable spec: backend: k8sSearch: @@ -26,6 +30,7 @@ metadata: name: minio-s3-credentials labels: secrets.stackable.tech/class: minio-s3-credentials + stackable.tech/vendor: Stackable stringData: accessKey: admin secretKey: {{ minioAdminPassword }} diff --git a/stacks/trino-superset-s3/superset.yaml b/stacks/trino-superset-s3/superset.yaml index 207183ef..8abddee8 100644 --- a/stacks/trino-superset-s3/superset.yaml +++ b/stacks/trino-superset-s3/superset.yaml @@ -3,6 +3,8 @@ apiVersion: superset.stackable.tech/v1alpha1 kind: SupersetCluster metadata: name: superset + labels: + stackable.tech/vendor: Stackable spec: image: productVersion: 3.0.1 @@ -19,6 +21,8 @@ apiVersion: v1 kind: Secret metadata: name: superset-credentials + labels: + stackable.tech/vendor: Stackable type: Opaque stringData: adminUser.username: admin @@ -33,6 +37,8 @@ apiVersion: v1 kind: Secret metadata: name: superset-mapbox-api-key + labels: + stackable.tech/vendor: Stackable type: Opaque stringData: connections.mapboxApiKey: "pk.eyJ1IjoibXVlbGxlcmNlbGluZSIsImEiOiJjbDZwM3llMTAwNGpmM2psdHU0Y21wZHJwIn0.kXFJKBbeyhbwf0z460JcTQ" diff --git a/stacks/trino-superset-s3/trino.yaml b/stacks/trino-superset-s3/trino.yaml index d33d81e2..43bb2643 100644 --- a/stacks/trino-superset-s3/trino.yaml +++ b/stacks/trino-superset-s3/trino.yaml @@ -3,6 +3,8 @@ apiVersion: trino.stackable.tech/v1alpha1 kind: TrinoCluster metadata: name: trino + labels: + stackable.tech/vendor: Stackable spec: image: productVersion: "428" @@ -37,6 +39,8 @@ apiVersion: authentication.stackable.tech/v1alpha1 kind: AuthenticationClass metadata: name: trino-users + labels: + stackable.tech/vendor: Stackable spec: provider: static: @@ -47,6 +51,8 @@ apiVersion: v1 kind: Secret metadata: name: trino-users + labels: + stackable.tech/vendor: Stackable type: kubernetes.io/opaque stringData: admin: "{{ trinoAdminPassword }}" @@ -56,6 +62,7 @@ kind: TrinoCatalog metadata: name: hive labels: + stackable.tech/vendor: Stackable trino: trino spec: connector: @@ -69,6 +76,8 @@ apiVersion: opa.stackable.tech/v1alpha1 kind: OpaCluster metadata: name: opa + labels: + stackable.tech/vendor: Stackable spec: image: productVersion: 0.57.0 @@ -82,6 +91,7 @@ metadata: name: trino-opa-bundle labels: opa.stackable.tech/bundle: "trino" + stackable.tech/vendor: Stackable data: trino.rego: | package trino From c5320e5825c1ee536f9837f4fe3f93832da4f3e9 Mon Sep 17 00:00:00 2001 From: Techassi Date: Thu, 1 Feb 2024 14:19:31 +0100 Subject: [PATCH 2/8] Remove vendor label from demo manifests --- .../01-airflow-spark-clusterrole.yaml | 2 -- .../02-airflow-spark-clusterrolebinding.yaml | 2 -- .../03-enable-and-run-spark-dag.yaml | 2 -- .../04-enable-and-run-date-dag.yaml | 2 -- .../create-nifi-ingestion-job.yaml | 4 ---- .../create-spark-ingestion-job.yaml | 8 +------- .../create-trino-tables.yaml | 4 ---- .../load-test-data.yaml | 2 -- .../serviceaccount.yaml | 6 ------ .../setup-superset.yaml | 4 ---- .../create-hfile-and-import-to-hbase.yaml | 2 -- .../distcp-cycling-data.yaml | 2 -- .../load-test-data.yaml | 2 -- demos/logging/zookeeper.yaml | 2 -- .../create-druid-ingestion-job.yaml | 4 ---- .../create-nifi-ingestion-job.yaml | 4 ---- .../setup-superset.yaml | 4 ---- .../create-druid-ingestion-job.yaml | 10 +++------- .../create-nifi-ingestion-job.yaml | 4 ---- .../setup-superset.yaml | 4 ---- demos/signal-processing/create-nifi-ingestion-job.yaml | 4 ---- demos/signal-processing/create-timescale-tables.yaml | 4 ---- demos/signal-processing/serviceaccount.yaml | 7 ------- .../create-spark-anomaly-detection-job.yaml | 10 ++-------- .../load-test-data.yaml | 2 -- .../serviceaccount.yaml | 4 ---- .../setup-superset.yaml | 4 ---- demos/trino-taxi-data/create-table-in-trino.yaml | 4 ---- demos/trino-taxi-data/load-test-data.yaml | 2 -- demos/trino-taxi-data/setup-superset.yaml | 4 ---- 30 files changed, 6 insertions(+), 113 deletions(-) diff --git a/demos/airflow-scheduled-job/01-airflow-spark-clusterrole.yaml b/demos/airflow-scheduled-job/01-airflow-spark-clusterrole.yaml index 1527b3c7..d63b6ec9 100644 --- a/demos/airflow-scheduled-job/01-airflow-spark-clusterrole.yaml +++ b/demos/airflow-scheduled-job/01-airflow-spark-clusterrole.yaml @@ -3,8 +3,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: name: airflow-spark-clusterrole - labels: - stackable.tech/vendor: Stackable rules: - apiGroups: - spark.stackable.tech diff --git a/demos/airflow-scheduled-job/02-airflow-spark-clusterrolebinding.yaml b/demos/airflow-scheduled-job/02-airflow-spark-clusterrolebinding.yaml index 51027c7b..d3441a4c 100644 --- a/demos/airflow-scheduled-job/02-airflow-spark-clusterrolebinding.yaml +++ b/demos/airflow-scheduled-job/02-airflow-spark-clusterrolebinding.yaml @@ -3,8 +3,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: name: airflow-spark-clusterrole-binding - labels: - stackable.tech/vendor: Stackable roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole diff --git a/demos/airflow-scheduled-job/03-enable-and-run-spark-dag.yaml b/demos/airflow-scheduled-job/03-enable-and-run-spark-dag.yaml index be26090e..677d266f 100644 --- a/demos/airflow-scheduled-job/03-enable-and-run-spark-dag.yaml +++ b/demos/airflow-scheduled-job/03-enable-and-run-spark-dag.yaml @@ -3,8 +3,6 @@ apiVersion: batch/v1 kind: Job metadata: name: start-pyspark-job - labels: - stackable.tech/vendor: Stackable spec: template: spec: diff --git a/demos/airflow-scheduled-job/04-enable-and-run-date-dag.yaml b/demos/airflow-scheduled-job/04-enable-and-run-date-dag.yaml index 5691bdaa..04857028 100644 --- a/demos/airflow-scheduled-job/04-enable-and-run-date-dag.yaml +++ b/demos/airflow-scheduled-job/04-enable-and-run-date-dag.yaml @@ -3,8 +3,6 @@ apiVersion: batch/v1 kind: Job metadata: name: start-date-job - labels: - stackable.tech/vendor: Stackable spec: template: spec: diff --git a/demos/data-lakehouse-iceberg-trino-spark/create-nifi-ingestion-job.yaml b/demos/data-lakehouse-iceberg-trino-spark/create-nifi-ingestion-job.yaml index 48dc643a..23514095 100644 --- a/demos/data-lakehouse-iceberg-trino-spark/create-nifi-ingestion-job.yaml +++ b/demos/data-lakehouse-iceberg-trino-spark/create-nifi-ingestion-job.yaml @@ -3,8 +3,6 @@ apiVersion: batch/v1 kind: Job metadata: name: create-nifi-ingestion-job - labels: - stackable.tech/vendor: Stackable spec: template: spec: @@ -41,8 +39,6 @@ apiVersion: v1 kind: ConfigMap metadata: name: create-nifi-ingestion-job-script - labels: - stackable.tech/vendor: Stackable data: script.py: | from nipyapi.canvas import get_root_pg_id, schedule_process_group, list_all_controllers, schedule_controller 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 index 50d034fa..5fa8c440 100644 --- a/demos/data-lakehouse-iceberg-trino-spark/create-spark-ingestion-job.yaml +++ b/demos/data-lakehouse-iceberg-trino-spark/create-spark-ingestion-job.yaml @@ -6,8 +6,6 @@ apiVersion: batch/v1 kind: Job metadata: name: create-spark-ingestion-job - labels: - stackable.tech/vendor: Stackable spec: template: spec: @@ -34,8 +32,6 @@ apiVersion: v1 kind: ConfigMap metadata: name: create-spark-ingestion-job-manifest - labels: - stackable.tech/vendor: Stackable data: spark-ingestion-job.yaml: | --- @@ -65,7 +61,7 @@ data: # Every merge into statements creates 8 files. # Paralleling is enough for the demo, might need to be increased (or omitted entirely) when merge larger data volumes spark.sql.shuffle.partitions: "8" - + # As of 2023-10-31 the operator does not set this spark.executor.cores: "4" volumes: @@ -127,8 +123,6 @@ apiVersion: v1 kind: ConfigMap metadata: name: write-iceberg-table-script - labels: - stackable.tech/vendor: Stackable data: spark-ingest-into-lakehouse.py: | from pyspark.sql import SparkSession diff --git a/demos/data-lakehouse-iceberg-trino-spark/create-trino-tables.yaml b/demos/data-lakehouse-iceberg-trino-spark/create-trino-tables.yaml index 9175c141..6e13f211 100644 --- a/demos/data-lakehouse-iceberg-trino-spark/create-trino-tables.yaml +++ b/demos/data-lakehouse-iceberg-trino-spark/create-trino-tables.yaml @@ -3,8 +3,6 @@ apiVersion: batch/v1 kind: Job metadata: name: create-tables-in-trino - labels: - stackable.tech/vendor: Stackable spec: template: spec: @@ -36,8 +34,6 @@ apiVersion: v1 kind: ConfigMap metadata: name: create-tables-in-trino-script - labels: - stackable.tech/vendor: Stackable data: script.py: | import sys diff --git a/demos/data-lakehouse-iceberg-trino-spark/load-test-data.yaml b/demos/data-lakehouse-iceberg-trino-spark/load-test-data.yaml index 57a0544a..b3271969 100644 --- a/demos/data-lakehouse-iceberg-trino-spark/load-test-data.yaml +++ b/demos/data-lakehouse-iceberg-trino-spark/load-test-data.yaml @@ -3,8 +3,6 @@ apiVersion: batch/v1 kind: Job metadata: name: load-test-data - labels: - stackable.tech/vendor: Stackable spec: template: spec: diff --git a/demos/data-lakehouse-iceberg-trino-spark/serviceaccount.yaml b/demos/data-lakehouse-iceberg-trino-spark/serviceaccount.yaml index 05ab03b5..cb3ea626 100644 --- a/demos/data-lakehouse-iceberg-trino-spark/serviceaccount.yaml +++ b/demos/data-lakehouse-iceberg-trino-spark/serviceaccount.yaml @@ -4,15 +4,11 @@ kind: ServiceAccount metadata: name: demo-serviceaccount namespace: default - labels: - stackable.tech/vendor: Stackable --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: name: demo-clusterrolebinding - labels: - stackable.tech/vendor: Stackable subjects: - kind: ServiceAccount name: demo-serviceaccount @@ -26,8 +22,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: name: demo-clusterrole - labels: - stackable.tech/vendor: Stackable rules: - apiGroups: - "" diff --git a/demos/data-lakehouse-iceberg-trino-spark/setup-superset.yaml b/demos/data-lakehouse-iceberg-trino-spark/setup-superset.yaml index d173af77..f4b4dc9e 100644 --- a/demos/data-lakehouse-iceberg-trino-spark/setup-superset.yaml +++ b/demos/data-lakehouse-iceberg-trino-spark/setup-superset.yaml @@ -3,8 +3,6 @@ apiVersion: batch/v1 kind: Job metadata: name: setup-superset - labels: - stackable.tech/vendor: Stackable spec: template: spec: @@ -36,8 +34,6 @@ apiVersion: v1 kind: ConfigMap metadata: name: setup-superset-script - labels: - stackable.tech/vendor: Stackable data: script.py: | import logging diff --git a/demos/hbase-hdfs-load-cycling-data/create-hfile-and-import-to-hbase.yaml b/demos/hbase-hdfs-load-cycling-data/create-hfile-and-import-to-hbase.yaml index d4aa0dc1..92ad7b0d 100644 --- a/demos/hbase-hdfs-load-cycling-data/create-hfile-and-import-to-hbase.yaml +++ b/demos/hbase-hdfs-load-cycling-data/create-hfile-and-import-to-hbase.yaml @@ -4,8 +4,6 @@ apiVersion: batch/v1 kind: Job metadata: name: create-hfile-and-import-to-hbase - labels: - stackable.tech/vendor: Stackable spec: template: spec: diff --git a/demos/hbase-hdfs-load-cycling-data/distcp-cycling-data.yaml b/demos/hbase-hdfs-load-cycling-data/distcp-cycling-data.yaml index 4f4c5488..a204c3ff 100644 --- a/demos/hbase-hdfs-load-cycling-data/distcp-cycling-data.yaml +++ b/demos/hbase-hdfs-load-cycling-data/distcp-cycling-data.yaml @@ -3,8 +3,6 @@ apiVersion: batch/v1 kind: Job metadata: name: distcp-cycling-data - labels: - stackable.tech/vendor: Stackable spec: template: spec: diff --git a/demos/jupyterhub-pyspark-hdfs-anomaly-detection-taxi-data/load-test-data.yaml b/demos/jupyterhub-pyspark-hdfs-anomaly-detection-taxi-data/load-test-data.yaml index 80610d24..7daa673f 100644 --- a/demos/jupyterhub-pyspark-hdfs-anomaly-detection-taxi-data/load-test-data.yaml +++ b/demos/jupyterhub-pyspark-hdfs-anomaly-detection-taxi-data/load-test-data.yaml @@ -3,8 +3,6 @@ apiVersion: batch/v1 kind: Job metadata: name: load-test-data - labels: - stackable.tech/vendor: Stackable spec: template: spec: diff --git a/demos/logging/zookeeper.yaml b/demos/logging/zookeeper.yaml index 4d8e2f82..fe1187ae 100644 --- a/demos/logging/zookeeper.yaml +++ b/demos/logging/zookeeper.yaml @@ -3,8 +3,6 @@ apiVersion: zookeeper.stackable.tech/v1alpha1 kind: ZookeeperCluster metadata: name: simple-zk - labels: - stackable.tech/vendor: Stackable spec: image: productVersion: 3.8.3 diff --git a/demos/nifi-kafka-druid-earthquake-data/create-druid-ingestion-job.yaml b/demos/nifi-kafka-druid-earthquake-data/create-druid-ingestion-job.yaml index 6ef45f43..5ff18136 100644 --- a/demos/nifi-kafka-druid-earthquake-data/create-druid-ingestion-job.yaml +++ b/demos/nifi-kafka-druid-earthquake-data/create-druid-ingestion-job.yaml @@ -3,8 +3,6 @@ apiVersion: batch/v1 kind: Job metadata: name: create-druid-ingestion-job - labels: - stackable.tech/vendor: Stackable spec: template: spec: @@ -26,8 +24,6 @@ apiVersion: v1 kind: ConfigMap metadata: name: create-druid-ingestion-job-spec - labels: - stackable.tech/vendor: Stackable data: ingestion-job-spec.json: | { diff --git a/demos/nifi-kafka-druid-earthquake-data/create-nifi-ingestion-job.yaml b/demos/nifi-kafka-druid-earthquake-data/create-nifi-ingestion-job.yaml index 8f50ec91..dc2267ae 100644 --- a/demos/nifi-kafka-druid-earthquake-data/create-nifi-ingestion-job.yaml +++ b/demos/nifi-kafka-druid-earthquake-data/create-nifi-ingestion-job.yaml @@ -3,8 +3,6 @@ apiVersion: batch/v1 kind: Job metadata: name: create-nifi-ingestion-job - labels: - stackable.tech/vendor: Stackable spec: template: spec: @@ -36,8 +34,6 @@ apiVersion: v1 kind: ConfigMap metadata: name: create-nifi-ingestion-job-script - labels: - stackable.tech/vendor: Stackable data: script.py: | from nipyapi.canvas import get_root_pg_id, schedule_process_group, list_all_controllers, schedule_controller diff --git a/demos/nifi-kafka-druid-earthquake-data/setup-superset.yaml b/demos/nifi-kafka-druid-earthquake-data/setup-superset.yaml index 5fc78cb9..66f0d78c 100644 --- a/demos/nifi-kafka-druid-earthquake-data/setup-superset.yaml +++ b/demos/nifi-kafka-druid-earthquake-data/setup-superset.yaml @@ -3,8 +3,6 @@ apiVersion: batch/v1 kind: Job metadata: name: setup-superset - labels: - stackable.tech/vendor: Stackable spec: template: spec: @@ -31,8 +29,6 @@ apiVersion: v1 kind: ConfigMap metadata: name: setup-superset-script - labels: - stackable.tech/vendor: Stackable data: script.py: | import logging diff --git a/demos/nifi-kafka-druid-water-level-data/create-druid-ingestion-job.yaml b/demos/nifi-kafka-druid-water-level-data/create-druid-ingestion-job.yaml index 8eaecdb6..9fc8b529 100644 --- a/demos/nifi-kafka-druid-water-level-data/create-druid-ingestion-job.yaml +++ b/demos/nifi-kafka-druid-water-level-data/create-druid-ingestion-job.yaml @@ -3,8 +3,6 @@ apiVersion: batch/v1 kind: Job metadata: name: create-druid-ingestion-job - labels: - stackable.tech/vendor: Stackable spec: template: spec: @@ -16,9 +14,9 @@ spec: - name: ingestion-job-spec mountPath: /tmp/ingestion-job-spec volumes: - - name: ingestion-job-spec - configMap: - name: create-druid-ingestion-job-spec + - name: ingestion-job-spec + configMap: + name: create-druid-ingestion-job-spec restartPolicy: OnFailure backoffLimit: 50 --- @@ -26,8 +24,6 @@ apiVersion: v1 kind: ConfigMap metadata: name: create-druid-ingestion-job-spec - labels: - stackable.tech/vendor: Stackable data: stations-ingestion-job-spec.json: | { diff --git a/demos/nifi-kafka-druid-water-level-data/create-nifi-ingestion-job.yaml b/demos/nifi-kafka-druid-water-level-data/create-nifi-ingestion-job.yaml index a76c3e2f..9367d263 100644 --- a/demos/nifi-kafka-druid-water-level-data/create-nifi-ingestion-job.yaml +++ b/demos/nifi-kafka-druid-water-level-data/create-nifi-ingestion-job.yaml @@ -3,8 +3,6 @@ apiVersion: batch/v1 kind: Job metadata: name: create-nifi-ingestion-job - labels: - stackable.tech/vendor: Stackable spec: template: spec: @@ -36,8 +34,6 @@ apiVersion: v1 kind: ConfigMap metadata: name: create-nifi-ingestion-job-script - labels: - stackable.tech/vendor: Stackable data: script.py: | from nipyapi.canvas import get_root_pg_id, schedule_process_group, list_all_controllers, schedule_controller diff --git a/demos/nifi-kafka-druid-water-level-data/setup-superset.yaml b/demos/nifi-kafka-druid-water-level-data/setup-superset.yaml index c84cb976..5a654ddc 100644 --- a/demos/nifi-kafka-druid-water-level-data/setup-superset.yaml +++ b/demos/nifi-kafka-druid-water-level-data/setup-superset.yaml @@ -3,8 +3,6 @@ apiVersion: batch/v1 kind: Job metadata: name: setup-superset - labels: - stackable.tech/vendor: Stackable spec: template: spec: @@ -31,8 +29,6 @@ apiVersion: v1 kind: ConfigMap metadata: name: setup-superset-script - labels: - stackable.tech/vendor: Stackable data: script.py: | import logging diff --git a/demos/signal-processing/create-nifi-ingestion-job.yaml b/demos/signal-processing/create-nifi-ingestion-job.yaml index 7713bae6..70e9e861 100644 --- a/demos/signal-processing/create-nifi-ingestion-job.yaml +++ b/demos/signal-processing/create-nifi-ingestion-job.yaml @@ -3,8 +3,6 @@ apiVersion: batch/v1 kind: Job metadata: name: create-nifi-ingestion-job - labels: - stackable.tech/vendor: Stackable spec: template: spec: @@ -51,8 +49,6 @@ apiVersion: v1 kind: ConfigMap metadata: name: create-nifi-ingestion-job-script - labels: - stackable.tech/vendor: Stackable data: script.py: | from nipyapi.canvas import get_root_pg_id, schedule_process_group, list_all_controllers, schedule_controller diff --git a/demos/signal-processing/create-timescale-tables.yaml b/demos/signal-processing/create-timescale-tables.yaml index 679e7aff..3757c701 100644 --- a/demos/signal-processing/create-timescale-tables.yaml +++ b/demos/signal-processing/create-timescale-tables.yaml @@ -3,8 +3,6 @@ apiVersion: batch/v1 kind: Job metadata: name: create-timescale-tables-job - labels: - stackable.tech/vendor: Stackable spec: template: spec: @@ -42,8 +40,6 @@ apiVersion: v1 kind: ConfigMap metadata: name: create-timescale-tables-job-script - labels: - stackable.tech/vendor: Stackable data: timescaledb.sql: | CREATE TABLE conditions ( diff --git a/demos/signal-processing/serviceaccount.yaml b/demos/signal-processing/serviceaccount.yaml index 995fc30c..8a2d0b19 100644 --- a/demos/signal-processing/serviceaccount.yaml +++ b/demos/signal-processing/serviceaccount.yaml @@ -4,15 +4,11 @@ kind: ServiceAccount metadata: name: demo-serviceaccount namespace: default - labels: - stackable.tech/vendor: Stackable --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: name: demo-clusterrolebinding - labels: - stackable.tech/vendor: Stackable subjects: - kind: ServiceAccount name: demo-serviceaccount @@ -26,8 +22,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: name: demo-clusterrole - labels: - stackable.tech/vendor: Stackable rules: - apiGroups: - "" @@ -51,4 +45,3 @@ rules: - pods/exec verbs: - create - diff --git a/demos/spark-k8s-anomaly-detection-taxi-data/create-spark-anomaly-detection-job.yaml b/demos/spark-k8s-anomaly-detection-taxi-data/create-spark-anomaly-detection-job.yaml index 4f38b518..31e53bac 100644 --- a/demos/spark-k8s-anomaly-detection-taxi-data/create-spark-anomaly-detection-job.yaml +++ b/demos/spark-k8s-anomaly-detection-taxi-data/create-spark-anomaly-detection-job.yaml @@ -3,8 +3,6 @@ apiVersion: batch/v1 kind: Job metadata: name: create-spark-anomaly-detection-job - labels: - stackable.tech/vendor: Stackable spec: template: spec: @@ -30,8 +28,6 @@ apiVersion: v1 kind: ConfigMap metadata: name: create-spark-ad-job-manifest - labels: - stackable.tech/vendor: Stackable data: spark-ad-job.yaml: | --- @@ -99,10 +95,8 @@ apiVersion: v1 kind: ConfigMap metadata: name: cm-spark - labels: - stackable.tech/vendor: Stackable data: - spark-ad.py: | + spark-ad.py: |- from pyspark.sql import SparkSession from pyspark.sql.functions import dayofweek, to_date, to_timestamp, date_format, year, hour, minute, month, when, dayofmonth, dayofweek from pyspark.sql.functions import concat_ws, substring, concat, lpad, lit @@ -197,4 +191,4 @@ data: ) # write via iceberg - df_out.writeTo("prediction.ad.iforest").append() \ No newline at end of file + df_out.writeTo("prediction.ad.iforest").append() diff --git a/demos/spark-k8s-anomaly-detection-taxi-data/load-test-data.yaml b/demos/spark-k8s-anomaly-detection-taxi-data/load-test-data.yaml index 7a4fb0c2..395249eb 100644 --- a/demos/spark-k8s-anomaly-detection-taxi-data/load-test-data.yaml +++ b/demos/spark-k8s-anomaly-detection-taxi-data/load-test-data.yaml @@ -3,8 +3,6 @@ apiVersion: batch/v1 kind: Job metadata: name: load-ny-taxi-data - labels: - stackable.tech/vendor: Stackable spec: template: spec: diff --git a/demos/spark-k8s-anomaly-detection-taxi-data/serviceaccount.yaml b/demos/spark-k8s-anomaly-detection-taxi-data/serviceaccount.yaml index 5a2fcde7..56908c9b 100644 --- a/demos/spark-k8s-anomaly-detection-taxi-data/serviceaccount.yaml +++ b/demos/spark-k8s-anomaly-detection-taxi-data/serviceaccount.yaml @@ -3,8 +3,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: name: demo-clusterrolebinding - labels: - stackable.tech/vendor: Stackable subjects: - apiGroup: rbac.authorization.k8s.io kind: Group @@ -18,8 +16,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: name: demo-clusterrole - labels: - stackable.tech/vendor: Stackable rules: - apiGroups: - "" diff --git a/demos/spark-k8s-anomaly-detection-taxi-data/setup-superset.yaml b/demos/spark-k8s-anomaly-detection-taxi-data/setup-superset.yaml index 3955c759..f0ed4486 100644 --- a/demos/spark-k8s-anomaly-detection-taxi-data/setup-superset.yaml +++ b/demos/spark-k8s-anomaly-detection-taxi-data/setup-superset.yaml @@ -3,8 +3,6 @@ apiVersion: batch/v1 kind: Job metadata: name: setup-superset - labels: - stackable.tech/vendor: Stackable spec: template: spec: @@ -36,8 +34,6 @@ apiVersion: v1 kind: ConfigMap metadata: name: setup-superset-script - labels: - stackable.tech/vendor: Stackable data: script.py: | import logging diff --git a/demos/trino-taxi-data/create-table-in-trino.yaml b/demos/trino-taxi-data/create-table-in-trino.yaml index 6b96649e..524875f1 100644 --- a/demos/trino-taxi-data/create-table-in-trino.yaml +++ b/demos/trino-taxi-data/create-table-in-trino.yaml @@ -3,8 +3,6 @@ apiVersion: batch/v1 kind: Job metadata: name: create-ny-taxi-data-table-in-trino - labels: - stackable.tech/vendor: Stackable spec: template: spec: @@ -31,8 +29,6 @@ apiVersion: v1 kind: ConfigMap metadata: name: create-ny-taxi-data-table-in-trino-script - labels: - stackable.tech/vendor: Stackable data: script.py: | import sys diff --git a/demos/trino-taxi-data/load-test-data.yaml b/demos/trino-taxi-data/load-test-data.yaml index 2537fcd2..31c8e0af 100644 --- a/demos/trino-taxi-data/load-test-data.yaml +++ b/demos/trino-taxi-data/load-test-data.yaml @@ -3,8 +3,6 @@ apiVersion: batch/v1 kind: Job metadata: name: load-ny-taxi-data - labels: - stackable.tech/vendor: Stackable spec: template: spec: diff --git a/demos/trino-taxi-data/setup-superset.yaml b/demos/trino-taxi-data/setup-superset.yaml index 1614f960..761a044b 100644 --- a/demos/trino-taxi-data/setup-superset.yaml +++ b/demos/trino-taxi-data/setup-superset.yaml @@ -3,8 +3,6 @@ apiVersion: batch/v1 kind: Job metadata: name: setup-superset - labels: - stackable.tech/vendor: Stackable spec: template: spec: @@ -36,8 +34,6 @@ apiVersion: v1 kind: ConfigMap metadata: name: setup-superset-script - labels: - stackable.tech/vendor: Stackable data: script.py: | import logging From d956e4d51871989262a337ceabef3574dc2f22f0 Mon Sep 17 00:00:00 2001 From: Techassi Date: Thu, 1 Feb 2024 14:20:32 +0100 Subject: [PATCH 3/8] Add vendor label to opensearch-dashboard service --- stacks/_templates/opensearch-dashboards.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/stacks/_templates/opensearch-dashboards.yaml b/stacks/_templates/opensearch-dashboards.yaml index 2af79be9..dd3c3891 100644 --- a/stacks/_templates/opensearch-dashboards.yaml +++ b/stacks/_templates/opensearch-dashboards.yaml @@ -14,6 +14,8 @@ options: stackable.tech/logging-view-logs: |- /app/discover?security_tenant=global#/view/logs stackable.tech/logging-credentials-secret: opensearch-user + labels: + stackable.tech/vendor: Stackable opensearchAccount: secret: opensearch-dashboard-user extraEnvs: From 0f0b04aacc0913d82046790d2fd2e32b9967682f Mon Sep 17 00:00:00 2001 From: Techassi Date: Thu, 1 Feb 2024 15:14:04 +0100 Subject: [PATCH 4/8] Change commonLabels to podLabels for timescaledb --- stacks/_templates/postgresql-timescaledb.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stacks/_templates/postgresql-timescaledb.yaml b/stacks/_templates/postgresql-timescaledb.yaml index 6870576b..594ff092 100644 --- a/stacks/_templates/postgresql-timescaledb.yaml +++ b/stacks/_templates/postgresql-timescaledb.yaml @@ -5,7 +5,7 @@ repo: url: https://charts.timescale.com/ version: 0.33.1 options: - commonLabels: + podLabels: stackable.tech/vendor: Stackable replicaCount: 1 secrets: From 3705881ad587e9767eb356ff9b4319b8ea9cc94b Mon Sep 17 00:00:00 2001 From: Techassi Date: Thu, 1 Feb 2024 16:04:20 +0100 Subject: [PATCH 5/8] Remove vendor label from stacks --- .../vector-aggregator-discovery.yaml | 2 - stacks/airflow/airflow.yaml | 6 - .../openldap-tls-authenticationclass.yaml | 5 - stacks/authentication/openldap-tls.yaml | 4 - .../hive-metastores.yaml | 4 - .../kafka.yaml | 6 - .../nifi.yaml | 10 +- .../s3-connection.yaml | 7 +- .../trino.yaml | 13 -- .../zookeeper.yaml | 2 - stacks/dual-hive-hdfs-s3/hdfs.yaml | 6 - stacks/dual-hive-hdfs-s3/hive.yaml | 9 - stacks/dual-hive-hdfs-s3/trino.yaml | 9 - stacks/hdfs-hbase/hbase.yaml | 2 - stacks/hdfs-hbase/hdfs.yaml | 2 - stacks/hdfs-hbase/zookeeper.yaml | 6 - stacks/jupyterhub-pyspark-hdfs/hdfs.yaml | 6 +- .../serviceaccount.yaml | 6 - .../spark_driver_service.yaml | 4 +- stacks/jupyterhub-pyspark-hdfs/zookeeper.yaml | 2 - stacks/keycloak-opa-poc/druid.yaml | 6 +- stacks/keycloak-opa-poc/hdfs.yaml | 4 +- stacks/keycloak-opa-poc/keycloak.yaml | 34 ++- stacks/keycloak-opa-poc/opa.yaml | 4 +- stacks/keycloak-opa-poc/policies.yaml | 2 - stacks/keycloak-opa-poc/serviceaccount.yaml | 6 - stacks/keycloak-opa-poc/setup-keycloak.yaml | 210 +++++++++--------- stacks/keycloak-opa-poc/superset.yaml | 4 - stacks/keycloak-opa-poc/trino.yaml | 2 - stacks/keycloak-opa-poc/zookeeper.yaml | 8 +- .../logging/setup-opensearch-dashboards.yaml | 2 - stacks/monitoring/grafana-dashboards.yaml | 2 - .../nifi-kafka-druid-superset-s3/druid.yaml | 7 - .../nifi-kafka-druid-superset-s3/kafka.yaml | 6 - stacks/nifi-kafka-druid-superset-s3/nifi.yaml | 8 - .../superset.yaml | 8 - .../zookeeper.yaml | 2 - .../signal-processing/grafana-dashboards.yaml | 2 - stacks/signal-processing/nifi.yaml | 8 - stacks/signal-processing/secrets.yaml | 4 +- .../hive-metastore.yaml | 4 - .../trino-prediction-catalog.yaml | 1 - stacks/trino-iceberg/hive-metastores.yaml | 2 - stacks/trino-iceberg/s3-connection.yaml | 5 - stacks/trino-iceberg/trino.yaml | 12 - stacks/trino-superset-s3/hive-metastore.yaml | 2 - stacks/trino-superset-s3/s3-connection.yaml | 5 - stacks/trino-superset-s3/superset.yaml | 6 - stacks/trino-superset-s3/trino.yaml | 10 - 49 files changed, 126 insertions(+), 361 deletions(-) diff --git a/stacks/_templates/vector-aggregator-discovery.yaml b/stacks/_templates/vector-aggregator-discovery.yaml index 0c8fee1e..daba2720 100644 --- a/stacks/_templates/vector-aggregator-discovery.yaml +++ b/stacks/_templates/vector-aggregator-discovery.yaml @@ -2,7 +2,5 @@ apiVersion: v1 kind: ConfigMap metadata: name: vector-aggregator-discovery - labels: - stackable.tech/vendor: Stackable data: ADDRESS: vector-aggregator:6000 diff --git a/stacks/airflow/airflow.yaml b/stacks/airflow/airflow.yaml index 57b85186..e6767b79 100644 --- a/stacks/airflow/airflow.yaml +++ b/stacks/airflow/airflow.yaml @@ -4,8 +4,6 @@ apiVersion: airflow.stackable.tech/v1alpha1 kind: AirflowCluster metadata: name: airflow - labels: - stackable.tech/vendor: Stackable spec: image: productVersion: 2.7.2 @@ -67,8 +65,6 @@ apiVersion: v1 kind: ConfigMap metadata: name: airflow-dags - labels: - stackable.tech/vendor: Stackable data: date_demo.py: | """Example DAG returning the current date""" @@ -310,8 +306,6 @@ apiVersion: v1 kind: Secret metadata: name: airflow-credentials - labels: - stackable.tech/vendor: Stackable type: Opaque stringData: adminUser.username: admin diff --git a/stacks/authentication/openldap-tls-authenticationclass.yaml b/stacks/authentication/openldap-tls-authenticationclass.yaml index 1f782048..fb69a52d 100644 --- a/stacks/authentication/openldap-tls-authenticationclass.yaml +++ b/stacks/authentication/openldap-tls-authenticationclass.yaml @@ -3,8 +3,6 @@ apiVersion: authentication.stackable.tech/v1alpha1 kind: AuthenticationClass metadata: name: openldap - labels: - stackable.tech/vendor: Stackable spec: provider: ldap: @@ -25,8 +23,6 @@ apiVersion: secrets.stackable.tech/v1alpha1 kind: SecretClass metadata: name: openldap-bind-credentials - labels: - stackable.tech/vendor: Stackable spec: backend: k8sSearch: @@ -40,7 +36,6 @@ metadata: name: openldap-bind-credentials labels: secrets.stackable.tech/class: openldap-bind-credentials - stackable.tech/vendor: Stackable stringData: # User and password are defined in the OpenLDAP StatefulSet user: cn=ldapadmin,dc=example,dc=org diff --git a/stacks/authentication/openldap-tls.yaml b/stacks/authentication/openldap-tls.yaml index 5b1492f1..0f61f417 100644 --- a/stacks/authentication/openldap-tls.yaml +++ b/stacks/authentication/openldap-tls.yaml @@ -3,8 +3,6 @@ apiVersion: secrets.stackable.tech/v1alpha1 kind: SecretClass metadata: name: openldap-tls - labels: - stackable.tech/vendor: Stackable spec: backend: autoTls: @@ -19,7 +17,6 @@ kind: StatefulSet metadata: name: openldap labels: - stackable.tech/vendor: Stackable app.kubernetes.io/name: openldap spec: selector: @@ -85,7 +82,6 @@ kind: Service metadata: name: openldap labels: - stackable.tech/vendor: Stackable app.kubernetes.io/name: openldap spec: type: ClusterIP diff --git a/stacks/data-lakehouse-iceberg-trino-spark/hive-metastores.yaml b/stacks/data-lakehouse-iceberg-trino-spark/hive-metastores.yaml index c00d76e3..82e9f5c1 100644 --- a/stacks/data-lakehouse-iceberg-trino-spark/hive-metastores.yaml +++ b/stacks/data-lakehouse-iceberg-trino-spark/hive-metastores.yaml @@ -3,8 +3,6 @@ apiVersion: hive.stackable.tech/v1alpha1 kind: HiveCluster metadata: name: hive - labels: - stackable.tech/vendor: Stackable spec: image: productVersion: 3.1.3 @@ -25,8 +23,6 @@ apiVersion: hive.stackable.tech/v1alpha1 kind: HiveCluster metadata: name: hive-iceberg - labels: - stackable.tech/vendor: Stackable spec: image: productVersion: 3.1.3 diff --git a/stacks/data-lakehouse-iceberg-trino-spark/kafka.yaml b/stacks/data-lakehouse-iceberg-trino-spark/kafka.yaml index 2e63798a..85be5393 100644 --- a/stacks/data-lakehouse-iceberg-trino-spark/kafka.yaml +++ b/stacks/data-lakehouse-iceberg-trino-spark/kafka.yaml @@ -3,8 +3,6 @@ apiVersion: zookeeper.stackable.tech/v1alpha1 kind: ZookeeperZnode metadata: name: kafka-znode - labels: - stackable.tech/vendor: Stackable spec: clusterRef: name: zookeeper @@ -13,8 +11,6 @@ apiVersion: kafka.stackable.tech/v1alpha1 kind: KafkaCluster metadata: name: kafka - labels: - stackable.tech/vendor: Stackable spec: image: productVersion: 3.5.1 @@ -46,8 +42,6 @@ apiVersion: authentication.stackable.tech/v1alpha1 kind: AuthenticationClass metadata: name: kafka-client-tls - labels: - stackable.tech/vendor: Stackable spec: provider: tls: diff --git a/stacks/data-lakehouse-iceberg-trino-spark/nifi.yaml b/stacks/data-lakehouse-iceberg-trino-spark/nifi.yaml index 36aef35a..8de99796 100644 --- a/stacks/data-lakehouse-iceberg-trino-spark/nifi.yaml +++ b/stacks/data-lakehouse-iceberg-trino-spark/nifi.yaml @@ -3,8 +3,6 @@ apiVersion: nifi.stackable.tech/v1alpha1 kind: NifiCluster metadata: name: nifi - labels: - stackable.tech/vendor: Stackable spec: image: productVersion: 1.23.2 @@ -43,8 +41,6 @@ apiVersion: authentication.stackable.tech/v1alpha1 kind: AuthenticationClass metadata: name: nifi-admin-credentials - labels: - stackable.tech/vendor: Stackable spec: provider: static: @@ -55,17 +51,13 @@ apiVersion: v1 kind: Secret metadata: name: nifi-admin-credentials-secret - labels: - stackable.tech/vendor: Stackable stringData: - admin: {{ nifiAdminPassword }} + admin: {? {nifiAdminPassword: ''} : ''} --- apiVersion: zookeeper.stackable.tech/v1alpha1 kind: ZookeeperZnode metadata: name: nifi-znode - labels: - stackable.tech/vendor: Stackable spec: clusterRef: name: zookeeper diff --git a/stacks/data-lakehouse-iceberg-trino-spark/s3-connection.yaml b/stacks/data-lakehouse-iceberg-trino-spark/s3-connection.yaml index f52cb8bb..27e26a8e 100644 --- a/stacks/data-lakehouse-iceberg-trino-spark/s3-connection.yaml +++ b/stacks/data-lakehouse-iceberg-trino-spark/s3-connection.yaml @@ -3,8 +3,6 @@ apiVersion: s3.stackable.tech/v1alpha1 kind: S3Connection metadata: name: minio - labels: - stackable.tech/vendor: Stackable spec: host: minio port: 9000 @@ -16,8 +14,6 @@ apiVersion: secrets.stackable.tech/v1alpha1 kind: SecretClass metadata: name: minio-s3-credentials - labels: - stackable.tech/vendor: Stackable spec: backend: k8sSearch: @@ -30,7 +26,6 @@ metadata: name: minio-s3-credentials labels: secrets.stackable.tech/class: minio-s3-credentials - stackable.tech/vendor: Stackable stringData: accessKey: admin - secretKey: {{ minioAdminPassword }} + secretKey: {? {minioAdminPassword: ''} : ''} diff --git a/stacks/data-lakehouse-iceberg-trino-spark/trino.yaml b/stacks/data-lakehouse-iceberg-trino-spark/trino.yaml index 2991b4f8..eb487c8f 100644 --- a/stacks/data-lakehouse-iceberg-trino-spark/trino.yaml +++ b/stacks/data-lakehouse-iceberg-trino-spark/trino.yaml @@ -3,8 +3,6 @@ apiVersion: trino.stackable.tech/v1alpha1 kind: TrinoCluster metadata: name: trino - labels: - stackable.tech/vendor: Stackable spec: image: productVersion: "428" @@ -48,8 +46,6 @@ apiVersion: authentication.stackable.tech/v1alpha1 kind: AuthenticationClass metadata: name: trino-users - labels: - stackable.tech/vendor: Stackable spec: provider: static: @@ -60,8 +56,6 @@ apiVersion: v1 kind: Secret metadata: name: trino-users - labels: - stackable.tech/vendor: Stackable type: kubernetes.io/opaque stringData: admin: "{{ trinoAdminPassword }}" @@ -71,7 +65,6 @@ kind: TrinoCatalog metadata: name: staging labels: - stackable.tech/vendor: Stackable trino: trino spec: connector: @@ -86,7 +79,6 @@ kind: TrinoCatalog metadata: name: lakehouse labels: - stackable.tech/vendor: Stackable trino: trino spec: connector: @@ -101,7 +93,6 @@ kind: TrinoCatalog metadata: name: tpcds labels: - stackable.tech/vendor: Stackable trino: trino spec: connector: @@ -112,7 +103,6 @@ kind: TrinoCatalog metadata: name: tpch labels: - stackable.tech/vendor: Stackable trino: trino spec: connector: @@ -122,8 +112,6 @@ apiVersion: opa.stackable.tech/v1alpha1 kind: OpaCluster metadata: name: opa - labels: - stackable.tech/vendor: Stackable spec: image: productVersion: 0.57.0 @@ -137,7 +125,6 @@ metadata: name: trino-opa-bundle labels: opa.stackable.tech/bundle: "trino" - stackable.tech/vendor: Stackable data: trino.rego: | package trino diff --git a/stacks/data-lakehouse-iceberg-trino-spark/zookeeper.yaml b/stacks/data-lakehouse-iceberg-trino-spark/zookeeper.yaml index 9a46a7e8..58735314 100644 --- a/stacks/data-lakehouse-iceberg-trino-spark/zookeeper.yaml +++ b/stacks/data-lakehouse-iceberg-trino-spark/zookeeper.yaml @@ -3,8 +3,6 @@ apiVersion: zookeeper.stackable.tech/v1alpha1 kind: ZookeeperCluster metadata: name: zookeeper - labels: - stackable.tech/vendor: Stackable spec: image: productVersion: 3.8.3 diff --git a/stacks/dual-hive-hdfs-s3/hdfs.yaml b/stacks/dual-hive-hdfs-s3/hdfs.yaml index 285a8284..db840268 100644 --- a/stacks/dual-hive-hdfs-s3/hdfs.yaml +++ b/stacks/dual-hive-hdfs-s3/hdfs.yaml @@ -3,8 +3,6 @@ apiVersion: zookeeper.stackable.tech/v1alpha1 kind: ZookeeperCluster metadata: name: hdfs-zk - labels: - stackable.tech/vendor: Stackable spec: image: productVersion: 3.8.1 @@ -17,8 +15,6 @@ apiVersion: zookeeper.stackable.tech/v1alpha1 kind: ZookeeperZnode metadata: name: hdfs-znode - labels: - stackable.tech/vendor: Stackable spec: clusterRef: name: hdfs-zk @@ -27,8 +23,6 @@ apiVersion: hdfs.stackable.tech/v1alpha1 kind: HdfsCluster metadata: name: hdfs - labels: - stackable.tech/vendor: Stackable spec: image: productVersion: 3.3.4 diff --git a/stacks/dual-hive-hdfs-s3/hive.yaml b/stacks/dual-hive-hdfs-s3/hive.yaml index c2a119c6..6b9cd982 100644 --- a/stacks/dual-hive-hdfs-s3/hive.yaml +++ b/stacks/dual-hive-hdfs-s3/hive.yaml @@ -3,8 +3,6 @@ apiVersion: secrets.stackable.tech/v1alpha1 kind: SecretClass metadata: name: hive-s3-secret-class - labels: - stackable.tech/vendor: Stackable spec: backend: k8sSearch: @@ -15,8 +13,6 @@ apiVersion: s3.stackable.tech/v1alpha1 kind: S3Connection metadata: name: minio - labels: - stackable.tech/vendor: Stackable spec: host: minio port: 9000 @@ -30,7 +26,6 @@ metadata: name: hive-s3-secret labels: secrets.stackable.tech/class: hive-s3-secret-class - stackable.tech/vendor: Stackable stringData: accessKey: trino secretKey: trinotrino @@ -39,8 +34,6 @@ apiVersion: hive.stackable.tech/v1alpha1 kind: HiveCluster metadata: name: hive-hdfs - labels: - stackable.tech/vendor: Stackable spec: image: productVersion: 3.1.3 @@ -61,8 +54,6 @@ apiVersion: hive.stackable.tech/v1alpha1 kind: HiveCluster metadata: name: hive-s3 - labels: - stackable.tech/vendor: Stackable spec: image: productVersion: 3.1.3 diff --git a/stacks/dual-hive-hdfs-s3/trino.yaml b/stacks/dual-hive-hdfs-s3/trino.yaml index 1c40c5f1..1bfb6010 100644 --- a/stacks/dual-hive-hdfs-s3/trino.yaml +++ b/stacks/dual-hive-hdfs-s3/trino.yaml @@ -4,7 +4,6 @@ kind: TrinoCatalog metadata: name: hivehdfs labels: - stackable.tech/vendor: Stackable trino: trino spec: connector: @@ -19,7 +18,6 @@ kind: TrinoCatalog metadata: name: hives3 labels: - stackable.tech/vendor: Stackable trino: trino spec: connector: @@ -36,7 +34,6 @@ kind: TrinoCatalog metadata: name: iceberg labels: - stackable.tech/vendor: Stackable trino: trino spec: connector: @@ -53,7 +50,6 @@ kind: TrinoCatalog metadata: name: tpcds labels: - stackable.tech/vendor: Stackable trino: trino spec: connector: @@ -63,8 +59,6 @@ apiVersion: trino.stackable.tech/v1alpha1 kind: TrinoCluster metadata: name: trino - labels: - stackable.tech/vendor: Stackable spec: image: productVersion: "414" @@ -90,8 +84,6 @@ apiVersion: opa.stackable.tech/v1alpha1 kind: OpaCluster metadata: name: opa - labels: - stackable.tech/vendor: Stackable spec: image: productVersion: 0.51.0 @@ -106,7 +98,6 @@ metadata: name: trino-opa-bundle labels: opa.stackable.tech/bundle: "trino" - stackable.tech/vendor: Stackable data: trino.rego: | package trino diff --git a/stacks/hdfs-hbase/hbase.yaml b/stacks/hdfs-hbase/hbase.yaml index af45f184..5d6d6041 100644 --- a/stacks/hdfs-hbase/hbase.yaml +++ b/stacks/hdfs-hbase/hbase.yaml @@ -3,8 +3,6 @@ apiVersion: hbase.stackable.tech/v1alpha1 kind: HbaseCluster metadata: name: hbase - labels: - stackable.tech/vendor: Stackable spec: image: productVersion: 2.4.17 diff --git a/stacks/hdfs-hbase/hdfs.yaml b/stacks/hdfs-hbase/hdfs.yaml index 61f9f831..78594a6c 100644 --- a/stacks/hdfs-hbase/hdfs.yaml +++ b/stacks/hdfs-hbase/hdfs.yaml @@ -2,8 +2,6 @@ apiVersion: hdfs.stackable.tech/v1alpha1 kind: HdfsCluster metadata: name: hdfs - labels: - stackable.tech/vendor: Stackable spec: image: productVersion: 3.3.6 diff --git a/stacks/hdfs-hbase/zookeeper.yaml b/stacks/hdfs-hbase/zookeeper.yaml index a0f60860..9ef234fa 100644 --- a/stacks/hdfs-hbase/zookeeper.yaml +++ b/stacks/hdfs-hbase/zookeeper.yaml @@ -3,8 +3,6 @@ apiVersion: zookeeper.stackable.tech/v1alpha1 kind: ZookeeperCluster metadata: name: zookeeper - labels: - stackable.tech/vendor: Stackable spec: image: productVersion: 3.8.3 @@ -17,8 +15,6 @@ apiVersion: zookeeper.stackable.tech/v1alpha1 kind: ZookeeperZnode metadata: name: hdfs-znode - labels: - stackable.tech/vendor: Stackable spec: clusterRef: name: zookeeper @@ -27,8 +23,6 @@ apiVersion: zookeeper.stackable.tech/v1alpha1 kind: ZookeeperZnode metadata: name: hbase-znode - labels: - stackable.tech/vendor: Stackable spec: clusterRef: name: zookeeper diff --git a/stacks/jupyterhub-pyspark-hdfs/hdfs.yaml b/stacks/jupyterhub-pyspark-hdfs/hdfs.yaml index ac863e5c..c3086e0e 100644 --- a/stacks/jupyterhub-pyspark-hdfs/hdfs.yaml +++ b/stacks/jupyterhub-pyspark-hdfs/hdfs.yaml @@ -3,8 +3,6 @@ apiVersion: zookeeper.stackable.tech/v1alpha1 kind: ZookeeperZnode metadata: name: hdfs-znode - labels: - stackable.tech/vendor: Stackable spec: clusterRef: name: zookeeper @@ -13,8 +11,6 @@ apiVersion: hdfs.stackable.tech/v1alpha1 kind: HdfsCluster metadata: name: hdfs - labels: - stackable.tech/vendor: Stackable spec: image: productVersion: 3.3.6 @@ -48,4 +44,4 @@ spec: capacity: 5Gi roleGroups: default: - replicas: 1 \ No newline at end of file + replicas: 1 diff --git a/stacks/jupyterhub-pyspark-hdfs/serviceaccount.yaml b/stacks/jupyterhub-pyspark-hdfs/serviceaccount.yaml index 3f7a589a..f8298b4b 100644 --- a/stacks/jupyterhub-pyspark-hdfs/serviceaccount.yaml +++ b/stacks/jupyterhub-pyspark-hdfs/serviceaccount.yaml @@ -3,15 +3,11 @@ apiVersion: v1 kind: ServiceAccount metadata: name: spark - labels: - stackable.tech/vendor: Stackable --- apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: name: spark - labels: - stackable.tech/vendor: Stackable subjects: - kind: ServiceAccount name: spark @@ -24,8 +20,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: name: spark-role - labels: - stackable.tech/vendor: Stackable rules: - apiGroups: [""] resources: [pods] diff --git a/stacks/jupyterhub-pyspark-hdfs/spark_driver_service.yaml b/stacks/jupyterhub-pyspark-hdfs/spark_driver_service.yaml index f6d08e0b..0bd609f3 100644 --- a/stacks/jupyterhub-pyspark-hdfs/spark_driver_service.yaml +++ b/stacks/jupyterhub-pyspark-hdfs/spark_driver_service.yaml @@ -3,8 +3,6 @@ apiVersion: v1 kind: Service metadata: name: driver-service - labels: - stackable.tech/vendor: Stackable spec: selector: app: jupyterhub @@ -23,4 +21,4 @@ spec: port: 4040 protocol: TCP targetPort: 4040 - type: ClusterIP \ No newline at end of file + type: ClusterIP diff --git a/stacks/jupyterhub-pyspark-hdfs/zookeeper.yaml b/stacks/jupyterhub-pyspark-hdfs/zookeeper.yaml index 4bf3577c..2f93fb8d 100644 --- a/stacks/jupyterhub-pyspark-hdfs/zookeeper.yaml +++ b/stacks/jupyterhub-pyspark-hdfs/zookeeper.yaml @@ -3,8 +3,6 @@ apiVersion: zookeeper.stackable.tech/v1alpha1 kind: ZookeeperCluster metadata: name: zookeeper - labels: - stackable.tech/vendor: Stackable spec: image: productVersion: 3.8.3 diff --git a/stacks/keycloak-opa-poc/druid.yaml b/stacks/keycloak-opa-poc/druid.yaml index c4562795..2dd9a0d8 100644 --- a/stacks/keycloak-opa-poc/druid.yaml +++ b/stacks/keycloak-opa-poc/druid.yaml @@ -3,8 +3,6 @@ apiVersion: druid.stackable.tech/v1alpha1 kind: DruidCluster metadata: name: druid - labels: - stackable.tech/vendor: Stackable spec: image: productVersion: 27.0.0 @@ -73,7 +71,7 @@ spec: # it seems like the Druid processes cannot handle the OIDC authentication flow. druid.auth.authenticator.MyBasicMetadataAuthenticator.type: basic druid.auth.authenticator.MyBasicMetadataAuthenticator.initialInternalClientPassword: '${env:DRUID_SYSTEM_USER_PASSWORD}' # Default password for internal 'druid_system' user - druid.auth.authenticator.MyBasicMetadataAuthenticator.skipOnFailure: "true" # for any non system user, skip to the pac4j authenticator + druid.auth.authenticator.MyBasicMetadataAuthenticator.skipOnFailure: "true" # for any non system user, skip to the pac4j authenticator druid.auth.authenticator.MyBasicMetadataAuthenticator.authorizerName: OpaAuthorizer # pac4j authenticator @@ -86,7 +84,7 @@ spec: druid.auth.pac4j.oidc.clientSecret: '{"type":"environment","variable":"DRUID_CLIENT_SECRET"}' druid.auth.pac4j.oidc.discoveryURI: '${env:KEYCLOAK_DISCOVERY_URL}' # druid.auth.pac4j.oidc.oidcClaim: preferred_username # setting doesn't work, but should? - + druid.auth.authenticatorChain: '["MyBasicMetadataAuthenticator","pac4j"]' druid.escalator.type: basic diff --git a/stacks/keycloak-opa-poc/hdfs.yaml b/stacks/keycloak-opa-poc/hdfs.yaml index 6268a94d..40d34d25 100644 --- a/stacks/keycloak-opa-poc/hdfs.yaml +++ b/stacks/keycloak-opa-poc/hdfs.yaml @@ -3,8 +3,6 @@ apiVersion: hdfs.stackable.tech/v1alpha1 kind: HdfsCluster metadata: name: hdfs - labels: - stackable.tech/vendor: Stackable spec: image: productVersion: 3.3.6 @@ -22,4 +20,4 @@ spec: journalNodes: roleGroups: default: - replicas: 1 \ No newline at end of file + replicas: 1 diff --git a/stacks/keycloak-opa-poc/keycloak.yaml b/stacks/keycloak-opa-poc/keycloak.yaml index ad7d715f..fe68c599 100644 --- a/stacks/keycloak-opa-poc/keycloak.yaml +++ b/stacks/keycloak-opa-poc/keycloak.yaml @@ -4,7 +4,6 @@ kind: Deployment metadata: name: keycloak labels: - stackable.tech/vendor: Stackable app: keycloak spec: replicas: 1 @@ -45,7 +44,6 @@ kind: Service metadata: name: keycloak labels: - stackable.tech/vendor: Stackable app: keycloak spec: type: NodePort @@ -60,8 +58,6 @@ apiVersion: v1 kind: Secret metadata: name: keycloak-admin-credentials - labels: - stackable.tech/vendor: Stackable stringData: admin: "{{ keycloakAdminPassword }}" --- @@ -70,27 +66,25 @@ apiVersion: batch/v1 kind: Job metadata: name: propagate-keycloak-address - labels: - stackable.tech/vendor: Stackable spec: template: spec: containers: - - name: propagate-keycloak-address - image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable23.11.0 - command: - - bash - - -x - - -euo - - pipefail - - -c - - | - echo "Determining Keycloak public reachable address" - KEYCLOAK_ADDRESS=$(kubectl get svc keycloak -o json | jq -r --argfile endpoints <(kubectl get endpoints keycloak -o json) --argfile nodes <(kubectl get nodes -o json) '($nodes.items[] | select(.metadata.name == $endpoints.subsets[].addresses[].nodeName) | .status.addresses | map(select(.type == "ExternalIP" or .type == "InternalIP")) | min_by(.type) | .address | tostring) + ":" + (.spec.ports[] | select(.name == "http") | .nodePort | tostring)') - echo "Found Keycloak running at $KEYCLOAK_ADDRESS" + - name: propagate-keycloak-address + image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable23.11.0 + command: + - bash + - -x + - -euo + - pipefail + - -c + - | + echo "Determining Keycloak public reachable address" + KEYCLOAK_ADDRESS=$(kubectl get svc keycloak -o json | jq -r --argfile endpoints <(kubectl get endpoints keycloak -o json) --argfile nodes <(kubectl get nodes -o json) '($nodes.items[] | select(.metadata.name == $endpoints.subsets[].addresses[].nodeName) | .status.addresses | map(select(.type == "ExternalIP" or .type == "InternalIP")) | min_by(.type) | .address | tostring) + ":" + (.spec.ports[] | select(.name == "http") | .nodePort | tostring)') + echo "Found Keycloak running at $KEYCLOAK_ADDRESS" - echo "Writing Keycloak address to ConfigMap keycloak" - kubectl create configmap keycloak --from-literal="KEYCLOAK=$KEYCLOAK_ADDRESS" --from-literal="KEYCLOAK_DISCOVERY_URL=http://$KEYCLOAK_ADDRESS/realms/master/.well-known/openid-configuration" -o yaml --dry-run | kubectl apply -f - + echo "Writing Keycloak address to ConfigMap keycloak" + kubectl create configmap keycloak --from-literal="KEYCLOAK=$KEYCLOAK_ADDRESS" --from-literal="KEYCLOAK_DISCOVERY_URL=http://$KEYCLOAK_ADDRESS/realms/master/.well-known/openid-configuration" -o yaml --dry-run | kubectl apply -f - serviceAccountName: demo-serviceaccount restartPolicy: OnFailure backoffLimit: 20 # give some time for the Keycloak to be available diff --git a/stacks/keycloak-opa-poc/opa.yaml b/stacks/keycloak-opa-poc/opa.yaml index 92de590e..0d5df1c9 100644 --- a/stacks/keycloak-opa-poc/opa.yaml +++ b/stacks/keycloak-opa-poc/opa.yaml @@ -3,11 +3,9 @@ apiVersion: opa.stackable.tech/v1alpha1 kind: OpaCluster metadata: name: opa - labels: - stackable.tech/vendor: Stackable spec: image: productVersion: 0.57.0 servers: roleGroups: - default: {} \ No newline at end of file + default: {} diff --git a/stacks/keycloak-opa-poc/policies.yaml b/stacks/keycloak-opa-poc/policies.yaml index afc40f2f..6ba37fc1 100644 --- a/stacks/keycloak-opa-poc/policies.yaml +++ b/stacks/keycloak-opa-poc/policies.yaml @@ -5,7 +5,6 @@ metadata: name: opa-bundle-trino labels: opa.stackable.tech/bundle: "true" - stackable.tech/vendor: Stackable data: trino.rego: | package trino @@ -28,7 +27,6 @@ metadata: name: opa-bundle-druid labels: opa.stackable.tech/bundle: "true" - stackable.tech/vendor: Stackable data: druid.rego: | package druid diff --git a/stacks/keycloak-opa-poc/serviceaccount.yaml b/stacks/keycloak-opa-poc/serviceaccount.yaml index de782fd2..b29d205b 100644 --- a/stacks/keycloak-opa-poc/serviceaccount.yaml +++ b/stacks/keycloak-opa-poc/serviceaccount.yaml @@ -4,15 +4,11 @@ kind: ServiceAccount metadata: name: demo-serviceaccount namespace: default - labels: - stackable.tech/vendor: Stackable --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: name: demo-clusterrolebinding - labels: - stackable.tech/vendor: Stackable subjects: - kind: ServiceAccount name: demo-serviceaccount @@ -26,8 +22,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: name: demo-clusterrole - labels: - stackable.tech/vendor: Stackable rules: - apiGroups: - "" diff --git a/stacks/keycloak-opa-poc/setup-keycloak.yaml b/stacks/keycloak-opa-poc/setup-keycloak.yaml index 856e8269..f721c529 100644 --- a/stacks/keycloak-opa-poc/setup-keycloak.yaml +++ b/stacks/keycloak-opa-poc/setup-keycloak.yaml @@ -2,8 +2,6 @@ apiVersion: v1 kind: Secret metadata: name: keycloak-client-secrets - labels: - stackable.tech/vendor: Stackable stringData: superset: "{{ keycloakSupersetClientSecret }}" trino: "{{ keycloakTrinoClientSecret }}" @@ -15,8 +13,6 @@ apiVersion: v1 kind: Secret metadata: name: keycloak-users - labels: - stackable.tech/vendor: Stackable stringData: alice: "{{ alicePassword }}" bob: "{{ bobPassword }}" @@ -27,114 +23,112 @@ apiVersion: batch/v1 kind: Job metadata: name: setup-keycloak - labels: - stackable.tech/vendor: Stackable spec: template: spec: containers: - - name: setup-keycloak - image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable23.11.0 - env: - - name: KEYCLOAK_ADMIN_PASSWORD - valueFrom: - secretKeyRef: - name: keycloak-admin-credentials - key: admin - - name: ALICE_PASSWORD - valueFrom: - secretKeyRef: - name: keycloak-users - key: alice - - name: BOB_PASSWORD - valueFrom: - secretKeyRef: - name: keycloak-users - key: bob - - name: SUPERSET_CLIENT_SECRET - valueFrom: - secretKeyRef: - name: keycloak-client-secrets - key: superset - - name: TRINO_CLIENT_SECRET - valueFrom: - secretKeyRef: - name: keycloak-client-secrets - key: trino - - name: DRUID_CLIENT_SECRET - valueFrom: - secretKeyRef: - name: keycloak-client-secrets - key: druid - command: - - bash - - -x - - -euo - - pipefail - - -c - - | - echo "Download keycloak" - curl -LO https://github.com/keycloak/keycloak/releases/download/23.0.0/keycloak-23.0.0.zip - unzip keycloak-23.0.0.zip - cd keycloak-23.0.0/bin - ./kcadm.sh config credentials --config kcadm.conf --server http://keycloak:8080/ --realm master --user admin --password "$KEYCLOAK_ADMIN_PASSWORD" - ./kcadm.sh create users --config kcadm.conf -s username=alice -s enabled=true || true - ./kcadm.sh create users --config kcadm.conf -s username=bob -s enabled=true || true - ./kcadm.sh set-password --config kcadm.conf --username alice --new-password "$ALICE_PASSWORD" - ./kcadm.sh set-password --config kcadm.conf --username bob --new-password "$BOB_PASSWORD" - ./kcadm.sh create clients --config kcadm.conf -f - << EOF || true - { - "clientId": "superset", - "enabled": true, - "clientAuthenticatorType": "client-secret", - "secret": "$SUPERSET_CLIENT_SECRET", - "redirectUris": [ - "*" - ], - "webOrigins": [ - "*" - ], - "standardFlowEnabled": true, - "protocol": "openid-connect" - } - EOF - ./kcadm.sh create clients --config kcadm.conf -f - << EOF || true - { - "clientId": "trino", - "enabled": true, - "clientAuthenticatorType": "client-secret", - "secret": "$TRINO_CLIENT_SECRET", - "redirectUris": [ - "*" - ], - "webOrigins": [ - "*" - ], - "standardFlowEnabled": true, - "protocol": "openid-connect" - } - EOF - ./kcadm.sh create clients --config kcadm.conf -f - << EOF || true - { - "clientId": "druid", - "enabled": true, - "clientAuthenticatorType": "client-secret", - "secret": "$DRUID_CLIENT_SECRET", - "redirectUris": [ - "*" - ], - "webOrigins": [ - "*" - ], - "standardFlowEnabled": true, - "protocol": "openid-connect" - } - EOF - ADMIN_ID=$(./kcadm.sh get users --config kcadm.conf -r master -q username=admin | sed -ne 's/^ "id" : \(.*\),$/\1/p') - ALICE_ID=$(./kcadm.sh get users --config kcadm.conf -r master -q username=alice | sed -ne 's/^ "id" : \(.*\),$/\1/p') - echo "Writing Keycloak address to ConfigMap keycloak" - kubectl create configmap opagroups --from-literal="data.json={\"admins\": [$ADMIN_ID, $ALICE_ID]}" -o yaml --dry-run | kubectl apply -f - - kubectl label configmap opagroups opa.stackable.tech/bundle=true + - name: setup-keycloak + image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable23.11.0 + env: + - name: KEYCLOAK_ADMIN_PASSWORD + valueFrom: + secretKeyRef: + name: keycloak-admin-credentials + key: admin + - name: ALICE_PASSWORD + valueFrom: + secretKeyRef: + name: keycloak-users + key: alice + - name: BOB_PASSWORD + valueFrom: + secretKeyRef: + name: keycloak-users + key: bob + - name: SUPERSET_CLIENT_SECRET + valueFrom: + secretKeyRef: + name: keycloak-client-secrets + key: superset + - name: TRINO_CLIENT_SECRET + valueFrom: + secretKeyRef: + name: keycloak-client-secrets + key: trino + - name: DRUID_CLIENT_SECRET + valueFrom: + secretKeyRef: + name: keycloak-client-secrets + key: druid + command: + - bash + - -x + - -euo + - pipefail + - -c + - | + echo "Download keycloak" + curl -LO https://github.com/keycloak/keycloak/releases/download/23.0.0/keycloak-23.0.0.zip + unzip keycloak-23.0.0.zip + cd keycloak-23.0.0/bin + ./kcadm.sh config credentials --config kcadm.conf --server http://keycloak:8080/ --realm master --user admin --password "$KEYCLOAK_ADMIN_PASSWORD" + ./kcadm.sh create users --config kcadm.conf -s username=alice -s enabled=true || true + ./kcadm.sh create users --config kcadm.conf -s username=bob -s enabled=true || true + ./kcadm.sh set-password --config kcadm.conf --username alice --new-password "$ALICE_PASSWORD" + ./kcadm.sh set-password --config kcadm.conf --username bob --new-password "$BOB_PASSWORD" + ./kcadm.sh create clients --config kcadm.conf -f - << EOF || true + { + "clientId": "superset", + "enabled": true, + "clientAuthenticatorType": "client-secret", + "secret": "$SUPERSET_CLIENT_SECRET", + "redirectUris": [ + "*" + ], + "webOrigins": [ + "*" + ], + "standardFlowEnabled": true, + "protocol": "openid-connect" + } + EOF + ./kcadm.sh create clients --config kcadm.conf -f - << EOF || true + { + "clientId": "trino", + "enabled": true, + "clientAuthenticatorType": "client-secret", + "secret": "$TRINO_CLIENT_SECRET", + "redirectUris": [ + "*" + ], + "webOrigins": [ + "*" + ], + "standardFlowEnabled": true, + "protocol": "openid-connect" + } + EOF + ./kcadm.sh create clients --config kcadm.conf -f - << EOF || true + { + "clientId": "druid", + "enabled": true, + "clientAuthenticatorType": "client-secret", + "secret": "$DRUID_CLIENT_SECRET", + "redirectUris": [ + "*" + ], + "webOrigins": [ + "*" + ], + "standardFlowEnabled": true, + "protocol": "openid-connect" + } + EOF + ADMIN_ID=$(./kcadm.sh get users --config kcadm.conf -r master -q username=admin | sed -ne 's/^ "id" : \(.*\),$/\1/p') + ALICE_ID=$(./kcadm.sh get users --config kcadm.conf -r master -q username=alice | sed -ne 's/^ "id" : \(.*\),$/\1/p') + echo "Writing Keycloak address to ConfigMap keycloak" + kubectl create configmap opagroups --from-literal="data.json={\"admins\": [$ADMIN_ID, $ALICE_ID]}" -o yaml --dry-run | kubectl apply -f - + kubectl label configmap opagroups opa.stackable.tech/bundle=true serviceAccountName: demo-serviceaccount restartPolicy: OnFailure backoffLimit: 20 # give some time for the Keycloak to be available diff --git a/stacks/keycloak-opa-poc/superset.yaml b/stacks/keycloak-opa-poc/superset.yaml index 74972af1..a9ac38d0 100644 --- a/stacks/keycloak-opa-poc/superset.yaml +++ b/stacks/keycloak-opa-poc/superset.yaml @@ -3,8 +3,6 @@ apiVersion: v1 kind: Secret metadata: name: superset-credentials - labels: - stackable.tech/vendor: Stackable type: Opaque stringData: adminUser.username: admin @@ -19,8 +17,6 @@ apiVersion: superset.stackable.tech/v1alpha1 kind: SupersetCluster metadata: name: superset - labels: - stackable.tech/vendor: Stackable spec: image: productVersion: 3.0.1 diff --git a/stacks/keycloak-opa-poc/trino.yaml b/stacks/keycloak-opa-poc/trino.yaml index 2968e49d..af941163 100644 --- a/stacks/keycloak-opa-poc/trino.yaml +++ b/stacks/keycloak-opa-poc/trino.yaml @@ -3,8 +3,6 @@ apiVersion: trino.stackable.tech/v1alpha1 kind: TrinoCluster metadata: name: trino - labels: - stackable.tech/vendor: Stackable spec: image: productVersion: "428" diff --git a/stacks/keycloak-opa-poc/zookeeper.yaml b/stacks/keycloak-opa-poc/zookeeper.yaml index 2aff25f8..0c133c90 100644 --- a/stacks/keycloak-opa-poc/zookeeper.yaml +++ b/stacks/keycloak-opa-poc/zookeeper.yaml @@ -3,8 +3,6 @@ apiVersion: zookeeper.stackable.tech/v1alpha1 kind: ZookeeperCluster metadata: name: zk - labels: - stackable.tech/vendor: Stackable spec: image: productVersion: 3.8.3 @@ -17,8 +15,6 @@ apiVersion: zookeeper.stackable.tech/v1alpha1 kind: ZookeeperZnode metadata: name: druid-znode - labels: - stackable.tech/vendor: Stackable spec: clusterRef: name: zk @@ -27,8 +23,6 @@ apiVersion: zookeeper.stackable.tech/v1alpha1 kind: ZookeeperZnode metadata: name: hdfs-znode - labels: - stackable.tech/vendor: Stackable spec: clusterRef: - name: zk \ No newline at end of file + name: zk diff --git a/stacks/logging/setup-opensearch-dashboards.yaml b/stacks/logging/setup-opensearch-dashboards.yaml index 36d2a477..b503b766 100644 --- a/stacks/logging/setup-opensearch-dashboards.yaml +++ b/stacks/logging/setup-opensearch-dashboards.yaml @@ -3,8 +3,6 @@ apiVersion: batch/v1 kind: Job metadata: name: setup-opensearch-dashboards - labels: - stackable.tech/vendor: Stackable spec: template: spec: diff --git a/stacks/monitoring/grafana-dashboards.yaml b/stacks/monitoring/grafana-dashboards.yaml index 3567bb1d..0df74960 100644 --- a/stacks/monitoring/grafana-dashboards.yaml +++ b/stacks/monitoring/grafana-dashboards.yaml @@ -3,8 +3,6 @@ apiVersion: v1 kind: ConfigMap metadata: name: stackable-grafana-dashboards - labels: - stackable.tech/vendor: Stackable data: trino.json: | { diff --git a/stacks/nifi-kafka-druid-superset-s3/druid.yaml b/stacks/nifi-kafka-druid-superset-s3/druid.yaml index 8c8e5897..c455ee8a 100644 --- a/stacks/nifi-kafka-druid-superset-s3/druid.yaml +++ b/stacks/nifi-kafka-druid-superset-s3/druid.yaml @@ -3,8 +3,6 @@ apiVersion: druid.stackable.tech/v1alpha1 kind: DruidCluster metadata: name: druid - labels: - stackable.tech/vendor: Stackable spec: image: productVersion: 27.0.0 @@ -74,8 +72,6 @@ apiVersion: zookeeper.stackable.tech/v1alpha1 kind: ZookeeperZnode metadata: name: druid-znode - labels: - stackable.tech/vendor: Stackable spec: clusterRef: name: zookeeper @@ -84,8 +80,6 @@ apiVersion: secrets.stackable.tech/v1alpha1 kind: SecretClass metadata: name: druid-s3-credentials - labels: - stackable.tech/vendor: Stackable spec: backend: k8sSearch: @@ -98,7 +92,6 @@ metadata: name: druid-s3-credentials labels: secrets.stackable.tech/class: druid-s3-credentials - stackable.tech/vendor: Stackable stringData: accessKey: admin secretKey: {{ minioAdminPassword }} diff --git a/stacks/nifi-kafka-druid-superset-s3/kafka.yaml b/stacks/nifi-kafka-druid-superset-s3/kafka.yaml index a76cb10f..f0fb70d2 100644 --- a/stacks/nifi-kafka-druid-superset-s3/kafka.yaml +++ b/stacks/nifi-kafka-druid-superset-s3/kafka.yaml @@ -3,8 +3,6 @@ apiVersion: zookeeper.stackable.tech/v1alpha1 kind: ZookeeperZnode metadata: name: kafka-znode - labels: - stackable.tech/vendor: Stackable spec: clusterRef: name: zookeeper @@ -13,8 +11,6 @@ apiVersion: kafka.stackable.tech/v1alpha1 kind: KafkaCluster metadata: name: kafka - labels: - stackable.tech/vendor: Stackable spec: image: productVersion: 3.5.1 @@ -51,8 +47,6 @@ apiVersion: authentication.stackable.tech/v1alpha1 kind: AuthenticationClass metadata: name: kafka-client-tls - labels: - stackable.tech/vendor: Stackable spec: provider: tls: diff --git a/stacks/nifi-kafka-druid-superset-s3/nifi.yaml b/stacks/nifi-kafka-druid-superset-s3/nifi.yaml index 00bf9d36..91b3ce0b 100644 --- a/stacks/nifi-kafka-druid-superset-s3/nifi.yaml +++ b/stacks/nifi-kafka-druid-superset-s3/nifi.yaml @@ -3,8 +3,6 @@ apiVersion: nifi.stackable.tech/v1alpha1 kind: NifiCluster metadata: name: nifi - labels: - stackable.tech/vendor: Stackable spec: image: productVersion: 1.23.2 @@ -43,8 +41,6 @@ apiVersion: authentication.stackable.tech/v1alpha1 kind: AuthenticationClass metadata: name: nifi-admin-credentials - labels: - stackable.tech/vendor: Stackable spec: provider: static: @@ -55,8 +51,6 @@ apiVersion: v1 kind: Secret metadata: name: nifi-admin-credentials-secret - labels: - stackable.tech/vendor: Stackable stringData: admin: {{ nifiAdminPassword }} --- @@ -64,8 +58,6 @@ apiVersion: zookeeper.stackable.tech/v1alpha1 kind: ZookeeperZnode metadata: name: nifi-znode - labels: - stackable.tech/vendor: Stackable spec: clusterRef: name: zookeeper diff --git a/stacks/nifi-kafka-druid-superset-s3/superset.yaml b/stacks/nifi-kafka-druid-superset-s3/superset.yaml index f2441d2a..7e382252 100644 --- a/stacks/nifi-kafka-druid-superset-s3/superset.yaml +++ b/stacks/nifi-kafka-druid-superset-s3/superset.yaml @@ -3,8 +3,6 @@ apiVersion: superset.stackable.tech/v1alpha1 kind: SupersetCluster metadata: name: superset - labels: - stackable.tech/vendor: Stackable spec: image: productVersion: 3.0.1 @@ -21,8 +19,6 @@ apiVersion: v1 kind: Secret metadata: name: superset-credentials - labels: - stackable.tech/vendor: Stackable type: Opaque stringData: adminUser.username: admin @@ -37,8 +33,6 @@ apiVersion: v1 kind: Secret metadata: name: superset-mapbox-api-key - labels: - stackable.tech/vendor: Stackable type: Opaque stringData: connections.mapboxApiKey: "pk.eyJ1IjoibXVlbGxlcmNlbGluZSIsImEiOiJjbDZwM3llMTAwNGpmM2psdHU0Y21wZHJwIn0.kXFJKBbeyhbwf0z460JcTQ" @@ -47,8 +41,6 @@ apiVersion: superset.stackable.tech/v1alpha1 kind: DruidConnection metadata: name: superset-druid-connection - labels: - stackable.tech/vendor: Stackable spec: superset: name: superset diff --git a/stacks/nifi-kafka-druid-superset-s3/zookeeper.yaml b/stacks/nifi-kafka-druid-superset-s3/zookeeper.yaml index 4bf3577c..2f93fb8d 100644 --- a/stacks/nifi-kafka-druid-superset-s3/zookeeper.yaml +++ b/stacks/nifi-kafka-druid-superset-s3/zookeeper.yaml @@ -3,8 +3,6 @@ apiVersion: zookeeper.stackable.tech/v1alpha1 kind: ZookeeperCluster metadata: name: zookeeper - labels: - stackable.tech/vendor: Stackable spec: image: productVersion: 3.8.3 diff --git a/stacks/signal-processing/grafana-dashboards.yaml b/stacks/signal-processing/grafana-dashboards.yaml index 03ab7a49..24ac2427 100644 --- a/stacks/signal-processing/grafana-dashboards.yaml +++ b/stacks/signal-processing/grafana-dashboards.yaml @@ -3,8 +3,6 @@ apiVersion: v1 kind: ConfigMap metadata: name: stackable-grafana-dashboards - labels: - stackable.tech/vendor: Stackable data: gas_measurements.json: | { diff --git a/stacks/signal-processing/nifi.yaml b/stacks/signal-processing/nifi.yaml index 8c8bcb2b..9bae5364 100644 --- a/stacks/signal-processing/nifi.yaml +++ b/stacks/signal-processing/nifi.yaml @@ -3,8 +3,6 @@ apiVersion: nifi.stackable.tech/v1alpha1 kind: NifiCluster metadata: name: nifi - labels: - stackable.tech/vendor: Stackable spec: image: productVersion: 1.21.0 @@ -44,8 +42,6 @@ apiVersion: authentication.stackable.tech/v1alpha1 kind: AuthenticationClass metadata: name: nifi-users - labels: - stackable.tech/vendor: Stackable spec: provider: static: @@ -56,8 +52,6 @@ apiVersion: v1 kind: Secret metadata: name: nifi-admin-credentials - labels: - stackable.tech/vendor: Stackable stringData: admin: {{ nifiAdminPassword }} --- @@ -65,8 +59,6 @@ apiVersion: zookeeper.stackable.tech/v1alpha1 kind: ZookeeperZnode metadata: name: nifi-znode - labels: - stackable.tech/vendor: Stackable spec: clusterRef: name: zookeeper diff --git a/stacks/signal-processing/secrets.yaml b/stacks/signal-processing/secrets.yaml index 35d35236..2265fb38 100644 --- a/stacks/signal-processing/secrets.yaml +++ b/stacks/signal-processing/secrets.yaml @@ -3,8 +3,6 @@ apiVersion: v1 kind: Secret metadata: name: timescale-admin-credentials - labels: - stackable.tech/vendor: Stackable stringData: username: admin - password: {{ postgresAdminPassword }} \ No newline at end of file + password: {{ postgresAdminPassword }} diff --git a/stacks/spark-trino-superset-s3/hive-metastore.yaml b/stacks/spark-trino-superset-s3/hive-metastore.yaml index c00d76e3..82e9f5c1 100644 --- a/stacks/spark-trino-superset-s3/hive-metastore.yaml +++ b/stacks/spark-trino-superset-s3/hive-metastore.yaml @@ -3,8 +3,6 @@ apiVersion: hive.stackable.tech/v1alpha1 kind: HiveCluster metadata: name: hive - labels: - stackable.tech/vendor: Stackable spec: image: productVersion: 3.1.3 @@ -25,8 +23,6 @@ apiVersion: hive.stackable.tech/v1alpha1 kind: HiveCluster metadata: name: hive-iceberg - labels: - stackable.tech/vendor: Stackable spec: image: productVersion: 3.1.3 diff --git a/stacks/spark-trino-superset-s3/trino-prediction-catalog.yaml b/stacks/spark-trino-superset-s3/trino-prediction-catalog.yaml index ca5bf0c6..0410fa17 100644 --- a/stacks/spark-trino-superset-s3/trino-prediction-catalog.yaml +++ b/stacks/spark-trino-superset-s3/trino-prediction-catalog.yaml @@ -4,7 +4,6 @@ kind: TrinoCatalog metadata: name: prediction labels: - stackable.tech/vendor: Stackable trino: trino spec: connector: diff --git a/stacks/trino-iceberg/hive-metastores.yaml b/stacks/trino-iceberg/hive-metastores.yaml index fc8e2b8c..446618dd 100644 --- a/stacks/trino-iceberg/hive-metastores.yaml +++ b/stacks/trino-iceberg/hive-metastores.yaml @@ -3,8 +3,6 @@ apiVersion: hive.stackable.tech/v1alpha1 kind: HiveCluster metadata: name: hive-iceberg - labels: - stackable.tech/vendor: Stackable spec: image: productVersion: 3.1.3 diff --git a/stacks/trino-iceberg/s3-connection.yaml b/stacks/trino-iceberg/s3-connection.yaml index f52cb8bb..7e026539 100644 --- a/stacks/trino-iceberg/s3-connection.yaml +++ b/stacks/trino-iceberg/s3-connection.yaml @@ -3,8 +3,6 @@ apiVersion: s3.stackable.tech/v1alpha1 kind: S3Connection metadata: name: minio - labels: - stackable.tech/vendor: Stackable spec: host: minio port: 9000 @@ -16,8 +14,6 @@ apiVersion: secrets.stackable.tech/v1alpha1 kind: SecretClass metadata: name: minio-s3-credentials - labels: - stackable.tech/vendor: Stackable spec: backend: k8sSearch: @@ -30,7 +26,6 @@ metadata: name: minio-s3-credentials labels: secrets.stackable.tech/class: minio-s3-credentials - stackable.tech/vendor: Stackable stringData: accessKey: admin secretKey: {{ minioAdminPassword }} diff --git a/stacks/trino-iceberg/trino.yaml b/stacks/trino-iceberg/trino.yaml index 9356dc2a..41a5e739 100644 --- a/stacks/trino-iceberg/trino.yaml +++ b/stacks/trino-iceberg/trino.yaml @@ -3,8 +3,6 @@ apiVersion: trino.stackable.tech/v1alpha1 kind: TrinoCluster metadata: name: trino - labels: - stackable.tech/vendor: Stackable spec: image: productVersion: "428" @@ -48,8 +46,6 @@ apiVersion: authentication.stackable.tech/v1alpha1 kind: AuthenticationClass metadata: name: trino-users - labels: - stackable.tech/vendor: Stackable spec: provider: static: @@ -60,8 +56,6 @@ apiVersion: v1 kind: Secret metadata: name: trino-users - labels: - stackable.tech/vendor: Stackable type: kubernetes.io/opaque stringData: admin: "{{ trinoAdminPassword }}" @@ -71,7 +65,6 @@ kind: TrinoCatalog metadata: name: lakehouse labels: - stackable.tech/vendor: Stackable trino: trino spec: connector: @@ -86,7 +79,6 @@ kind: TrinoCatalog metadata: name: tpcds labels: - stackable.tech/vendor: Stackable trino: trino spec: connector: @@ -97,7 +89,6 @@ kind: TrinoCatalog metadata: name: tpch labels: - stackable.tech/vendor: Stackable trino: trino spec: connector: @@ -107,8 +98,6 @@ apiVersion: opa.stackable.tech/v1alpha1 kind: OpaCluster metadata: name: opa - labels: - stackable.tech/vendor: Stackable spec: image: productVersion: 0.57.0 @@ -125,7 +114,6 @@ metadata: name: trino-opa-bundle labels: opa.stackable.tech/bundle: "trino" - stackable.tech/vendor: Stackable data: trino.rego: | package trino diff --git a/stacks/trino-superset-s3/hive-metastore.yaml b/stacks/trino-superset-s3/hive-metastore.yaml index 8a0b9e06..397e5207 100644 --- a/stacks/trino-superset-s3/hive-metastore.yaml +++ b/stacks/trino-superset-s3/hive-metastore.yaml @@ -3,8 +3,6 @@ apiVersion: hive.stackable.tech/v1alpha1 kind: HiveCluster metadata: name: hive - labels: - stackable.tech/vendor: Stackable spec: image: productVersion: 3.1.3 diff --git a/stacks/trino-superset-s3/s3-connection.yaml b/stacks/trino-superset-s3/s3-connection.yaml index f52cb8bb..7e026539 100644 --- a/stacks/trino-superset-s3/s3-connection.yaml +++ b/stacks/trino-superset-s3/s3-connection.yaml @@ -3,8 +3,6 @@ apiVersion: s3.stackable.tech/v1alpha1 kind: S3Connection metadata: name: minio - labels: - stackable.tech/vendor: Stackable spec: host: minio port: 9000 @@ -16,8 +14,6 @@ apiVersion: secrets.stackable.tech/v1alpha1 kind: SecretClass metadata: name: minio-s3-credentials - labels: - stackable.tech/vendor: Stackable spec: backend: k8sSearch: @@ -30,7 +26,6 @@ metadata: name: minio-s3-credentials labels: secrets.stackable.tech/class: minio-s3-credentials - stackable.tech/vendor: Stackable stringData: accessKey: admin secretKey: {{ minioAdminPassword }} diff --git a/stacks/trino-superset-s3/superset.yaml b/stacks/trino-superset-s3/superset.yaml index 8abddee8..207183ef 100644 --- a/stacks/trino-superset-s3/superset.yaml +++ b/stacks/trino-superset-s3/superset.yaml @@ -3,8 +3,6 @@ apiVersion: superset.stackable.tech/v1alpha1 kind: SupersetCluster metadata: name: superset - labels: - stackable.tech/vendor: Stackable spec: image: productVersion: 3.0.1 @@ -21,8 +19,6 @@ apiVersion: v1 kind: Secret metadata: name: superset-credentials - labels: - stackable.tech/vendor: Stackable type: Opaque stringData: adminUser.username: admin @@ -37,8 +33,6 @@ apiVersion: v1 kind: Secret metadata: name: superset-mapbox-api-key - labels: - stackable.tech/vendor: Stackable type: Opaque stringData: connections.mapboxApiKey: "pk.eyJ1IjoibXVlbGxlcmNlbGluZSIsImEiOiJjbDZwM3llMTAwNGpmM2psdHU0Y21wZHJwIn0.kXFJKBbeyhbwf0z460JcTQ" diff --git a/stacks/trino-superset-s3/trino.yaml b/stacks/trino-superset-s3/trino.yaml index 43bb2643..d33d81e2 100644 --- a/stacks/trino-superset-s3/trino.yaml +++ b/stacks/trino-superset-s3/trino.yaml @@ -3,8 +3,6 @@ apiVersion: trino.stackable.tech/v1alpha1 kind: TrinoCluster metadata: name: trino - labels: - stackable.tech/vendor: Stackable spec: image: productVersion: "428" @@ -39,8 +37,6 @@ apiVersion: authentication.stackable.tech/v1alpha1 kind: AuthenticationClass metadata: name: trino-users - labels: - stackable.tech/vendor: Stackable spec: provider: static: @@ -51,8 +47,6 @@ apiVersion: v1 kind: Secret metadata: name: trino-users - labels: - stackable.tech/vendor: Stackable type: kubernetes.io/opaque stringData: admin: "{{ trinoAdminPassword }}" @@ -62,7 +56,6 @@ kind: TrinoCatalog metadata: name: hive labels: - stackable.tech/vendor: Stackable trino: trino spec: connector: @@ -76,8 +69,6 @@ apiVersion: opa.stackable.tech/v1alpha1 kind: OpaCluster metadata: name: opa - labels: - stackable.tech/vendor: Stackable spec: image: productVersion: 0.57.0 @@ -91,7 +82,6 @@ metadata: name: trino-opa-bundle labels: opa.stackable.tech/bundle: "trino" - stackable.tech/vendor: Stackable data: trino.rego: | package trino From 00adef68ec8d582958f1a35b84df9a7ca207dc82 Mon Sep 17 00:00:00 2001 From: Techassi Date: Thu, 1 Feb 2024 16:11:35 +0100 Subject: [PATCH 6/8] Adjust Jupyterhub labels --- stacks/_templates/jupyterhub.yaml | 6 ++++-- stacks/signal-processing/jupyterhub.yaml | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/stacks/_templates/jupyterhub.yaml b/stacks/_templates/jupyterhub.yaml index 67fc9d3c..69c48809 100644 --- a/stacks/_templates/jupyterhub.yaml +++ b/stacks/_templates/jupyterhub.yaml @@ -5,8 +5,6 @@ repo: url: https://jupyterhub.github.io/helm-chart/ version: 3.0.0 options: - labels: - stackable.tech/vendor: Stackable hub: config: Authenticator: @@ -16,6 +14,8 @@ options: password: {{ jupyterHubAdminPassword }} JupyterHub: authenticator_class: dummy + labels: + stackable.tech/vendor: Stackable proxy: service: type: NodePort @@ -43,6 +43,8 @@ options: serviceAccountName: spark networkPolicy: enabled: false + extraLabels: + stackable.tech/vendor: Stackable extraEnv: HADOOP_CONF_DIR: "/home/jovyan/hdfs" initContainers: diff --git a/stacks/signal-processing/jupyterhub.yaml b/stacks/signal-processing/jupyterhub.yaml index a3166f98..a3ab254b 100644 --- a/stacks/signal-processing/jupyterhub.yaml +++ b/stacks/signal-processing/jupyterhub.yaml @@ -5,8 +5,6 @@ repo: url: https://jupyterhub.github.io/helm-chart/ version: 2.0.0 options: - labels: - stackable.tech/vendor: Stackable hub: config: Authenticator: @@ -16,6 +14,8 @@ options: password: {{ jupyterHubAdminPassword }} JupyterHub: authenticator_class: dummy + labels: + stackable.tech/vendor: Stackable proxy: service: type: NodePort @@ -34,6 +34,8 @@ options: serviceAccountName: spark networkPolicy: enabled: false + extraLabels: + stackable.tech/vendor: Stackable initContainers: - name: download-notebook image: docker.stackable.tech/stackable/tools:1.0.0-stackable23.11.0 From 8200c216b022ae961286b1373129644d2b4607e4 Mon Sep 17 00:00:00 2001 From: Techassi Date: Thu, 1 Feb 2024 16:15:07 +0100 Subject: [PATCH 7/8] Add label to inlined SparkApplication --- .../create-spark-ingestion-job.yaml | 2 ++ 1 file changed, 2 insertions(+) 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 index 5fa8c440..ab0f5606 100644 --- a/demos/data-lakehouse-iceberg-trino-spark/create-spark-ingestion-job.yaml +++ b/demos/data-lakehouse-iceberg-trino-spark/create-spark-ingestion-job.yaml @@ -39,6 +39,8 @@ data: kind: SparkApplication metadata: name: spark-ingest-into-lakehouse + labels: + stackable.tech/vendor: Stackable spec: version: "1.0" sparkImage: From 9a84d7be71edd1bb6aeb7c32e416d5adbb33dbf9 Mon Sep 17 00:00:00 2001 From: Techassi Date: Thu, 1 Feb 2024 16:31:22 +0100 Subject: [PATCH 8/8] Cleanup leftover yq formatting --- .../nifi.yaml | 2 +- .../s3-connection.yaml | 2 +- stacks/keycloak-opa-poc/keycloak.yaml | 29 ++- stacks/keycloak-opa-poc/setup-keycloak.yaml | 204 +++++++++--------- 4 files changed, 118 insertions(+), 119 deletions(-) diff --git a/stacks/data-lakehouse-iceberg-trino-spark/nifi.yaml b/stacks/data-lakehouse-iceberg-trino-spark/nifi.yaml index 8de99796..9b5a3e4c 100644 --- a/stacks/data-lakehouse-iceberg-trino-spark/nifi.yaml +++ b/stacks/data-lakehouse-iceberg-trino-spark/nifi.yaml @@ -52,7 +52,7 @@ kind: Secret metadata: name: nifi-admin-credentials-secret stringData: - admin: {? {nifiAdminPassword: ''} : ''} + admin: {{ nifiAdminPassword }} --- apiVersion: zookeeper.stackable.tech/v1alpha1 kind: ZookeeperZnode diff --git a/stacks/data-lakehouse-iceberg-trino-spark/s3-connection.yaml b/stacks/data-lakehouse-iceberg-trino-spark/s3-connection.yaml index 27e26a8e..7e026539 100644 --- a/stacks/data-lakehouse-iceberg-trino-spark/s3-connection.yaml +++ b/stacks/data-lakehouse-iceberg-trino-spark/s3-connection.yaml @@ -28,4 +28,4 @@ metadata: secrets.stackable.tech/class: minio-s3-credentials stringData: accessKey: admin - secretKey: {? {minioAdminPassword: ''} : ''} + secretKey: {{ minioAdminPassword }} diff --git a/stacks/keycloak-opa-poc/keycloak.yaml b/stacks/keycloak-opa-poc/keycloak.yaml index fe68c599..a1b9ac35 100644 --- a/stacks/keycloak-opa-poc/keycloak.yaml +++ b/stacks/keycloak-opa-poc/keycloak.yaml @@ -13,7 +13,6 @@ spec: template: metadata: labels: - stackable.tech/vendor: Stackable app: keycloak spec: containers: @@ -70,21 +69,21 @@ spec: template: spec: containers: - - name: propagate-keycloak-address - image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable23.11.0 - command: - - bash - - -x - - -euo - - pipefail - - -c - - | - echo "Determining Keycloak public reachable address" - KEYCLOAK_ADDRESS=$(kubectl get svc keycloak -o json | jq -r --argfile endpoints <(kubectl get endpoints keycloak -o json) --argfile nodes <(kubectl get nodes -o json) '($nodes.items[] | select(.metadata.name == $endpoints.subsets[].addresses[].nodeName) | .status.addresses | map(select(.type == "ExternalIP" or .type == "InternalIP")) | min_by(.type) | .address | tostring) + ":" + (.spec.ports[] | select(.name == "http") | .nodePort | tostring)') - echo "Found Keycloak running at $KEYCLOAK_ADDRESS" + - name: propagate-keycloak-address + image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable23.11.0 + command: + - bash + - -x + - -euo + - pipefail + - -c + - | + echo "Determining Keycloak public reachable address" + KEYCLOAK_ADDRESS=$(kubectl get svc keycloak -o json | jq -r --argfile endpoints <(kubectl get endpoints keycloak -o json) --argfile nodes <(kubectl get nodes -o json) '($nodes.items[] | select(.metadata.name == $endpoints.subsets[].addresses[].nodeName) | .status.addresses | map(select(.type == "ExternalIP" or .type == "InternalIP")) | min_by(.type) | .address | tostring) + ":" + (.spec.ports[] | select(.name == "http") | .nodePort | tostring)') + echo "Found Keycloak running at $KEYCLOAK_ADDRESS" - echo "Writing Keycloak address to ConfigMap keycloak" - kubectl create configmap keycloak --from-literal="KEYCLOAK=$KEYCLOAK_ADDRESS" --from-literal="KEYCLOAK_DISCOVERY_URL=http://$KEYCLOAK_ADDRESS/realms/master/.well-known/openid-configuration" -o yaml --dry-run | kubectl apply -f - + echo "Writing Keycloak address to ConfigMap keycloak" + kubectl create configmap keycloak --from-literal="KEYCLOAK=$KEYCLOAK_ADDRESS" --from-literal="KEYCLOAK_DISCOVERY_URL=http://$KEYCLOAK_ADDRESS/realms/master/.well-known/openid-configuration" -o yaml --dry-run | kubectl apply -f - serviceAccountName: demo-serviceaccount restartPolicy: OnFailure backoffLimit: 20 # give some time for the Keycloak to be available diff --git a/stacks/keycloak-opa-poc/setup-keycloak.yaml b/stacks/keycloak-opa-poc/setup-keycloak.yaml index f721c529..e8ac9d7b 100644 --- a/stacks/keycloak-opa-poc/setup-keycloak.yaml +++ b/stacks/keycloak-opa-poc/setup-keycloak.yaml @@ -27,108 +27,108 @@ spec: template: spec: containers: - - name: setup-keycloak - image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable23.11.0 - env: - - name: KEYCLOAK_ADMIN_PASSWORD - valueFrom: - secretKeyRef: - name: keycloak-admin-credentials - key: admin - - name: ALICE_PASSWORD - valueFrom: - secretKeyRef: - name: keycloak-users - key: alice - - name: BOB_PASSWORD - valueFrom: - secretKeyRef: - name: keycloak-users - key: bob - - name: SUPERSET_CLIENT_SECRET - valueFrom: - secretKeyRef: - name: keycloak-client-secrets - key: superset - - name: TRINO_CLIENT_SECRET - valueFrom: - secretKeyRef: - name: keycloak-client-secrets - key: trino - - name: DRUID_CLIENT_SECRET - valueFrom: - secretKeyRef: - name: keycloak-client-secrets - key: druid - command: - - bash - - -x - - -euo - - pipefail - - -c - - | - echo "Download keycloak" - curl -LO https://github.com/keycloak/keycloak/releases/download/23.0.0/keycloak-23.0.0.zip - unzip keycloak-23.0.0.zip - cd keycloak-23.0.0/bin - ./kcadm.sh config credentials --config kcadm.conf --server http://keycloak:8080/ --realm master --user admin --password "$KEYCLOAK_ADMIN_PASSWORD" - ./kcadm.sh create users --config kcadm.conf -s username=alice -s enabled=true || true - ./kcadm.sh create users --config kcadm.conf -s username=bob -s enabled=true || true - ./kcadm.sh set-password --config kcadm.conf --username alice --new-password "$ALICE_PASSWORD" - ./kcadm.sh set-password --config kcadm.conf --username bob --new-password "$BOB_PASSWORD" - ./kcadm.sh create clients --config kcadm.conf -f - << EOF || true - { - "clientId": "superset", - "enabled": true, - "clientAuthenticatorType": "client-secret", - "secret": "$SUPERSET_CLIENT_SECRET", - "redirectUris": [ - "*" - ], - "webOrigins": [ - "*" - ], - "standardFlowEnabled": true, - "protocol": "openid-connect" - } - EOF - ./kcadm.sh create clients --config kcadm.conf -f - << EOF || true - { - "clientId": "trino", - "enabled": true, - "clientAuthenticatorType": "client-secret", - "secret": "$TRINO_CLIENT_SECRET", - "redirectUris": [ - "*" - ], - "webOrigins": [ - "*" - ], - "standardFlowEnabled": true, - "protocol": "openid-connect" - } - EOF - ./kcadm.sh create clients --config kcadm.conf -f - << EOF || true - { - "clientId": "druid", - "enabled": true, - "clientAuthenticatorType": "client-secret", - "secret": "$DRUID_CLIENT_SECRET", - "redirectUris": [ - "*" - ], - "webOrigins": [ - "*" - ], - "standardFlowEnabled": true, - "protocol": "openid-connect" - } - EOF - ADMIN_ID=$(./kcadm.sh get users --config kcadm.conf -r master -q username=admin | sed -ne 's/^ "id" : \(.*\),$/\1/p') - ALICE_ID=$(./kcadm.sh get users --config kcadm.conf -r master -q username=alice | sed -ne 's/^ "id" : \(.*\),$/\1/p') - echo "Writing Keycloak address to ConfigMap keycloak" - kubectl create configmap opagroups --from-literal="data.json={\"admins\": [$ADMIN_ID, $ALICE_ID]}" -o yaml --dry-run | kubectl apply -f - - kubectl label configmap opagroups opa.stackable.tech/bundle=true + - name: setup-keycloak + image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable23.11.0 + env: + - name: KEYCLOAK_ADMIN_PASSWORD + valueFrom: + secretKeyRef: + name: keycloak-admin-credentials + key: admin + - name: ALICE_PASSWORD + valueFrom: + secretKeyRef: + name: keycloak-users + key: alice + - name: BOB_PASSWORD + valueFrom: + secretKeyRef: + name: keycloak-users + key: bob + - name: SUPERSET_CLIENT_SECRET + valueFrom: + secretKeyRef: + name: keycloak-client-secrets + key: superset + - name: TRINO_CLIENT_SECRET + valueFrom: + secretKeyRef: + name: keycloak-client-secrets + key: trino + - name: DRUID_CLIENT_SECRET + valueFrom: + secretKeyRef: + name: keycloak-client-secrets + key: druid + command: + - bash + - -x + - -euo + - pipefail + - -c + - | + echo "Download keycloak" + curl -LO https://github.com/keycloak/keycloak/releases/download/23.0.0/keycloak-23.0.0.zip + unzip keycloak-23.0.0.zip + cd keycloak-23.0.0/bin + ./kcadm.sh config credentials --config kcadm.conf --server http://keycloak:8080/ --realm master --user admin --password "$KEYCLOAK_ADMIN_PASSWORD" + ./kcadm.sh create users --config kcadm.conf -s username=alice -s enabled=true || true + ./kcadm.sh create users --config kcadm.conf -s username=bob -s enabled=true || true + ./kcadm.sh set-password --config kcadm.conf --username alice --new-password "$ALICE_PASSWORD" + ./kcadm.sh set-password --config kcadm.conf --username bob --new-password "$BOB_PASSWORD" + ./kcadm.sh create clients --config kcadm.conf -f - << EOF || true + { + "clientId": "superset", + "enabled": true, + "clientAuthenticatorType": "client-secret", + "secret": "$SUPERSET_CLIENT_SECRET", + "redirectUris": [ + "*" + ], + "webOrigins": [ + "*" + ], + "standardFlowEnabled": true, + "protocol": "openid-connect" + } + EOF + ./kcadm.sh create clients --config kcadm.conf -f - << EOF || true + { + "clientId": "trino", + "enabled": true, + "clientAuthenticatorType": "client-secret", + "secret": "$TRINO_CLIENT_SECRET", + "redirectUris": [ + "*" + ], + "webOrigins": [ + "*" + ], + "standardFlowEnabled": true, + "protocol": "openid-connect" + } + EOF + ./kcadm.sh create clients --config kcadm.conf -f - << EOF || true + { + "clientId": "druid", + "enabled": true, + "clientAuthenticatorType": "client-secret", + "secret": "$DRUID_CLIENT_SECRET", + "redirectUris": [ + "*" + ], + "webOrigins": [ + "*" + ], + "standardFlowEnabled": true, + "protocol": "openid-connect" + } + EOF + ADMIN_ID=$(./kcadm.sh get users --config kcadm.conf -r master -q username=admin | sed -ne 's/^ "id" : \(.*\),$/\1/p') + ALICE_ID=$(./kcadm.sh get users --config kcadm.conf -r master -q username=alice | sed -ne 's/^ "id" : \(.*\),$/\1/p') + echo "Writing Keycloak address to ConfigMap keycloak" + kubectl create configmap opagroups --from-literal="data.json={\"admins\": [$ADMIN_ID, $ALICE_ID]}" -o yaml --dry-run | kubectl apply -f - + kubectl label configmap opagroups opa.stackable.tech/bundle=true serviceAccountName: demo-serviceaccount restartPolicy: OnFailure backoffLimit: 20 # give some time for the Keycloak to be available