You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by do...@apache.org on 2024/08/17 23:14:41 UTC
(spark-kubernetes-operator) branch main updated: [SPARK-49276] Use API Group `spark.apache.org`
This is an automated email from the ASF dual-hosted git repository.
dongjoon pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/spark-kubernetes-operator.git
The following commit(s) were added to refs/heads/main by this push:
new 7b3dc1c [SPARK-49276] Use API Group `spark.apache.org`
7b3dc1c is described below
commit 7b3dc1c77ecaf1309127bdb7d494ef81915bec34
Author: Dongjoon Hyun <do...@apache.org>
AuthorDate: Sat Aug 17 16:14:35 2024 -0700
[SPARK-49276] Use API Group `spark.apache.org`
### What changes were proposed in this pull request?
This PR aims to use API Group `spark.apache.org`.
```
-apiVersion: org.apache.spark/...
+apiVersion: spark.apache.org/...
```
### Why are the changes needed?
K8s convention follows domain name styles instead of package name styles.
- https://kubernetes.io/docs/tasks/extend-kubernetes/custom-resources/custom-resource-definitions/#create-a-customresourcedefinition
```
apiVersion: apiextensions.k8s.io/v1
```
```
# group name to use for REST API: /apis/<group>/<version>
group: stable.example.com
```
### Does this PR introduce _any_ user-facing change?
No, this is not released yet.
### How was this patch tested?
Pass the CIs.
In addition, we can check via K8s API Server.
**BEFORE**
```
$ kubectl proxy --port=8080 &
$ curl -s http://localhost:8080/ | grep spark
"/apis/org.apache.spark",
"/apis/org.apache.spark/v1alpha1",
```
**AFTER**
```
$ kubectl proxy --port=8080 &
$ curl -s http://localhost:8080/ | grep spark
"/apis/spark.apache.org",
"/apis/spark.apache.org/v1alpha1",
```
### Was this patch authored or co-authored using generative AI tooling?
No.
Closes #55 from dongjoon-hyun/SPARK-49276.
Authored-by: Dongjoon Hyun <do...@apache.org>
Signed-off-by: Dongjoon Hyun <do...@apache.org>
---
build-tools/helm/spark-kubernetes-operator/templates/app-rbac.yaml | 2 +-
build-tools/helm/spark-kubernetes-operator/templates/operator-rbac.yaml | 2 +-
examples/pi.yaml | 2 +-
examples/sql.yaml | 2 +-
spark-operator-api/build.gradle | 2 +-
.../src/main/java/org/apache/spark/k8s/operator/Constants.java | 2 +-
spark-operator-api/src/main/resources/printer-columns.sh | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/build-tools/helm/spark-kubernetes-operator/templates/app-rbac.yaml b/build-tools/helm/spark-kubernetes-operator/templates/app-rbac.yaml
index f76d56b..1ae62d9 100644
--- a/build-tools/helm/spark-kubernetes-operator/templates/app-rbac.yaml
+++ b/build-tools/helm/spark-kubernetes-operator/templates/app-rbac.yaml
@@ -161,7 +161,7 @@ metadata:
{{- end }}
{{- if $appResources.sparkApplicationSentinel.create }}
{{- range $sentinelNs := .Values.appResources.sparkApplicationSentinel.sentinelNamespaces.data }}
-apiVersion: org.apache.spark/v1alpha1
+apiVersion: spark.apache.org/v1alpha1
kind: SparkApplication
metadata:
name: {{ $appResources.sparkApplicationSentinel.name }}
diff --git a/build-tools/helm/spark-kubernetes-operator/templates/operator-rbac.yaml b/build-tools/helm/spark-kubernetes-operator/templates/operator-rbac.yaml
index f8364e6..f05be1c 100644
--- a/build-tools/helm/spark-kubernetes-operator/templates/operator-rbac.yaml
+++ b/build-tools/helm/spark-kubernetes-operator/templates/operator-rbac.yaml
@@ -36,7 +36,7 @@ rules:
verbs:
- '*'
- apiGroups:
- - "org.apache.spark"
+ - "spark.apache.org"
resources:
- '*'
verbs:
diff --git a/examples/pi.yaml b/examples/pi.yaml
index eb8ea07..78e3b2e 100644
--- a/examples/pi.yaml
+++ b/examples/pi.yaml
@@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: org.apache.spark/v1alpha1
+apiVersion: spark.apache.org/v1alpha1
kind: SparkApplication
metadata:
name: pi
diff --git a/examples/sql.yaml b/examples/sql.yaml
index c4063fc..f355902 100644
--- a/examples/sql.yaml
+++ b/examples/sql.yaml
@@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: org.apache.spark/v1alpha1
+apiVersion: spark.apache.org/v1alpha1
kind: SparkApplication
metadata:
name: sql
diff --git a/spark-operator-api/build.gradle b/spark-operator-api/build.gradle
index 8b1dfc3..5fb3719 100644
--- a/spark-operator-api/build.gradle
+++ b/spark-operator-api/build.gradle
@@ -36,7 +36,7 @@ tasks.register('finalizeGeneratedCRD', Exec) {
// Copy generated yaml to Helm charts
tasks.register('relocateGeneratedCRD', Copy) {
dependsOn finalizeGeneratedCRD
- from "build/classes/java/main/META-INF/fabric8/sparkapplications.org.apache.spark-v1.yml"
+ from "build/classes/java/main/META-INF/fabric8/sparkapplications.spark.apache.org-v1.yml"
into "../build-tools/helm/spark-kubernetes-operator/crds"
rename '(.+).yml', '$1.yaml'
}
diff --git a/spark-operator-api/src/main/java/org/apache/spark/k8s/operator/Constants.java b/spark-operator-api/src/main/java/org/apache/spark/k8s/operator/Constants.java
index b8d0863..799da04 100644
--- a/spark-operator-api/src/main/java/org/apache/spark/k8s/operator/Constants.java
+++ b/spark-operator-api/src/main/java/org/apache/spark/k8s/operator/Constants.java
@@ -20,7 +20,7 @@
package org.apache.spark.k8s.operator;
public class Constants {
- public static final String API_GROUP = "org.apache.spark";
+ public static final String API_GROUP = "spark.apache.org";
public static final String API_VERSION = "v1alpha1";
public static final String LABEL_SPARK_APPLICATION_NAME = "spark.operator/spark-app-name";
public static final String LABEL_SPARK_OPERATOR_NAME = "spark.operator/name";
diff --git a/spark-operator-api/src/main/resources/printer-columns.sh b/spark-operator-api/src/main/resources/printer-columns.sh
index 84cc199..d681d04 100755
--- a/spark-operator-api/src/main/resources/printer-columns.sh
+++ b/spark-operator-api/src/main/resources/printer-columns.sh
@@ -21,6 +21,6 @@
# We do a yq to add printer columns
SCRIPT_PATH=$(cd "$(dirname "$0")"; pwd)
-CRD_PATH="${SCRIPT_PATH}/../../../build/classes/java/main/META-INF/fabric8/sparkapplications.org.apache.spark-v1.yml"
+CRD_PATH="${SCRIPT_PATH}/../../../build/classes/java/main/META-INF/fabric8/sparkapplications.spark.apache.org-v1.yml"
yq -i '.spec.versions[0] += ({"additionalPrinterColumns": [{"jsonPath": ".status.currentState.currentStateSummary", "name": "Current State", "type": "string"}, {"jsonPath": ".metadata.creationTimestamp", "name": "Age", "type": "date"}]})' ${CRD_PATH}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org