store test rbac update

chauhanshubham · chauhanshubham · commit deca7dce028a · 2023-05-04T14:56:28.000+05:30
Signed-off-by: Shubham Chauhan &lt;shubham@tetrate.io&gt;
diff --git a/charts/gateway-helm/templates/generated/rbac/roles.yaml b/charts/gateway-helm/templates/generated/rbac/roles.yaml
@@ -8,8 +8,8 @@ rules:
 - apiGroups:
   - ""
   resources:
-  - nodes
   - namespaces
+  - nodes
   - secrets
   - services
   verbs:
diff --git a/internal/provider/kubernetes/rbac.go b/internal/provider/kubernetes/rbac.go
@@ -14,5 +14,5 @@ package kubernetes
 // +kubebuilder:rbac:groups="gateway.envoyproxy.io",resources=authenticationfilters;ratelimitfilters,verbs=get;list;watch;update
 
 // RBAC for watched resources of Gateway API controllers.
-// +kubebuilder:rbac:groups="",resources=secrets;services;namespaces,verbs=get;list;watch
+// +kubebuilder:rbac:groups="",resources=secrets;services;namespaces;nodes,verbs=get;list;watch
 // +kubebuilder:rbac:groups=apps,resources=deployments,verbs=get;list;watch
diff --git a/internal/provider/kubernetes/store.go b/internal/provider/kubernetes/store.go
@@ -46,9 +46,9 @@ func (p *kubernetesProviderStore) addNode(n *corev1.Node) {
 	// to the internalIP of the Node.
 	if externalIP != "" {
 		details.address = externalIP
-		return
+	} else if internalIP != "" {
+		details.address = internalIP
 	}
-	details.address = internalIP
 	p.nodes[n.Name] = details
 }
 
@@ -59,7 +59,9 @@ func (p *kubernetesProviderStore) removeNode(n *corev1.Node) {
 func (p *kubernetesProviderStore) listNodeAddresses() []string {
 	addrs := []string{}
 	for _, n := range p.nodes {
-		addrs = append(addrs, n.address)
+		if n.address != "" {
+			addrs = append(addrs, n.address)
+		}
 	}
 	return addrs
 }
diff --git a/internal/provider/kubernetes/store_test.go b/internal/provider/kubernetes/store_test.go
@@ -0,0 +1,79 @@
+// Copyright Envoy Gateway Authors
+// SPDX-License-Identifier: Apache-2.0
+// The full text of the Apache license is available in the LICENSE file at
+// the root of the repo.
+
+package kubernetes
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	corev1 "k8s.io/api/core/v1"
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+func TestNodeDetailsAddressStore(t *testing.T) {
+	store := newProviderStore()
+	testCases := []struct {
+		name              string
+		nodeObject        *corev1.Node
+		expectedAddresses []string
+	}{
+		{
+			name: "No node addresses",
+			nodeObject: &corev1.Node{
+				ObjectMeta: v1.ObjectMeta{Name: "node1"},
+				Status:     corev1.NodeStatus{Addresses: []corev1.NodeAddress{{}}},
+			},
+			expectedAddresses: []string{},
+		},
+		{
+			name: "only external address",
+			nodeObject: &corev1.Node{
+				ObjectMeta: v1.ObjectMeta{Name: "node1"},
+				Status: corev1.NodeStatus{Addresses: []corev1.NodeAddress{{
+					Address: "1.1.1.1",
+					Type:    corev1.NodeExternalIP,
+				}}},
+			},
+			expectedAddresses: []string{"1.1.1.1"},
+		},
+		{
+			name: "only internal address",
+			nodeObject: &corev1.Node{
+				ObjectMeta: v1.ObjectMeta{Name: "node1"},
+				Status: corev1.NodeStatus{Addresses: []corev1.NodeAddress{{
+					Address: "1.1.1.1",
+					Type:    corev1.NodeInternalIP,
+				}}},
+			},
+			expectedAddresses: []string{"1.1.1.1"},
+		},
+		{
+			name: "prefer external address",
+			nodeObject: &corev1.Node{
+				ObjectMeta: v1.ObjectMeta{Name: "node1"},
+				Status: corev1.NodeStatus{Addresses: []corev1.NodeAddress{
+					{
+						Address: "1.1.1.1",
+						Type:    corev1.NodeExternalIP,
+					},
+					{
+						Address: "2.2.2.2",
+						Type:    corev1.NodeInternalIP,
+					},
+				}},
+			},
+			expectedAddresses: []string{"1.1.1.1"},
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			store.addNode(tc.nodeObject)
+			assert.Equal(t, tc.expectedAddresses, store.listNodeAddresses())
+			store.removeNode(tc.nodeObject)
+		})
+	}
+}

Original file line number	Diff line number	Diff line change
`@@ -46,9 +46,9 @@ func (p kubernetesProviderStore) addNode(n corev1.Node) {`
`46`	`46`	`// to the internalIP of the Node.`
`47`	`47`	`if externalIP != "" {`
`48`	`48`	`details.address = externalIP`
`49`		`- return`
	`49`	`+ } else if internalIP != "" {`
	`50`	`+ details.address = internalIP`
`50`	`51`	`}`
`51`		`- details.address = internalIP`
`52`	`52`	`p.nodes[n.Name] = details`
`53`	`53`	`}`
`54`	`54`
`@@ -59,7 +59,9 @@ func (p kubernetesProviderStore) removeNode(n corev1.Node) {`
`59`	`59`	`func (p *kubernetesProviderStore) listNodeAddresses() []string {`
`60`	`60`	`addrs := []string{}`
`61`	`61`	`for _, n := range p.nodes {`
`62`		`- addrs = append(addrs, n.address)`
	`62`	`+ if n.address != "" {`
	`63`	`+ addrs = append(addrs, n.address)`
	`64`	`+ }`
`63`	`65`	`}`
`64`	`66`	`return addrs`
`65`	`67`	`}`