From eee84d29fdea80cd859d76210bd8262ad484ebd3 Mon Sep 17 00:00:00 2001 From: Chaoran Yu Date: Wed, 6 Feb 2019 23:53:07 -0500 Subject: [PATCH] Added flag for ingress URL format (#11219) Signed-off-by: Chaoran Yu --- incubator/sparkoperator/Chart.yaml | 2 +- incubator/sparkoperator/README.md | 3 ++- .../sparkoperator/templates/spark-operator-deployment.yaml | 1 + incubator/sparkoperator/values.yaml | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/incubator/sparkoperator/Chart.yaml b/incubator/sparkoperator/Chart.yaml index 9d57ec35f3..289f036b02 100644 --- a/incubator/sparkoperator/Chart.yaml +++ b/incubator/sparkoperator/Chart.yaml @@ -1,6 +1,6 @@ name: sparkoperator description: A Helm chart for Spark on Kubernetes operator -version: 0.1.8 +version: 0.1.9 appVersion: v1beta1-0.7-2.4.0 kubeVersion: ">=1.8.0-0" keywords: diff --git a/incubator/sparkoperator/README.md b/incubator/sparkoperator/README.md index 6ff8029187..ba0f05bcde 100644 --- a/incubator/sparkoperator/README.md +++ b/incubator/sparkoperator/README.md @@ -30,12 +30,13 @@ The following table lists the configurable parameters of the Spark operator char | `enableWebhook` | Whether to enable mutating admission webhook | false | | `enableMetrics` | Whether to expose metrics to be scraped by Premetheus | true | | `controllerThreads` | Number of worker threads used by the SparkApplication controller | 10 | +| `ingressUrlFormat` | Ingress URL format | "" | | `installCrds` | Whether to install CRDs | true | | `metricsPort` | Port for the metrics endpoint | 10254 | | `metricsEndpoint` | Metrics endpoint | "/metrics" | | `metricsPrefix` | Prefix for the metrics | "" | | `resyncInterval` | Informer resync interval in seconds | 30 | -| `webhookPort` | Service port of the webhook server | 8080 | | +| `webhookPort` | Service port of the webhook server | 8080 | Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. diff --git a/incubator/sparkoperator/templates/spark-operator-deployment.yaml b/incubator/sparkoperator/templates/spark-operator-deployment.yaml index d2f1612aad..fdfc51a275 100644 --- a/incubator/sparkoperator/templates/spark-operator-deployment.yaml +++ b/incubator/sparkoperator/templates/spark-operator-deployment.yaml @@ -58,6 +58,7 @@ spec: args: - -v=2 - -namespace={{ .Values.sparkJobNamespace }} + - -ingress-url-format={{ .Values.ingressUrlFormat }} - -install-crds={{ .Values.installCrds }} - -controller-threads={{ .Values.controllerThreads }} - -resync-interval={{ .Values.resyncInterval }} diff --git a/incubator/sparkoperator/values.yaml b/incubator/sparkoperator/values.yaml index 563c402f6b..bfb03eab2d 100644 --- a/incubator/sparkoperator/values.yaml +++ b/incubator/sparkoperator/values.yaml @@ -19,6 +19,7 @@ enableWebhook: false enableMetrics: true controllerThreads: 10 +ingressUrlFormat: "" installCrds: true metricsPort: 10254 metricsEndpoint: "/metrics"