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/08/05 07:41:45 UTC
[flink-kubernetes-operator] branch main updated: [FLINK-28792] Upgrade to JOSDK 3.1.0
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
The following commit(s) were added to refs/heads/main by this push:
new 4eed42b6 [FLINK-28792] Upgrade to JOSDK 3.1.0
4eed42b6 is described below
commit 4eed42b6e70268b2fb3eaf94bbcff0a16efebb3f
Author: Gyula Fora <g_...@apple.com>
AuthorDate: Wed Aug 3 16:19:51 2022 +0200
[FLINK-28792] Upgrade to JOSDK 3.1.0
---
.../kubernetes_operator_config_configuration.html | 2 +-
.../shortcodes/generated/system_section.html | 2 +-
.../src/main/resources/META-INF/NOTICE | 4 +-
.../operator/metrics/OperatorJosdkMetricsTest.java | 85 ++++++++++++----------
pom.xml | 2 +-
5 files changed, 50 insertions(+), 45 deletions(-)
diff --git a/docs/layouts/shortcodes/generated/kubernetes_operator_config_configuration.html b/docs/layouts/shortcodes/generated/kubernetes_operator_config_configuration.html
index 3912ef71..f950054e 100644
--- a/docs/layouts/shortcodes/generated/kubernetes_operator_config_configuration.html
+++ b/docs/layouts/shortcodes/generated/kubernetes_operator_config_configuration.html
@@ -112,7 +112,7 @@
</tr>
<tr>
<td><h5>kubernetes.operator.reconcile.parallelism</h5></td>
- <td style="word-wrap: break-word;">5</td>
+ <td style="word-wrap: break-word;">10</td>
<td>Integer</td>
<td>The maximum number of threads running the reconciliation loop. Use -1 for infinite.</td>
</tr>
diff --git a/docs/layouts/shortcodes/generated/system_section.html b/docs/layouts/shortcodes/generated/system_section.html
index 8b2dad2b..d6b8cab8 100644
--- a/docs/layouts/shortcodes/generated/system_section.html
+++ b/docs/layouts/shortcodes/generated/system_section.html
@@ -40,7 +40,7 @@
</tr>
<tr>
<td><h5>kubernetes.operator.reconcile.parallelism</h5></td>
- <td style="word-wrap: break-word;">5</td>
+ <td style="word-wrap: break-word;">10</td>
<td>Integer</td>
<td>The maximum number of threads running the reconciliation loop. Use -1 for infinite.</td>
</tr>
diff --git a/flink-kubernetes-operator/src/main/resources/META-INF/NOTICE b/flink-kubernetes-operator/src/main/resources/META-INF/NOTICE
index ae6ba041..73d51797 100644
--- a/flink-kubernetes-operator/src/main/resources/META-INF/NOTICE
+++ b/flink-kubernetes-operator/src/main/resources/META-INF/NOTICE
@@ -66,9 +66,9 @@ This project bundles the following dependencies under the Apache Software Licens
- io.fabric8:openshift-model-whereabouts:5.12.2
- io.fabric8:openshift-model:5.12.2
- io.fabric8:zjsonpatch:0.3.0
-- io.javaoperatorsdk:operator-framework-core:3.0.3
+- io.javaoperatorsdk:operator-framework-core:3.1.0
- io.javaoperatorsdk:operator-framework-framework-core:0.2.0
-- io.javaoperatorsdk:operator-framework:3.0.3
+- io.javaoperatorsdk:operator-framework:3.1.0
- org.apache.commons:commons-compress:1.21
- org.apache.commons:commons-lang3:3.12.0
- org.apache.commons:commons-math3:3.6.1
diff --git a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/metrics/OperatorJosdkMetricsTest.java b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/metrics/OperatorJosdkMetricsTest.java
index 7c49a1c4..e38cffee 100644
--- a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/metrics/OperatorJosdkMetricsTest.java
+++ b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/metrics/OperatorJosdkMetricsTest.java
@@ -21,6 +21,7 @@ import org.apache.flink.configuration.Configuration;
import org.apache.flink.kubernetes.operator.TestUtils;
import org.apache.flink.kubernetes.operator.config.FlinkConfigManager;
import org.apache.flink.kubernetes.operator.controller.FlinkDeploymentController;
+import org.apache.flink.kubernetes.operator.crd.FlinkDeployment;
import org.apache.flink.kubernetes.operator.exception.ReconciliationException;
import org.apache.flink.metrics.Counter;
import org.apache.flink.metrics.Gauge;
@@ -29,7 +30,9 @@ import org.apache.flink.metrics.Metric;
import org.apache.flink.runtime.metrics.util.TestingMetricRegistry;
import io.javaoperatorsdk.operator.api.monitoring.Metrics;
+import io.javaoperatorsdk.operator.api.reconciler.Constants;
import io.javaoperatorsdk.operator.api.reconciler.RetryInfo;
+import io.javaoperatorsdk.operator.processing.GroupVersionKind;
import io.javaoperatorsdk.operator.processing.event.ResourceID;
import io.javaoperatorsdk.operator.processing.event.source.controller.ResourceAction;
import io.javaoperatorsdk.operator.processing.event.source.controller.ResourceEvent;
@@ -45,13 +48,13 @@ import static org.junit.jupiter.api.Assertions.fail;
/** {@link OperatorJosdkMetrics} tests. */
public class OperatorJosdkMetricsTest {
- private final ResourceID resourceId = new ResourceID("testname", "testns");
- private final String controllerName = FlinkDeploymentController.class.getSimpleName();
- private final String resourcePrefix =
+ private static final ResourceID resourceId = new ResourceID("testname", "testns");
+ private static final String controllerName = FlinkDeploymentController.class.getSimpleName();
+ private static final String resourcePrefix =
"testhost.k8soperator.flink-operator-test.testopname.resource.testns.testname.JOSDK.";
- private final String systemPrefix =
+ private static final String systemPrefix =
"testhost.k8soperator.flink-operator-test.testopname.system.";
- private final String executionPrefix = systemPrefix + "JOSDK.FlinkDeployment.";
+ private static final String executionPrefix = systemPrefix + "JOSDK.FlinkDeployment.";
private Map<String, Metric> metrics = new HashMap<>();
private OperatorJosdkMetrics operatorMetrics;
@@ -73,29 +76,7 @@ public class OperatorJosdkMetricsTest {
@Test
public void testTimeControllerExecution() throws Exception {
- Metrics.ControllerExecution<Object> successExecution =
- new Metrics.ControllerExecution<>() {
- @Override
- public String name() {
- return "reconcile";
- }
-
- @Override
- public String controllerName() {
- return controllerName;
- }
-
- @Override
- public String successTypeName(Object o) {
- return "resource";
- }
-
- @Override
- public Object execute() throws Exception {
- Thread.sleep(1000);
- return null;
- }
- };
+ var successExecution = new TestingExecutionBase<>();
operatorMetrics.timeControllerExecution(successExecution);
assertEquals(1, metrics.size());
assertEquals(1, getHistogram("reconcile", "resource").getCount());
@@ -106,23 +87,13 @@ public class OperatorJosdkMetricsTest {
assertEquals(3, getHistogram("reconcile", "resource").getCount());
assertEquals(1, getHistogram("reconcile", "resource").getStatistics().getMin());
- Metrics.ControllerExecution<Object> failureExecution =
- new Metrics.ControllerExecution<>() {
+ var failureExecution =
+ new TestingExecutionBase<>() {
@Override
public String name() {
return "cleanup";
}
- @Override
- public String controllerName() {
- return controllerName;
- }
-
- @Override
- public String successTypeName(Object o) {
- return null;
- }
-
@Override
public Object execute() throws Exception {
Thread.sleep(1000);
@@ -218,4 +189,38 @@ public class OperatorJosdkMetricsTest {
private long getCount(String name) {
return ((Counter) metrics.get(resourcePrefix + name + ".Count")).getCount();
}
+
+ private static class TestingExecutionBase<T> implements Metrics.ControllerExecution<T> {
+ @Override
+ public String controllerName() {
+ return controllerName;
+ }
+
+ @Override
+ public String successTypeName(Object o) {
+ return "resource";
+ }
+
+ @Override
+ public ResourceID resourceID() {
+ return resourceId;
+ }
+
+ @Override
+ public Map<String, Object> metadata() {
+ return Map.of(
+ Constants.RESOURCE_GVK_KEY, GroupVersionKind.gvkFor(FlinkDeployment.class));
+ }
+
+ @Override
+ public String name() {
+ return "reconcile";
+ }
+
+ @Override
+ public T execute() throws Exception {
+ Thread.sleep(1000);
+ return null;
+ }
+ }
}
diff --git a/pom.xml b/pom.xml
index 26ed748b..6d9220ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,7 +68,7 @@ under the License.
<maven-resources-plugin.version>3.2.0</maven-resources-plugin.version>
<git-commit-id-maven-plugin.version>5.0.0</git-commit-id-maven-plugin.version>
- <operator.sdk.version>3.0.3</operator.sdk.version>
+ <operator.sdk.version>3.1.0</operator.sdk.version>
<operator.sdk.admission-controller.version>0.2.0</operator.sdk.admission-controller.version>
<fabric8.version>5.12.2</fabric8.version>