This is an automated email from the ASF dual-hosted git repository.
mbalassi 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 91cf2338 [FLINK-31407] Bump fabric8 version to 6.5.0
91cf2338 is described below
commit 91cf2338c9bd54b1bad7680c231a59facc12c8b9
Author: Márton Balassi <[email protected]>
AuthorDate: Wed Mar 22 22:25:26 2023 +0100
[FLINK-31407] Bump fabric8 version to 6.5.0
---
.../operator/autoscaler/AutoScalerInfo.java | 2 +-
.../operator/service/AbstractFlinkService.java | 1 -
.../operator/utils/KubernetesClientUtils.java | 4 +-
.../kubernetes/operator/utils/StatusRecorder.java | 4 +-
.../flink/kubernetes/operator/TestUtils.java | 2 +-
.../metrics/KubernetesClientMetricsTest.java | 2 +-
.../operator/utils/KubernetesClientUtilsTest.java | 20 +--
.../Fabric8FlinkStandaloneKubeClient.java | 5 +-
.../crds/flinkdeployments.flink.apache.org-v1.yml | 153 +++++++++++++++++++++
pom.xml | 2 +-
10 files changed, 169 insertions(+), 26 deletions(-)
diff --git
a/flink-kubernetes-operator-autoscaler/src/main/java/org/apache/flink/kubernetes/operator/autoscaler/AutoScalerInfo.java
b/flink-kubernetes-operator-autoscaler/src/main/java/org/apache/flink/kubernetes/operator/autoscaler/AutoScalerInfo.java
index 8850b95a..a5462219 100644
---
a/flink-kubernetes-operator-autoscaler/src/main/java/org/apache/flink/kubernetes/operator/autoscaler/AutoScalerInfo.java
+++
b/flink-kubernetes-operator-autoscaler/src/main/java/org/apache/flink/kubernetes/operator/autoscaler/AutoScalerInfo.java
@@ -181,7 +181,7 @@ public class AutoScalerInfo {
public void replaceInKubernetes(KubernetesClient client) throws Exception {
trimHistoryToMaxCmSize();
- client.resource(configMap).replace();
+ client.resource(configMap).update();
}
@VisibleForTesting
diff --git
a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/service/AbstractFlinkService.java
b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/service/AbstractFlinkService.java
index 4c5d9fcc..97262daf 100644
---
a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/service/AbstractFlinkService.java
+++
b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/service/AbstractFlinkService.java
@@ -808,7 +808,6 @@ public abstract class AbstractFlinkService implements
FlinkService {
.inNamespace(namespace)
.withName(
ExternalServiceDecorator.getExternalServiceName(clusterId))
- .fromServer()
.get();
if (service == null) {
serviceRunning = false;
diff --git
a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/utils/KubernetesClientUtils.java
b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/utils/KubernetesClientUtils.java
index d52bfc67..d6724adf 100644
---
a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/utils/KubernetesClientUtils.java
+++
b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/utils/KubernetesClientUtils.java
@@ -73,12 +73,12 @@ public class KubernetesClientUtils {
public static <T extends AbstractFlinkResource<?, ?>> void applyToStoredCr(
KubernetesClient kubernetesClient, T cr, Consumer<T> function) {
- var inKube = kubernetesClient.resource(cr).fromServer().get();
+ var inKube = kubernetesClient.resource(cr).get();
Long localGeneration = cr.getMetadata().getGeneration();
Long serverGeneration = inKube.getMetadata().getGeneration();
if (serverGeneration.equals(localGeneration)) {
function.accept(inKube);
- kubernetesClient.resource(inKube).lockResourceVersion().replace();
+ kubernetesClient.resource(inKube).lockResourceVersion().update();
} else {
LOG.info(
"Spec already upgrading in kube (generation - local: {}
server: {}), skipping scale operation.",
diff --git
a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/utils/StatusRecorder.java
b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/utils/StatusRecorder.java
index b1bec2f7..e009a7ce 100644
---
a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/utils/StatusRecorder.java
+++
b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/utils/StatusRecorder.java
@@ -120,7 +120,7 @@ public class StatusRecorder<
int retries = 0;
while (true) {
try {
- var updated =
client.resource(resource).lockResourceVersion().replaceStatus();
+ var updated =
client.resource(resource).lockResourceVersion().updateStatus();
// If we successfully replaced the status, update the resource
version so we know
// what to lock next in the same reconciliation loop
@@ -135,7 +135,7 @@ public class StatusRecorder<
"Could not apply status update for resource
version {}",
currentVersion);
- var latest = client.resource(resource).fromServer().get();
+ var latest = client.resource(resource).get();
var latestVersion =
latest.getMetadata().getResourceVersion();
if (latestVersion.equals(currentVersion)) {
diff --git
a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/TestUtils.java
b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/TestUtils.java
index f0d0941b..88a352ef 100644
---
a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/TestUtils.java
+++
b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/TestUtils.java
@@ -288,7 +288,7 @@ public class TestUtils extends BaseTestUtils {
}
public static Stream<Arguments> flinkVersions() {
- return List.of(arguments(FlinkVersion.v1_14),
arguments(FlinkVersion.v1_15)).stream();
+ return Stream.of(arguments(FlinkVersion.v1_14),
arguments(FlinkVersion.v1_15));
}
/** Testing ResponseProvider. */
diff --git
a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/metrics/KubernetesClientMetricsTest.java
b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/metrics/KubernetesClientMetricsTest.java
index 2dd86a5b..2c52965d 100644
---
a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/metrics/KubernetesClientMetricsTest.java
+++
b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/metrics/KubernetesClientMetricsTest.java
@@ -104,7 +104,7 @@ public class KubernetesClientMetricsTest {
mockServer.createClient().getConfiguration());
var deployment = TestUtils.buildApplicationCluster();
- kubernetesClient.resource(deployment).fromServer().get();
+ kubernetesClient.resource(deployment).get();
assertFalse(listener.getCounter(listener.getMetricId(REQUEST_COUNTER_ID)).isPresent());
assertFalse(listener.getMeter(listener.getMetricId(REQUEST_METER_ID)).isPresent());
assertFalse(
diff --git
a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/utils/KubernetesClientUtilsTest.java
b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/utils/KubernetesClientUtilsTest.java
index 056194ae..1d7a4ec3 100644
---
a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/utils/KubernetesClientUtilsTest.java
+++
b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/utils/KubernetesClientUtilsTest.java
@@ -45,11 +45,11 @@ public class KubernetesClientUtilsTest {
var secondVersion =
TestUtils.buildApplicationCluster(FlinkVersion.v1_15);
kubernetesClient.resource(firstVersion).create();
- firstVersion =
kubernetesClient.resource(firstVersion).fromServer().get();
+ firstVersion = kubernetesClient.resource(firstVersion).get();
// simulate external upgrade
- kubernetesClient.resource(secondVersion).replace();
- secondVersion =
kubernetesClient.resource(secondVersion).fromServer().get();
+ kubernetesClient.resource(secondVersion).update();
+ secondVersion = kubernetesClient.resource(secondVersion).get();
KubernetesClientUtils.applyToStoredCr(
kubernetesClient,
@@ -59,12 +59,7 @@ public class KubernetesClientUtilsTest {
// Make sure the spec change wasn't applied
assertEquals(
FlinkVersion.v1_15,
- kubernetesClient
- .resource(secondVersion)
- .fromServer()
- .get()
- .getSpec()
- .getFlinkVersion());
+
kubernetesClient.resource(secondVersion).get().getSpec().getFlinkVersion());
// Apply with correct version (generation)
KubernetesClientUtils.applyToStoredCr(
@@ -73,11 +68,6 @@ public class KubernetesClientUtilsTest {
cr -> cr.getSpec().setFlinkVersion(FlinkVersion.v1_16));
assertEquals(
FlinkVersion.v1_16,
- kubernetesClient
- .resource(secondVersion)
- .fromServer()
- .get()
- .getSpec()
- .getFlinkVersion());
+
kubernetesClient.resource(secondVersion).get().getSpec().getFlinkVersion());
}
}
diff --git
a/flink-kubernetes-standalone/src/main/java/org/apache/flink/kubernetes/operator/kubeclient/Fabric8FlinkStandaloneKubeClient.java
b/flink-kubernetes-standalone/src/main/java/org/apache/flink/kubernetes/operator/kubeclient/Fabric8FlinkStandaloneKubeClient.java
index b09b6672..76063e25 100644
---
a/flink-kubernetes-standalone/src/main/java/org/apache/flink/kubernetes/operator/kubeclient/Fabric8FlinkStandaloneKubeClient.java
+++
b/flink-kubernetes-standalone/src/main/java/org/apache/flink/kubernetes/operator/kubeclient/Fabric8FlinkStandaloneKubeClient.java
@@ -23,6 +23,7 @@ import
org.apache.flink.kubernetes.configuration.KubernetesConfigOptions;
import org.apache.flink.kubernetes.kubeclient.Fabric8FlinkKubeClient;
import org.apache.flink.kubernetes.operator.utils.StandaloneKubernetesUtils;
+import io.fabric8.kubernetes.api.model.DeletionPropagation;
import io.fabric8.kubernetes.api.model.apps.Deployment;
import io.fabric8.kubernetes.client.DefaultKubernetesClient;
import io.fabric8.kubernetes.client.NamespacedKubernetesClient;
@@ -57,14 +58,14 @@ public class Fabric8FlinkStandaloneKubeClient extends
Fabric8FlinkKubeClient
.apps()
.deployments()
.withName(StandaloneKubernetesUtils.getJobManagerDeploymentName(clusterId))
- .cascading(true)
+ .withPropagationPolicy(DeletionPropagation.FOREGROUND)
.delete();
this.internalClient
.apps()
.deployments()
.withName(StandaloneKubernetesUtils.getTaskManagerDeploymentName(clusterId))
- .cascading(true)
+ .withPropagationPolicy(DeletionPropagation.FOREGROUND)
.delete();
}
diff --git
a/helm/flink-kubernetes-operator/crds/flinkdeployments.flink.apache.org-v1.yml
b/helm/flink-kubernetes-operator/crds/flinkdeployments.flink.apache.org-v1.yml
index c31d9298..e8638289 100644
---
a/helm/flink-kubernetes-operator/crds/flinkdeployments.flink.apache.org-v1.yml
+++
b/helm/flink-kubernetes-operator/crds/flinkdeployments.flink.apache.org-v1.yml
@@ -750,6 +750,13 @@ spec:
type: object
resources:
properties:
+ claims:
+ items:
+ properties:
+ name:
+ type: string
+ type: object
+ type: array
limits:
additionalProperties:
anyOf:
@@ -1265,6 +1272,13 @@ spec:
type: object
resources:
properties:
+ claims:
+ items:
+ properties:
+ name:
+ type: string
+ type: object
+ type: array
limits:
additionalProperties:
anyOf:
@@ -1786,6 +1800,13 @@ spec:
type: object
resources:
properties:
+ claims:
+ items:
+ properties:
+ name:
+ type: string
+ type: object
+ type: array
limits:
additionalProperties:
anyOf:
@@ -1991,12 +2012,33 @@ spec:
type: string
type: object
type: array
+ resourceClaims:
+ items:
+ properties:
+ name:
+ type: string
+ source:
+ properties:
+ resourceClaimName:
+ type: string
+ resourceClaimTemplateName:
+ type: string
+ type: object
+ type: object
+ type: array
restartPolicy:
type: string
runtimeClassName:
type: string
schedulerName:
type: string
+ schedulingGates:
+ items:
+ properties:
+ name:
+ type: string
+ type: object
+ type: array
securityContext:
properties:
fsGroup:
@@ -2371,9 +2413,18 @@ spec:
type: string
name:
type: string
+ namespace:
+ type: string
type: object
resources:
properties:
+ claims:
+ items:
+ properties:
+ name:
+ type: string
+ type: object
+ type: array
limits:
additionalProperties:
anyOf:
@@ -3761,6 +3812,13 @@ spec:
type: object
resources:
properties:
+ claims:
+ items:
+ properties:
+ name:
+ type: string
+ type: object
+ type: array
limits:
additionalProperties:
anyOf:
@@ -4276,6 +4334,13 @@ spec:
type: object
resources:
properties:
+ claims:
+ items:
+ properties:
+ name:
+ type: string
+ type: object
+ type: array
limits:
additionalProperties:
anyOf:
@@ -4797,6 +4862,13 @@ spec:
type: object
resources:
properties:
+ claims:
+ items:
+ properties:
+ name:
+ type: string
+ type: object
+ type: array
limits:
additionalProperties:
anyOf:
@@ -5002,12 +5074,33 @@ spec:
type: string
type: object
type: array
+ resourceClaims:
+ items:
+ properties:
+ name:
+ type: string
+ source:
+ properties:
+ resourceClaimName:
+ type: string
+ resourceClaimTemplateName:
+ type: string
+ type: object
+ type: object
+ type: array
restartPolicy:
type: string
runtimeClassName:
type: string
schedulerName:
type: string
+ schedulingGates:
+ items:
+ properties:
+ name:
+ type: string
+ type: object
+ type: array
securityContext:
properties:
fsGroup:
@@ -5382,9 +5475,18 @@ spec:
type: string
name:
type: string
+ namespace:
+ type: string
type: object
resources:
properties:
+ claims:
+ items:
+ properties:
+ name:
+ type: string
+ type: object
+ type: array
limits:
additionalProperties:
anyOf:
@@ -6773,6 +6875,13 @@ spec:
type: object
resources:
properties:
+ claims:
+ items:
+ properties:
+ name:
+ type: string
+ type: object
+ type: array
limits:
additionalProperties:
anyOf:
@@ -7288,6 +7397,13 @@ spec:
type: object
resources:
properties:
+ claims:
+ items:
+ properties:
+ name:
+ type: string
+ type: object
+ type: array
limits:
additionalProperties:
anyOf:
@@ -7809,6 +7925,13 @@ spec:
type: object
resources:
properties:
+ claims:
+ items:
+ properties:
+ name:
+ type: string
+ type: object
+ type: array
limits:
additionalProperties:
anyOf:
@@ -8014,12 +8137,33 @@ spec:
type: string
type: object
type: array
+ resourceClaims:
+ items:
+ properties:
+ name:
+ type: string
+ source:
+ properties:
+ resourceClaimName:
+ type: string
+ resourceClaimTemplateName:
+ type: string
+ type: object
+ type: object
+ type: array
restartPolicy:
type: string
runtimeClassName:
type: string
schedulerName:
type: string
+ schedulingGates:
+ items:
+ properties:
+ name:
+ type: string
+ type: object
+ type: array
securityContext:
properties:
fsGroup:
@@ -8394,9 +8538,18 @@ spec:
type: string
name:
type: string
+ namespace:
+ type: string
type: object
resources:
properties:
+ claims:
+ items:
+ properties:
+ name:
+ type: string
+ type: object
+ type: array
limits:
additionalProperties:
anyOf:
diff --git a/pom.xml b/pom.xml
index 31300f09..c2376588 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,7 +76,7 @@ under the License.
<operator.sdk.version>4.2.6</operator.sdk.version>
<operator.sdk.admission-controller.version>0.2.0</operator.sdk.admission-controller.version>
- <fabric8.version>6.2.0</fabric8.version>
+ <fabric8.version>6.5.0</fabric8.version>
<lombok.version>1.18.22</lombok.version>
<commons-lang3.version>3.12.0</commons-lang3.version>
