From 977e00330b7a31c415606435ec987fc0eeec0d03 Mon Sep 17 00:00:00 2001 From: ImpSy <3097030+ImpSy@users.noreply.github.com> Date: Mon, 4 Nov 2024 16:54:38 +0100 Subject: [PATCH] Always create telemetry ConfigMap Signed-off-by: ImpSy <3097030+ImpSy@users.noreply.github.com> --- charts/bigdata-notebook-service/Chart.yaml | 2 +- .../bigdata-notebook-service/templates/telemetry_configmap.yaml | 2 -- charts/bigdata-notebook-workspace/Chart.yaml | 2 +- .../templates/telemetry_configmap.yaml | 2 -- charts/bigdata-operator/Chart.yaml | 2 +- .../bigdata-operator/templates/common_telemetry_configmap.yaml | 2 -- charts/bigdata-operator/templates/telemetry_configmap.yaml | 2 -- charts/bigdata-proxy/Chart.yaml | 2 +- charts/bigdata-proxy/templates/telemetry_configmap.yaml | 2 -- charts/bigdata-spark-watcher/Chart.yaml | 2 +- charts/bigdata-spark-watcher/templates/telemetry_configmap.yaml | 2 -- charts/spark-operator/Chart.yaml | 2 +- .../charts/spark-operator/templates/telemetry_configmap.yaml | 2 -- 13 files changed, 6 insertions(+), 20 deletions(-) diff --git a/charts/bigdata-notebook-service/Chart.yaml b/charts/bigdata-notebook-service/Chart.yaml index 57324ac..42df031 100644 --- a/charts/bigdata-notebook-service/Chart.yaml +++ b/charts/bigdata-notebook-service/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: bigdata-notebook-service description: A Helm chart for the Spot Big Data Notebook Service type: application -version: 0.4.3 +version: 0.4.4 appVersion: 0.94.1 home: https://github.com/spotinst/charts icon: https://docs.spot.io/_media/images/spot_mark.png diff --git a/charts/bigdata-notebook-service/templates/telemetry_configmap.yaml b/charts/bigdata-notebook-service/templates/telemetry_configmap.yaml index a114fa0..bb0df2e 100644 --- a/charts/bigdata-notebook-service/templates/telemetry_configmap.yaml +++ b/charts/bigdata-notebook-service/templates/telemetry_configmap.yaml @@ -1,4 +1,3 @@ -{{- if .Values.telemetry.enabled }} apiVersion: v1 kind: ConfigMap metadata: @@ -14,4 +13,3 @@ data: metrics-collection.conf: | # Configuration for collecting metrics from the notebook service -{{- end }} diff --git a/charts/bigdata-notebook-workspace/Chart.yaml b/charts/bigdata-notebook-workspace/Chart.yaml index 93a2554..48cc068 100644 --- a/charts/bigdata-notebook-workspace/Chart.yaml +++ b/charts/bigdata-notebook-workspace/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: bigdata-notebook-workspace description: A Helm chart for the Spot Big Data Notebook Workspace type: application -version: 0.0.15 +version: 0.0.16 appVersion: 4.1.8-ofas-31799c9 home: https://github.com/spotinst/charts icon: https://docs.spot.io/_media/images/spot_mark.png diff --git a/charts/bigdata-notebook-workspace/templates/telemetry_configmap.yaml b/charts/bigdata-notebook-workspace/templates/telemetry_configmap.yaml index 6f21063..e68a60c 100644 --- a/charts/bigdata-notebook-workspace/templates/telemetry_configmap.yaml +++ b/charts/bigdata-notebook-workspace/templates/telemetry_configmap.yaml @@ -1,4 +1,3 @@ -{{- if .Values.telemetry.enabled }} apiVersion: v1 kind: ConfigMap metadata: @@ -14,4 +13,3 @@ data: metrics-collection.conf: | # Configuration for collecting metrics from the notebook workspace -{{- end }} diff --git a/charts/bigdata-operator/Chart.yaml b/charts/bigdata-operator/Chart.yaml index f3111e7..4df54b2 100644 --- a/charts/bigdata-operator/Chart.yaml +++ b/charts/bigdata-operator/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: bigdata-operator description: Spot Ocean BigData Operator type: application -version: 0.4.24 +version: 0.4.25 appVersion: 0.4.19 home: https://github.com/spotinst/charts icon: https://docs.spot.io/_media/images/spot_mark.png diff --git a/charts/bigdata-operator/templates/common_telemetry_configmap.yaml b/charts/bigdata-operator/templates/common_telemetry_configmap.yaml index 0ecc715..feb5a4c 100644 --- a/charts/bigdata-operator/templates/common_telemetry_configmap.yaml +++ b/charts/bigdata-operator/templates/common_telemetry_configmap.yaml @@ -1,4 +1,3 @@ -{{- if .Values.telemetry.enabled }} apiVersion: v1 kind: ConfigMap metadata: @@ -57,4 +56,3 @@ data: use_put_object On total_file_size 5M upload_timeout 5m -{{- end }} \ No newline at end of file diff --git a/charts/bigdata-operator/templates/telemetry_configmap.yaml b/charts/bigdata-operator/templates/telemetry_configmap.yaml index 4e91a98..bf411d0 100644 --- a/charts/bigdata-operator/templates/telemetry_configmap.yaml +++ b/charts/bigdata-operator/templates/telemetry_configmap.yaml @@ -1,4 +1,3 @@ -{{- if .Values.telemetry.enabled }} apiVersion: v1 kind: ConfigMap metadata: @@ -30,4 +29,3 @@ data: tls off tls.verify off Workers 1 -{{- end }} diff --git a/charts/bigdata-proxy/Chart.yaml b/charts/bigdata-proxy/Chart.yaml index ea63121..07dad40 100644 --- a/charts/bigdata-proxy/Chart.yaml +++ b/charts/bigdata-proxy/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: bigdata-proxy description: A Helm chart for the Spot Big Data Proxy type: application -version: 0.4.13 +version: 0.4.14 appVersion: 0.5.5 home: https://github.com/spotinst/charts icon: https://docs.spot.io/_media/images/spot_mark.png diff --git a/charts/bigdata-proxy/templates/telemetry_configmap.yaml b/charts/bigdata-proxy/templates/telemetry_configmap.yaml index 93663c2..aa95654 100644 --- a/charts/bigdata-proxy/templates/telemetry_configmap.yaml +++ b/charts/bigdata-proxy/templates/telemetry_configmap.yaml @@ -1,4 +1,3 @@ -{{- if .Values.telemetry.enabled }} apiVersion: v1 kind: ConfigMap metadata: @@ -15,4 +14,3 @@ data: metrics-collection.conf: | # Configuration for collecting metrics from the bigdata proxy -{{- end }} diff --git a/charts/bigdata-spark-watcher/Chart.yaml b/charts/bigdata-spark-watcher/Chart.yaml index 66e7da9..f913d81 100644 --- a/charts/bigdata-spark-watcher/Chart.yaml +++ b/charts/bigdata-spark-watcher/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: bigdata-spark-watcher description: A Helm chart for the Spot Big Data Spark Watcher type: application -version: 0.6.1 +version: 0.6.2 appVersion: 0.6.1 home: https://github.com/spotinst/charts icon: https://docs.spot.io/_media/images/spot_mark.png diff --git a/charts/bigdata-spark-watcher/templates/telemetry_configmap.yaml b/charts/bigdata-spark-watcher/templates/telemetry_configmap.yaml index 914e3a2..6dd85e0 100644 --- a/charts/bigdata-spark-watcher/templates/telemetry_configmap.yaml +++ b/charts/bigdata-spark-watcher/templates/telemetry_configmap.yaml @@ -1,4 +1,3 @@ -{{- if .Values.telemetry.enabled }} apiVersion: v1 kind: ConfigMap metadata: @@ -30,4 +29,3 @@ data: tls off tls.verify off Workers 1 -{{- end }} diff --git a/charts/spark-operator/Chart.yaml b/charts/spark-operator/Chart.yaml index dd805c3..ce9cb8a 100644 --- a/charts/spark-operator/Chart.yaml +++ b/charts/spark-operator/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 description: Spark Operator (b/g part) name: spark-operator -version: 0.1.33 +version: 0.1.34 appVersion: v1beta2-1.3.4-3.1.1 dependencies: - name: spark-operator diff --git a/charts/spark-operator/charts/spark-operator/templates/telemetry_configmap.yaml b/charts/spark-operator/charts/spark-operator/templates/telemetry_configmap.yaml index 4aa1a24..719a45f 100644 --- a/charts/spark-operator/charts/spark-operator/templates/telemetry_configmap.yaml +++ b/charts/spark-operator/charts/spark-operator/templates/telemetry_configmap.yaml @@ -1,4 +1,3 @@ -{{- if .Values.telemetry.enabled }} apiVersion: v1 kind: ConfigMap metadata: @@ -33,4 +32,3 @@ data: tls.verify off Workers 1 {{- end }} -{{- end }}