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/06/09 06:06:28 UTC
[flink-kubernetes-operator] branch release-1.0 updated (ae6e671 -> cc8207c)
This is an automated email from the ASF dual-hosted git repository.
gyfora pushed a change to branch release-1.0
in repository https://gitbox.apache.org/repos/asf/flink-kubernetes-operator.git
from ae6e671 [hotfix] Remove incorrect savepoint path check
new d8e0928 [FLINK-27961] Include the resource uid when generate the event name
new cc8207c [FLINK-27956][helm] Operator deployment uses recreate strategy
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../kubernetes/operator/utils/EventUtils.java | 7 ++++++-
.../kubernetes/operator/utils/EventUtilsTest.java | 24 ++++++++++++++++++++++
.../templates/flink-operator.yaml | 2 ++
3 files changed, 32 insertions(+), 1 deletion(-)
[flink-kubernetes-operator] 01/02: [FLINK-27961] Include the resource uid when generate the event name
Posted by gy...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gyfora pushed a commit to branch release-1.0
in repository https://gitbox.apache.org/repos/asf/flink-kubernetes-operator.git
commit d8e0928a5a272604e9135015455910b6b2fcb66c
Author: Aitozi <yu...@alibaba-inc.com>
AuthorDate: Wed Jun 8 23:04:17 2022 +0800
[FLINK-27961] Include the resource uid when generate the event name
---
.../kubernetes/operator/utils/EventUtils.java | 7 ++++++-
.../kubernetes/operator/utils/EventUtilsTest.java | 24 ++++++++++++++++++++++
2 files changed, 30 insertions(+), 1 deletion(-)
diff --git a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/utils/EventUtils.java b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/utils/EventUtils.java
index f590084..aad4375 100644
--- a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/utils/EventUtils.java
+++ b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/utils/EventUtils.java
@@ -46,7 +46,12 @@ public class EventUtils {
HasMetadata target, Type type, String reason, String message, Component component) {
return component
+ "."
- + ((reason + message + type + target.getKind() + target.getMetadata().getName())
+ + ((reason
+ + message
+ + type
+ + target.getKind()
+ + target.getMetadata().getName()
+ + target.getMetadata().getUid())
.hashCode()
& 0x7FFFFFFF);
}
diff --git a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/utils/EventUtilsTest.java b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/utils/EventUtilsTest.java
index bc3a07f..db2dfec 100644
--- a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/utils/EventUtilsTest.java
+++ b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/utils/EventUtilsTest.java
@@ -81,4 +81,28 @@ public class EventUtilsTest {
Assertions.assertEquals(2, event.getCount());
}
+
+ @Test
+ public void testSameResourceNameWithDifferentUidNotShareEvents() {
+ var flinkApp = TestUtils.buildApplicationCluster();
+ flinkApp.getMetadata().setUid("uid1");
+ var reason = "Cleanup";
+ var message = "message";
+ var name1 =
+ EventUtils.generateEventName(
+ flinkApp,
+ EventUtils.Type.Warning,
+ reason,
+ message,
+ EventUtils.Component.Operator);
+ flinkApp.getMetadata().setUid("uid2");
+ var name2 =
+ EventUtils.generateEventName(
+ flinkApp,
+ EventUtils.Type.Warning,
+ reason,
+ message,
+ EventUtils.Component.Operator);
+ Assertions.assertNotEquals(name1, name2);
+ }
}
[flink-kubernetes-operator] 02/02: [FLINK-27956][helm] Operator deployment uses recreate strategy
Posted by gy...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gyfora pushed a commit to branch release-1.0
in repository https://gitbox.apache.org/repos/asf/flink-kubernetes-operator.git
commit cc8207cf8d283b112ef0bd1a82415addab32036a
Author: Marton Balassi <ma...@apple.com>
AuthorDate: Wed Jun 8 15:29:12 2022 +0200
[FLINK-27956][helm] Operator deployment uses recreate strategy
---
helm/flink-kubernetes-operator/templates/flink-operator.yaml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/helm/flink-kubernetes-operator/templates/flink-operator.yaml b/helm/flink-kubernetes-operator/templates/flink-operator.yaml
index 3a962c0..4e9df19 100644
--- a/helm/flink-kubernetes-operator/templates/flink-operator.yaml
+++ b/helm/flink-kubernetes-operator/templates/flink-operator.yaml
@@ -25,6 +25,8 @@ metadata:
{{- include "flink-operator.labels" . | nindent 4 }}
spec:
replicas: 1
+ strategy:
+ type: Recreate
selector:
matchLabels:
{{- include "flink-operator.selectorLabels" . | nindent 6 }}