[incubator/sparkoperator] Upgrade to use the v1beta2-1.0.0-2.4.4 version (#17492)

Signed-off-by: Yinan Li <ynli@google.com>
This commit is contained in:
Yinan Li
2019-09-27 16:53:40 -07:00
committed by Kubernetes Prow Robot
parent bc49b4a9a1
commit ba1a9cbfc9
5 changed files with 5195 additions and 15 deletions
+2 -2
View File
@@ -1,8 +1,8 @@
apiVersion: v1
name: sparkoperator
description: A Helm chart for Spark on Kubernetes operator
version: 0.3.1
appVersion: v2.4.0-v1beta1-0.9.0
version: 0.4.0
appVersion: v1beta2-1.0.0-2.4.4
kubeVersion: ">=1.8.0-0"
keywords:
- spark
+4 -1
View File
@@ -24,8 +24,9 @@ The following table lists the configurable parameters of the Spark operator char
| Parameter | Description | Default |
| ------------------------- | ------------------------------------------------------------ | -------------------------------------- |
| `operatorImageName` | The name of the operator image | `gcr.io/spark-operator/spark-operator` |
| `operatorVersion` | The version of the operator to install | `v2.4.0-v1beta1-0.8.1` |
| `operatorVersion` | The version of the operator to install | `v1beta2-1.0.0-2.4.4` |
| `imagePullPolicy` | Docker image pull policy | `IfNotPresent` |
| `replicas` | The number of replicas of the operator Deployment | 1 |
| `sparkJobNamespace` | K8s namespace where Spark jobs are to be deployed | `` |
| `enableWebhook` | Whether to enable mutating admission webhook | false |
| `enableMetrics` | Whether to expose metrics to be scraped by Premetheus | true |
@@ -41,5 +42,7 @@ The following table lists the configurable parameters of the Spark operator char
| `webhookPort` | Service port of the webhook server | 8080 |
| `resources` | Resources needed for the sparkoperator deployment | {} |
| `enableBatchScheduler` | Whether to enable batch scheduler for pod scheduling | false |
| `enableResourceQuotaEnforcement` | Whether to enable the ResourceQuota enforcement for SparkApplication resources. Requires the webhook to be enabled by setting enableWebhook to true. | false |
| `enableLeaderElection` | Whether to enable leader election when the operator Deployment has more than one replica, i.e., when `replicas` is greater than 1. | false |
Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`.
File diff suppressed because it is too large Load Diff
@@ -15,7 +15,7 @@ metadata:
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
spec:
replicas: 1
replicas: {{ .Values.replicas }}
selector:
matchLabels:
app.kubernetes.io/name: {{ include "sparkoperator.name" . }}
@@ -65,7 +65,6 @@ spec:
- -v={{ .Values.logLevel }}
- -namespace={{ .Values.sparkJobNamespace }}
- -ingress-url-format={{ .Values.ingressUrlFormat }}
- -install-crds={{ .Values.installCrds }}
- -controller-threads={{ .Values.controllerThreads }}
- -resync-interval={{ .Values.resyncInterval }}
- -logtostderr
@@ -86,6 +85,12 @@ spec:
- -webhook-svc-name={{ .Release.Name }}-webhook
- -webhook-config-name={{ include "sparkoperator.fullname" . }}-webhook-config
{{- end }}
{{- if .Values.enableResourceQuotaEnforcement }}
- -enable-resource-quota-enforcement={{ .Values.enableResourceQuotaEnforcement }}
{{- end }}
{{- if .Values.enableLeaderElection }}
- -leader-election={{ .Values.enableLeaderElection }}
{{- end }}
{{- if .Values.resources }}
resources:
{{ toYaml .Values.resources | indent 10 }}
+20 -10
View File
@@ -1,6 +1,7 @@
operatorImageName: gcr.io/spark-operator/spark-operator
operatorVersion: v2.4.0-v1beta1-0.9.0
operatorVersion: v1beta2-1.0.0-2.4.4
imagePullPolicy: IfNotPresent
replicas: 1
rbac:
create: true
@@ -14,33 +15,42 @@ serviceAccounts:
name:
sparkJobNamespace: ""
installCrds: true
controllerThreads: 10
resyncInterval: 30
ingressUrlFormat: ""
logLevel: 2
enableWebhook: false
enableMetrics: true
webhookPort: 8080
controllerThreads: 10
ingressUrlFormat: ""
installCrds: true
enableMetrics: true
metricsPort: 10254
metricsEndpoint: "/metrics"
metricsPrefix: ""
resyncInterval: 30
webhookPort: 8080
## Node labels for pod assignment
## Ref: https://kubernetes.io/docs/user-guide/node-selection/
##
nodeSelector: {}
podAnnotations: {}
## Resources for the sparkoperator deployment
## Ref: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/
##
resources: {}
logLevel: 2
## Whether to enable batch scheduler for pod scheduling,
## if enabled, end user can specify batch scheduler name in spark application.
enableBatchScheduler: false
podAnnotations: {}
## Whether to enable the ResourceQuota enforcement for SparkApplication resources.
## Requires the webhook to be enabled by setting enableWebhook to true.
## Ref: https://github.com/GoogleCloudPlatform/spark-on-k8s-operator/blob/master/docs/user-guide.md#enabling-resource-quota-enforcement.
enableResourceQuotaEnforcement: false
## Whether to enable leader election when the operator Deployment has more than one replica.
## Only applicable when `replicas` is set to a value greater than 1.
## Ref: https://github.com/GoogleCloudPlatform/spark-on-k8s-operator/blob/master/docs/user-guide.md#enabling-leader-election-for-high-availability.
enableLeaderElection: false