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:14 UTC
[flink-kubernetes-operator] 21/23: Minor cleanups and fixes
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 0b48ce04486475a7485ea2f2fc917db60081c5ee
Author: Gyula Fora <g_...@apple.com>
AuthorDate: Tue Feb 15 08:56:58 2022 +0100
Minor cleanups and fixes
---
README.md | 6 +++---
examples/basic-checkpoint-ha.yaml | 1 -
examples/basic-ingress.yaml | 1 -
examples/basic-session.yaml | 1 -
examples/basic.yaml | 1 -
examples/pod-template.yaml | 2 --
flink-kubernetes-operator/pom.xml | 7 -------
.../org/apache/flink/kubernetes/operator/FlinkOperator.java | 10 +---------
pom.xml | 11 +++++------
9 files changed, 9 insertions(+), 31 deletions(-)
diff --git a/README.md b/README.md
index 6aa1ce7..8871f98 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ The webhook can be disabled during helm install by passing the `--set webhook.cr
## User Guide
### Create a new Flink deployment
-The flink-operator will watch the CRD resources and submit a new Flink deployment once the CR it applied.
+The flink-operator will watch the CRD resources and submit a new Flink deployment once the CR is applied.
```
kubectl create -f examples/basic.yaml
```
@@ -37,7 +37,7 @@ Get all the Flink deployments running in the K8s cluster
```
kubectl get flinkdep
```
-Describe a specific Flink deployment to show the status(including job status, savepoint, ect.)
+Describe a specific Flink deployment to show the status(including job status, savepoint, etc.)
```
kubectl describe flinkdep {dep_name}
```
@@ -61,7 +61,7 @@ NAME TYPE CLUSTER-IP EXTERNAL-IP PORT(S)
basic-session-example ClusterIP None <none> 6123/TCP,6124/TCP 14h
basic-session-example-rest LoadBalancer 10.96.36.250 127.0.0.1 8081:30572/TCP 14h
```
-The operator pics up the default log and flink configurations from `/opt/flink/conf`. You can put the rest configuration parameters here:
+The operator picks up the default log and flink configurations from `/opt/flink/conf`. You can put the rest configuration parameters here:
```
cat /opt/flink/conf/flink-conf.yaml
rest.port: 8081
diff --git a/examples/basic-checkpoint-ha.yaml b/examples/basic-checkpoint-ha.yaml
index 57f321b..d8172b4 100644
--- a/examples/basic-checkpoint-ha.yaml
+++ b/examples/basic-checkpoint-ha.yaml
@@ -25,7 +25,6 @@ spec:
image: flink:1.14.3
flinkVersion: 1.14.3
flinkConfiguration:
- taskmanager.numberOfTaskSlots: "2"
state.savepoints.dir: file:///flink-data/savepoints
high-availability: org.apache.flink.kubernetes.highavailability.KubernetesHaServicesFactory
high-availability.storageDir: file:///flink-data/ha
diff --git a/examples/basic-ingress.yaml b/examples/basic-ingress.yaml
index d846766..af058ec 100644
--- a/examples/basic-ingress.yaml
+++ b/examples/basic-ingress.yaml
@@ -28,7 +28,6 @@ spec:
flinkConfiguration:
# rest.address: basic-example.flink.k8s.io
# rest.port: "80"
- taskmanager.numberOfTaskSlots: "2"
kubernetes.jobmanager.service-account: flink-operator
jobManager:
replicas: 1
diff --git a/examples/basic-session.yaml b/examples/basic-session.yaml
index 0dea5d5..f956100 100644
--- a/examples/basic-session.yaml
+++ b/examples/basic-session.yaml
@@ -25,7 +25,6 @@ spec:
image: flink:1.14.3
flinkVersion: 1.14.3
flinkConfiguration:
- taskmanager.numberOfTaskSlots: "2"
kubernetes.jobmanager.service-account: flink-operator
jobManager:
replicas: 1
diff --git a/examples/basic.yaml b/examples/basic.yaml
index affe78a..ce1983c 100644
--- a/examples/basic.yaml
+++ b/examples/basic.yaml
@@ -25,7 +25,6 @@ spec:
image: flink:1.14.3
flinkVersion: 1.14.3
flinkConfiguration:
- taskmanager.numberOfTaskSlots: "2"
kubernetes.jobmanager.service-account: flink-operator
jobManager:
replicas: 1
diff --git a/examples/pod-template.yaml b/examples/pod-template.yaml
index e234f38..4807639 100644
--- a/examples/pod-template.yaml
+++ b/examples/pod-template.yaml
@@ -24,8 +24,6 @@ metadata:
spec:
image: flink:1.14.3
flinkVersion: 1.14.3
- flinkConfiguration:
- taskmanager.numberOfTaskSlots: "2"
podTemplate:
apiVersion: v1
kind: Pod
diff --git a/flink-kubernetes-operator/pom.xml b/flink-kubernetes-operator/pom.xml
index 2779349..45845d2 100644
--- a/flink-kubernetes-operator/pom.xml
+++ b/flink-kubernetes-operator/pom.xml
@@ -33,7 +33,6 @@ under the License.
<properties>
<awaitility.version>4.1.0</awaitility.version>
- <takes.version>1.19</takes.version>
</properties>
<dependencies>
@@ -56,12 +55,6 @@ under the License.
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.takes</groupId>
- <artifactId>takes</artifactId>
- <version>${takes.version}</version>
- </dependency>
-
<!-- Flink -->
<dependency>
<groupId>org.apache.flink</groupId>
diff --git a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/FlinkOperator.java b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/FlinkOperator.java
index 3a52f82..6482576 100644
--- a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/FlinkOperator.java
+++ b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/FlinkOperator.java
@@ -29,18 +29,12 @@ import io.javaoperatorsdk.operator.api.config.ConfigurationServiceOverrider;
import io.javaoperatorsdk.operator.config.runtime.DefaultConfigurationService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.takes.facets.fork.FkRegex;
-import org.takes.facets.fork.TkFork;
-import org.takes.http.Exit;
-import org.takes.http.FtBasic;
-
-import java.io.IOException;
/** Main Class for Flink native k8s operator. */
public class FlinkOperator {
private static final Logger LOG = LoggerFactory.getLogger(FlinkOperator.class);
- public static void main(String... args) throws IOException {
+ public static void main(String... args) {
LOG.info("Starting Flink Kubernetes Operator");
@@ -68,7 +62,5 @@ public class FlinkOperator {
operator.register(controller);
operator.installShutdownHook();
operator.start();
-
- new FtBasic(new TkFork(new FkRegex("/health", "ALL GOOD!")), 8080).start(Exit.NEVER);
}
}
diff --git a/pom.xml b/pom.xml
index 20413ef..7f31747 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,14 +50,14 @@ under the License.
</modules>
<properties>
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
+ <maven.compiler.source>11</maven.compiler.source>
+ <maven.compiler.target>11</maven.compiler.target>
<maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version>
<maven-surefire-plugin.version>3.0.0-M4</maven-surefire-plugin.version>
<maven-failsafe-plugin.version>3.0.0-M4</maven-failsafe-plugin.version>
<maven-resources-plugin.version>3.2.0</maven-resources-plugin.version>
- <operator.sdk.version>2.0.1</operator.sdk.version>
+ <operator.sdk.version>2.1.1</operator.sdk.version>
<fabric8.version>5.12.1</fabric8.version>
<lombok.version>1.18.22</lombok.version>
@@ -65,13 +65,12 @@ under the License.
<flink.version>1.14.3</flink.version>
<flink.shaded.version>15.0</flink.shaded.version>
- <slf4j.version>1.7.15</slf4j.version>
+ <slf4j.version>1.7.36</slf4j.version>
<log4j.version>2.17.1</log4j.version>
<spotless.version>2.4.2</spotless.version>
- <awaitility.version>4.1.0</awaitility.version>
<it.skip>true</it.skip>
- <mockito.version>2.21.0</mockito.version>
+ <mockito.version>3.12.4</mockito.version>
</properties>
<dependencies>