Skip to content

Commit 7b01553

Browse files
authored
[FLINK-35649] Bump Flink version to 1.19.1 in k8s-operator
1 parent 2b78ea3 commit 7b01553

File tree

9 files changed

+22
-192
lines changed

9 files changed

+22
-192
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,8 @@ jobs:
4747
${{ runner.os }}-maven-
4848
- name: Build with Maven
4949
run: |
50-
set -o pipefail; mvn -B clean install javadoc:javadoc -Pgenerate-docs | tee ./mvn.log; set +o pipefail
51-
if [[ $(cat ./mvn.log | grep -E -v '(flink-runtime-.*.jar, flink-kubernetes-operator-.*.jar)|(flink-kubernetes-operator-.*.jar, flink-runtime-.*.jar) define 3 overlapping classes' | grep -E -v '(flink-runtime-.*.jar, flink-autoscaler-.*.jar)|(flink-autoscaler-.*.jar, flink-runtime-.*.jar) define 1|2 overlapping classes' | grep -c "overlapping classes" -) -gt 0 ]];then
52-
echo "Found overlapping classes: "
53-
cat ./mvn.log | grep "overlapping classes"
54-
exit 1
55-
fi
56-
if [[ $(git diff HEAD | wc -l) -gt 0 ]];then
50+
mvn -B clean install javadoc:javadoc -Pgenerate-docs
51+
if [[ $(git diff HEAD | wc -l) -gt 0 ]]; then
5752
echo "Please generate the java doc via 'mvn clean install -DskipTests -Pgenerate-docs' again"
5853
exit 1
5954
fi

flink-autoscaler-plugin-jdbc/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,12 @@ under the License.
104104
</exclusions>
105105
</dependency>
106106

107+
<dependency>
108+
<groupId>commons-codec</groupId>
109+
<artifactId>commons-codec</artifactId>
110+
<version>1.17.0</version>
111+
</dependency>
112+
107113
<!-- Derby tests -->
108114
<dependency>
109115
<groupId>org.apache.derby</groupId>

flink-autoscaler/src/main/java/org/apache/flink/runtime/rest/messages/job/JobDetailsInfo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
import java.util.Map;
4646
import java.util.Objects;
4747

48-
/** Copied from Flink. Should be removed once the client dependency is upgraded to 1.18. */
48+
/** Copied from Flink. Should be removed once the client dependency is upgraded to 1.20. */
4949
/** The difference compared to 1.18 is that slot sharing group is optional here. */
5050
public class JobDetailsInfo implements ResponseBody {
5151

flink-kubernetes-operator/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,12 @@ under the License.
251251
<exclude>META-INF/**/module-info.class</exclude>
252252
</excludes>
253253
</filter>
254+
<filter>
255+
<artifact>org.apache.flink:flink-kubernetes</artifact>
256+
<excludes>
257+
<exclude>META-INF/versions/**/com/fasterxml/jackson/core/io/doubleparser/**</exclude>
258+
</excludes>
259+
</filter>
254260
</filters>
255261
<artifactSet>
256262
<includes combine.children="append">

flink-kubernetes-operator/src/main/java/org/apache/flink/runtime/rest/messages/job/savepoints/SavepointTriggerRequestBody.java

Lines changed: 0 additions & 90 deletions
This file was deleted.

flink-kubernetes-operator/src/main/java/org/apache/flink/runtime/rest/messages/job/savepoints/stop/StopWithSavepointRequestBody.java

Lines changed: 0 additions & 91 deletions
This file was deleted.

flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/autoscaler/KubernetesScalingRealizerTest.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
package org.apache.flink.kubernetes.operator.autoscaler;
1919

2020
import org.apache.flink.autoscaler.tuning.ConfigChanges;
21+
import org.apache.flink.configuration.GlobalConfiguration;
2122
import org.apache.flink.configuration.MemorySize;
2223
import org.apache.flink.configuration.PipelineOptions;
2324
import org.apache.flink.configuration.TaskManagerOptions;
@@ -35,6 +36,9 @@ public class KubernetesScalingRealizerTest {
3536

3637
@Test
3738
public void testApplyOverrides() {
39+
// Required to keep the test config context on legacy Flink YAML converters.
40+
GlobalConfiguration.setStandardYaml(false);
41+
3842
KubernetesJobAutoScalerContext ctx =
3943
TestingKubernetesAutoscalerUtils.createContext("test", null);
4044

flink-kubernetes-standalone/src/test/java/org/apache/flink/kubernetes/operator/kubeclient/factory/StandaloneKubernetesJobManagerFactoryTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ public void testTemplateSpec() {
136136
assertEquals(1, podSpec.getContainers().size());
137137
assertEquals(TestUtils.SERVICE_ACCOUNT, podSpec.getServiceAccountName());
138138
// Config and secret volumes
139-
assertEquals(3, podSpec.getVolumes().size());
139+
assertEquals(4, podSpec.getVolumes().size());
140140

141141
final Container mainContainer = podSpec.getContainers().get(0);
142142
assertEquals(Constants.MAIN_CONTAINER_NAME, mainContainer.getName());
@@ -184,7 +184,7 @@ public void testTemplateSpec() {
184184
assertEquals(
185185
String.valueOf(TestUtils.JOB_MANAGER_MEMORY_MB), limits.get("memory").getAmount());
186186

187-
assertEquals(3, mainContainer.getVolumeMounts().size());
187+
assertEquals(4, mainContainer.getVolumeMounts().size());
188188
}
189189

190190
@Test

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ under the License.
8383
<lombok.version>1.18.30</lombok.version>
8484
<commons-lang3.version>3.12.0</commons-lang3.version>
8585
<commons-io.version>2.11.0</commons-io.version>
86-
<flink.version>1.18.1</flink.version>
86+
<flink.version>1.19.1</flink.version>
8787

8888
<slf4j.version>1.7.36</slf4j.version>
8989
<log4j.version>2.17.1</log4j.version>

0 commit comments

Comments
 (0)