You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by gy...@apache.org on 2022/02/16 10:34:10 UTC
[flink-kubernetes-operator] 17/23: Move CRD to flink.apache.org group
This is an automated email from the ASF dual-hosted git repository.
gyfora pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/flink-kubernetes-operator.git
commit da6ae36c94f034224e35a780ea8c04c5a5688ede
Author: Marton Balassi <ma...@apple.com>
AuthorDate: Thu Feb 10 11:57:27 2022 +0100
Move CRD to flink.apache.org group
---
.gitignore | 2 +-
examples/basic-checkpoint-ha.yaml | 2 +-
examples/basic-ingress.yaml | 2 +-
examples/basic-session.yaml | 2 +-
examples/basic.yaml | 2 +-
examples/pod-template.yaml | 2 +-
flink-kubernetes-operator/pom.xml | 25 ++
.../kubernetes/operator/crd/FlinkDeployment.java | 2 +-
helm/flink-operator/templates/rbac.yaml | 2 +-
helm/flink-operator/templates/webhook.yaml | 2 +-
pom.xml | 279 ++++++++++-----------
11 files changed, 161 insertions(+), 161 deletions(-)
diff --git a/.gitignore b/.gitignore
index 7bc2df1..83fe873 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,4 +36,4 @@ buildNumber.properties
.idea
*.iml
-helm/flink-operator/templates/flinkdeployments.flink.io-v1.yml
+helm/flink-operator/templates/flinkdeployments.flink.apache.org-v1.yml
diff --git a/examples/basic-checkpoint-ha.yaml b/examples/basic-checkpoint-ha.yaml
index 910376f..57f321b 100644
--- a/examples/basic-checkpoint-ha.yaml
+++ b/examples/basic-checkpoint-ha.yaml
@@ -16,7 +16,7 @@
# limitations under the License.
################################################################################
-apiVersion: flink.io/v1alpha1
+apiVersion: flink.apache.org/v1alpha1
kind: FlinkDeployment
metadata:
namespace: default
diff --git a/examples/basic-ingress.yaml b/examples/basic-ingress.yaml
index cb9d656..c0ad3a2 100644
--- a/examples/basic-ingress.yaml
+++ b/examples/basic-ingress.yaml
@@ -16,7 +16,7 @@
# limitations under the License.
################################################################################
-apiVersion: flink.io/v1alpha1
+apiVersion: flink.apache.org/v1alpha1
kind: FlinkDeployment
metadata:
namespace: default
diff --git a/examples/basic-session.yaml b/examples/basic-session.yaml
index 6db65e5..0dea5d5 100644
--- a/examples/basic-session.yaml
+++ b/examples/basic-session.yaml
@@ -16,7 +16,7 @@
# limitations under the License.
################################################################################
-apiVersion: flink.io/v1alpha1
+apiVersion: flink.apache.org/v1alpha1
kind: FlinkDeployment
metadata:
namespace: default
diff --git a/examples/basic.yaml b/examples/basic.yaml
index 9027db7..affe78a 100644
--- a/examples/basic.yaml
+++ b/examples/basic.yaml
@@ -16,7 +16,7 @@
# limitations under the License.
################################################################################
-apiVersion: flink.io/v1alpha1
+apiVersion: flink.apache.org/v1alpha1
kind: FlinkDeployment
metadata:
namespace: default
diff --git a/examples/pod-template.yaml b/examples/pod-template.yaml
index 386813c..e234f38 100644
--- a/examples/pod-template.yaml
+++ b/examples/pod-template.yaml
@@ -16,7 +16,7 @@
# limitations under the License.
################################################################################
-apiVersion: flink.io/v1alpha1
+apiVersion: flink.apache.org/v1alpha1
kind: FlinkDeployment
metadata:
namespace: default
diff --git a/flink-kubernetes-operator/pom.xml b/flink-kubernetes-operator/pom.xml
index 23516c2..2779349 100644
--- a/flink-kubernetes-operator/pom.xml
+++ b/flink-kubernetes-operator/pom.xml
@@ -94,6 +94,31 @@ under the License.
<build>
<plugins>
<plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>${maven-resources-plugin.version}</version>
+ <executions>
+ <execution>
+ <id>copy-resources</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.basedir}/../helm/flink-operator/templates</outputDirectory>
+ <resources>
+ <resource>
+ <directory>${project.build.outputDirectory}/META-INF/fabric8</directory>
+ <includes>
+ <include>flinkdeployments.flink.apache.org-v1.yml</include>
+ </includes>
+ <filtering>false</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<executions>
diff --git a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/crd/FlinkDeployment.java b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/crd/FlinkDeployment.java
index 3037279..7a01bb8 100644
--- a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/crd/FlinkDeployment.java
+++ b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/crd/FlinkDeployment.java
@@ -31,7 +31,7 @@ import io.fabric8.kubernetes.model.annotation.Version;
/** Flink deployment object (spec + status). */
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonDeserialize()
-@Group("flink.io")
+@Group("flink.apache.org")
@Version("v1alpha1")
@ShortNames({"flinkdep"})
public class FlinkDeployment extends CustomResource<FlinkDeploymentSpec, FlinkDeploymentStatus>
diff --git a/helm/flink-operator/templates/rbac.yaml b/helm/flink-operator/templates/rbac.yaml
index c83bb0c..95d23ef 100644
--- a/helm/flink-operator/templates/rbac.yaml
+++ b/helm/flink-operator/templates/rbac.yaml
@@ -60,7 +60,7 @@ rules:
verbs:
- "*"
- apiGroups:
- - flink.io
+ - flink.apache.org
resources:
- flinkdeployments
- flinkdeployments/status
diff --git a/helm/flink-operator/templates/webhook.yaml b/helm/flink-operator/templates/webhook.yaml
index cce4ea3..95f9403 100644
--- a/helm/flink-operator/templates/webhook.yaml
+++ b/helm/flink-operator/templates/webhook.yaml
@@ -83,7 +83,7 @@ metadata:
cert-manager.io/inject-ca-from: default/flink-operator-serving-cert
name: flink-operator-validating-webhook-configuration
webhooks:
-- name: vflinkdeployments.flink.io
+- name: vflinkdeployments.flink.apache.org
admissionReviewVersions: ["v1"]
clientConfig:
service:
diff --git a/pom.xml b/pom.xml
index 5520c30..20413ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,9 +32,9 @@ under the License.
<version>1.0-SNAPSHOT</version>
<name>Flink Kubernetes: </name>
- <packaging>pom</packaging>
- <url>https://flink.apache.org</url>
- <inceptionYear>2014</inceptionYear>
+ <packaging>pom</packaging>
+ <url>https://flink.apache.org</url>
+ <inceptionYear>2014</inceptionYear>
<licenses>
<license>
@@ -126,33 +126,6 @@ under the License.
<build>
<plugins>
-
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>${maven-resources-plugin.version}</version>
- <executions>
- <execution>
- <id>copy-resources</id>
- <phase>process-classes</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${basedir}/helm/flink-operator/templates</outputDirectory>
- <resources>
- <resource>
- <directory>${project.build.outputDirectory}/META-INF/fabric8</directory>
- <includes>
- <include>flinkdeployments.flink.io-v1.yml</include>
- </includes>
- <filtering>false</filtering>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
@@ -179,132 +152,134 @@ under the License.
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.17</version>
- <dependencies>
- <dependency>
- <groupId>com.puppycrawl.tools</groupId>
- <artifactId>checkstyle</artifactId>
- <!-- Note: match version with docs/flinkDev/ide_setup.md -->
- <version>8.14</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>validate</id>
- <phase>validate</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <suppressionsLocation>/tools/maven/suppressions.xml</suppressionsLocation>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <configLocation>/tools/maven/checkstyle.xml</configLocation>
- <logViolationsToConsole>true</logViolationsToConsole>
- <failOnViolation>true</failOnViolation>
- </configuration>
- </plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.17</version>
+ <dependencies>
+ <dependency>
+ <groupId>com.puppycrawl.tools</groupId>
+ <artifactId>checkstyle</artifactId>
+ <!-- Note: match version with docs/flinkDev/ide_setup.md -->
+ <version>8.14</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>validate</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <suppressionsLocation>/tools/maven/suppressions.xml</suppressionsLocation>
+ <includeTestSourceDirectory>true</includeTestSourceDirectory>
+ <configLocation>/tools/maven/checkstyle.xml</configLocation>
+ <logViolationsToConsole>true</logViolationsToConsole>
+ <failOnViolation>true</failOnViolation>
+ </configuration>
+ </plugin>
- <plugin>
- <groupId>com.diffplug.spotless</groupId>
- <artifactId>spotless-maven-plugin</artifactId>
- <version>${spotless.version}</version>
- <configuration>
- <java>
- <googleJavaFormat>
- <version>1.7</version>
- <style>AOSP</style>
- </googleJavaFormat>
+ <plugin>
+ <groupId>com.diffplug.spotless</groupId>
+ <artifactId>spotless-maven-plugin</artifactId>
+ <version>${spotless.version}</version>
+ <configuration>
+ <java>
+ <googleJavaFormat>
+ <version>1.7</version>
+ <style>AOSP</style>
+ </googleJavaFormat>
- <!-- \# refers to the static imports -->
- <importOrder>
- <order>org.apache.flink,org.apache.flink.shaded,,javax,java,scala,\#</order>
- </importOrder>
+ <!-- \# refers to the static imports -->
+ <importOrder>
+ <order>org.apache.flink,org.apache.flink.shaded,,javax,java,scala,\#</order>
+ </importOrder>
+
+ <removeUnusedImports />
+ </java>
+ </configuration>
+ <executions>
+ <execution>
+ <id>spotless-check</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
- <removeUnusedImports />
- </java>
- </configuration>
- <executions>
- <execution>
- <id>spotless-check</id>
- <phase>validate</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
<plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>0.12</version><!--$NO-MVN-MAN-VER$-->
- <inherited>false</inherited>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <excludeSubProjects>false</excludeSubProjects>
- <numUnapprovedLicenses>0</numUnapprovedLicenses>
- <licenses>
- <!-- Enforce this license:
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, 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.
- -->
- <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
- <licenseFamilyCategory>AL2 </licenseFamilyCategory>
- <licenseFamilyName>Apache License 2.0</licenseFamilyName>
- <notes />
- <patterns>
- <pattern>Licensed to the Apache Software Foundation (ASF) under one</pattern>
- </patterns>
- </license>
- </licenses>
- <licenseFamilies>
- <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily">
- <familyName>Apache License 2.0</familyName>
- </licenseFamily>
- </licenseFamilies>
- <excludes>
- <!-- Additional files like .gitignore etc.-->
- <exclude>**/.*/**</exclude>
- <exclude>**/*.prefs</exclude>
- <exclude>**/*.log</exclude>
- <exclude>**/dependency-reduced-pom.xml</exclude>
- <!-- Administrative files in the main trunk. -->
- <exclude>**/README.md</exclude>
- <exclude>.github/**</exclude>
- <!-- Build files -->
- <exclude>**/*.iml</exclude>
- <!-- Generated content -->
- <exclude>**/target/**</exclude>
- <exclude>apache-maven-3.2.5/**</exclude>
- <!-- PyCharm -->
- <exclude>**/.idea/**</exclude>
- <!-- Generated CRD -->
- <exclude>helm/flink-operator/templates/flinkdeployments.flink.io-v1.yml</exclude>
- </excludes>
- </configuration>
- </plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>0.12</version><!--$NO-MVN-MAN-VER$-->
+ <inherited>false</inherited>
+ <executions>
+ <execution>
+ <phase>verify</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <excludeSubProjects>false</excludeSubProjects>
+ <numUnapprovedLicenses>0</numUnapprovedLicenses>
+ <licenses>
+ <!-- Enforce this license:
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, 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.
+ -->
+ <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
+ <licenseFamilyCategory>AL2 </licenseFamilyCategory>
+ <licenseFamilyName>Apache License 2.0</licenseFamilyName>
+ <notes />
+ <patterns>
+ <pattern>Licensed to the Apache Software Foundation (ASF) under one</pattern>
+ </patterns>
+ </license>
+ </licenses>
+ <licenseFamilies>
+ <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily">
+ <familyName>Apache License 2.0</familyName>
+ </licenseFamily>
+ </licenseFamilies>
+ <excludes>
+ <!-- Additional files like .gitignore etc.-->
+ <exclude>**/.*/**</exclude>
+ <exclude>**/*.prefs</exclude>
+ <exclude>**/*.log</exclude>
+ <exclude>**/dependency-reduced-pom.xml</exclude>
+ <!-- Administrative files in the main trunk. -->
+ <exclude>**/README.md</exclude>
+ <exclude>.github/**</exclude>
+ <!-- Build files -->
+ <exclude>**/*.iml</exclude>
+ <!-- Generated content -->
+ <exclude>**/target/**</exclude>
+ <exclude>apache-maven-3.2.5/**</exclude>
+ <!-- PyCharm -->
+ <exclude>**/.idea/**</exclude>
+ <!-- Generated CRD -->
+ <exclude>helm/flink-operator/templates/flinkdeployments.flink.apache.org-v1.yml</exclude>
+ <exclude>rio.yml</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
</build>