From 0dff70eb41fa384125956fb59e3fd01a67c50d9f Mon Sep 17 00:00:00 2001 From: Yinan Li Date: Wed, 2 Oct 2019 16:36:08 -0700 Subject: [PATCH] [incubator/sparkoperator] Upgraded to use the latest patch release (#17625) Signed-off-by: Yinan Li --- incubator/sparkoperator/Chart.yaml | 5 +- incubator/sparkoperator/README.md | 2 +- incubator/sparkoperator/templates/crds.yaml | 79 +------------------ .../templates/spark-operator-rbac.yaml | 2 +- incubator/sparkoperator/values.yaml | 2 +- 5 files changed, 9 insertions(+), 81 deletions(-) diff --git a/incubator/sparkoperator/Chart.yaml b/incubator/sparkoperator/Chart.yaml index bacab9d530..379bf02cb4 100644 --- a/incubator/sparkoperator/Chart.yaml +++ b/incubator/sparkoperator/Chart.yaml @@ -1,9 +1,8 @@ apiVersion: v1 name: sparkoperator description: A Helm chart for Spark on Kubernetes operator -version: 0.4.0 -appVersion: v1beta2-1.0.0-2.4.4 -kubeVersion: ">=1.8.0-0" +version: 0.4.1 +appVersion: v1beta2-1.0.1-2.4.4 keywords: - spark home: https://github.com/GoogleCloudPlatform/spark-on-k8s-operator diff --git a/incubator/sparkoperator/README.md b/incubator/sparkoperator/README.md index d94a21b1bf..da131e29c4 100644 --- a/incubator/sparkoperator/README.md +++ b/incubator/sparkoperator/README.md @@ -24,7 +24,7 @@ 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 | `v1beta2-1.0.0-2.4.4` | +| `operatorVersion` | The version of the operator to install | `v1beta2-1.0.1-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 | `` | diff --git a/incubator/sparkoperator/templates/crds.yaml b/incubator/sparkoperator/templates/crds.yaml index 81d450548e..c7a843e9c6 100644 --- a/incubator/sparkoperator/templates/crds.yaml +++ b/incubator/sparkoperator/templates/crds.yaml @@ -1888,7 +1888,8 @@ spec: type: string port: format: int32 - minimum: 49151 + minimum: 1024 + maximum: 49151 type: integer required: - jmxExporterJar @@ -2518,56 +2519,6 @@ spec: - sparkVersion - type type: object - status: - properties: - applicationState: - properties: - errorMessage: - type: string - state: - type: string - required: - - state - type: object - driverInfo: - properties: - podName: - type: string - webUIAddress: - type: string - webUIIngressAddress: - type: string - webUIIngressName: - type: string - webUIPort: - format: int32 - type: integer - webUIServiceName: - type: string - type: object - executionAttempts: - format: int32 - type: integer - executorState: - additionalProperties: - type: string - type: object - lastSubmissionAttemptTime: - format: date-time - type: string - sparkApplicationId: - type: string - submissionAttempts: - format: int32 - type: integer - submissionID: - type: string - terminationTime: - format: date-time - type: string - required: - - driverInfo - type: object required: - metadata - spec @@ -4487,7 +4438,8 @@ spec: type: string port: format: int32 - minimum: 49151 + minimum: 1024 + maximum: 49151 type: integer required: - jmxExporterJar @@ -5121,29 +5073,6 @@ spec: - schedule - template type: object - status: - properties: - lastRun: - format: date-time - type: string - lastRunName: - type: string - nextRun: - format: date-time - type: string - pastFailedRunNames: - items: - type: string - type: array - pastSuccessfulRunNames: - items: - type: string - type: array - reason: - type: string - scheduleState: - type: string - type: object required: - metadata - spec diff --git a/incubator/sparkoperator/templates/spark-operator-rbac.yaml b/incubator/sparkoperator/templates/spark-operator-rbac.yaml index 632fe7f52c..2c6553dbd2 100644 --- a/incubator/sparkoperator/templates/spark-operator-rbac.yaml +++ b/incubator/sparkoperator/templates/spark-operator-rbac.yaml @@ -31,7 +31,7 @@ rules: resources: ["mutatingwebhookconfigurations"] verbs: ["create", "get", "update", "delete"] - apiGroups: ["sparkoperator.k8s.io"] - resources: ["sparkapplications", "scheduledsparkapplications"] + resources: ["sparkapplications", "scheduledsparkapplications", "sparkapplications/status", "scheduledsparkapplications/status"] verbs: ["*"] {{- if .Values.enableBatchScheduler }} # This api resources below is configured for the `volcano` batch scheduler. diff --git a/incubator/sparkoperator/values.yaml b/incubator/sparkoperator/values.yaml index 6e0f4fd112..96ab1d6ff1 100644 --- a/incubator/sparkoperator/values.yaml +++ b/incubator/sparkoperator/values.yaml @@ -1,5 +1,5 @@ operatorImageName: gcr.io/spark-operator/spark-operator -operatorVersion: v1beta2-1.0.0-2.4.4 +operatorVersion: v1beta2-1.0.1-2.4.4 imagePullPolicy: IfNotPresent replicas: 1