From b9853e3d40568afbbed127b4bdb208f0685fe3f0 Mon Sep 17 00:00:00 2001 From: kz33 Date: Tue, 26 Jan 2021 17:22:15 +0800 Subject: [PATCH 1/4] fix issue #1131 --- charts/spark-operator-chart/templates/deployment.yaml | 1 + charts/spark-operator-chart/values.yaml | 3 +++ 2 files changed, 4 insertions(+) diff --git a/charts/spark-operator-chart/templates/deployment.yaml b/charts/spark-operator-chart/templates/deployment.yaml index 6bc792889..120a465d8 100644 --- a/charts/spark-operator-chart/templates/deployment.yaml +++ b/charts/spark-operator-chart/templates/deployment.yaml @@ -59,6 +59,7 @@ spec: - -controller-threads={{ .Values.controllerThreads }} - -resync-interval={{ .Values.resyncInterval }} - -enable-batch-scheduler={{ .Values.batchScheduler.enable }} + - -label-selector-filter={{ .Values.labelSelectorFilter }} {{- if .Values.metrics.enable }} - -enable-metrics=true - -metrics-labels=app_type diff --git a/charts/spark-operator-chart/values.yaml b/charts/spark-operator-chart/values.yaml index af2f84750..114229cec 100644 --- a/charts/spark-operator-chart/values.yaml +++ b/charts/spark-operator-chart/values.yaml @@ -140,3 +140,6 @@ leaderElection: istio: # -- When using `istio`, spark jobs need to run without a sidecar to properly terminate enabled: false + +# labelSelectorFilter -- A comma-separated list of key=value, or key labels to filter resources during watch and list based on the specified labels. +labelSelectorFilter: "" \ No newline at end of file From f2d6a7c637baf521d93f09d2b93e2f784b5434c3 Mon Sep 17 00:00:00 2001 From: kz33 Date: Thu, 28 Jan 2021 14:39:35 +0800 Subject: [PATCH 2/4] format code and update README.md --- charts/spark-operator-chart/README.md | 1 + charts/spark-operator-chart/values.yaml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/charts/spark-operator-chart/README.md b/charts/spark-operator-chart/README.md index 22382716b..df02a5bd1 100644 --- a/charts/spark-operator-chart/README.md +++ b/charts/spark-operator-chart/README.md @@ -92,6 +92,7 @@ The command removes all the Kubernetes components associated with the chart and | webhook.enable | bool | `false` | Enable webhook server | | webhook.namespaceSelector | string | `""` | The webhook server will only operate on namespaces with this label, specified in the form key1=value1,key2=value2. Empty string (default) will operate on all namespaces | | webhook.port | int | `8080` | Webhook service port | +| labelSelectorFilter | string | `""` | Set this if only operator watches spark jobs with certain labels are allowed | ## Maintainers diff --git a/charts/spark-operator-chart/values.yaml b/charts/spark-operator-chart/values.yaml index 114229cec..fe469efc3 100644 --- a/charts/spark-operator-chart/values.yaml +++ b/charts/spark-operator-chart/values.yaml @@ -142,4 +142,4 @@ istio: enabled: false # labelSelectorFilter -- A comma-separated list of key=value, or key labels to filter resources during watch and list based on the specified labels. -labelSelectorFilter: "" \ No newline at end of file +labelSelectorFilter: "" From b9db63242cebd1a223565ee4478095bbcad60cca Mon Sep 17 00:00:00 2001 From: kz33 Date: Sat, 30 Jan 2021 14:56:45 +0800 Subject: [PATCH 3/4] rebase and update chart version --- charts/spark-operator-chart/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/spark-operator-chart/Chart.yaml b/charts/spark-operator-chart/Chart.yaml index b1855eb6a..2faa91307 100644 --- a/charts/spark-operator-chart/Chart.yaml +++ b/charts/spark-operator-chart/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: spark-operator description: A Helm chart for Spark on Kubernetes operator -version: 1.0.6 +version: 1.0.7 appVersion: v1beta2-1.2.0-3.0.0 keywords: - spark From c9dcb6f8296ac697a5a565f54c8636f792cde4d3 Mon Sep 17 00:00:00 2001 From: kz33 Date: Thu, 4 Feb 2021 16:25:59 +0800 Subject: [PATCH 4/4] Trigger Build