diff --git a/pkg/proxy/apis/config/fuzzer/fuzzer.go b/pkg/proxy/apis/config/fuzzer/fuzzer.go index 343f9ba67af..720ca3f81b1 100644 --- a/pkg/proxy/apis/config/fuzzer/fuzzer.go +++ b/pkg/proxy/apis/config/fuzzer/fuzzer.go @@ -25,7 +25,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtimeserializer "k8s.io/apimachinery/pkg/runtime/serializer" kubeproxyconfig "k8s.io/kubernetes/pkg/proxy/apis/config" - utilpointer "k8s.io/utils/pointer" + "k8s.io/utils/pointer" ) // Funcs returns the fuzzer functions for the kube-proxy apis. @@ -35,15 +35,15 @@ func Funcs(codecs runtimeserializer.CodecFactory) []interface{} { c.FuzzNoCustom(obj) obj.BindAddress = fmt.Sprintf("%d.%d.%d.%d", c.Intn(256), c.Intn(256), c.Intn(256), c.Intn(256)) obj.ClientConnection.ContentType = c.RandString() - obj.Conntrack.MaxPerCore = utilpointer.Int32Ptr(c.Int31()) - obj.Conntrack.Min = utilpointer.Int32Ptr(c.Int31()) + obj.Conntrack.MaxPerCore = pointer.Int32(c.Int31()) + obj.Conntrack.Min = pointer.Int32(c.Int31()) obj.Conntrack.TCPCloseWaitTimeout = &metav1.Duration{Duration: time.Duration(c.Int63()) * time.Hour} obj.Conntrack.TCPEstablishedTimeout = &metav1.Duration{Duration: time.Duration(c.Int63()) * time.Hour} obj.FeatureGates = map[string]bool{c.RandString(): true} obj.HealthzBindAddress = fmt.Sprintf("%d.%d.%d.%d:%d", c.Intn(256), c.Intn(256), c.Intn(256), c.Intn(256), c.Intn(65536)) - obj.IPTables.MasqueradeBit = utilpointer.Int32Ptr(c.Int31()) + obj.IPTables.MasqueradeBit = pointer.Int32(c.Int31()) obj.MetricsBindAddress = fmt.Sprintf("%d.%d.%d.%d:%d", c.Intn(256), c.Intn(256), c.Intn(256), c.Intn(256), c.Intn(65536)) - obj.OOMScoreAdj = utilpointer.Int32Ptr(c.Int31()) + obj.OOMScoreAdj = pointer.Int32(c.Int31()) obj.ClientConnection.ContentType = "bar" obj.NodePortAddresses = []string{"1.2.3.0/24"} }, diff --git a/pkg/proxy/apis/config/v1alpha1/defaults.go b/pkg/proxy/apis/config/v1alpha1/defaults.go index 30d677d7f0f..ac345d6d48c 100644 --- a/pkg/proxy/apis/config/v1alpha1/defaults.go +++ b/pkg/proxy/apis/config/v1alpha1/defaults.go @@ -73,10 +73,10 @@ func SetDefaults_KubeProxyConfiguration(obj *kubeproxyconfigv1alpha1.KubeProxyCo } if obj.Conntrack.MaxPerCore == nil { - obj.Conntrack.MaxPerCore = pointer.Int32Ptr(32 * 1024) + obj.Conntrack.MaxPerCore = pointer.Int32(32 * 1024) } if obj.Conntrack.Min == nil { - obj.Conntrack.Min = pointer.Int32Ptr(128 * 1024) + obj.Conntrack.Min = pointer.Int32(128 * 1024) } if obj.IPTables.MasqueradeBit == nil { diff --git a/pkg/proxy/apis/config/validation/validation_test.go b/pkg/proxy/apis/config/validation/validation_test.go index 23c56614bbe..85f1b68b35f 100644 --- a/pkg/proxy/apis/config/validation/validation_test.go +++ b/pkg/proxy/apis/config/validation/validation_test.go @@ -55,8 +55,8 @@ func TestValidateKubeProxyConfiguration(t *testing.T) { MinSyncPeriod: metav1.Duration{Duration: 5 * time.Second}, }, Conntrack: kubeproxyconfig.KubeProxyConntrackConfiguration{ - MaxPerCore: pointer.Int32Ptr(1), - Min: pointer.Int32Ptr(1), + MaxPerCore: pointer.Int32(1), + Min: pointer.Int32(1), TCPEstablishedTimeout: &metav1.Duration{Duration: 5 * time.Second}, TCPCloseWaitTimeout: &metav1.Duration{Duration: 5 * time.Second}, }, @@ -74,8 +74,8 @@ func TestValidateKubeProxyConfiguration(t *testing.T) { MinSyncPeriod: metav1.Duration{Duration: 2 * time.Second}, }, Conntrack: kubeproxyconfig.KubeProxyConntrackConfiguration{ - MaxPerCore: pointer.Int32Ptr(1), - Min: pointer.Int32Ptr(1), + MaxPerCore: pointer.Int32(1), + Min: pointer.Int32(1), TCPEstablishedTimeout: &metav1.Duration{Duration: 5 * time.Second}, TCPCloseWaitTimeout: &metav1.Duration{Duration: 5 * time.Second}, }, @@ -93,8 +93,8 @@ func TestValidateKubeProxyConfiguration(t *testing.T) { MinSyncPeriod: metav1.Duration{Duration: 2 * time.Second}, }, Conntrack: kubeproxyconfig.KubeProxyConntrackConfiguration{ - MaxPerCore: pointer.Int32Ptr(1), - Min: pointer.Int32Ptr(1), + MaxPerCore: pointer.Int32(1), + Min: pointer.Int32(1), TCPEstablishedTimeout: &metav1.Duration{Duration: 5 * time.Second}, TCPCloseWaitTimeout: &metav1.Duration{Duration: 5 * time.Second}, }, @@ -112,8 +112,8 @@ func TestValidateKubeProxyConfiguration(t *testing.T) { MinSyncPeriod: metav1.Duration{Duration: 2 * time.Second}, }, Conntrack: kubeproxyconfig.KubeProxyConntrackConfiguration{ - MaxPerCore: pointer.Int32Ptr(1), - Min: pointer.Int32Ptr(1), + MaxPerCore: pointer.Int32(1), + Min: pointer.Int32(1), TCPEstablishedTimeout: &metav1.Duration{Duration: 5 * time.Second}, TCPCloseWaitTimeout: &metav1.Duration{Duration: 5 * time.Second}, }, @@ -131,8 +131,8 @@ func TestValidateKubeProxyConfiguration(t *testing.T) { MinSyncPeriod: metav1.Duration{Duration: 2 * time.Second}, }, Conntrack: kubeproxyconfig.KubeProxyConntrackConfiguration{ - MaxPerCore: pointer.Int32Ptr(1), - Min: pointer.Int32Ptr(1), + MaxPerCore: pointer.Int32(1), + Min: pointer.Int32(1), TCPEstablishedTimeout: &metav1.Duration{Duration: 5 * time.Second}, TCPCloseWaitTimeout: &metav1.Duration{Duration: 5 * time.Second}, }, @@ -150,8 +150,8 @@ func TestValidateKubeProxyConfiguration(t *testing.T) { MinSyncPeriod: metav1.Duration{Duration: 2 * time.Second}, }, Conntrack: kubeproxyconfig.KubeProxyConntrackConfiguration{ - MaxPerCore: pointer.Int32Ptr(1), - Min: pointer.Int32Ptr(1), + MaxPerCore: pointer.Int32(1), + Min: pointer.Int32(1), TCPEstablishedTimeout: &metav1.Duration{Duration: 5 * time.Second}, TCPCloseWaitTimeout: &metav1.Duration{Duration: 5 * time.Second}, }, @@ -169,8 +169,8 @@ func TestValidateKubeProxyConfiguration(t *testing.T) { MinSyncPeriod: metav1.Duration{Duration: 2 * time.Second}, }, Conntrack: kubeproxyconfig.KubeProxyConntrackConfiguration{ - MaxPerCore: pointer.Int32Ptr(1), - Min: pointer.Int32Ptr(1), + MaxPerCore: pointer.Int32(1), + Min: pointer.Int32(1), TCPEstablishedTimeout: &metav1.Duration{Duration: 5 * time.Second}, TCPCloseWaitTimeout: &metav1.Duration{Duration: 5 * time.Second}, }, @@ -188,8 +188,8 @@ func TestValidateKubeProxyConfiguration(t *testing.T) { MinSyncPeriod: metav1.Duration{Duration: 2 * time.Second}, }, Conntrack: kubeproxyconfig.KubeProxyConntrackConfiguration{ - MaxPerCore: pointer.Int32Ptr(1), - Min: pointer.Int32Ptr(1), + MaxPerCore: pointer.Int32(1), + Min: pointer.Int32(1), TCPEstablishedTimeout: &metav1.Duration{Duration: 5 * time.Second}, TCPCloseWaitTimeout: &metav1.Duration{Duration: 5 * time.Second}, }, @@ -211,8 +211,8 @@ func TestValidateKubeProxyConfiguration(t *testing.T) { MinSyncPeriod: metav1.Duration{Duration: 2 * time.Second}, }, Conntrack: kubeproxyconfig.KubeProxyConntrackConfiguration{ - MaxPerCore: pointer.Int32Ptr(1), - Min: pointer.Int32Ptr(1), + MaxPerCore: pointer.Int32(1), + Min: pointer.Int32(1), TCPEstablishedTimeout: &metav1.Duration{Duration: 5 * time.Second}, TCPCloseWaitTimeout: &metav1.Duration{Duration: 5 * time.Second}, }, @@ -248,8 +248,8 @@ func TestValidateKubeProxyConfiguration(t *testing.T) { MinSyncPeriod: metav1.Duration{Duration: 2 * time.Second}, }, Conntrack: kubeproxyconfig.KubeProxyConntrackConfiguration{ - MaxPerCore: pointer.Int32Ptr(1), - Min: pointer.Int32Ptr(1), + MaxPerCore: pointer.Int32(1), + Min: pointer.Int32(1), TCPEstablishedTimeout: &metav1.Duration{Duration: 5 * time.Second}, TCPCloseWaitTimeout: &metav1.Duration{Duration: 5 * time.Second}, }, @@ -270,8 +270,8 @@ func TestValidateKubeProxyConfiguration(t *testing.T) { MinSyncPeriod: metav1.Duration{Duration: 2 * time.Second}, }, Conntrack: kubeproxyconfig.KubeProxyConntrackConfiguration{ - MaxPerCore: pointer.Int32Ptr(1), - Min: pointer.Int32Ptr(1), + MaxPerCore: pointer.Int32(1), + Min: pointer.Int32(1), TCPEstablishedTimeout: &metav1.Duration{Duration: 5 * time.Second}, TCPCloseWaitTimeout: &metav1.Duration{Duration: 5 * time.Second}, }, @@ -292,8 +292,8 @@ func TestValidateKubeProxyConfiguration(t *testing.T) { MinSyncPeriod: metav1.Duration{Duration: 2 * time.Second}, }, Conntrack: kubeproxyconfig.KubeProxyConntrackConfiguration{ - MaxPerCore: pointer.Int32Ptr(1), - Min: pointer.Int32Ptr(1), + MaxPerCore: pointer.Int32(1), + Min: pointer.Int32(1), TCPEstablishedTimeout: &metav1.Duration{Duration: 5 * time.Second}, TCPCloseWaitTimeout: &metav1.Duration{Duration: 5 * time.Second}, }, @@ -314,8 +314,8 @@ func TestValidateKubeProxyConfiguration(t *testing.T) { MinSyncPeriod: metav1.Duration{Duration: 2 * time.Second}, }, Conntrack: kubeproxyconfig.KubeProxyConntrackConfiguration{ - MaxPerCore: pointer.Int32Ptr(1), - Min: pointer.Int32Ptr(1), + MaxPerCore: pointer.Int32(1), + Min: pointer.Int32(1), TCPEstablishedTimeout: &metav1.Duration{Duration: 5 * time.Second}, TCPCloseWaitTimeout: &metav1.Duration{Duration: 5 * time.Second}, }, @@ -336,8 +336,8 @@ func TestValidateKubeProxyConfiguration(t *testing.T) { MinSyncPeriod: metav1.Duration{Duration: 2 * time.Second}, }, Conntrack: kubeproxyconfig.KubeProxyConntrackConfiguration{ - MaxPerCore: pointer.Int32Ptr(1), - Min: pointer.Int32Ptr(1), + MaxPerCore: pointer.Int32(1), + Min: pointer.Int32(1), TCPEstablishedTimeout: &metav1.Duration{Duration: 5 * time.Second}, TCPCloseWaitTimeout: &metav1.Duration{Duration: 5 * time.Second}, }, @@ -358,8 +358,8 @@ func TestValidateKubeProxyConfiguration(t *testing.T) { MinSyncPeriod: metav1.Duration{Duration: 2 * time.Second}, }, Conntrack: kubeproxyconfig.KubeProxyConntrackConfiguration{ - MaxPerCore: pointer.Int32Ptr(1), - Min: pointer.Int32Ptr(1), + MaxPerCore: pointer.Int32(1), + Min: pointer.Int32(1), TCPEstablishedTimeout: &metav1.Duration{Duration: 5 * time.Second}, TCPCloseWaitTimeout: &metav1.Duration{Duration: 5 * time.Second}, }, @@ -380,8 +380,8 @@ func TestValidateKubeProxyConfiguration(t *testing.T) { MinSyncPeriod: metav1.Duration{Duration: 2 * time.Second}, }, Conntrack: kubeproxyconfig.KubeProxyConntrackConfiguration{ - MaxPerCore: pointer.Int32Ptr(1), - Min: pointer.Int32Ptr(1), + MaxPerCore: pointer.Int32(1), + Min: pointer.Int32(1), TCPEstablishedTimeout: &metav1.Duration{Duration: 5 * time.Second}, TCPCloseWaitTimeout: &metav1.Duration{Duration: 5 * time.Second}, }, @@ -404,8 +404,8 @@ func TestValidateKubeProxyConfiguration(t *testing.T) { // not specifying valid period in IPVS mode. Mode: kubeproxyconfig.ProxyModeIPVS, Conntrack: kubeproxyconfig.KubeProxyConntrackConfiguration{ - MaxPerCore: pointer.Int32Ptr(1), - Min: pointer.Int32Ptr(1), + MaxPerCore: pointer.Int32(1), + Min: pointer.Int32(1), TCPEstablishedTimeout: &metav1.Duration{Duration: 5 * time.Second}, TCPCloseWaitTimeout: &metav1.Duration{Duration: 5 * time.Second}, }, @@ -426,8 +426,8 @@ func TestValidateKubeProxyConfiguration(t *testing.T) { MinSyncPeriod: metav1.Duration{Duration: 2 * time.Second}, }, Conntrack: kubeproxyconfig.KubeProxyConntrackConfiguration{ - MaxPerCore: pointer.Int32Ptr(1), - Min: pointer.Int32Ptr(1), + MaxPerCore: pointer.Int32(1), + Min: pointer.Int32(1), TCPEstablishedTimeout: &metav1.Duration{Duration: 5 * time.Second}, TCPCloseWaitTimeout: &metav1.Duration{Duration: 5 * time.Second}, }, @@ -452,8 +452,8 @@ func TestValidateKubeProxyConfiguration(t *testing.T) { MinSyncPeriod: metav1.Duration{Duration: 2 * time.Second}, }, Conntrack: kubeproxyconfig.KubeProxyConntrackConfiguration{ - MaxPerCore: pointer.Int32Ptr(1), - Min: pointer.Int32Ptr(1), + MaxPerCore: pointer.Int32(1), + Min: pointer.Int32(1), TCPEstablishedTimeout: &metav1.Duration{Duration: 5 * time.Second}, TCPCloseWaitTimeout: &metav1.Duration{Duration: 5 * time.Second}, }, @@ -498,7 +498,7 @@ func TestValidateKubeProxyIPTablesConfiguration(t *testing.T) { }, "valid custom MasqueradeBit": { config: kubeproxyconfig.KubeProxyIPTablesConfiguration{ - MasqueradeBit: pointer.Int32Ptr(5), + MasqueradeBit: pointer.Int32(5), MasqueradeAll: true, SyncPeriod: metav1.Duration{Duration: 5 * time.Second}, MinSyncPeriod: metav1.Duration{Duration: 2 * time.Second}, @@ -516,7 +516,7 @@ func TestValidateKubeProxyIPTablesConfiguration(t *testing.T) { }, "MinSyncPeriod must be > 0": { config: kubeproxyconfig.KubeProxyIPTablesConfiguration{ - MasqueradeBit: pointer.Int32Ptr(5), + MasqueradeBit: pointer.Int32(5), MasqueradeAll: true, SyncPeriod: metav1.Duration{Duration: 5 * time.Second}, MinSyncPeriod: metav1.Duration{Duration: -1 * time.Second}, @@ -525,7 +525,7 @@ func TestValidateKubeProxyIPTablesConfiguration(t *testing.T) { }, "MasqueradeBit cannot be < 0": { config: kubeproxyconfig.KubeProxyIPTablesConfiguration{ - MasqueradeBit: pointer.Int32Ptr(-10), + MasqueradeBit: pointer.Int32(-10), MasqueradeAll: true, SyncPeriod: metav1.Duration{Duration: 5 * time.Second}, MinSyncPeriod: metav1.Duration{Duration: 2 * time.Second}, @@ -534,7 +534,7 @@ func TestValidateKubeProxyIPTablesConfiguration(t *testing.T) { }, "SyncPeriod must be >= MinSyncPeriod": { config: kubeproxyconfig.KubeProxyIPTablesConfiguration{ - MasqueradeBit: pointer.Int32Ptr(5), + MasqueradeBit: pointer.Int32(5), MasqueradeAll: true, SyncPeriod: metav1.Duration{Duration: 1 * time.Second}, MinSyncPeriod: metav1.Duration{Duration: 5 * time.Second}, @@ -664,8 +664,8 @@ func TestValidateKubeProxyConntrackConfiguration(t *testing.T) { }{ "valid 5 second timeouts": { config: kubeproxyconfig.KubeProxyConntrackConfiguration{ - MaxPerCore: pointer.Int32Ptr(1), - Min: pointer.Int32Ptr(1), + MaxPerCore: pointer.Int32(1), + Min: pointer.Int32(1), TCPEstablishedTimeout: &metav1.Duration{Duration: 5 * time.Second}, TCPCloseWaitTimeout: &metav1.Duration{Duration: 5 * time.Second}, }, @@ -673,8 +673,8 @@ func TestValidateKubeProxyConntrackConfiguration(t *testing.T) { }, "valid duration equal to 0 second timeout": { config: kubeproxyconfig.KubeProxyConntrackConfiguration{ - MaxPerCore: pointer.Int32Ptr(1), - Min: pointer.Int32Ptr(1), + MaxPerCore: pointer.Int32(1), + Min: pointer.Int32(1), TCPEstablishedTimeout: &metav1.Duration{Duration: 0 * time.Second}, TCPCloseWaitTimeout: &metav1.Duration{Duration: 0 * time.Second}, }, @@ -682,8 +682,8 @@ func TestValidateKubeProxyConntrackConfiguration(t *testing.T) { }, "invalid MaxPerCore < 0": { config: kubeproxyconfig.KubeProxyConntrackConfiguration{ - MaxPerCore: pointer.Int32Ptr(-1), - Min: pointer.Int32Ptr(1), + MaxPerCore: pointer.Int32(-1), + Min: pointer.Int32(1), TCPEstablishedTimeout: &metav1.Duration{Duration: 5 * time.Second}, TCPCloseWaitTimeout: &metav1.Duration{Duration: 5 * time.Second}, }, @@ -691,8 +691,8 @@ func TestValidateKubeProxyConntrackConfiguration(t *testing.T) { }, "invalid minimum < 0": { config: kubeproxyconfig.KubeProxyConntrackConfiguration{ - MaxPerCore: pointer.Int32Ptr(1), - Min: pointer.Int32Ptr(-1), + MaxPerCore: pointer.Int32(1), + Min: pointer.Int32(-1), TCPEstablishedTimeout: &metav1.Duration{Duration: 5 * time.Second}, TCPCloseWaitTimeout: &metav1.Duration{Duration: 5 * time.Second}, }, @@ -700,8 +700,8 @@ func TestValidateKubeProxyConntrackConfiguration(t *testing.T) { }, "invalid EstablishedTimeout < 0": { config: kubeproxyconfig.KubeProxyConntrackConfiguration{ - MaxPerCore: pointer.Int32Ptr(1), - Min: pointer.Int32Ptr(1), + MaxPerCore: pointer.Int32(1), + Min: pointer.Int32(1), TCPEstablishedTimeout: &metav1.Duration{Duration: -5 * time.Second}, TCPCloseWaitTimeout: &metav1.Duration{Duration: 5 * time.Second}, }, @@ -709,8 +709,8 @@ func TestValidateKubeProxyConntrackConfiguration(t *testing.T) { }, "invalid CloseWaitTimeout < 0": { config: kubeproxyconfig.KubeProxyConntrackConfiguration{ - MaxPerCore: pointer.Int32Ptr(1), - Min: pointer.Int32Ptr(1), + MaxPerCore: pointer.Int32(1), + Min: pointer.Int32(1), TCPEstablishedTimeout: &metav1.Duration{Duration: 5 * time.Second}, TCPCloseWaitTimeout: &metav1.Duration{Duration: -5 * time.Second}, }, diff --git a/pkg/proxy/endpoints_test.go b/pkg/proxy/endpoints_test.go index 3aeaa18985a..4e900ba85ae 100644 --- a/pkg/proxy/endpoints_test.go +++ b/pkg/proxy/endpoints_test.go @@ -28,7 +28,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/sets" - utilpointer "k8s.io/utils/pointer" + "k8s.io/utils/pointer" ) func (proxier *FakeProxier) addEndpoints(endpoints *v1.Endpoints) { @@ -1516,7 +1516,7 @@ func TestLastChangeTriggerTime(t *testing.T) { } func TestEndpointSliceUpdate(t *testing.T) { - fqdnSlice := generateEndpointSlice("svc1", "ns1", 2, 5, 999, 999, []string{"host1"}, []*int32{utilpointer.Int32Ptr(80), utilpointer.Int32Ptr(443)}) + fqdnSlice := generateEndpointSlice("svc1", "ns1", 2, 5, 999, 999, []string{"host1"}, []*int32{pointer.Int32(80), pointer.Int32(443)}) fqdnSlice.AddressType = discovery.AddressTypeFQDN testCases := map[string]struct { @@ -1533,7 +1533,7 @@ func TestEndpointSliceUpdate(t *testing.T) { startingSlices: []*discovery.EndpointSlice{}, endpointChangeTracker: NewEndpointChangeTracker("host1", nil, v1.IPv4Protocol, nil, nil), namespacedName: types.NamespacedName{Name: "svc1", Namespace: "ns1"}, - paramEndpointSlice: generateEndpointSlice("svc1", "ns1", 1, 3, 999, 999, []string{"host1", "host2"}, []*int32{utilpointer.Int32Ptr(80), utilpointer.Int32Ptr(443)}), + paramEndpointSlice: generateEndpointSlice("svc1", "ns1", 1, 3, 999, 999, []string{"host1", "host2"}, []*int32{pointer.Int32(80), pointer.Int32(443)}), paramRemoveSlice: false, expectedReturnVal: true, expectedCurrentChange: map[ServicePortName][]*BaseEndpointInfo{ @@ -1552,11 +1552,11 @@ func TestEndpointSliceUpdate(t *testing.T) { // test no modification to state - current change should be nil as nothing changes "add the same slice that already exists": { startingSlices: []*discovery.EndpointSlice{ - generateEndpointSlice("svc1", "ns1", 1, 3, 999, 999, []string{"host1", "host2"}, []*int32{utilpointer.Int32Ptr(80), utilpointer.Int32Ptr(443)}), + generateEndpointSlice("svc1", "ns1", 1, 3, 999, 999, []string{"host1", "host2"}, []*int32{pointer.Int32(80), pointer.Int32(443)}), }, endpointChangeTracker: NewEndpointChangeTracker("host1", nil, v1.IPv4Protocol, nil, nil), namespacedName: types.NamespacedName{Name: "svc1", Namespace: "ns1"}, - paramEndpointSlice: generateEndpointSlice("svc1", "ns1", 1, 3, 999, 999, []string{"host1", "host2"}, []*int32{utilpointer.Int32Ptr(80), utilpointer.Int32Ptr(443)}), + paramEndpointSlice: generateEndpointSlice("svc1", "ns1", 1, 3, 999, 999, []string{"host1", "host2"}, []*int32{pointer.Int32(80), pointer.Int32(443)}), paramRemoveSlice: false, expectedReturnVal: false, expectedCurrentChange: nil, @@ -1564,7 +1564,7 @@ func TestEndpointSliceUpdate(t *testing.T) { // ensure that only valide address types are processed "add an FQDN slice (invalid address type)": { startingSlices: []*discovery.EndpointSlice{ - generateEndpointSlice("svc1", "ns1", 1, 3, 999, 999, []string{"host1", "host2"}, []*int32{utilpointer.Int32Ptr(80), utilpointer.Int32Ptr(443)}), + generateEndpointSlice("svc1", "ns1", 1, 3, 999, 999, []string{"host1", "host2"}, []*int32{pointer.Int32(80), pointer.Int32(443)}), }, endpointChangeTracker: NewEndpointChangeTracker("host1", nil, v1.IPv4Protocol, nil, nil), namespacedName: types.NamespacedName{Name: "svc1", Namespace: "ns1"}, @@ -1576,12 +1576,12 @@ func TestEndpointSliceUpdate(t *testing.T) { // test additions to existing state "add a slice that overlaps with existing state": { startingSlices: []*discovery.EndpointSlice{ - generateEndpointSlice("svc1", "ns1", 1, 3, 999, 999, []string{"host1", "host2"}, []*int32{utilpointer.Int32Ptr(80), utilpointer.Int32Ptr(443)}), - generateEndpointSlice("svc1", "ns1", 2, 2, 999, 999, []string{"host1", "host2"}, []*int32{utilpointer.Int32Ptr(80), utilpointer.Int32Ptr(443)}), + generateEndpointSlice("svc1", "ns1", 1, 3, 999, 999, []string{"host1", "host2"}, []*int32{pointer.Int32(80), pointer.Int32(443)}), + generateEndpointSlice("svc1", "ns1", 2, 2, 999, 999, []string{"host1", "host2"}, []*int32{pointer.Int32(80), pointer.Int32(443)}), }, endpointChangeTracker: NewEndpointChangeTracker("host1", nil, v1.IPv4Protocol, nil, nil), namespacedName: types.NamespacedName{Name: "svc1", Namespace: "ns1"}, - paramEndpointSlice: generateEndpointSlice("svc1", "ns1", 1, 5, 999, 999, []string{"host1"}, []*int32{utilpointer.Int32Ptr(80), utilpointer.Int32Ptr(443)}), + paramEndpointSlice: generateEndpointSlice("svc1", "ns1", 1, 5, 999, 999, []string{"host1"}, []*int32{pointer.Int32(80), pointer.Int32(443)}), paramRemoveSlice: false, expectedReturnVal: true, expectedCurrentChange: map[ServicePortName][]*BaseEndpointInfo{ @@ -1608,12 +1608,12 @@ func TestEndpointSliceUpdate(t *testing.T) { // test additions to existing state with partially overlapping slices and ports "add a slice that overlaps with existing state and partial ports": { startingSlices: []*discovery.EndpointSlice{ - generateEndpointSlice("svc1", "ns1", 1, 3, 999, 999, []string{"host1", "host2"}, []*int32{utilpointer.Int32Ptr(80), utilpointer.Int32Ptr(443)}), - generateEndpointSlice("svc1", "ns1", 2, 2, 999, 999, []string{"host1", "host2"}, []*int32{utilpointer.Int32Ptr(80), utilpointer.Int32Ptr(443)}), + generateEndpointSlice("svc1", "ns1", 1, 3, 999, 999, []string{"host1", "host2"}, []*int32{pointer.Int32(80), pointer.Int32(443)}), + generateEndpointSlice("svc1", "ns1", 2, 2, 999, 999, []string{"host1", "host2"}, []*int32{pointer.Int32(80), pointer.Int32(443)}), }, endpointChangeTracker: NewEndpointChangeTracker("host1", nil, v1.IPv4Protocol, nil, nil), namespacedName: types.NamespacedName{Name: "svc1", Namespace: "ns1"}, - paramEndpointSlice: generateEndpointSliceWithOffset("svc1", "ns1", 3, 1, 5, 999, 999, []string{"host1"}, []*int32{utilpointer.Int32Ptr(80)}), + paramEndpointSlice: generateEndpointSliceWithOffset("svc1", "ns1", 3, 1, 5, 999, 999, []string{"host1"}, []*int32{pointer.Int32(80)}), paramRemoveSlice: false, expectedReturnVal: true, expectedCurrentChange: map[ServicePortName][]*BaseEndpointInfo{ @@ -1638,12 +1638,12 @@ func TestEndpointSliceUpdate(t *testing.T) { // test deletions from existing state with partially overlapping slices and ports "remove a slice that overlaps with existing state": { startingSlices: []*discovery.EndpointSlice{ - generateEndpointSlice("svc1", "ns1", 1, 3, 999, 999, []string{"host1", "host2"}, []*int32{utilpointer.Int32Ptr(80), utilpointer.Int32Ptr(443)}), - generateEndpointSlice("svc1", "ns1", 2, 2, 999, 999, []string{"host1", "host2"}, []*int32{utilpointer.Int32Ptr(80), utilpointer.Int32Ptr(443)}), + generateEndpointSlice("svc1", "ns1", 1, 3, 999, 999, []string{"host1", "host2"}, []*int32{pointer.Int32(80), pointer.Int32(443)}), + generateEndpointSlice("svc1", "ns1", 2, 2, 999, 999, []string{"host1", "host2"}, []*int32{pointer.Int32(80), pointer.Int32(443)}), }, endpointChangeTracker: NewEndpointChangeTracker("host1", nil, v1.IPv4Protocol, nil, nil), namespacedName: types.NamespacedName{Name: "svc1", Namespace: "ns1"}, - paramEndpointSlice: generateEndpointSlice("svc1", "ns1", 1, 5, 999, 999, []string{"host1"}, []*int32{utilpointer.Int32Ptr(80), utilpointer.Int32Ptr(443)}), + paramEndpointSlice: generateEndpointSlice("svc1", "ns1", 1, 5, 999, 999, []string{"host1"}, []*int32{pointer.Int32(80), pointer.Int32(443)}), paramRemoveSlice: true, expectedReturnVal: true, expectedCurrentChange: map[ServicePortName][]*BaseEndpointInfo{ @@ -1660,12 +1660,12 @@ func TestEndpointSliceUpdate(t *testing.T) { // ensure a removal that has no effect turns into a no-op "remove a slice that doesn't even exist in current state": { startingSlices: []*discovery.EndpointSlice{ - generateEndpointSlice("svc1", "ns1", 1, 5, 999, 999, []string{"host1"}, []*int32{utilpointer.Int32Ptr(80), utilpointer.Int32Ptr(443)}), - generateEndpointSlice("svc1", "ns1", 2, 2, 999, 999, []string{"host1"}, []*int32{utilpointer.Int32Ptr(80), utilpointer.Int32Ptr(443)}), + generateEndpointSlice("svc1", "ns1", 1, 5, 999, 999, []string{"host1"}, []*int32{pointer.Int32(80), pointer.Int32(443)}), + generateEndpointSlice("svc1", "ns1", 2, 2, 999, 999, []string{"host1"}, []*int32{pointer.Int32(80), pointer.Int32(443)}), }, endpointChangeTracker: NewEndpointChangeTracker("host1", nil, v1.IPv4Protocol, nil, nil), namespacedName: types.NamespacedName{Name: "svc1", Namespace: "ns1"}, - paramEndpointSlice: generateEndpointSlice("svc1", "ns1", 3, 5, 999, 999, []string{"host1"}, []*int32{utilpointer.Int32Ptr(80), utilpointer.Int32Ptr(443)}), + paramEndpointSlice: generateEndpointSlice("svc1", "ns1", 3, 5, 999, 999, []string{"host1"}, []*int32{pointer.Int32(80), pointer.Int32(443)}), paramRemoveSlice: true, expectedReturnVal: false, expectedCurrentChange: nil, @@ -1673,11 +1673,11 @@ func TestEndpointSliceUpdate(t *testing.T) { // start with all endpoints ready, transition to no endpoints ready "transition all endpoints to unready state": { startingSlices: []*discovery.EndpointSlice{ - generateEndpointSlice("svc1", "ns1", 1, 3, 999, 999, []string{"host1", "host2"}, []*int32{utilpointer.Int32Ptr(80), utilpointer.Int32Ptr(443)}), + generateEndpointSlice("svc1", "ns1", 1, 3, 999, 999, []string{"host1", "host2"}, []*int32{pointer.Int32(80), pointer.Int32(443)}), }, endpointChangeTracker: NewEndpointChangeTracker("host1", nil, v1.IPv4Protocol, nil, nil), namespacedName: types.NamespacedName{Name: "svc1", Namespace: "ns1"}, - paramEndpointSlice: generateEndpointSlice("svc1", "ns1", 1, 3, 1, 999, []string{"host1"}, []*int32{utilpointer.Int32Ptr(80), utilpointer.Int32Ptr(443)}), + paramEndpointSlice: generateEndpointSlice("svc1", "ns1", 1, 3, 1, 999, []string{"host1"}, []*int32{pointer.Int32(80), pointer.Int32(443)}), paramRemoveSlice: false, expectedReturnVal: true, expectedCurrentChange: map[ServicePortName][]*BaseEndpointInfo{ @@ -1696,11 +1696,11 @@ func TestEndpointSliceUpdate(t *testing.T) { // start with no endpoints ready, transition to all endpoints ready "transition all endpoints to ready state": { startingSlices: []*discovery.EndpointSlice{ - generateEndpointSlice("svc1", "ns1", 1, 2, 1, 999, []string{"host1", "host2"}, []*int32{utilpointer.Int32Ptr(80), utilpointer.Int32Ptr(443)}), + generateEndpointSlice("svc1", "ns1", 1, 2, 1, 999, []string{"host1", "host2"}, []*int32{pointer.Int32(80), pointer.Int32(443)}), }, endpointChangeTracker: NewEndpointChangeTracker("host1", nil, v1.IPv4Protocol, nil, nil), namespacedName: types.NamespacedName{Name: "svc1", Namespace: "ns1"}, - paramEndpointSlice: generateEndpointSlice("svc1", "ns1", 1, 2, 999, 999, []string{"host1"}, []*int32{utilpointer.Int32Ptr(80), utilpointer.Int32Ptr(443)}), + paramEndpointSlice: generateEndpointSlice("svc1", "ns1", 1, 2, 999, 999, []string{"host1"}, []*int32{pointer.Int32(80), pointer.Int32(443)}), paramRemoveSlice: false, expectedReturnVal: true, expectedCurrentChange: map[ServicePortName][]*BaseEndpointInfo{ @@ -1717,12 +1717,12 @@ func TestEndpointSliceUpdate(t *testing.T) { // start with some endpoints ready, transition to more endpoints ready "transition some endpoints to ready state": { startingSlices: []*discovery.EndpointSlice{ - generateEndpointSlice("svc1", "ns1", 1, 3, 2, 999, []string{"host1"}, []*int32{utilpointer.Int32Ptr(80), utilpointer.Int32Ptr(443)}), - generateEndpointSlice("svc1", "ns1", 2, 2, 2, 999, []string{"host1"}, []*int32{utilpointer.Int32Ptr(80), utilpointer.Int32Ptr(443)}), + generateEndpointSlice("svc1", "ns1", 1, 3, 2, 999, []string{"host1"}, []*int32{pointer.Int32(80), pointer.Int32(443)}), + generateEndpointSlice("svc1", "ns1", 2, 2, 2, 999, []string{"host1"}, []*int32{pointer.Int32(80), pointer.Int32(443)}), }, endpointChangeTracker: NewEndpointChangeTracker("host1", nil, v1.IPv4Protocol, nil, nil), namespacedName: types.NamespacedName{Name: "svc1", Namespace: "ns1"}, - paramEndpointSlice: generateEndpointSlice("svc1", "ns1", 1, 3, 3, 999, []string{"host1"}, []*int32{utilpointer.Int32Ptr(80), utilpointer.Int32Ptr(443)}), + paramEndpointSlice: generateEndpointSlice("svc1", "ns1", 1, 3, 3, 999, []string{"host1"}, []*int32{pointer.Int32(80), pointer.Int32(443)}), paramRemoveSlice: false, expectedReturnVal: true, expectedCurrentChange: map[ServicePortName][]*BaseEndpointInfo{ @@ -1745,12 +1745,12 @@ func TestEndpointSliceUpdate(t *testing.T) { // start with some endpoints ready, transition to some terminating "transition some endpoints to terminating state": { startingSlices: []*discovery.EndpointSlice{ - generateEndpointSlice("svc1", "ns1", 1, 3, 2, 2, []string{"host1"}, []*int32{utilpointer.Int32Ptr(80), utilpointer.Int32Ptr(443)}), - generateEndpointSlice("svc1", "ns1", 2, 2, 2, 2, []string{"host1"}, []*int32{utilpointer.Int32Ptr(80), utilpointer.Int32Ptr(443)}), + generateEndpointSlice("svc1", "ns1", 1, 3, 2, 2, []string{"host1"}, []*int32{pointer.Int32(80), pointer.Int32(443)}), + generateEndpointSlice("svc1", "ns1", 2, 2, 2, 2, []string{"host1"}, []*int32{pointer.Int32(80), pointer.Int32(443)}), }, endpointChangeTracker: NewEndpointChangeTracker("host1", nil, v1.IPv4Protocol, nil, nil), namespacedName: types.NamespacedName{Name: "svc1", Namespace: "ns1"}, - paramEndpointSlice: generateEndpointSlice("svc1", "ns1", 1, 3, 3, 2, []string{"host1"}, []*int32{utilpointer.Int32Ptr(80), utilpointer.Int32Ptr(443)}), + paramEndpointSlice: generateEndpointSlice("svc1", "ns1", 1, 3, 3, 2, []string{"host1"}, []*int32{pointer.Int32(80), pointer.Int32(443)}), paramRemoveSlice: false, expectedReturnVal: true, expectedCurrentChange: map[ServicePortName][]*BaseEndpointInfo{ @@ -1825,7 +1825,7 @@ func TestCheckoutChanges(t *testing.T) { }}, appliedSlices: []*discovery.EndpointSlice{}, pendingSlices: []*discovery.EndpointSlice{ - generateEndpointSlice("svc1", "ns1", 1, 3, 3, 2, []string{"host1"}, []*int32{utilpointer.Int32Ptr(80)}), + generateEndpointSlice("svc1", "ns1", 1, 3, 3, 2, []string{"host1"}, []*int32{pointer.Int32(80)}), }, }, "removing port in update": { @@ -1840,10 +1840,10 @@ func TestCheckoutChanges(t *testing.T) { }, }}, appliedSlices: []*discovery.EndpointSlice{ - generateEndpointSlice("svc1", "ns1", 1, 3, 3, 999, []string{"host1"}, []*int32{utilpointer.Int32Ptr(80), utilpointer.Int32Ptr(443)}), + generateEndpointSlice("svc1", "ns1", 1, 3, 3, 999, []string{"host1"}, []*int32{pointer.Int32(80), pointer.Int32(443)}), }, pendingSlices: []*discovery.EndpointSlice{ - generateEndpointSlice("svc1", "ns1", 1, 3, 3, 999, []string{"host1"}, []*int32{utilpointer.Int32Ptr(80)}), + generateEndpointSlice("svc1", "ns1", 1, 3, 3, 999, []string{"host1"}, []*int32{pointer.Int32(80)}), }, }, } diff --git a/pkg/proxy/endpointslicecache_test.go b/pkg/proxy/endpointslicecache_test.go index dd1e639dd7a..414d2ef60b8 100644 --- a/pkg/proxy/endpointslicecache_test.go +++ b/pkg/proxy/endpointslicecache_test.go @@ -26,7 +26,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" - utilpointer "k8s.io/utils/pointer" + "k8s.io/utils/pointer" ) func TestEndpointsMapFromESC(t *testing.T) { @@ -40,7 +40,7 @@ func TestEndpointsMapFromESC(t *testing.T) { namespacedName: types.NamespacedName{Name: "svc1", Namespace: "ns1"}, hostname: "host1", endpointSlices: []*discovery.EndpointSlice{ - generateEndpointSlice("svc1", "ns1", 1, 3, 999, 999, []string{"host1", "host2"}, []*int32{utilpointer.Int32Ptr(80), utilpointer.Int32Ptr(443)}), + generateEndpointSlice("svc1", "ns1", 1, 3, 999, 999, []string{"host1", "host2"}, []*int32{pointer.Int32(80), pointer.Int32(443)}), }, expectedMap: map[ServicePortName][]*BaseEndpointInfo{ makeServicePortName("ns1", "svc1", "port-0", v1.ProtocolTCP): { @@ -58,8 +58,8 @@ func TestEndpointsMapFromESC(t *testing.T) { "2 slices, same port": { namespacedName: types.NamespacedName{Name: "svc1", Namespace: "ns1"}, endpointSlices: []*discovery.EndpointSlice{ - generateEndpointSlice("svc1", "ns1", 1, 3, 999, 999, []string{}, []*int32{utilpointer.Int32Ptr(80)}), - generateEndpointSlice("svc1", "ns1", 2, 3, 999, 999, []string{}, []*int32{utilpointer.Int32Ptr(80)}), + generateEndpointSlice("svc1", "ns1", 1, 3, 999, 999, []string{}, []*int32{pointer.Int32(80)}), + generateEndpointSlice("svc1", "ns1", 2, 3, 999, 999, []string{}, []*int32{pointer.Int32(80)}), }, expectedMap: map[ServicePortName][]*BaseEndpointInfo{ makeServicePortName("ns1", "svc1", "port-0", v1.ProtocolTCP): { @@ -77,8 +77,8 @@ func TestEndpointsMapFromESC(t *testing.T) { "2 overlapping slices, same port": { namespacedName: types.NamespacedName{Name: "svc1", Namespace: "ns1"}, endpointSlices: []*discovery.EndpointSlice{ - generateEndpointSlice("svc1", "ns1", 1, 3, 999, 999, []string{}, []*int32{utilpointer.Int32Ptr(80)}), - generateEndpointSlice("svc1", "ns1", 1, 4, 999, 999, []string{}, []*int32{utilpointer.Int32Ptr(80)}), + generateEndpointSlice("svc1", "ns1", 1, 3, 999, 999, []string{}, []*int32{pointer.Int32(80)}), + generateEndpointSlice("svc1", "ns1", 1, 4, 999, 999, []string{}, []*int32{pointer.Int32(80)}), }, expectedMap: map[ServicePortName][]*BaseEndpointInfo{ makeServicePortName("ns1", "svc1", "port-0", v1.ProtocolTCP): { @@ -96,8 +96,8 @@ func TestEndpointsMapFromESC(t *testing.T) { "2 slices, overlapping endpoints, some endpoints unready in 1 or both": { namespacedName: types.NamespacedName{Name: "svc1", Namespace: "ns1"}, endpointSlices: []*discovery.EndpointSlice{ - generateEndpointSlice("svc1", "ns1", 1, 10, 3, 999, []string{}, []*int32{utilpointer.Int32Ptr(80)}), - generateEndpointSlice("svc1", "ns1", 1, 10, 6, 999, []string{}, []*int32{utilpointer.Int32Ptr(80)}), + generateEndpointSlice("svc1", "ns1", 1, 10, 3, 999, []string{}, []*int32{pointer.Int32(80)}), + generateEndpointSlice("svc1", "ns1", 1, 10, 6, 999, []string{}, []*int32{pointer.Int32(80)}), }, expectedMap: map[ServicePortName][]*BaseEndpointInfo{ makeServicePortName("ns1", "svc1", "port-0", v1.ProtocolTCP): { @@ -118,8 +118,8 @@ func TestEndpointsMapFromESC(t *testing.T) { "2 slices, overlapping endpoints, some endpoints unready and some endpoints terminating": { namespacedName: types.NamespacedName{Name: "svc1", Namespace: "ns1"}, endpointSlices: []*discovery.EndpointSlice{ - generateEndpointSlice("svc1", "ns1", 1, 10, 3, 5, []string{}, []*int32{utilpointer.Int32Ptr(80)}), - generateEndpointSlice("svc1", "ns1", 1, 10, 6, 5, []string{}, []*int32{utilpointer.Int32Ptr(80)}), + generateEndpointSlice("svc1", "ns1", 1, 10, 3, 5, []string{}, []*int32{pointer.Int32(80)}), + generateEndpointSlice("svc1", "ns1", 1, 10, 6, 5, []string{}, []*int32{pointer.Int32(80)}), }, expectedMap: map[ServicePortName][]*BaseEndpointInfo{ makeServicePortName("ns1", "svc1", "port-0", v1.ProtocolTCP): { @@ -139,8 +139,8 @@ func TestEndpointsMapFromESC(t *testing.T) { "2 slices, overlapping endpoints, all unready": { namespacedName: types.NamespacedName{Name: "svc1", Namespace: "ns1"}, endpointSlices: []*discovery.EndpointSlice{ - generateEndpointSlice("svc1", "ns1", 1, 10, 1, 999, []string{}, []*int32{utilpointer.Int32Ptr(80)}), - generateEndpointSlice("svc1", "ns1", 1, 10, 1, 999, []string{}, []*int32{utilpointer.Int32Ptr(80)}), + generateEndpointSlice("svc1", "ns1", 1, 10, 1, 999, []string{}, []*int32{pointer.Int32(80)}), + generateEndpointSlice("svc1", "ns1", 1, 10, 1, 999, []string{}, []*int32{pointer.Int32(80)}), }, expectedMap: map[ServicePortName][]*BaseEndpointInfo{ makeServicePortName("ns1", "svc1", "port-0", v1.ProtocolTCP): { @@ -160,9 +160,9 @@ func TestEndpointsMapFromESC(t *testing.T) { "3 slices with different services and namespaces": { namespacedName: types.NamespacedName{Name: "svc1", Namespace: "ns1"}, endpointSlices: []*discovery.EndpointSlice{ - generateEndpointSlice("svc1", "ns1", 1, 3, 999, 999, []string{}, []*int32{utilpointer.Int32Ptr(80)}), - generateEndpointSlice("svc2", "ns1", 2, 3, 999, 999, []string{}, []*int32{utilpointer.Int32Ptr(80)}), - generateEndpointSlice("svc1", "ns2", 3, 3, 999, 999, []string{}, []*int32{utilpointer.Int32Ptr(80)}), + generateEndpointSlice("svc1", "ns1", 1, 3, 999, 999, []string{}, []*int32{pointer.Int32(80)}), + generateEndpointSlice("svc2", "ns1", 2, 3, 999, 999, []string{}, []*int32{pointer.Int32(80)}), + generateEndpointSlice("svc1", "ns2", 3, 3, 999, 999, []string{}, []*int32{pointer.Int32(80)}), }, expectedMap: map[ServicePortName][]*BaseEndpointInfo{ makeServicePortName("ns1", "svc1", "port-0", v1.ProtocolTCP): { @@ -188,8 +188,8 @@ func TestEndpointsMapFromESC(t *testing.T) { namespacedName: types.NamespacedName{Name: "svc1", Namespace: "ns1"}, hostname: "host1", endpointSlices: []*discovery.EndpointSlice{ - generateEndpointSliceWithOffset("svc1", "ns1", 1, 1, 2, 999, 999, []string{"host1", "host2"}, []*int32{utilpointer.Int32Ptr(80)}), - generateEndpointSliceWithOffset("svc1", "ns1", 2, 1, 2, 999, 999, []string{"host1", "host2"}, []*int32{utilpointer.Int32Ptr(8080)}), + generateEndpointSliceWithOffset("svc1", "ns1", 1, 1, 2, 999, 999, []string{"host1", "host2"}, []*int32{pointer.Int32(80)}), + generateEndpointSliceWithOffset("svc1", "ns1", 2, 1, 2, 999, 999, []string{"host1", "host2"}, []*int32{pointer.Int32(8080)}), }, expectedMap: map[ServicePortName][]*BaseEndpointInfo{ makeServicePortName("ns1", "svc1", "port-0", v1.ProtocolTCP): { @@ -228,7 +228,7 @@ func TestEndpointInfoByServicePort(t *testing.T) { namespacedName: types.NamespacedName{Name: "svc1", Namespace: "ns1"}, hostname: "host1", endpointSlices: []*discovery.EndpointSlice{ - generateEndpointSlice("svc1", "ns1", 1, 3, 999, 999, []string{"host1", "host2"}, []*int32{utilpointer.Int32Ptr(80)}), + generateEndpointSlice("svc1", "ns1", 1, 3, 999, 999, []string{"host1", "host2"}, []*int32{pointer.Int32(80)}), }, expectedMap: spToEndpointMap{ makeServicePortName("ns1", "svc1", "port-0", v1.ProtocolTCP): { @@ -263,8 +263,8 @@ func TestEndpointInfoByServicePort(t *testing.T) { namespacedName: types.NamespacedName{Name: "svc1", Namespace: "ns1"}, hostname: "host1", endpointSlices: []*discovery.EndpointSlice{ - generateEndpointSliceWithOffset("svc1", "ns1", 1, 1, 2, 999, 999, []string{"host1", "host2"}, []*int32{utilpointer.Int32Ptr(80)}), - generateEndpointSliceWithOffset("svc1", "ns1", 2, 1, 2, 999, 999, []string{"host1", "host2"}, []*int32{utilpointer.Int32Ptr(8080)}), + generateEndpointSliceWithOffset("svc1", "ns1", 1, 1, 2, 999, 999, []string{"host1", "host2"}, []*int32{pointer.Int32(80)}), + generateEndpointSliceWithOffset("svc1", "ns1", 2, 1, 2, 999, 999, []string{"host1", "host2"}, []*int32{pointer.Int32(8080)}), }, expectedMap: spToEndpointMap{ makeServicePortName("ns1", "svc1", "port-0", v1.ProtocolTCP): { @@ -325,8 +325,8 @@ func TestEsInfoChanged(t *testing.T) { p80 := int32(80) p443 := int32(443) tcpProto := v1.ProtocolTCP - port80 := discovery.EndpointPort{Port: &p80, Name: utilpointer.StringPtr("http"), Protocol: &tcpProto} - port443 := discovery.EndpointPort{Port: &p443, Name: utilpointer.StringPtr("https"), Protocol: &tcpProto} + port80 := discovery.EndpointPort{Port: &p80, Name: pointer.String("http"), Protocol: &tcpProto} + port443 := discovery.EndpointPort{Port: &p443, Name: pointer.String("https"), Protocol: &tcpProto} endpoint1 := discovery.Endpoint{Addresses: []string{"10.0.1.0"}} endpoint2 := discovery.Endpoint{Addresses: []string{"10.0.1.1"}} @@ -476,7 +476,7 @@ func generateEndpointSliceWithOffset(serviceName, namespace string, sliceNum, of for i, portNum := range portNums { endpointSlice.Ports = append(endpointSlice.Ports, discovery.EndpointPort{ - Name: utilpointer.StringPtr(fmt.Sprintf("port-%d", i)), + Name: pointer.String(fmt.Sprintf("port-%d", i)), Port: portNum, Protocol: &tcpProtocol, }) @@ -486,9 +486,9 @@ func generateEndpointSliceWithOffset(serviceName, namespace string, sliceNum, of readyCondition := i%unreadyMod != 0 terminatingCondition := i%terminatingMod == 0 - ready := utilpointer.BoolPtr(readyCondition && !terminatingCondition) - serving := utilpointer.BoolPtr(readyCondition) - terminating := utilpointer.BoolPtr(terminatingCondition) + ready := pointer.Bool(readyCondition && !terminatingCondition) + serving := pointer.Bool(readyCondition) + terminating := pointer.Bool(terminatingCondition) endpoint := discovery.Endpoint{ Addresses: []string{fmt.Sprintf("10.0.%d.%d", offset, i)}, diff --git a/pkg/proxy/iptables/number_generated_rules_test.go b/pkg/proxy/iptables/number_generated_rules_test.go index 28a362bf11a..bf2b259fe19 100644 --- a/pkg/proxy/iptables/number_generated_rules_test.go +++ b/pkg/proxy/iptables/number_generated_rules_test.go @@ -27,7 +27,7 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" iptablestest "k8s.io/kubernetes/pkg/util/iptables/testing" netutils "k8s.io/utils/net" - utilpointer "k8s.io/utils/pointer" + "k8s.io/utils/pointer" ) // kube-proxy generates iptables rules to forward traffic from Services to Endpoints @@ -371,8 +371,8 @@ func generateServiceEndpoints(nServices, nEndpoints int, epsFunc func(eps *disco AddressType: discovery.AddressTypeIPv4, Endpoints: []discovery.Endpoint{}, Ports: []discovery.EndpointPort{{ - Name: utilpointer.StringPtr(fmt.Sprintf("%d", epPort)), - Port: utilpointer.Int32(int32(epPort)), + Name: pointer.String(fmt.Sprintf("%d", epPort)), + Port: pointer.Int32(int32(epPort)), Protocol: &tcpProtocol, }}, } diff --git a/pkg/proxy/iptables/proxier_test.go b/pkg/proxy/iptables/proxier_test.go index 73aae014a06..4f2a194ae23 100644 --- a/pkg/proxy/iptables/proxier_test.go +++ b/pkg/proxy/iptables/proxier_test.go @@ -57,7 +57,7 @@ import ( "k8s.io/utils/exec" fakeexec "k8s.io/utils/exec/testing" netutils "k8s.io/utils/net" - utilpointer "k8s.io/utils/pointer" + "k8s.io/utils/pointer" ) func TestDeleteEndpointConnectionsIPv4(t *testing.T) { @@ -1885,8 +1885,8 @@ func TestOverallIPTablesRulesWithMultipleServices(t *testing.T) { Addresses: []string{"10.180.0.1"}, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.StringPtr("p80"), - Port: utilpointer.Int32(80), + Name: pointer.String("p80"), + Port: pointer.Int32(80), Protocol: &tcpProtocol, }} }), @@ -1898,8 +1898,8 @@ func TestOverallIPTablesRulesWithMultipleServices(t *testing.T) { Addresses: []string{"10.180.0.2"}, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.StringPtr("p80"), - Port: utilpointer.Int32(80), + Name: pointer.String("p80"), + Port: pointer.Int32(80), Protocol: &tcpProtocol, }} }), @@ -1910,8 +1910,8 @@ func TestOverallIPTablesRulesWithMultipleServices(t *testing.T) { Addresses: []string{"10.180.0.3"}, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.StringPtr("p80"), - Port: utilpointer.Int32(80), + Name: pointer.String("p80"), + Port: pointer.Int32(80), Protocol: &tcpProtocol, }} }), @@ -1922,11 +1922,11 @@ func TestOverallIPTablesRulesWithMultipleServices(t *testing.T) { Addresses: []string{"10.180.0.4"}, }, { Addresses: []string{"10.180.0.5"}, - NodeName: utilpointer.StringPtr(testHostname), + NodeName: pointer.String(testHostname), }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.StringPtr("p80"), - Port: utilpointer.Int32(80), + Name: pointer.String("p80"), + Port: pointer.Int32(80), Protocol: &tcpProtocol, }} }), @@ -1937,8 +1937,8 @@ func TestOverallIPTablesRulesWithMultipleServices(t *testing.T) { Addresses: []string{"10.180.0.3"}, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.StringPtr("p80"), - Port: utilpointer.Int32(80), + Name: pointer.String("p80"), + Port: pointer.Int32(80), Protocol: &tcpProtocol, }} }), @@ -2143,8 +2143,8 @@ func TestClusterIPEndpointsJump(t *testing.T) { Addresses: []string{epIP}, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.StringPtr(svcPortName.Port), - Port: utilpointer.Int32(int32(svcPort)), + Name: pointer.String(svcPortName.Port), + Port: pointer.Int32(int32(svcPort)), Protocol: &tcpProtocol, }} }), @@ -2250,8 +2250,8 @@ func TestLoadBalancer(t *testing.T) { Addresses: []string{epIP}, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.StringPtr(svcPortName.Port), - Port: utilpointer.Int32(int32(svcPort)), + Name: pointer.String(svcPortName.Port), + Port: pointer.Int32(int32(svcPort)), Protocol: &tcpProtocol, }} }), @@ -2448,8 +2448,8 @@ func TestNodePort(t *testing.T) { Addresses: []string{epIP}, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.StringPtr(svcPortName.Port), - Port: utilpointer.Int32(int32(svcPort)), + Name: pointer.String(svcPortName.Port), + Port: pointer.Int32(int32(svcPort)), Protocol: &tcpProtocol, }} }), @@ -2759,11 +2759,11 @@ func TestOnlyLocalExternalIPs(t *testing.T) { Addresses: []string{epIP1}, }, { Addresses: []string{epIP2}, - NodeName: utilpointer.StringPtr(testHostname), + NodeName: pointer.String(testHostname), }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.StringPtr(svcPortName.Port), - Port: utilpointer.Int32(int32(svcPort)), + Name: pointer.String(svcPortName.Port), + Port: pointer.Int32(int32(svcPort)), Protocol: &tcpProtocol, }} }), @@ -2871,11 +2871,11 @@ func TestNonLocalExternalIPs(t *testing.T) { NodeName: nil, }, { Addresses: []string{epIP2}, - NodeName: utilpointer.StringPtr(testHostname), + NodeName: pointer.String(testHostname), }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.StringPtr(svcPortName.Port), - Port: utilpointer.Int32(int32(svcPort)), + Name: pointer.String(svcPortName.Port), + Port: pointer.Int32(int32(svcPort)), Protocol: &tcpProtocol, }} }), @@ -3160,11 +3160,11 @@ func TestOnlyLocalLoadBalancing(t *testing.T) { Addresses: []string{epIP1}, }, { Addresses: []string{epIP2}, - NodeName: utilpointer.StringPtr(testHostname), + NodeName: pointer.String(testHostname), }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.StringPtr(svcPortName.Port), - Port: utilpointer.Int32(int32(svcPort)), + Name: pointer.String(svcPortName.Port), + Port: pointer.Int32(int32(svcPort)), Protocol: &tcpProtocol, }} }), @@ -3383,11 +3383,11 @@ func onlyLocalNodePorts(t *testing.T, fp *Proxier, ipt *iptablestest.FakeIPTable NodeName: nil, }, { Addresses: []string{epIP2}, - NodeName: utilpointer.StringPtr(testHostname), + NodeName: pointer.String(testHostname), }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.StringPtr(svcPortName.Port), - Port: utilpointer.Int32(int32(svcPort)), + Name: pointer.String(svcPortName.Port), + Port: pointer.Int32(int32(svcPort)), Protocol: &tcpProtocol, }} }), @@ -3829,8 +3829,8 @@ func TestUpdateEndpointsMap(t *testing.T) { Addresses: []string{"10.1.1.1"}, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.String("p11"), - Port: utilpointer.Int32(11), + Name: pointer.String("p11"), + Port: pointer.Int32(11), Protocol: &udpProtocol, }} } @@ -3840,8 +3840,8 @@ func TestUpdateEndpointsMap(t *testing.T) { Addresses: []string{"10.1.1.2"}, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.String("p12"), - Port: utilpointer.Int32(12), + Name: pointer.String("p12"), + Port: pointer.Int32(12), Protocol: &udpProtocol, }} } @@ -3854,8 +3854,8 @@ func TestUpdateEndpointsMap(t *testing.T) { NodeName: &nodeName, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.String("p11"), - Port: utilpointer.Int32(11), + Name: pointer.String("p11"), + Port: pointer.Int32(11), Protocol: &udpProtocol, }} }), @@ -3871,8 +3871,8 @@ func TestUpdateEndpointsMap(t *testing.T) { Addresses: []string{"10.1.1.1"}, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.String("p11-2"), - Port: utilpointer.Int32(11), + Name: pointer.String("p11-2"), + Port: pointer.Int32(11), Protocol: &udpProtocol, }} }), @@ -3885,8 +3885,8 @@ func TestUpdateEndpointsMap(t *testing.T) { Addresses: []string{"10.1.1.1"}, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.String("p11"), - Port: utilpointer.Int32(22), + Name: pointer.String("p11"), + Port: pointer.Int32(22), Protocol: &udpProtocol, }} }), @@ -3902,12 +3902,12 @@ func TestUpdateEndpointsMap(t *testing.T) { NodeName: &nodeName, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.String("p11"), - Port: utilpointer.Int32(11), + Name: pointer.String("p11"), + Port: pointer.Int32(11), Protocol: &udpProtocol, }, { - Name: utilpointer.String("p12"), - Port: utilpointer.Int32(12), + Name: pointer.String("p12"), + Port: pointer.Int32(12), Protocol: &udpProtocol, }} }), @@ -3923,8 +3923,8 @@ func TestUpdateEndpointsMap(t *testing.T) { NodeName: &nodeName, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.String("p12"), - Port: utilpointer.Int32(12), + Name: pointer.String("p12"), + Port: pointer.Int32(12), Protocol: &udpProtocol, }} } @@ -3939,12 +3939,12 @@ func TestUpdateEndpointsMap(t *testing.T) { NodeName: &nodeName, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.String("p11"), - Port: utilpointer.Int32(11), + Name: pointer.String("p11"), + Port: pointer.Int32(11), Protocol: &udpProtocol, }, { - Name: utilpointer.String("p12"), - Port: utilpointer.Int32(12), + Name: pointer.String("p12"), + Port: pointer.Int32(12), Protocol: &udpProtocol, }} } @@ -3954,8 +3954,8 @@ func TestUpdateEndpointsMap(t *testing.T) { Addresses: []string{"10.1.1.3"}, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.String("p13"), - Port: utilpointer.Int32(13), + Name: pointer.String("p13"), + Port: pointer.Int32(13), Protocol: &udpProtocol, }} } @@ -3972,12 +3972,12 @@ func TestUpdateEndpointsMap(t *testing.T) { NodeName: &nodeName, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.String("p11"), - Port: utilpointer.Int32(11), + Name: pointer.String("p11"), + Port: pointer.Int32(11), Protocol: &udpProtocol, }, { - Name: utilpointer.String("p12"), - Port: utilpointer.Int32(12), + Name: pointer.String("p12"), + Port: pointer.Int32(12), Protocol: &udpProtocol, }} } @@ -3990,12 +3990,12 @@ func TestUpdateEndpointsMap(t *testing.T) { NodeName: &nodeName, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.String("p13"), - Port: utilpointer.Int32(13), + Name: pointer.String("p13"), + Port: pointer.Int32(13), Protocol: &udpProtocol, }, { - Name: utilpointer.String("p14"), - Port: utilpointer.Int32(14), + Name: pointer.String("p14"), + Port: pointer.Int32(14), Protocol: &udpProtocol, }} } @@ -4008,12 +4008,12 @@ func TestUpdateEndpointsMap(t *testing.T) { NodeName: &nodeName, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.String("p21"), - Port: utilpointer.Int32(21), + Name: pointer.String("p21"), + Port: pointer.Int32(21), Protocol: &udpProtocol, }, { - Name: utilpointer.String("p22"), - Port: utilpointer.Int32(22), + Name: pointer.String("p22"), + Port: pointer.Int32(22), Protocol: &udpProtocol, }} } @@ -4032,8 +4032,8 @@ func TestUpdateEndpointsMap(t *testing.T) { NodeName: &nodeName, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.String("p22"), - Port: utilpointer.Int32(22), + Name: pointer.String("p22"), + Port: pointer.Int32(22), Protocol: &udpProtocol, }} } @@ -4044,8 +4044,8 @@ func TestUpdateEndpointsMap(t *testing.T) { NodeName: &nodeName, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.String("p23"), - Port: utilpointer.Int32(23), + Name: pointer.String("p23"), + Port: pointer.Int32(23), Protocol: &udpProtocol, }} } @@ -4059,8 +4059,8 @@ func TestUpdateEndpointsMap(t *testing.T) { NodeName: &nodeName, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.String("p44"), - Port: utilpointer.Int32(44), + Name: pointer.String("p44"), + Port: pointer.Int32(44), Protocol: &udpProtocol, }} } @@ -4071,8 +4071,8 @@ func TestUpdateEndpointsMap(t *testing.T) { NodeName: &nodeName, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.String("p45"), - Port: utilpointer.Int32(45), + Name: pointer.String("p45"), + Port: pointer.Int32(45), Protocol: &udpProtocol, }} } @@ -4084,8 +4084,8 @@ func TestUpdateEndpointsMap(t *testing.T) { Addresses: []string{"10.1.1.11"}, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.String("p11"), - Port: utilpointer.Int32(11), + Name: pointer.String("p11"), + Port: pointer.Int32(11), Protocol: &udpProtocol, }} } @@ -4095,12 +4095,12 @@ func TestUpdateEndpointsMap(t *testing.T) { Addresses: []string{"10.1.1.2"}, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.String("p12"), - Port: utilpointer.Int32(12), + Name: pointer.String("p12"), + Port: pointer.Int32(12), Protocol: &udpProtocol, }, { - Name: utilpointer.String("p122"), - Port: utilpointer.Int32(122), + Name: pointer.String("p122"), + Port: pointer.Int32(122), Protocol: &udpProtocol, }} } @@ -4110,8 +4110,8 @@ func TestUpdateEndpointsMap(t *testing.T) { Addresses: []string{"10.3.3.3"}, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.String("p33"), - Port: utilpointer.Int32(33), + Name: pointer.String("p33"), + Port: pointer.Int32(33), Protocol: &udpProtocol, }} } @@ -4122,8 +4122,8 @@ func TestUpdateEndpointsMap(t *testing.T) { NodeName: &nodeName, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.String("p44"), - Port: utilpointer.Int32(44), + Name: pointer.String("p44"), + Port: pointer.Int32(44), Protocol: &udpProtocol, }} } @@ -4716,27 +4716,27 @@ func TestEndpointSliceE2E(t *testing.T) { Labels: map[string]string{discovery.LabelServiceName: serviceName}, }, Ports: []discovery.EndpointPort{{ - Name: utilpointer.StringPtr(""), - Port: utilpointer.Int32Ptr(80), + Name: pointer.String(""), + Port: pointer.Int32(80), Protocol: &tcpProtocol, }}, AddressType: discovery.AddressTypeIPv4, Endpoints: []discovery.Endpoint{{ Addresses: []string{"10.0.1.1"}, - Conditions: discovery.EndpointConditions{Ready: utilpointer.BoolPtr(true)}, - NodeName: utilpointer.StringPtr(testHostname), + Conditions: discovery.EndpointConditions{Ready: pointer.Bool(true)}, + NodeName: pointer.String(testHostname), }, { Addresses: []string{"10.0.1.2"}, - Conditions: discovery.EndpointConditions{Ready: utilpointer.BoolPtr(true)}, - NodeName: utilpointer.StringPtr("node2"), + Conditions: discovery.EndpointConditions{Ready: pointer.Bool(true)}, + NodeName: pointer.String("node2"), }, { Addresses: []string{"10.0.1.3"}, - Conditions: discovery.EndpointConditions{Ready: utilpointer.BoolPtr(true)}, - NodeName: utilpointer.StringPtr("node3"), + Conditions: discovery.EndpointConditions{Ready: pointer.Bool(true)}, + NodeName: pointer.String("node3"), }, { Addresses: []string{"10.0.1.4"}, - Conditions: discovery.EndpointConditions{Ready: utilpointer.BoolPtr(false)}, - NodeName: utilpointer.StringPtr("node4"), + Conditions: discovery.EndpointConditions{Ready: pointer.Bool(false)}, + NodeName: pointer.String("node4"), }}, } @@ -4776,27 +4776,27 @@ func TestHealthCheckNodePortWhenTerminating(t *testing.T) { Labels: map[string]string{discovery.LabelServiceName: serviceName}, }, Ports: []discovery.EndpointPort{{ - Name: utilpointer.StringPtr(""), - Port: utilpointer.Int32Ptr(80), + Name: pointer.String(""), + Port: pointer.Int32(80), Protocol: &tcpProtocol, }}, AddressType: discovery.AddressTypeIPv4, Endpoints: []discovery.Endpoint{{ Addresses: []string{"10.0.1.1"}, - Conditions: discovery.EndpointConditions{Ready: utilpointer.BoolPtr(true)}, - NodeName: utilpointer.StringPtr(testHostname), + Conditions: discovery.EndpointConditions{Ready: pointer.Bool(true)}, + NodeName: pointer.String(testHostname), }, { Addresses: []string{"10.0.1.2"}, - Conditions: discovery.EndpointConditions{Ready: utilpointer.BoolPtr(true)}, - NodeName: utilpointer.StringPtr(testHostname), + Conditions: discovery.EndpointConditions{Ready: pointer.Bool(true)}, + NodeName: pointer.String(testHostname), }, { Addresses: []string{"10.0.1.3"}, - Conditions: discovery.EndpointConditions{Ready: utilpointer.BoolPtr(true)}, - NodeName: utilpointer.StringPtr(testHostname), + Conditions: discovery.EndpointConditions{Ready: pointer.Bool(true)}, + NodeName: pointer.String(testHostname), }, { // not ready endpoints should be ignored Addresses: []string{"10.0.1.4"}, - Conditions: discovery.EndpointConditions{Ready: utilpointer.BoolPtr(false)}, - NodeName: utilpointer.StringPtr(testHostname), + Conditions: discovery.EndpointConditions{Ready: pointer.Bool(false)}, + NodeName: pointer.String(testHostname), }}, } @@ -4814,43 +4814,43 @@ func TestHealthCheckNodePortWhenTerminating(t *testing.T) { Labels: map[string]string{discovery.LabelServiceName: serviceName}, }, Ports: []discovery.EndpointPort{{ - Name: utilpointer.StringPtr(""), - Port: utilpointer.Int32Ptr(80), + Name: pointer.String(""), + Port: pointer.Int32(80), Protocol: &tcpProtocol, }}, AddressType: discovery.AddressTypeIPv4, Endpoints: []discovery.Endpoint{{ Addresses: []string{"10.0.1.1"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(false), - Serving: utilpointer.BoolPtr(true), - Terminating: utilpointer.BoolPtr(false), + Ready: pointer.Bool(false), + Serving: pointer.Bool(true), + Terminating: pointer.Bool(false), }, - NodeName: utilpointer.StringPtr(testHostname), + NodeName: pointer.String(testHostname), }, { Addresses: []string{"10.0.1.2"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(false), - Serving: utilpointer.BoolPtr(true), - Terminating: utilpointer.BoolPtr(true), + Ready: pointer.Bool(false), + Serving: pointer.Bool(true), + Terminating: pointer.Bool(true), }, - NodeName: utilpointer.StringPtr(testHostname), + NodeName: pointer.String(testHostname), }, { Addresses: []string{"10.0.1.3"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(false), - Serving: utilpointer.BoolPtr(true), - Terminating: utilpointer.BoolPtr(true), + Ready: pointer.Bool(false), + Serving: pointer.Bool(true), + Terminating: pointer.Bool(true), }, - NodeName: utilpointer.StringPtr(testHostname), + NodeName: pointer.String(testHostname), }, { // not ready endpoints should be ignored Addresses: []string{"10.0.1.4"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(false), - Serving: utilpointer.BoolPtr(false), - Terminating: utilpointer.BoolPtr(true), + Ready: pointer.Bool(false), + Serving: pointer.Bool(false), + Terminating: pointer.Bool(true), }, - NodeName: utilpointer.StringPtr(testHostname), + NodeName: pointer.String(testHostname), }}, } @@ -4930,12 +4930,12 @@ func TestProxierDeleteNodePortStaleUDP(t *testing.T) { eps.Endpoints = []discovery.Endpoint{{ Addresses: []string{epIP}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.Bool(false), + Ready: pointer.Bool(false), }, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.StringPtr(svcPortName.Port), - Port: utilpointer.Int32(int32(svcPort)), + Name: pointer.String(svcPortName.Port), + Port: pointer.Int32(int32(svcPort)), Protocol: &udpProtocol, }} }), @@ -4953,12 +4953,12 @@ func TestProxierDeleteNodePortStaleUDP(t *testing.T) { eps.Endpoints = []discovery.Endpoint{{ Addresses: []string{epIP}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.Bool(true), + Ready: pointer.Bool(true), }, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.StringPtr(svcPortName.Port), - Port: utilpointer.Int32(int32(svcPort)), + Name: pointer.String(svcPortName.Port), + Port: pointer.Int32(int32(svcPort)), Protocol: &udpProtocol, }} }), @@ -5056,8 +5056,8 @@ func TestProxierMetricsIptablesTotalRules(t *testing.T) { Addresses: []string{"10.0.0.5"}, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.StringPtr(svcPortName.Port), - Port: utilpointer.Int32(int32(svcPort)), + Name: pointer.String(svcPortName.Port), + Port: pointer.Int32(int32(svcPort)), Protocol: &tcpProtocol, }} }), @@ -5329,8 +5329,8 @@ func TestInternalTrafficPolicyE2E(t *testing.T) { Labels: map[string]string{discovery.LabelServiceName: serviceName}, }, Ports: []discovery.EndpointPort{{ - Name: utilpointer.StringPtr(""), - Port: utilpointer.Int32Ptr(80), + Name: pointer.String(""), + Port: pointer.Int32(80), Protocol: &tcpProtocol, }}, AddressType: discovery.AddressTypeIPv4, @@ -5338,8 +5338,8 @@ func TestInternalTrafficPolicyE2E(t *testing.T) { for _, ep := range tc.endpoints { endpointSlice.Endpoints = append(endpointSlice.Endpoints, discovery.Endpoint{ Addresses: []string{ep.ip}, - Conditions: discovery.EndpointConditions{Ready: utilpointer.BoolPtr(true)}, - NodeName: utilpointer.StringPtr(ep.hostname), + Conditions: discovery.EndpointConditions{Ready: pointer.Bool(true)}, + NodeName: pointer.String(ep.hostname), }) } @@ -5425,8 +5425,8 @@ func TestEndpointSliceWithTerminatingEndpointsTrafficPolicyLocal(t *testing.T) { Labels: map[string]string{discovery.LabelServiceName: "svc1"}, }, Ports: []discovery.EndpointPort{{ - Name: utilpointer.StringPtr(""), - Port: utilpointer.Int32Ptr(80), + Name: pointer.String(""), + Port: pointer.Int32(80), Protocol: &tcpProtocol, }}, AddressType: discovery.AddressTypeIPv4, @@ -5434,50 +5434,50 @@ func TestEndpointSliceWithTerminatingEndpointsTrafficPolicyLocal(t *testing.T) { { Addresses: []string{"10.0.1.1"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(true), - Serving: utilpointer.BoolPtr(true), - Terminating: utilpointer.BoolPtr(false), + Ready: pointer.Bool(true), + Serving: pointer.Bool(true), + Terminating: pointer.Bool(false), }, - NodeName: utilpointer.StringPtr(testHostname), + NodeName: pointer.String(testHostname), }, { Addresses: []string{"10.0.1.2"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(true), - Serving: utilpointer.BoolPtr(true), - Terminating: utilpointer.BoolPtr(false), + Ready: pointer.Bool(true), + Serving: pointer.Bool(true), + Terminating: pointer.Bool(false), }, - NodeName: utilpointer.StringPtr(testHostname), + NodeName: pointer.String(testHostname), }, { // this endpoint should be ignored for external since there are ready non-terminating endpoints Addresses: []string{"10.0.1.3"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(false), - Serving: utilpointer.BoolPtr(true), - Terminating: utilpointer.BoolPtr(true), + Ready: pointer.Bool(false), + Serving: pointer.Bool(true), + Terminating: pointer.Bool(true), }, - NodeName: utilpointer.StringPtr(testHostname), + NodeName: pointer.String(testHostname), }, { // this endpoint should be ignored for external since there are ready non-terminating endpoints Addresses: []string{"10.0.1.4"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(false), - Serving: utilpointer.BoolPtr(false), - Terminating: utilpointer.BoolPtr(true), + Ready: pointer.Bool(false), + Serving: pointer.Bool(false), + Terminating: pointer.Bool(true), }, - NodeName: utilpointer.StringPtr(testHostname), + NodeName: pointer.String(testHostname), }, { // this endpoint should be ignored for external since it's not local Addresses: []string{"10.0.1.5"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(true), - Serving: utilpointer.BoolPtr(true), - Terminating: utilpointer.BoolPtr(false), + Ready: pointer.Bool(true), + Serving: pointer.Bool(true), + Terminating: pointer.Bool(false), }, - NodeName: utilpointer.StringPtr("host-1"), + NodeName: pointer.String("host-1"), }, }, }, @@ -5564,8 +5564,8 @@ func TestEndpointSliceWithTerminatingEndpointsTrafficPolicyLocal(t *testing.T) { Labels: map[string]string{discovery.LabelServiceName: "svc1"}, }, Ports: []discovery.EndpointPort{{ - Name: utilpointer.StringPtr(""), - Port: utilpointer.Int32Ptr(80), + Name: pointer.String(""), + Port: pointer.Int32(80), Protocol: &tcpProtocol, }}, AddressType: discovery.AddressTypeIPv4, @@ -5573,50 +5573,50 @@ func TestEndpointSliceWithTerminatingEndpointsTrafficPolicyLocal(t *testing.T) { { Addresses: []string{"10.0.1.1"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(true), - Serving: utilpointer.BoolPtr(true), - Terminating: utilpointer.BoolPtr(false), + Ready: pointer.Bool(true), + Serving: pointer.Bool(true), + Terminating: pointer.Bool(false), }, - NodeName: utilpointer.StringPtr(testHostname), + NodeName: pointer.String(testHostname), }, { Addresses: []string{"10.0.1.2"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(true), - Serving: utilpointer.BoolPtr(true), - Terminating: utilpointer.BoolPtr(false), + Ready: pointer.Bool(true), + Serving: pointer.Bool(true), + Terminating: pointer.Bool(false), }, - NodeName: utilpointer.StringPtr(testHostname), + NodeName: pointer.String(testHostname), }, { // this endpoint should be ignored since it is not ready and the feature gate is off Addresses: []string{"10.0.1.3"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(false), - Serving: utilpointer.BoolPtr(true), - Terminating: utilpointer.BoolPtr(true), + Ready: pointer.Bool(false), + Serving: pointer.Bool(true), + Terminating: pointer.Bool(true), }, - NodeName: utilpointer.StringPtr(testHostname), + NodeName: pointer.String(testHostname), }, { // this endpoint should be ignored since it is not ready and the feature gate is off Addresses: []string{"10.0.1.4"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(false), - Serving: utilpointer.BoolPtr(false), - Terminating: utilpointer.BoolPtr(true), + Ready: pointer.Bool(false), + Serving: pointer.Bool(false), + Terminating: pointer.Bool(true), }, - NodeName: utilpointer.StringPtr(testHostname), + NodeName: pointer.String(testHostname), }, { // this endpoint should be ignored for external since it's not local Addresses: []string{"10.0.1.5"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(true), - Serving: utilpointer.BoolPtr(true), - Terminating: utilpointer.BoolPtr(false), + Ready: pointer.Bool(true), + Serving: pointer.Bool(true), + Terminating: pointer.Bool(false), }, - NodeName: utilpointer.StringPtr("host-1"), + NodeName: pointer.String("host-1"), }, }, }, @@ -5703,8 +5703,8 @@ func TestEndpointSliceWithTerminatingEndpointsTrafficPolicyLocal(t *testing.T) { Labels: map[string]string{discovery.LabelServiceName: "svc1"}, }, Ports: []discovery.EndpointPort{{ - Name: utilpointer.StringPtr(""), - Port: utilpointer.Int32Ptr(80), + Name: pointer.String(""), + Port: pointer.Int32(80), Protocol: &tcpProtocol, }}, AddressType: discovery.AddressTypeIPv4, @@ -5713,41 +5713,41 @@ func TestEndpointSliceWithTerminatingEndpointsTrafficPolicyLocal(t *testing.T) { // this endpoint should be used since there are only ready terminating endpoints Addresses: []string{"10.0.1.2"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(false), - Serving: utilpointer.BoolPtr(true), - Terminating: utilpointer.BoolPtr(true), + Ready: pointer.Bool(false), + Serving: pointer.Bool(true), + Terminating: pointer.Bool(true), }, - NodeName: utilpointer.StringPtr(testHostname), + NodeName: pointer.String(testHostname), }, { // this endpoint should be used since there are only ready terminating endpoints Addresses: []string{"10.0.1.3"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(false), - Serving: utilpointer.BoolPtr(true), - Terminating: utilpointer.BoolPtr(true), + Ready: pointer.Bool(false), + Serving: pointer.Bool(true), + Terminating: pointer.Bool(true), }, - NodeName: utilpointer.StringPtr(testHostname), + NodeName: pointer.String(testHostname), }, { // this endpoint should not be used since it is both terminating and not ready. Addresses: []string{"10.0.1.4"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(false), - Serving: utilpointer.BoolPtr(false), - Terminating: utilpointer.BoolPtr(true), + Ready: pointer.Bool(false), + Serving: pointer.Bool(false), + Terminating: pointer.Bool(true), }, - NodeName: utilpointer.StringPtr(testHostname), + NodeName: pointer.String(testHostname), }, { // this endpoint should be ignored for external since it's not local Addresses: []string{"10.0.1.5"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(true), - Serving: utilpointer.BoolPtr(true), - Terminating: utilpointer.BoolPtr(false), + Ready: pointer.Bool(true), + Serving: pointer.Bool(true), + Terminating: pointer.Bool(false), }, - NodeName: utilpointer.StringPtr("host-1"), + NodeName: pointer.String("host-1"), }, }, }, @@ -5830,8 +5830,8 @@ func TestEndpointSliceWithTerminatingEndpointsTrafficPolicyLocal(t *testing.T) { Labels: map[string]string{discovery.LabelServiceName: "svc1"}, }, Ports: []discovery.EndpointPort{{ - Name: utilpointer.StringPtr(""), - Port: utilpointer.Int32Ptr(80), + Name: pointer.String(""), + Port: pointer.Int32(80), Protocol: &tcpProtocol, }}, AddressType: discovery.AddressTypeIPv4, @@ -5839,47 +5839,47 @@ func TestEndpointSliceWithTerminatingEndpointsTrafficPolicyLocal(t *testing.T) { { Addresses: []string{"10.0.1.1"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(false), - Serving: utilpointer.BoolPtr(true), - Terminating: utilpointer.BoolPtr(true), + Ready: pointer.Bool(false), + Serving: pointer.Bool(true), + Terminating: pointer.Bool(true), }, - NodeName: utilpointer.StringPtr(testHostname), + NodeName: pointer.String(testHostname), }, { Addresses: []string{"10.0.1.2"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(false), - Serving: utilpointer.BoolPtr(true), - Terminating: utilpointer.BoolPtr(true), + Ready: pointer.Bool(false), + Serving: pointer.Bool(true), + Terminating: pointer.Bool(true), }, - NodeName: utilpointer.StringPtr(testHostname), + NodeName: pointer.String(testHostname), }, { Addresses: []string{"10.0.1.3"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(false), - Serving: utilpointer.BoolPtr(false), - Terminating: utilpointer.BoolPtr(true), + Ready: pointer.Bool(false), + Serving: pointer.Bool(false), + Terminating: pointer.Bool(true), }, - NodeName: utilpointer.StringPtr(testHostname), + NodeName: pointer.String(testHostname), }, { Addresses: []string{"10.0.1.4"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(false), - Serving: utilpointer.BoolPtr(false), - Terminating: utilpointer.BoolPtr(true), + Ready: pointer.Bool(false), + Serving: pointer.Bool(false), + Terminating: pointer.Bool(true), }, - NodeName: utilpointer.StringPtr(testHostname), + NodeName: pointer.String(testHostname), }, { Addresses: []string{"10.0.1.5"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(true), - Serving: utilpointer.BoolPtr(true), - Terminating: utilpointer.BoolPtr(false), + Ready: pointer.Bool(true), + Serving: pointer.Bool(true), + Terminating: pointer.Bool(false), }, - NodeName: utilpointer.StringPtr("host-1"), + NodeName: pointer.String("host-1"), }, }, }, @@ -5950,8 +5950,8 @@ func TestEndpointSliceWithTerminatingEndpointsTrafficPolicyLocal(t *testing.T) { Labels: map[string]string{discovery.LabelServiceName: "svc1"}, }, Ports: []discovery.EndpointPort{{ - Name: utilpointer.StringPtr(""), - Port: utilpointer.Int32Ptr(80), + Name: pointer.String(""), + Port: pointer.Int32(80), Protocol: &tcpProtocol, }}, AddressType: discovery.AddressTypeIPv4, @@ -5961,11 +5961,11 @@ func TestEndpointSliceWithTerminatingEndpointsTrafficPolicyLocal(t *testing.T) { // but it will prevent a REJECT rule from being created Addresses: []string{"10.0.1.5"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(false), - Serving: utilpointer.BoolPtr(true), - Terminating: utilpointer.BoolPtr(true), + Ready: pointer.Bool(false), + Serving: pointer.Bool(true), + Terminating: pointer.Bool(true), }, - NodeName: utilpointer.StringPtr("host-1"), + NodeName: pointer.String("host-1"), }, }, }, @@ -6035,8 +6035,8 @@ func TestEndpointSliceWithTerminatingEndpointsTrafficPolicyLocal(t *testing.T) { Labels: map[string]string{discovery.LabelServiceName: "svc1"}, }, Ports: []discovery.EndpointPort{{ - Name: utilpointer.StringPtr(""), - Port: utilpointer.Int32Ptr(80), + Name: pointer.String(""), + Port: pointer.Int32(80), Protocol: &tcpProtocol, }}, AddressType: discovery.AddressTypeIPv4, @@ -6045,21 +6045,21 @@ func TestEndpointSliceWithTerminatingEndpointsTrafficPolicyLocal(t *testing.T) { // Local but not ready or serving Addresses: []string{"10.0.1.5"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(false), - Serving: utilpointer.BoolPtr(false), - Terminating: utilpointer.BoolPtr(true), + Ready: pointer.Bool(false), + Serving: pointer.Bool(false), + Terminating: pointer.Bool(true), }, - NodeName: utilpointer.StringPtr(testHostname), + NodeName: pointer.String(testHostname), }, { // Remote and not ready or serving Addresses: []string{"10.0.1.5"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(false), - Serving: utilpointer.BoolPtr(false), - Terminating: utilpointer.BoolPtr(true), + Ready: pointer.Bool(false), + Serving: pointer.Bool(false), + Terminating: pointer.Bool(true), }, - NodeName: utilpointer.StringPtr("host-1"), + NodeName: pointer.String("host-1"), }, }, }, @@ -6210,8 +6210,8 @@ func TestEndpointSliceWithTerminatingEndpointsTrafficPolicyCluster(t *testing.T) Labels: map[string]string{discovery.LabelServiceName: "svc1"}, }, Ports: []discovery.EndpointPort{{ - Name: utilpointer.StringPtr(""), - Port: utilpointer.Int32Ptr(80), + Name: pointer.String(""), + Port: pointer.Int32(80), Protocol: &tcpProtocol, }}, AddressType: discovery.AddressTypeIPv4, @@ -6219,49 +6219,49 @@ func TestEndpointSliceWithTerminatingEndpointsTrafficPolicyCluster(t *testing.T) { Addresses: []string{"10.0.1.1"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(true), - Serving: utilpointer.BoolPtr(true), - Terminating: utilpointer.BoolPtr(false), + Ready: pointer.Bool(true), + Serving: pointer.Bool(true), + Terminating: pointer.Bool(false), }, - NodeName: utilpointer.StringPtr(testHostname), + NodeName: pointer.String(testHostname), }, { Addresses: []string{"10.0.1.2"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(true), - Serving: utilpointer.BoolPtr(true), - Terminating: utilpointer.BoolPtr(false), + Ready: pointer.Bool(true), + Serving: pointer.Bool(true), + Terminating: pointer.Bool(false), }, - NodeName: utilpointer.StringPtr(testHostname), + NodeName: pointer.String(testHostname), }, { // this endpoint should be ignored since there are ready non-terminating endpoints Addresses: []string{"10.0.1.3"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(false), - Serving: utilpointer.BoolPtr(true), - Terminating: utilpointer.BoolPtr(true), + Ready: pointer.Bool(false), + Serving: pointer.Bool(true), + Terminating: pointer.Bool(true), }, - NodeName: utilpointer.StringPtr("another-host"), + NodeName: pointer.String("another-host"), }, { // this endpoint should be ignored since it is not "serving" Addresses: []string{"10.0.1.4"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(false), - Serving: utilpointer.BoolPtr(false), - Terminating: utilpointer.BoolPtr(true), + Ready: pointer.Bool(false), + Serving: pointer.Bool(false), + Terminating: pointer.Bool(true), }, - NodeName: utilpointer.StringPtr("another-host"), + NodeName: pointer.String("another-host"), }, { Addresses: []string{"10.0.1.5"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(true), - Serving: utilpointer.BoolPtr(true), - Terminating: utilpointer.BoolPtr(false), + Ready: pointer.Bool(true), + Serving: pointer.Bool(true), + Terminating: pointer.Bool(false), }, - NodeName: utilpointer.StringPtr("another-host"), + NodeName: pointer.String("another-host"), }, }, }, @@ -6340,8 +6340,8 @@ func TestEndpointSliceWithTerminatingEndpointsTrafficPolicyCluster(t *testing.T) Labels: map[string]string{discovery.LabelServiceName: "svc1"}, }, Ports: []discovery.EndpointPort{{ - Name: utilpointer.StringPtr(""), - Port: utilpointer.Int32Ptr(80), + Name: pointer.String(""), + Port: pointer.Int32(80), Protocol: &tcpProtocol, }}, AddressType: discovery.AddressTypeIPv4, @@ -6349,49 +6349,49 @@ func TestEndpointSliceWithTerminatingEndpointsTrafficPolicyCluster(t *testing.T) { Addresses: []string{"10.0.1.1"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(true), - Serving: utilpointer.BoolPtr(true), - Terminating: utilpointer.BoolPtr(false), + Ready: pointer.Bool(true), + Serving: pointer.Bool(true), + Terminating: pointer.Bool(false), }, - NodeName: utilpointer.StringPtr(testHostname), + NodeName: pointer.String(testHostname), }, { Addresses: []string{"10.0.1.2"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(true), - Serving: utilpointer.BoolPtr(true), - Terminating: utilpointer.BoolPtr(false), + Ready: pointer.Bool(true), + Serving: pointer.Bool(true), + Terminating: pointer.Bool(false), }, - NodeName: utilpointer.StringPtr(testHostname), + NodeName: pointer.String(testHostname), }, { // always ignored since feature gate is disabled Addresses: []string{"10.0.1.3"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(false), - Serving: utilpointer.BoolPtr(true), - Terminating: utilpointer.BoolPtr(true), + Ready: pointer.Bool(false), + Serving: pointer.Bool(true), + Terminating: pointer.Bool(true), }, - NodeName: utilpointer.StringPtr("another-host"), + NodeName: pointer.String("another-host"), }, { // always ignored since serving=false Addresses: []string{"10.0.1.4"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(false), - Serving: utilpointer.BoolPtr(false), - Terminating: utilpointer.BoolPtr(true), + Ready: pointer.Bool(false), + Serving: pointer.Bool(false), + Terminating: pointer.Bool(true), }, - NodeName: utilpointer.StringPtr("another-host"), + NodeName: pointer.String("another-host"), }, { Addresses: []string{"10.0.1.5"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(true), - Serving: utilpointer.BoolPtr(true), - Terminating: utilpointer.BoolPtr(false), + Ready: pointer.Bool(true), + Serving: pointer.Bool(true), + Terminating: pointer.Bool(false), }, - NodeName: utilpointer.StringPtr("another-host"), + NodeName: pointer.String("another-host"), }, }, }, @@ -6470,8 +6470,8 @@ func TestEndpointSliceWithTerminatingEndpointsTrafficPolicyCluster(t *testing.T) Labels: map[string]string{discovery.LabelServiceName: "svc1"}, }, Ports: []discovery.EndpointPort{{ - Name: utilpointer.StringPtr(""), - Port: utilpointer.Int32Ptr(80), + Name: pointer.String(""), + Port: pointer.Int32(80), Protocol: &tcpProtocol, }}, AddressType: discovery.AddressTypeIPv4, @@ -6480,41 +6480,41 @@ func TestEndpointSliceWithTerminatingEndpointsTrafficPolicyCluster(t *testing.T) // this endpoint should be used since there are only ready terminating endpoints Addresses: []string{"10.0.1.2"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(false), - Serving: utilpointer.BoolPtr(true), - Terminating: utilpointer.BoolPtr(true), + Ready: pointer.Bool(false), + Serving: pointer.Bool(true), + Terminating: pointer.Bool(true), }, - NodeName: utilpointer.StringPtr(testHostname), + NodeName: pointer.String(testHostname), }, { // this endpoint should be used since there are only ready terminating endpoints Addresses: []string{"10.0.1.3"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(false), - Serving: utilpointer.BoolPtr(true), - Terminating: utilpointer.BoolPtr(true), + Ready: pointer.Bool(false), + Serving: pointer.Bool(true), + Terminating: pointer.Bool(true), }, - NodeName: utilpointer.StringPtr(testHostname), + NodeName: pointer.String(testHostname), }, { // this endpoint should not be used since it is both terminating and not ready. Addresses: []string{"10.0.1.4"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(false), - Serving: utilpointer.BoolPtr(false), - Terminating: utilpointer.BoolPtr(true), + Ready: pointer.Bool(false), + Serving: pointer.Bool(false), + Terminating: pointer.Bool(true), }, - NodeName: utilpointer.StringPtr("another-host"), + NodeName: pointer.String("another-host"), }, { // this endpoint should be used since there are only ready terminating endpoints Addresses: []string{"10.0.1.5"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(false), - Serving: utilpointer.BoolPtr(true), - Terminating: utilpointer.BoolPtr(true), + Ready: pointer.Bool(false), + Serving: pointer.Bool(true), + Terminating: pointer.Bool(true), }, - NodeName: utilpointer.StringPtr("another-host"), + NodeName: pointer.String("another-host"), }, }, }, @@ -6593,8 +6593,8 @@ func TestEndpointSliceWithTerminatingEndpointsTrafficPolicyCluster(t *testing.T) Labels: map[string]string{discovery.LabelServiceName: "svc1"}, }, Ports: []discovery.EndpointPort{{ - Name: utilpointer.StringPtr(""), - Port: utilpointer.Int32Ptr(80), + Name: pointer.String(""), + Port: pointer.Int32(80), Protocol: &tcpProtocol, }}, AddressType: discovery.AddressTypeIPv4, @@ -6602,47 +6602,47 @@ func TestEndpointSliceWithTerminatingEndpointsTrafficPolicyCluster(t *testing.T) { Addresses: []string{"10.0.1.1"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(false), - Serving: utilpointer.BoolPtr(true), - Terminating: utilpointer.BoolPtr(true), + Ready: pointer.Bool(false), + Serving: pointer.Bool(true), + Terminating: pointer.Bool(true), }, - NodeName: utilpointer.StringPtr(testHostname), + NodeName: pointer.String(testHostname), }, { Addresses: []string{"10.0.1.2"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(false), - Serving: utilpointer.BoolPtr(true), - Terminating: utilpointer.BoolPtr(true), + Ready: pointer.Bool(false), + Serving: pointer.Bool(true), + Terminating: pointer.Bool(true), }, - NodeName: utilpointer.StringPtr(testHostname), + NodeName: pointer.String(testHostname), }, { Addresses: []string{"10.0.1.3"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(false), - Serving: utilpointer.BoolPtr(false), - Terminating: utilpointer.BoolPtr(true), + Ready: pointer.Bool(false), + Serving: pointer.Bool(false), + Terminating: pointer.Bool(true), }, - NodeName: utilpointer.StringPtr("another-host"), + NodeName: pointer.String("another-host"), }, { Addresses: []string{"10.0.1.4"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(false), - Serving: utilpointer.BoolPtr(false), - Terminating: utilpointer.BoolPtr(true), + Ready: pointer.Bool(false), + Serving: pointer.Bool(false), + Terminating: pointer.Bool(true), }, - NodeName: utilpointer.StringPtr("another-host"), + NodeName: pointer.String("another-host"), }, { Addresses: []string{"10.0.1.5"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(false), - Serving: utilpointer.BoolPtr(true), - Terminating: utilpointer.BoolPtr(true), + Ready: pointer.Bool(false), + Serving: pointer.Bool(true), + Terminating: pointer.Bool(true), }, - NodeName: utilpointer.StringPtr("another-host"), + NodeName: pointer.String("another-host"), }, }, }, @@ -6700,8 +6700,8 @@ func TestEndpointSliceWithTerminatingEndpointsTrafficPolicyCluster(t *testing.T) Labels: map[string]string{discovery.LabelServiceName: "svc1"}, }, Ports: []discovery.EndpointPort{{ - Name: utilpointer.StringPtr(""), - Port: utilpointer.Int32Ptr(80), + Name: pointer.String(""), + Port: pointer.Int32(80), Protocol: &tcpProtocol, }}, AddressType: discovery.AddressTypeIPv4, @@ -6709,11 +6709,11 @@ func TestEndpointSliceWithTerminatingEndpointsTrafficPolicyCluster(t *testing.T) { Addresses: []string{"10.0.1.5"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(false), - Serving: utilpointer.BoolPtr(true), - Terminating: utilpointer.BoolPtr(true), + Ready: pointer.Bool(false), + Serving: pointer.Bool(true), + Terminating: pointer.Bool(true), }, - NodeName: utilpointer.StringPtr("host-1"), + NodeName: pointer.String("host-1"), }, }, }, @@ -6782,8 +6782,8 @@ func TestEndpointSliceWithTerminatingEndpointsTrafficPolicyCluster(t *testing.T) Labels: map[string]string{discovery.LabelServiceName: "svc1"}, }, Ports: []discovery.EndpointPort{{ - Name: utilpointer.StringPtr(""), - Port: utilpointer.Int32Ptr(80), + Name: pointer.String(""), + Port: pointer.Int32(80), Protocol: &tcpProtocol, }}, AddressType: discovery.AddressTypeIPv4, @@ -6792,21 +6792,21 @@ func TestEndpointSliceWithTerminatingEndpointsTrafficPolicyCluster(t *testing.T) // Local, not ready or serving Addresses: []string{"10.0.1.5"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(false), - Serving: utilpointer.BoolPtr(false), - Terminating: utilpointer.BoolPtr(true), + Ready: pointer.Bool(false), + Serving: pointer.Bool(false), + Terminating: pointer.Bool(true), }, - NodeName: utilpointer.StringPtr(testHostname), + NodeName: pointer.String(testHostname), }, { // Remote, not ready or serving Addresses: []string{"10.0.1.5"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(false), - Serving: utilpointer.BoolPtr(false), - Terminating: utilpointer.BoolPtr(true), + Ready: pointer.Bool(false), + Serving: pointer.Bool(false), + Terminating: pointer.Bool(true), }, - NodeName: utilpointer.StringPtr("host-1"), + NodeName: pointer.String("host-1"), }, }, }, @@ -6959,16 +6959,16 @@ func TestInternalExternalMasquerade(t *testing.T) { eps.Endpoints = []discovery.Endpoint{ { Addresses: []string{"10.180.0.1"}, - NodeName: utilpointer.StringPtr(testHostname), + NodeName: pointer.String(testHostname), }, { Addresses: []string{"10.180.1.1"}, - NodeName: utilpointer.StringPtr("remote"), + NodeName: pointer.String("remote"), }, } eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.StringPtr("p80"), - Port: utilpointer.Int32(80), + Name: pointer.String("p80"), + Port: pointer.Int32(80), Protocol: &tcpProtocol, }} }), @@ -6977,16 +6977,16 @@ func TestInternalExternalMasquerade(t *testing.T) { eps.Endpoints = []discovery.Endpoint{ { Addresses: []string{"10.180.0.2"}, - NodeName: utilpointer.StringPtr(testHostname), + NodeName: pointer.String(testHostname), }, { Addresses: []string{"10.180.1.2"}, - NodeName: utilpointer.StringPtr("remote"), + NodeName: pointer.String("remote"), }, } eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.StringPtr("p80"), - Port: utilpointer.Int32(80), + Name: pointer.String("p80"), + Port: pointer.Int32(80), Protocol: &tcpProtocol, }} }), @@ -6995,16 +6995,16 @@ func TestInternalExternalMasquerade(t *testing.T) { eps.Endpoints = []discovery.Endpoint{ { Addresses: []string{"10.180.0.3"}, - NodeName: utilpointer.StringPtr(testHostname), + NodeName: pointer.String(testHostname), }, { Addresses: []string{"10.180.1.3"}, - NodeName: utilpointer.StringPtr("remote"), + NodeName: pointer.String("remote"), }, } eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.StringPtr("p80"), - Port: utilpointer.Int32(80), + Name: pointer.String("p80"), + Port: pointer.Int32(80), Protocol: &tcpProtocol, }} }), @@ -7353,31 +7353,31 @@ func TestInternalExternalMasquerade(t *testing.T) { // ClusterIP is assumed to be from a pod, and thus to not // require masquerading. "node to ClusterIP": { - masq: utilpointer.Bool(false), + masq: pointer.Bool(false), }, "node to ClusterIP with eTP:Local": { - masq: utilpointer.Bool(false), + masq: pointer.Bool(false), }, "node to ClusterIP with iTP:Local": { - masq: utilpointer.Bool(false), + masq: pointer.Bool(false), }, "external to ClusterIP": { - masq: utilpointer.Bool(false), + masq: pointer.Bool(false), }, "external to ClusterIP with eTP:Local": { - masq: utilpointer.Bool(false), + masq: pointer.Bool(false), }, "external to ClusterIP with iTP:Local": { - masq: utilpointer.Bool(false), + masq: pointer.Bool(false), }, // And there's no eTP:Local short-circuit for pod traffic, // so pods get only the local endpoints. "pod to NodePort with eTP:Local": { - output: utilpointer.String("10.180.0.2:80"), + output: pointer.String("10.180.0.2:80"), }, "pod to LB with eTP:Local": { - output: utilpointer.String("10.180.0.2:80"), + output: pointer.String("10.180.0.2:80"), }, }, }, @@ -7390,13 +7390,13 @@ func TestInternalExternalMasquerade(t *testing.T) { // All "to ClusterIP" traffic gets masqueraded when using // --masquerade-all. "pod to ClusterIP": { - masq: utilpointer.Bool(true), + masq: pointer.Bool(true), }, "pod to ClusterIP with eTP:Local": { - masq: utilpointer.Bool(true), + masq: pointer.Bool(true), }, "pod to ClusterIP with iTP:Local": { - masq: utilpointer.Bool(true), + masq: pointer.Bool(true), }, }, }, @@ -7408,21 +7408,21 @@ func TestInternalExternalMasquerade(t *testing.T) { overrides: map[string]packetFlowTestOverride{ // As in "masqueradeAll" "pod to ClusterIP": { - masq: utilpointer.Bool(true), + masq: pointer.Bool(true), }, "pod to ClusterIP with eTP:Local": { - masq: utilpointer.Bool(true), + masq: pointer.Bool(true), }, "pod to ClusterIP with iTP:Local": { - masq: utilpointer.Bool(true), + masq: pointer.Bool(true), }, // As in "no LocalTrafficDetector" "pod to NodePort with eTP:Local": { - output: utilpointer.String("10.180.0.2:80"), + output: pointer.String("10.180.0.2:80"), }, "pod to LB with eTP:Local": { - output: utilpointer.String("10.180.0.2:80"), + output: pointer.String("10.180.0.2:80"), }, }, }, @@ -7531,8 +7531,8 @@ func TestSyncProxyRulesLargeClusterMode(t *testing.T) { eps.Endpoints[i].Addresses = []string{fmt.Sprintf("10.0.%d.%d", i%256, i/256)} } eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.StringPtr("p80"), - Port: utilpointer.Int32(80), + Name: pointer.String("p80"), + Port: pointer.Int32(80), Protocol: &tcpProtocol, }} }), @@ -7543,8 +7543,8 @@ func TestSyncProxyRulesLargeClusterMode(t *testing.T) { eps.Endpoints[i].Addresses = []string{fmt.Sprintf("10.1.%d.%d", i%256, i/256)} } eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.StringPtr("p8080"), - Port: utilpointer.Int32(8080), + Name: pointer.String("p8080"), + Port: pointer.Int32(8080), Protocol: &tcpProtocol, }} }), @@ -7572,8 +7572,8 @@ func TestSyncProxyRulesLargeClusterMode(t *testing.T) { Addresses: []string{"203.0.113.12"}, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.StringPtr("p8081"), - Port: utilpointer.Int32(8081), + Name: pointer.String("p8081"), + Port: pointer.Int32(8081), Protocol: &tcpProtocol, }} })) @@ -7608,8 +7608,8 @@ func TestSyncProxyRulesLargeClusterMode(t *testing.T) { Addresses: []string{"10.4.0.1"}, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.StringPtr("p8082"), - Port: utilpointer.Int32(8082), + Name: pointer.String("p8082"), + Port: pointer.Int32(8082), Protocol: &tcpProtocol, }} })) @@ -7687,8 +7687,8 @@ func TestSyncProxyRulesRepeated(t *testing.T) { Addresses: []string{"10.0.1.1"}, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.StringPtr("p80"), - Port: utilpointer.Int32(80), + Name: pointer.String("p80"), + Port: pointer.Int32(80), Protocol: &tcpProtocol, }} }), @@ -7698,8 +7698,8 @@ func TestSyncProxyRulesRepeated(t *testing.T) { Addresses: []string{"10.0.2.1"}, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.StringPtr("p8080"), - Port: utilpointer.Int32(8080), + Name: pointer.String("p8080"), + Port: pointer.Int32(8080), Protocol: &tcpProtocol, }} }), @@ -7767,8 +7767,8 @@ func TestSyncProxyRulesRepeated(t *testing.T) { Addresses: []string{"10.0.3.1"}, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.StringPtr("p80"), - Port: utilpointer.Int32(80), + Name: pointer.String("p80"), + Port: pointer.Int32(80), Protocol: &tcpProtocol, }} }), @@ -7928,8 +7928,8 @@ func TestSyncProxyRulesRepeated(t *testing.T) { Addresses: []string{"10.0.4.1"}, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.StringPtr("p80"), - Port: utilpointer.Int32(80), + Name: pointer.String("p80"), + Port: pointer.Int32(80), Protocol: &tcpProtocol, }} }), @@ -8270,8 +8270,8 @@ func TestNoEndpointsMetric(t *testing.T) { Labels: map[string]string{discovery.LabelServiceName: serviceName}, }, Ports: []discovery.EndpointPort{{ - Name: utilpointer.StringPtr(""), - Port: utilpointer.Int32Ptr(80), + Name: pointer.String(""), + Port: pointer.Int32(80), Protocol: &tcpProtocol, }}, AddressType: discovery.AddressTypeIPv4, @@ -8279,8 +8279,8 @@ func TestNoEndpointsMetric(t *testing.T) { for _, ep := range tc.endpoints { endpointSlice.Endpoints = append(endpointSlice.Endpoints, discovery.Endpoint{ Addresses: []string{ep.ip}, - Conditions: discovery.EndpointConditions{Ready: utilpointer.BoolPtr(true)}, - NodeName: utilpointer.StringPtr(ep.hostname), + Conditions: discovery.EndpointConditions{Ready: pointer.Bool(true)}, + NodeName: pointer.String(ep.hostname), }) } diff --git a/pkg/proxy/ipvs/proxier_test.go b/pkg/proxy/ipvs/proxier_test.go index 5a149d0a8d3..8f414c0f5c7 100644 --- a/pkg/proxy/ipvs/proxier_test.go +++ b/pkg/proxy/ipvs/proxier_test.go @@ -54,7 +54,7 @@ import ( "k8s.io/utils/exec" fakeexec "k8s.io/utils/exec/testing" netutils "k8s.io/utils/net" - utilpointer "k8s.io/utils/pointer" + "k8s.io/utils/pointer" ) const testHostname = "test-hostname" @@ -244,8 +244,8 @@ func TestCleanupLeftovers(t *testing.T) { Addresses: []string{epIP}, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.StringPtr(svcPortName.Port), - Port: utilpointer.Int32(int32(svcPort)), + Name: pointer.String(svcPortName.Port), + Port: pointer.Int32(int32(svcPort)), Protocol: &tcpProtocol, }} }), @@ -497,8 +497,8 @@ func TestNodePortIPv4(t *testing.T) { Addresses: []string{"10.180.0.1"}, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.String("p80"), - Port: utilpointer.Int32(80), + Name: pointer.String("p80"), + Port: pointer.Int32(80), Protocol: &tcpProtocol, }} }), @@ -508,8 +508,8 @@ func TestNodePortIPv4(t *testing.T) { Addresses: []string{"1002:ab8::2:10"}, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.String("p80"), - Port: utilpointer.Int32(80), + Name: pointer.String("p80"), + Port: pointer.Int32(80), Protocol: &tcpProtocol, }} }), @@ -589,8 +589,8 @@ func TestNodePortIPv4(t *testing.T) { Addresses: []string{"10.180.0.1"}, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.String("p80"), - Port: utilpointer.Int32(80), + Name: pointer.String("p80"), + Port: pointer.Int32(80), Protocol: &udpProtocol, }} }), @@ -746,8 +746,8 @@ func TestNodePortIPv4(t *testing.T) { Addresses: []string{"10.180.0.1"}, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.String("p80"), - Port: utilpointer.Int32(80), + Name: pointer.String("p80"), + Port: pointer.Int32(80), Protocol: &sctpProtocol, }} }), @@ -894,14 +894,14 @@ func TestNodePortIPv4(t *testing.T) { eps.AddressType = discovery.AddressTypeIPv4 eps.Endpoints = []discovery.Endpoint{{ Addresses: []string{"10.180.0.1"}, - NodeName: utilpointer.StringPtr(testHostname), + NodeName: pointer.String(testHostname), }, { Addresses: []string{"10.180.1.1"}, - NodeName: utilpointer.StringPtr("otherHost"), + NodeName: pointer.String("otherHost"), }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.String("p80"), - Port: utilpointer.Int32(80), + Name: pointer.String("p80"), + Port: pointer.Int32(80), Protocol: &sctpProtocol, }} }), @@ -1058,8 +1058,8 @@ func TestNodePortIPv6(t *testing.T) { Addresses: []string{"10.180.0.1"}, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.StringPtr("p80"), - Port: utilpointer.Int32(80), + Name: pointer.String("p80"), + Port: pointer.Int32(80), Protocol: &tcpProtocol, }} }), @@ -1069,8 +1069,8 @@ func TestNodePortIPv6(t *testing.T) { Addresses: []string{"1002:ab8::2:10"}, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.StringPtr("p80"), - Port: utilpointer.Int32(80), + Name: pointer.String("p80"), + Port: pointer.Int32(80), Protocol: &tcpProtocol, }} }), @@ -1152,8 +1152,8 @@ func TestNodePortIPv6(t *testing.T) { Addresses: []string{"10.180.0.1"}, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.StringPtr("p80"), - Port: utilpointer.Int32(80), + Name: pointer.String("p80"), + Port: pointer.Int32(80), Protocol: &udpProtocol, }} }), @@ -1250,8 +1250,8 @@ func TestNodePortIPv6(t *testing.T) { Addresses: []string{"2001::1"}, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.String("p80"), - Port: utilpointer.Int32(80), + Name: pointer.String("p80"), + Port: pointer.Int32(80), Protocol: &sctpProtocol, }} }), @@ -1414,8 +1414,8 @@ func TestIPv4Proxier(t *testing.T) { Addresses: []string{"10.180.0.1"}, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.StringPtr("p80"), - Port: utilpointer.Int32(80), + Name: pointer.String("p80"), + Port: pointer.Int32(80), Protocol: &tcpProtocol, }} }), @@ -1425,8 +1425,8 @@ func TestIPv4Proxier(t *testing.T) { Addresses: []string{"1009:ab8::5:6"}, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.StringPtr("p8080"), - Port: utilpointer.Int32(8080), + Name: pointer.String("p8080"), + Port: pointer.Int32(8080), Protocol: &tcpProtocol, }} }), @@ -1552,8 +1552,8 @@ func TestIPv6Proxier(t *testing.T) { Addresses: []string{"10.180.0.1"}, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.StringPtr("p80"), - Port: utilpointer.Int32(80), + Name: pointer.String("p80"), + Port: pointer.Int32(80), Protocol: &tcpProtocol, }} }), @@ -1563,8 +1563,8 @@ func TestIPv6Proxier(t *testing.T) { Addresses: []string{"1009:ab8::5:6"}, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.StringPtr("p8080"), - Port: utilpointer.Int32(8080), + Name: pointer.String("p8080"), + Port: pointer.Int32(8080), Protocol: &tcpProtocol, }} }), @@ -1777,8 +1777,8 @@ func TestExternalIPs(t *testing.T) { Addresses: []string{epIP}, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.StringPtr(svcPortName.Port), - Port: utilpointer.Int32(int32(svcPort)), + Name: pointer.String(svcPortName.Port), + Port: pointer.Int32(int32(svcPort)), Protocol: &udpProtocol, }} }), @@ -1849,15 +1849,15 @@ func TestOnlyLocalExternalIPs(t *testing.T) { eps.AddressType = discovery.AddressTypeIPv4 eps.Endpoints = []discovery.Endpoint{{ Addresses: []string{epIP}, - NodeName: utilpointer.StringPtr(thisHostname), + NodeName: pointer.String(thisHostname), }, { Addresses: []string{epIP1}, - NodeName: utilpointer.StringPtr(otherHostname), + NodeName: pointer.String(otherHostname), }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.StringPtr(svcPortName.Port), - Port: utilpointer.Int32(int32(svcPort)), + Name: pointer.String(svcPortName.Port), + Port: pointer.Int32(int32(svcPort)), Protocol: &tcpProtocol, }} }), @@ -1930,8 +1930,8 @@ func TestLoadBalancer(t *testing.T) { Addresses: []string{epIP}, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.StringPtr(svcPortName.Port), - Port: utilpointer.Int32(int32(svcPort)), + Name: pointer.String(svcPortName.Port), + Port: pointer.Int32(int32(svcPort)), Protocol: &udpProtocol, }} }), @@ -2021,8 +2021,8 @@ func TestOnlyLocalNodePorts(t *testing.T) { NodeName: &otherHostname, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.StringPtr(svcPortName.Port), - Port: utilpointer.Int32(int32(svcPort)), + Name: pointer.String(svcPortName.Port), + Port: pointer.Int32(int32(svcPort)), Protocol: &tcpProtocol, }} }), @@ -2189,8 +2189,8 @@ func TestLoadBalancerSourceRanges(t *testing.T) { Addresses: []string{epIP}, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.StringPtr(svcPortName.Port), - Port: utilpointer.Int32(int32(svcPort)), + Name: pointer.String(svcPortName.Port), + Port: pointer.Int32(int32(svcPort)), Protocol: &tcpProtocol, }} }), @@ -2300,8 +2300,8 @@ func TestAcceptIPVSTraffic(t *testing.T) { Addresses: []string{svcInfo.epIP}, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.StringPtr("p80"), - Port: utilpointer.Int32(80), + Name: pointer.String("p80"), + Port: pointer.Int32(80), Protocol: &udpProtocol, }} }), @@ -2373,8 +2373,8 @@ func TestOnlyLocalLoadBalancing(t *testing.T) { NodeName: &otherHostname, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.StringPtr(svcPortName.Port), - Port: utilpointer.Int32(int32(svcPort)), + Name: pointer.String(svcPortName.Port), + Port: pointer.Int32(int32(svcPort)), Protocol: &tcpProtocol, }} }), @@ -2770,8 +2770,8 @@ func Test_updateEndpointsMap(t *testing.T) { Addresses: []string{"1.1.1.1"}, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.String("p11"), - Port: utilpointer.Int32(11), + Name: pointer.String("p11"), + Port: pointer.Int32(11), Protocol: &udpProtocol, }} } @@ -2781,8 +2781,8 @@ func Test_updateEndpointsMap(t *testing.T) { Addresses: []string{"1.1.1.2"}, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.String("p12"), - Port: utilpointer.Int32(12), + Name: pointer.String("p12"), + Port: pointer.Int32(12), Protocol: &udpProtocol, }} } @@ -2795,8 +2795,8 @@ func Test_updateEndpointsMap(t *testing.T) { NodeName: &nodeName, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.String("p11"), - Port: utilpointer.Int32(11), + Name: pointer.String("p11"), + Port: pointer.Int32(11), Protocol: &udpProtocol, }} }), @@ -2812,8 +2812,8 @@ func Test_updateEndpointsMap(t *testing.T) { Addresses: []string{"1.1.1.1"}, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.String("p11-2"), - Port: utilpointer.Int32(11), + Name: pointer.String("p11-2"), + Port: pointer.Int32(11), Protocol: &udpProtocol, }} }), @@ -2826,8 +2826,8 @@ func Test_updateEndpointsMap(t *testing.T) { Addresses: []string{"1.1.1.1"}, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.String("p11"), - Port: utilpointer.Int32(22), + Name: pointer.String("p11"), + Port: pointer.Int32(22), Protocol: &udpProtocol, }} }), @@ -2843,12 +2843,12 @@ func Test_updateEndpointsMap(t *testing.T) { NodeName: &nodeName, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.String("p11"), - Port: utilpointer.Int32(11), + Name: pointer.String("p11"), + Port: pointer.Int32(11), Protocol: &udpProtocol, }, { - Name: utilpointer.String("p12"), - Port: utilpointer.Int32(12), + Name: pointer.String("p12"), + Port: pointer.Int32(12), Protocol: &udpProtocol, }} }), @@ -2864,8 +2864,8 @@ func Test_updateEndpointsMap(t *testing.T) { NodeName: &nodeName, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.String("p12"), - Port: utilpointer.Int32(12), + Name: pointer.String("p12"), + Port: pointer.Int32(12), Protocol: &udpProtocol, }} } @@ -2880,12 +2880,12 @@ func Test_updateEndpointsMap(t *testing.T) { NodeName: &nodeName, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.String("p11"), - Port: utilpointer.Int32(11), + Name: pointer.String("p11"), + Port: pointer.Int32(11), Protocol: &udpProtocol, }, { - Name: utilpointer.String("p12"), - Port: utilpointer.Int32(12), + Name: pointer.String("p12"), + Port: pointer.Int32(12), Protocol: &udpProtocol, }} } @@ -2895,8 +2895,8 @@ func Test_updateEndpointsMap(t *testing.T) { Addresses: []string{"1.1.1.3"}, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.String("p13"), - Port: utilpointer.Int32(13), + Name: pointer.String("p13"), + Port: pointer.Int32(13), Protocol: &udpProtocol, }} } @@ -2913,12 +2913,12 @@ func Test_updateEndpointsMap(t *testing.T) { NodeName: &nodeName, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.String("p11"), - Port: utilpointer.Int32(11), + Name: pointer.String("p11"), + Port: pointer.Int32(11), Protocol: &udpProtocol, }, { - Name: utilpointer.String("p12"), - Port: utilpointer.Int32(12), + Name: pointer.String("p12"), + Port: pointer.Int32(12), Protocol: &udpProtocol, }} } @@ -2931,12 +2931,12 @@ func Test_updateEndpointsMap(t *testing.T) { NodeName: &nodeName, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.String("p13"), - Port: utilpointer.Int32(13), + Name: pointer.String("p13"), + Port: pointer.Int32(13), Protocol: &udpProtocol, }, { - Name: utilpointer.String("p14"), - Port: utilpointer.Int32(14), + Name: pointer.String("p14"), + Port: pointer.Int32(14), Protocol: &udpProtocol, }} } @@ -2949,12 +2949,12 @@ func Test_updateEndpointsMap(t *testing.T) { NodeName: &nodeName, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.String("p21"), - Port: utilpointer.Int32(21), + Name: pointer.String("p21"), + Port: pointer.Int32(21), Protocol: &udpProtocol, }, { - Name: utilpointer.String("p22"), - Port: utilpointer.Int32(22), + Name: pointer.String("p22"), + Port: pointer.Int32(22), Protocol: &udpProtocol, }} } @@ -2973,8 +2973,8 @@ func Test_updateEndpointsMap(t *testing.T) { NodeName: &nodeName, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.String("p22"), - Port: utilpointer.Int32(22), + Name: pointer.String("p22"), + Port: pointer.Int32(22), Protocol: &udpProtocol, }} } @@ -2985,8 +2985,8 @@ func Test_updateEndpointsMap(t *testing.T) { NodeName: &nodeName, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.String("p23"), - Port: utilpointer.Int32(23), + Name: pointer.String("p23"), + Port: pointer.Int32(23), Protocol: &udpProtocol, }} } @@ -3000,8 +3000,8 @@ func Test_updateEndpointsMap(t *testing.T) { NodeName: &nodeName, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.String("p44"), - Port: utilpointer.Int32(44), + Name: pointer.String("p44"), + Port: pointer.Int32(44), Protocol: &udpProtocol, }} } @@ -3012,8 +3012,8 @@ func Test_updateEndpointsMap(t *testing.T) { NodeName: &nodeName, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.String("p45"), - Port: utilpointer.Int32(45), + Name: pointer.String("p45"), + Port: pointer.Int32(45), Protocol: &udpProtocol, }} } @@ -3025,8 +3025,8 @@ func Test_updateEndpointsMap(t *testing.T) { Addresses: []string{"1.1.1.11"}, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.String("p11"), - Port: utilpointer.Int32(11), + Name: pointer.String("p11"), + Port: pointer.Int32(11), Protocol: &udpProtocol, }} } @@ -3036,12 +3036,12 @@ func Test_updateEndpointsMap(t *testing.T) { Addresses: []string{"1.1.1.2"}, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.String("p12"), - Port: utilpointer.Int32(12), + Name: pointer.String("p12"), + Port: pointer.Int32(12), Protocol: &udpProtocol, }, { - Name: utilpointer.String("p122"), - Port: utilpointer.Int32(122), + Name: pointer.String("p122"), + Port: pointer.Int32(122), Protocol: &udpProtocol, }} } @@ -3051,8 +3051,8 @@ func Test_updateEndpointsMap(t *testing.T) { Addresses: []string{"3.3.3.3"}, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.String("p33"), - Port: utilpointer.Int32(33), + Name: pointer.String("p33"), + Port: pointer.Int32(33), Protocol: &udpProtocol, }} } @@ -3063,8 +3063,8 @@ func Test_updateEndpointsMap(t *testing.T) { NodeName: &nodeName, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.String("p44"), - Port: utilpointer.Int32(44), + Name: pointer.String("p44"), + Port: pointer.Int32(44), Protocol: &udpProtocol, }} } @@ -4411,27 +4411,27 @@ func TestEndpointSliceE2E(t *testing.T) { Labels: map[string]string{discovery.LabelServiceName: serviceName}, }, Ports: []discovery.EndpointPort{{ - Name: utilpointer.StringPtr(""), - Port: utilpointer.Int32Ptr(80), + Name: pointer.String(""), + Port: pointer.Int32(80), Protocol: &tcpProtocol, }}, AddressType: discovery.AddressTypeIPv4, Endpoints: []discovery.Endpoint{{ Addresses: []string{"10.0.1.1"}, - Conditions: discovery.EndpointConditions{Ready: utilpointer.BoolPtr(true)}, - NodeName: utilpointer.StringPtr(testHostname), + Conditions: discovery.EndpointConditions{Ready: pointer.Bool(true)}, + NodeName: pointer.String(testHostname), }, { Addresses: []string{"10.0.1.2"}, - Conditions: discovery.EndpointConditions{Ready: utilpointer.BoolPtr(true)}, - NodeName: utilpointer.StringPtr("node2"), + Conditions: discovery.EndpointConditions{Ready: pointer.Bool(true)}, + NodeName: pointer.String("node2"), }, { Addresses: []string{"10.0.1.3"}, - Conditions: discovery.EndpointConditions{Ready: utilpointer.BoolPtr(true)}, - NodeName: utilpointer.StringPtr("node3"), + Conditions: discovery.EndpointConditions{Ready: pointer.Bool(true)}, + NodeName: pointer.String("node3"), }, { // not ready endpoints should be ignored Addresses: []string{"10.0.1.4"}, - Conditions: discovery.EndpointConditions{Ready: utilpointer.BoolPtr(false)}, - NodeName: utilpointer.StringPtr("node3"), + Conditions: discovery.EndpointConditions{Ready: pointer.Bool(false)}, + NodeName: pointer.String("node3"), }}, } @@ -4551,26 +4551,26 @@ func Test_HealthCheckNodePortWhenTerminating(t *testing.T) { Labels: map[string]string{discovery.LabelServiceName: serviceName}, }, Ports: []discovery.EndpointPort{{ - Name: utilpointer.StringPtr(""), - Port: utilpointer.Int32Ptr(80), + Name: pointer.String(""), + Port: pointer.Int32(80), Protocol: &tcpProtocol, }}, AddressType: discovery.AddressTypeIPv4, Endpoints: []discovery.Endpoint{{ Addresses: []string{"10.0.1.1"}, - Conditions: discovery.EndpointConditions{Ready: utilpointer.BoolPtr(true)}, - NodeName: utilpointer.StringPtr(testHostname), + Conditions: discovery.EndpointConditions{Ready: pointer.Bool(true)}, + NodeName: pointer.String(testHostname), }, { Addresses: []string{"10.0.1.2"}, - Conditions: discovery.EndpointConditions{Ready: utilpointer.BoolPtr(true)}, - NodeName: utilpointer.StringPtr(testHostname), + Conditions: discovery.EndpointConditions{Ready: pointer.Bool(true)}, + NodeName: pointer.String(testHostname), }, { Addresses: []string{"10.0.1.3"}, - Conditions: discovery.EndpointConditions{Ready: utilpointer.BoolPtr(true)}, + Conditions: discovery.EndpointConditions{Ready: pointer.Bool(true)}, }, { // not ready endpoints should be ignored Addresses: []string{"10.0.1.4"}, - Conditions: discovery.EndpointConditions{Ready: utilpointer.BoolPtr(false)}, - NodeName: utilpointer.StringPtr(testHostname), + Conditions: discovery.EndpointConditions{Ready: pointer.Bool(false)}, + NodeName: pointer.String(testHostname), }}, } @@ -4588,43 +4588,43 @@ func Test_HealthCheckNodePortWhenTerminating(t *testing.T) { Labels: map[string]string{discovery.LabelServiceName: serviceName}, }, Ports: []discovery.EndpointPort{{ - Name: utilpointer.StringPtr(""), - Port: utilpointer.Int32Ptr(80), + Name: pointer.String(""), + Port: pointer.Int32(80), Protocol: &tcpProtocol, }}, AddressType: discovery.AddressTypeIPv4, Endpoints: []discovery.Endpoint{{ Addresses: []string{"10.0.1.1"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(false), - Serving: utilpointer.BoolPtr(true), - Terminating: utilpointer.BoolPtr(false), + Ready: pointer.Bool(false), + Serving: pointer.Bool(true), + Terminating: pointer.Bool(false), }, - NodeName: utilpointer.StringPtr(testHostname), + NodeName: pointer.String(testHostname), }, { Addresses: []string{"10.0.1.2"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(false), - Serving: utilpointer.BoolPtr(true), - Terminating: utilpointer.BoolPtr(true), + Ready: pointer.Bool(false), + Serving: pointer.Bool(true), + Terminating: pointer.Bool(true), }, - NodeName: utilpointer.StringPtr(testHostname), + NodeName: pointer.String(testHostname), }, { Addresses: []string{"10.0.1.3"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(false), - Serving: utilpointer.BoolPtr(true), - Terminating: utilpointer.BoolPtr(true), + Ready: pointer.Bool(false), + Serving: pointer.Bool(true), + Terminating: pointer.Bool(true), }, - NodeName: utilpointer.StringPtr(testHostname), + NodeName: pointer.String(testHostname), }, { // not ready endpoints should be ignored Addresses: []string{"10.0.1.4"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(false), - Serving: utilpointer.BoolPtr(false), - Terminating: utilpointer.BoolPtr(true), + Ready: pointer.Bool(false), + Serving: pointer.Bool(false), + Terminating: pointer.Bool(true), }, - NodeName: utilpointer.StringPtr(testHostname), + NodeName: pointer.String(testHostname), }}, } @@ -4807,8 +4807,8 @@ func TestTestInternalTrafficPolicyE2E(t *testing.T) { Labels: map[string]string{discovery.LabelServiceName: serviceName}, }, Ports: []discovery.EndpointPort{{ - Name: utilpointer.StringPtr(""), - Port: utilpointer.Int32Ptr(80), + Name: pointer.String(""), + Port: pointer.Int32(80), Protocol: &tcpProtocol, }}, AddressType: discovery.AddressTypeIPv4, @@ -4817,8 +4817,8 @@ func TestTestInternalTrafficPolicyE2E(t *testing.T) { for _, ep := range tc.endpoints { endpointSlice.Endpoints = append(endpointSlice.Endpoints, discovery.Endpoint{ Addresses: []string{ep.ip}, - Conditions: discovery.EndpointConditions{Ready: utilpointer.BoolPtr(true)}, - NodeName: utilpointer.StringPtr(ep.hostname), + Conditions: discovery.EndpointConditions{Ready: pointer.Bool(true)}, + NodeName: pointer.String(ep.hostname), }) } @@ -4915,8 +4915,8 @@ func Test_EndpointSliceReadyAndTerminatingCluster(t *testing.T) { Labels: map[string]string{discovery.LabelServiceName: serviceName}, }, Ports: []discovery.EndpointPort{{ - Name: utilpointer.StringPtr(""), - Port: utilpointer.Int32Ptr(80), + Name: pointer.String(""), + Port: pointer.Int32(80), Protocol: &tcpProtocol, }}, AddressType: discovery.AddressTypeIPv4, @@ -4924,47 +4924,47 @@ func Test_EndpointSliceReadyAndTerminatingCluster(t *testing.T) { { Addresses: []string{"10.0.1.1"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(true), - Serving: utilpointer.BoolPtr(true), - Terminating: utilpointer.BoolPtr(false), + Ready: pointer.Bool(true), + Serving: pointer.Bool(true), + Terminating: pointer.Bool(false), }, - NodeName: utilpointer.StringPtr(testHostname), + NodeName: pointer.String(testHostname), }, { Addresses: []string{"10.0.1.2"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(true), - Serving: utilpointer.BoolPtr(true), - Terminating: utilpointer.BoolPtr(false), + Ready: pointer.Bool(true), + Serving: pointer.Bool(true), + Terminating: pointer.Bool(false), }, - NodeName: utilpointer.StringPtr(testHostname), + NodeName: pointer.String(testHostname), }, { Addresses: []string{"10.0.1.3"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(false), - Serving: utilpointer.BoolPtr(true), - Terminating: utilpointer.BoolPtr(true), + Ready: pointer.Bool(false), + Serving: pointer.Bool(true), + Terminating: pointer.Bool(true), }, - NodeName: utilpointer.StringPtr(testHostname), + NodeName: pointer.String(testHostname), }, { Addresses: []string{"10.0.1.4"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(false), - Serving: utilpointer.BoolPtr(false), - Terminating: utilpointer.BoolPtr(true), + Ready: pointer.Bool(false), + Serving: pointer.Bool(false), + Terminating: pointer.Bool(true), }, - NodeName: utilpointer.StringPtr(testHostname), + NodeName: pointer.String(testHostname), }, { Addresses: []string{"10.0.1.5"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(true), - Serving: utilpointer.BoolPtr(true), - Terminating: utilpointer.BoolPtr(false), + Ready: pointer.Bool(true), + Serving: pointer.Bool(true), + Terminating: pointer.Bool(false), }, - NodeName: utilpointer.StringPtr("another-host"), + NodeName: pointer.String("another-host"), }, }, } @@ -5092,8 +5092,8 @@ func Test_EndpointSliceReadyAndTerminatingLocal(t *testing.T) { Labels: map[string]string{discovery.LabelServiceName: serviceName}, }, Ports: []discovery.EndpointPort{{ - Name: utilpointer.StringPtr(""), - Port: utilpointer.Int32Ptr(80), + Name: pointer.String(""), + Port: pointer.Int32(80), Protocol: &tcpProtocol, }}, AddressType: discovery.AddressTypeIPv4, @@ -5101,47 +5101,47 @@ func Test_EndpointSliceReadyAndTerminatingLocal(t *testing.T) { { Addresses: []string{"10.0.1.1"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(true), - Serving: utilpointer.BoolPtr(true), - Terminating: utilpointer.BoolPtr(false), + Ready: pointer.Bool(true), + Serving: pointer.Bool(true), + Terminating: pointer.Bool(false), }, - NodeName: utilpointer.StringPtr(testHostname), + NodeName: pointer.String(testHostname), }, { Addresses: []string{"10.0.1.2"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(true), - Serving: utilpointer.BoolPtr(true), - Terminating: utilpointer.BoolPtr(false), + Ready: pointer.Bool(true), + Serving: pointer.Bool(true), + Terminating: pointer.Bool(false), }, - NodeName: utilpointer.StringPtr(testHostname), + NodeName: pointer.String(testHostname), }, { Addresses: []string{"10.0.1.3"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(false), - Serving: utilpointer.BoolPtr(true), - Terminating: utilpointer.BoolPtr(true), + Ready: pointer.Bool(false), + Serving: pointer.Bool(true), + Terminating: pointer.Bool(true), }, - NodeName: utilpointer.StringPtr(testHostname), + NodeName: pointer.String(testHostname), }, { Addresses: []string{"10.0.1.4"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(false), - Serving: utilpointer.BoolPtr(false), - Terminating: utilpointer.BoolPtr(true), + Ready: pointer.Bool(false), + Serving: pointer.Bool(false), + Terminating: pointer.Bool(true), }, - NodeName: utilpointer.StringPtr(testHostname), + NodeName: pointer.String(testHostname), }, { Addresses: []string{"10.0.1.5"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(true), - Serving: utilpointer.BoolPtr(true), - Terminating: utilpointer.BoolPtr(false), + Ready: pointer.Bool(true), + Serving: pointer.Bool(true), + Terminating: pointer.Bool(false), }, - NodeName: utilpointer.StringPtr("another-host"), + NodeName: pointer.String("another-host"), }, }, } @@ -5268,8 +5268,8 @@ func Test_EndpointSliceOnlyReadyAndTerminatingCluster(t *testing.T) { Labels: map[string]string{discovery.LabelServiceName: serviceName}, }, Ports: []discovery.EndpointPort{{ - Name: utilpointer.StringPtr(""), - Port: utilpointer.Int32Ptr(80), + Name: pointer.String(""), + Port: pointer.Int32(80), Protocol: &tcpProtocol, }}, AddressType: discovery.AddressTypeIPv4, @@ -5277,47 +5277,47 @@ func Test_EndpointSliceOnlyReadyAndTerminatingCluster(t *testing.T) { { Addresses: []string{"10.0.1.1"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(false), - Serving: utilpointer.BoolPtr(true), - Terminating: utilpointer.BoolPtr(true), + Ready: pointer.Bool(false), + Serving: pointer.Bool(true), + Terminating: pointer.Bool(true), }, - NodeName: utilpointer.StringPtr(testHostname), + NodeName: pointer.String(testHostname), }, { Addresses: []string{"10.0.1.2"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(false), - Serving: utilpointer.BoolPtr(true), - Terminating: utilpointer.BoolPtr(true), + Ready: pointer.Bool(false), + Serving: pointer.Bool(true), + Terminating: pointer.Bool(true), }, - NodeName: utilpointer.StringPtr(testHostname), + NodeName: pointer.String(testHostname), }, { Addresses: []string{"10.0.1.3"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(false), - Serving: utilpointer.BoolPtr(false), - Terminating: utilpointer.BoolPtr(true), + Ready: pointer.Bool(false), + Serving: pointer.Bool(false), + Terminating: pointer.Bool(true), }, - NodeName: utilpointer.StringPtr(testHostname), + NodeName: pointer.String(testHostname), }, { Addresses: []string{"10.0.1.4"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(false), - Serving: utilpointer.BoolPtr(true), - Terminating: utilpointer.BoolPtr(true), + Ready: pointer.Bool(false), + Serving: pointer.Bool(true), + Terminating: pointer.Bool(true), }, - NodeName: utilpointer.StringPtr("another-host"), + NodeName: pointer.String("another-host"), }, { Addresses: []string{"10.0.1.5"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(false), - Serving: utilpointer.BoolPtr(false), - Terminating: utilpointer.BoolPtr(false), + Ready: pointer.Bool(false), + Serving: pointer.Bool(false), + Terminating: pointer.Bool(false), }, - NodeName: utilpointer.StringPtr("another-host"), + NodeName: pointer.String("another-host"), }, }, } @@ -5444,8 +5444,8 @@ func Test_EndpointSliceOnlyReadyAndTerminatingLocal(t *testing.T) { Labels: map[string]string{discovery.LabelServiceName: serviceName}, }, Ports: []discovery.EndpointPort{{ - Name: utilpointer.StringPtr(""), - Port: utilpointer.Int32Ptr(80), + Name: pointer.String(""), + Port: pointer.Int32(80), Protocol: &tcpProtocol, }}, AddressType: discovery.AddressTypeIPv4, @@ -5453,47 +5453,47 @@ func Test_EndpointSliceOnlyReadyAndTerminatingLocal(t *testing.T) { { Addresses: []string{"10.0.1.1"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(false), - Serving: utilpointer.BoolPtr(true), - Terminating: utilpointer.BoolPtr(true), + Ready: pointer.Bool(false), + Serving: pointer.Bool(true), + Terminating: pointer.Bool(true), }, - NodeName: utilpointer.StringPtr(testHostname), + NodeName: pointer.String(testHostname), }, { Addresses: []string{"10.0.1.2"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(false), - Serving: utilpointer.BoolPtr(true), - Terminating: utilpointer.BoolPtr(true), + Ready: pointer.Bool(false), + Serving: pointer.Bool(true), + Terminating: pointer.Bool(true), }, - NodeName: utilpointer.StringPtr(testHostname), + NodeName: pointer.String(testHostname), }, { Addresses: []string{"10.0.1.3"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(false), - Serving: utilpointer.BoolPtr(false), - Terminating: utilpointer.BoolPtr(true), + Ready: pointer.Bool(false), + Serving: pointer.Bool(false), + Terminating: pointer.Bool(true), }, - NodeName: utilpointer.StringPtr(testHostname), + NodeName: pointer.String(testHostname), }, { Addresses: []string{"10.0.1.4"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(false), - Serving: utilpointer.BoolPtr(true), - Terminating: utilpointer.BoolPtr(true), + Ready: pointer.Bool(false), + Serving: pointer.Bool(true), + Terminating: pointer.Bool(true), }, - NodeName: utilpointer.StringPtr("another-host"), + NodeName: pointer.String("another-host"), }, { Addresses: []string{"10.0.1.5"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(true), - Serving: utilpointer.BoolPtr(true), - Terminating: utilpointer.BoolPtr(false), + Ready: pointer.Bool(true), + Serving: pointer.Bool(true), + Terminating: pointer.Bool(false), }, - NodeName: utilpointer.StringPtr("another-host"), + NodeName: pointer.String("another-host"), }, }, } @@ -5617,8 +5617,8 @@ func Test_EndpointSliceOnlyReadyAndTerminatingLocalWithFeatureGateDisabled(t *te Labels: map[string]string{discovery.LabelServiceName: serviceName}, }, Ports: []discovery.EndpointPort{{ - Name: utilpointer.StringPtr(""), - Port: utilpointer.Int32Ptr(80), + Name: pointer.String(""), + Port: pointer.Int32(80), Protocol: &tcpProtocol, }}, AddressType: discovery.AddressTypeIPv4, @@ -5626,47 +5626,47 @@ func Test_EndpointSliceOnlyReadyAndTerminatingLocalWithFeatureGateDisabled(t *te { Addresses: []string{"10.0.1.1"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(false), - Serving: utilpointer.BoolPtr(true), - Terminating: utilpointer.BoolPtr(true), + Ready: pointer.Bool(false), + Serving: pointer.Bool(true), + Terminating: pointer.Bool(true), }, - NodeName: utilpointer.StringPtr(testHostname), + NodeName: pointer.String(testHostname), }, { Addresses: []string{"10.0.1.2"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(false), - Serving: utilpointer.BoolPtr(true), - Terminating: utilpointer.BoolPtr(true), + Ready: pointer.Bool(false), + Serving: pointer.Bool(true), + Terminating: pointer.Bool(true), }, - NodeName: utilpointer.StringPtr(testHostname), + NodeName: pointer.String(testHostname), }, { Addresses: []string{"10.0.1.3"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(false), - Serving: utilpointer.BoolPtr(false), - Terminating: utilpointer.BoolPtr(true), + Ready: pointer.Bool(false), + Serving: pointer.Bool(false), + Terminating: pointer.Bool(true), }, - NodeName: utilpointer.StringPtr(testHostname), + NodeName: pointer.String(testHostname), }, { Addresses: []string{"10.0.1.4"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(false), - Serving: utilpointer.BoolPtr(true), - Terminating: utilpointer.BoolPtr(true), + Ready: pointer.Bool(false), + Serving: pointer.Bool(true), + Terminating: pointer.Bool(true), }, - NodeName: utilpointer.StringPtr("another-host"), + NodeName: pointer.String("another-host"), }, { Addresses: []string{"10.0.1.5"}, Conditions: discovery.EndpointConditions{ - Ready: utilpointer.BoolPtr(true), - Serving: utilpointer.BoolPtr(true), - Terminating: utilpointer.BoolPtr(false), + Ready: pointer.Bool(true), + Serving: pointer.Bool(true), + Terminating: pointer.Bool(false), }, - NodeName: utilpointer.StringPtr("another-host"), + NodeName: pointer.String("another-host"), }, }, } @@ -5960,8 +5960,8 @@ func TestNoEndpointsMetric(t *testing.T) { Labels: map[string]string{discovery.LabelServiceName: serviceName}, }, Ports: []discovery.EndpointPort{{ - Name: utilpointer.StringPtr("p80"), - Port: utilpointer.Int32Ptr(80), + Name: pointer.String("p80"), + Port: pointer.Int32(80), Protocol: &tcpProtocol, }}, AddressType: discovery.AddressTypeIPv4, @@ -5970,8 +5970,8 @@ func TestNoEndpointsMetric(t *testing.T) { for _, ep := range tc.endpoints { endpointSlice.Endpoints = append(endpointSlice.Endpoints, discovery.Endpoint{ Addresses: []string{ep.ip}, - Conditions: discovery.EndpointConditions{Ready: utilpointer.BoolPtr(true)}, - NodeName: utilpointer.StringPtr(ep.hostname), + Conditions: discovery.EndpointConditions{Ready: pointer.Bool(true)}, + NodeName: pointer.String(ep.hostname), }) } diff --git a/pkg/proxy/winkernel/proxier_test.go b/pkg/proxy/winkernel/proxier_test.go index 30bf4c0643a..29218803d6d 100644 --- a/pkg/proxy/winkernel/proxier_test.go +++ b/pkg/proxy/winkernel/proxier_test.go @@ -34,7 +34,7 @@ import ( "k8s.io/kubernetes/pkg/proxy" "k8s.io/kubernetes/pkg/proxy/healthcheck" netutils "k8s.io/utils/net" - utilpointer "k8s.io/utils/pointer" + "k8s.io/utils/pointer" ) const ( @@ -251,8 +251,8 @@ func TestCreateRemoteEndpointOverlay(t *testing.T) { Addresses: []string{epIpAddressRemote}, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.StringPtr(svcPortName.Port), - Port: utilpointer.Int32(int32(svcPort)), + Name: pointer.String(svcPortName.Port), + Port: pointer.Int32(int32(svcPort)), Protocol: &tcpProtocol, }} }), @@ -316,8 +316,8 @@ func TestCreateRemoteEndpointL2Bridge(t *testing.T) { Addresses: []string{epIpAddressRemote}, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.String(svcPortName.Port), - Port: utilpointer.Int32(int32(svcPort)), + Name: pointer.String(svcPortName.Port), + Port: pointer.Int32(int32(svcPort)), Protocol: &tcpProtocol, }} }), @@ -398,8 +398,8 @@ func TestSharedRemoteEndpointDelete(t *testing.T) { Addresses: []string{epIpAddressRemote}, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.StringPtr(svcPortName1.Port), - Port: utilpointer.Int32(int32(svcPort1)), + Name: pointer.String(svcPortName1.Port), + Port: pointer.Int32(int32(svcPort1)), Protocol: &tcpProtocol, }} }), @@ -409,8 +409,8 @@ func TestSharedRemoteEndpointDelete(t *testing.T) { Addresses: []string{epIpAddressRemote}, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.StringPtr(svcPortName2.Port), - Port: utilpointer.Int32(int32(svcPort2)), + Name: pointer.String(svcPortName2.Port), + Port: pointer.Int32(int32(svcPort2)), Protocol: &tcpProtocol, }} }), @@ -457,8 +457,8 @@ func TestSharedRemoteEndpointDelete(t *testing.T) { Addresses: []string{epIpAddressRemote}, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.StringPtr(svcPortName2.Port), - Port: utilpointer.Int32(int32(svcPort2)), + Name: pointer.String(svcPortName2.Port), + Port: pointer.Int32(int32(svcPort2)), Protocol: &tcpProtocol, }} }), @@ -542,8 +542,8 @@ func TestSharedRemoteEndpointUpdate(t *testing.T) { Addresses: []string{epIpAddressRemote}, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.StringPtr(svcPortName1.Port), - Port: utilpointer.Int32(int32(svcPort1)), + Name: pointer.String(svcPortName1.Port), + Port: pointer.Int32(int32(svcPort1)), Protocol: &tcpProtocol, }} }), @@ -553,8 +553,8 @@ func TestSharedRemoteEndpointUpdate(t *testing.T) { Addresses: []string{epIpAddressRemote}, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.StringPtr(svcPortName2.Port), - Port: utilpointer.Int32(int32(svcPort2)), + Name: pointer.String(svcPortName2.Port), + Port: pointer.Int32(int32(svcPort2)), Protocol: &tcpProtocol, }} }), @@ -611,8 +611,8 @@ func TestSharedRemoteEndpointUpdate(t *testing.T) { Addresses: []string{epIpAddressRemote}, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.StringPtr(svcPortName1.Port), - Port: utilpointer.Int32(int32(svcPort1)), + Name: pointer.String(svcPortName1.Port), + Port: pointer.Int32(int32(svcPort1)), Protocol: &tcpProtocol, }} }), @@ -622,13 +622,13 @@ func TestSharedRemoteEndpointUpdate(t *testing.T) { Addresses: []string{epIpAddressRemote}, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.StringPtr(svcPortName1.Port), - Port: utilpointer.Int32(int32(svcPort1)), + Name: pointer.String(svcPortName1.Port), + Port: pointer.Int32(int32(svcPort1)), Protocol: &tcpProtocol, }, { - Name: utilpointer.StringPtr("p443"), - Port: utilpointer.Int32(int32(443)), + Name: pointer.String("p443"), + Port: pointer.Int32(int32(443)), Protocol: &tcpProtocol, }} })) @@ -696,8 +696,8 @@ func TestCreateLoadBalancer(t *testing.T) { Addresses: []string{epIpAddressRemote}, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.StringPtr(svcPortName.Port), - Port: utilpointer.Int32(int32(svcPort)), + Name: pointer.String(svcPortName.Port), + Port: pointer.Int32(int32(svcPort)), Protocol: &tcpProtocol, }} }), @@ -759,8 +759,8 @@ func TestCreateDsrLoadBalancer(t *testing.T) { Addresses: []string{epIpAddressRemote}, }} eps.Ports = []discovery.EndpointPort{{ - Name: utilpointer.StringPtr(svcPortName.Port), - Port: utilpointer.Int32(int32(svcPort)), + Name: pointer.String(svcPortName.Port), + Port: pointer.Int32(int32(svcPort)), Protocol: &tcpProtocol, }} }), @@ -824,14 +824,14 @@ func TestEndpointSlice(t *testing.T) { }, Ports: []discovery.EndpointPort{{ Name: &svcPortName.Port, - Port: utilpointer.Int32Ptr(80), + Port: pointer.Int32(80), Protocol: &tcpProtocol, }}, AddressType: discovery.AddressTypeIPv4, Endpoints: []discovery.Endpoint{{ Addresses: []string{"192.168.2.3"}, - Conditions: discovery.EndpointConditions{Ready: utilpointer.BoolPtr(true)}, - NodeName: utilpointer.StringPtr("testhost2"), + Conditions: discovery.EndpointConditions{Ready: pointer.Bool(true)}, + NodeName: pointer.String("testhost2"), }}, }