Merge pull request #407 from Lyt99/bugfix/backend-ip-version

fix backend ip version check for clb

pkg/controller/service/reconcile/backend/backend.go

@@ -87,17 +87,26 @@ func (e *EndpointWithENI) setTrafficPolicy(reqCtx *svcCtx.RequestContext) {
 }
 
 func (e *EndpointWithENI) setAddressIpVersion(reqCtx *svcCtx.RequestContext) {
+	e.AddressIPVersion = model.IPv4
+	if reqCtx.Anno.Get(annotation.BackendIPVersion) != string(model.IPv6) {
+		return
+	}
 	// Only EndpointSlice support dual stack.
 	// Enable IPv6DualStack and EndpointSlice feature gates if you want to use ipv6 backends
-	if utilfeature.DefaultMutableFeatureGate.Enabled(ctrlCfg.IPv6DualStack) &&
-		utilfeature.DefaultMutableFeatureGate.Enabled(ctrlCfg.EndpointSlice) &&
-		strings.EqualFold(reqCtx.Anno.Get(annotation.IPVersion), string(model.DualStack)) &&
-		reqCtx.Anno.Get(annotation.BackendIPVersion) == string(model.IPv6) {
-		e.AddressIPVersion = model.IPv6
-		reqCtx.Log.Info("backend address ip version is ipv6")
+	if !utilfeature.DefaultMutableFeatureGate.Enabled(ctrlCfg.IPv6DualStack) ||
+		!utilfeature.DefaultMutableFeatureGate.Enabled(ctrlCfg.EndpointSlice) {
 		return
 	}
-	e.AddressIPVersion = model.IPv4
+
+	c := model.IPv6
+	if helper.NeedNLB(reqCtx.Service) {
+		c = model.DualStack
+	}
+	if strings.EqualFold(reqCtx.Anno.Get(annotation.IPVersion), string(c)) {
+		reqCtx.Log.Info("backend address ip version is ipv6")
+		e.AddressIPVersion = model.IPv6
+	}
+	return
 }
 
 func GetNodes(reqCtx *svcCtx.RequestContext, kubeClient client.Client) ([]v1.Node, error) {