Merge pull request alibaba#392 from hhyasdf/release/v0.8.4

[CHERRY PICK] release for v0.8.4
hhyasdf · Jun 28, 2023 · 7feb6b8 · 7feb6b8
2 parents 4b0ef6a + 1fc0762
commit 7feb6b8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/pkg/daemon/controller/utils.go b/pkg/daemon/controller/utils.go
@@ -59,6 +59,11 @@ func (t *simpleTriggerSource) Start(ctx context.Context, handler handler.EventHa
 }
 
 func (t *simpleTriggerSource) Trigger() {
+	// do nothing if source is not started
+	if t.queue == nil {
+		return
+	}
+
 	t.queue.Add(reconcile.Request{NamespacedName: types.NamespacedName{
 		Name: t.key,
 	}})

diff --git a/pkg/daemon/iptables/iptables.go b/pkg/daemon/iptables/iptables.go
@@ -49,11 +49,14 @@ const (
 	ChainHybridnetFromRuleSkip         = CustomChainPrefix + "FROM-RULE-SKIP"
 	ChainHybridnetPodToNodeTrafficMark = CustomChainPrefix + "POD-TO-NODE-MARK"
 
-	HybridnetOverlayNetSetName       = "HYBRIDNET-OVERLAY-NET"
-	HybridnetAllIPSetName            = "HYBRIDNET-ALL"
-	HybridnetNodeIPSetName           = "HYBRIDNET-NODE-IP"
-	HybridnetLocalPodIPSetName       = "HYBRIDNET-LOCAL-POD-IP"
-	HybridnetLocalUnderlayNetSetName = "HYBRIDNET-LOCAL-UNDERLAY-NET"
+	// The origin ip set name below should not be longer than 25 characters, because v6 ip set name will get an "inet6:" prefix,
+	// and the actual length of ip set name should not be longer than 31 characters.
+
+	HybridnetOverlayNetSetName       = "HYBR-OVERLAY-NET"
+	HybridnetAllIPSetName            = "HYBR-ALL"
+	HybridnetNodeIPSetName           = "HYBR-NODE-IP"
+	HybridnetLocalPodIPSetName       = "HYBR-LOCAL-POD-IP"
+	HybridnetLocalUnderlayNetSetName = "HYBR-LOCAL-UNDERLAY-NET"
 
 	PodToNodeBackTrafficMarkString = "0x20"
 	FullNATedPodTrafficMarkString  = "0x40"