add local hash name func

Signed-off-by: Karol Szwaj <[email protected]>

Author: cnvergence

internal/infrastructure/kubernetes/infra.go

@@ -62,19 +62,10 @@ type Infra struct {
 
 // NewInfra returns a new Infra.
 func NewInfra(cli client.Client, cfg *config.Server) *Infra {
-<<<<<<< HEAD
 	return &Infra{
 		// Always set infra namespace to cfg.ControllerNamespace,
 		// Otherwise RateLimit resource provider will failed to create/delete.
 		Namespace:    cfg.ControllerNamespace,
-=======
-	var ns string
-	if !cfg.EnvoyGateway.GatewayNamespaceMode() {
-		ns = cfg.ControllerNamespace
-	}
-	return &Infra{
-		Namespace:    ns,
->>>>>>> 445c3b09 (Revert "Add controller namespace to infra")
 		DNSDomain:    cfg.DNSDomain,
 		EnvoyGateway: cfg.EnvoyGateway,
 		Client:       New(cli),

internal/infrastructure/kubernetes/proxy/resource_provider.go

@@ -59,16 +59,7 @@ type ResourceRender struct {
 
 func NewResourceRender(ns, dnsDomain string, infra *ir.ProxyInfra, gateway *egv1a1.EnvoyGateway) *ResourceRender {
 	return &ResourceRender{
-<<<<<<< HEAD
-<<<<<<< HEAD
 		namespace:            ns,
-=======
-		Namespace:            infraNamespace,
-		ControllerNamespace:  controllerNamespace,
->>>>>>> 5aa72e72 (Add controller namespace to infra)
-=======
-		Namespace:            ns,
->>>>>>> 445c3b09 (Revert "Add controller namespace to infra")
 		DNSDomain:            dnsDomain,
 		infra:                infra,
 		ShutdownManager:      gateway.GetEnvoyGatewayProvider().GetEnvoyGatewayKubeProvider().ShutdownManager,
@@ -293,15 +284,7 @@ func (r *ResourceRender) Deployment() (*appsv1.Deployment, error) {
 	}
 
 	// Get expected bootstrap configurations rendered ProxyContainers
-<<<<<<< HEAD
-<<<<<<< HEAD
 	containers, err := expectedProxyContainers(r.infra, deploymentConfig.Container, proxyConfig.Spec.Shutdown, r.ShutdownManager, r.Namespace(), r.DNSDomain, r.GatewayNamespaceMode)
-=======
-	containers, err := expectedProxyContainers(r.infra, deploymentConfig.Container, proxyConfig.Spec.Shutdown, r.ShutdownManager, r.ControllerNamespace, r.DNSDomain, r.GatewayNamespaceMode)
->>>>>>> 5aa72e72 (Add controller namespace to infra)
-=======
-	containers, err := expectedProxyContainers(r.infra, deploymentConfig.Container, proxyConfig.Spec.Shutdown, r.ShutdownManager, r.Namespace, r.DNSDomain, r.GatewayNamespaceMode)
->>>>>>> 445c3b09 (Revert "Add controller namespace to infra")
 	if err != nil {
 		return nil, err
 	}
@@ -389,15 +372,7 @@ func (r *ResourceRender) DaemonSet() (*appsv1.DaemonSet, error) {
 	}
 
 	// Get expected bootstrap configurations rendered ProxyContainers
-<<<<<<< HEAD
-<<<<<<< HEAD
 	containers, err := expectedProxyContainers(r.infra, daemonSetConfig.Container, proxyConfig.Spec.Shutdown, r.ShutdownManager, r.Namespace(), r.DNSDomain, r.GatewayNamespaceMode)
-=======
-	containers, err := expectedProxyContainers(r.infra, daemonSetConfig.Container, proxyConfig.Spec.Shutdown, r.ShutdownManager, r.ControllerNamespace, r.DNSDomain, r.GatewayNamespaceMode)
->>>>>>> 5aa72e72 (Add controller namespace to infra)
-=======
-	containers, err := expectedProxyContainers(r.infra, daemonSetConfig.Container, proxyConfig.Spec.Shutdown, r.ShutdownManager, r.Namespace, r.DNSDomain, r.GatewayNamespaceMode)
->>>>>>> 445c3b09 (Revert "Add controller namespace to infra")
 	if err != nil {
 		return nil, err
 	}

internal/infrastructure/kubernetes/proxy/resource_provider_test.go

@@ -1315,8 +1315,6 @@ func TestServiceAccount(t *testing.T) {
 
 	for _, tc := range cases {
 		t.Run(tc.name, func(t *testing.T) {
-<<<<<<< HEAD
-<<<<<<< HEAD
 			ns := cfg.ControllerNamespace
 			if tc.gatewayNamespaceMode {
 				deployType := egv1a1.KubernetesDeployModeType(egv1a1.KubernetesDeployModeTypeGatewayNamespace)
@@ -1331,13 +1329,6 @@ func TestServiceAccount(t *testing.T) {
 				ns = tc.infra.GetProxyInfra().Namespace
 			}
 			r := NewResourceRender(ns, cfg.DNSDomain, tc.infra.GetProxyInfra(), cfg.EnvoyGateway)
-
-=======
-			r := NewResourceRender(cfg.ControllerNamespace, cfg.ControllerNamespace, cfg.DNSDomain, tc.infra.GetProxyInfra(), cfg.EnvoyGateway)
->>>>>>> 5aa72e72 (Add controller namespace to infra)
-=======
-			r := NewResourceRender(cfg.ControllerNamespace, cfg.DNSDomain, tc.infra.GetProxyInfra(), cfg.EnvoyGateway)
->>>>>>> 445c3b09 (Revert "Add controller namespace to infra")
 			sa, err := r.ServiceAccount()
 			require.NoError(t, err)
 

internal/infrastructure/kubernetes/proxy_infra.go

@@ -23,16 +23,8 @@ func (i *Infra) CreateOrUpdateProxyInfra(ctx context.Context, infra *ir.Infra) e
 		return errors.New("infra proxy ir is nil")
 	}
 
-<<<<<<< HEAD
 	ns := i.GetResourceNamespace(infra)
 	r := proxy.NewResourceRender(ns, i.DNSDomain, infra.GetProxyInfra(), i.EnvoyGateway)
-=======
-	if i.EnvoyGateway.GatewayNamespaceMode() && i.Namespace == "" {
-		i.Namespace = infra.Proxy.Namespace
-	}
-
-	r := proxy.NewResourceRender(i.Namespace, i.DNSDomain, infra.GetProxyInfra(), i.EnvoyGateway)
->>>>>>> 445c3b09 (Revert "Add controller namespace to infra")
 	return i.createOrUpdate(ctx, r)
 }
 
@@ -42,16 +34,8 @@ func (i *Infra) DeleteProxyInfra(ctx context.Context, infra *ir.Infra) error {
 		return errors.New("infra ir is nil")
 	}
 
-<<<<<<< HEAD
 	ns := i.GetResourceNamespace(infra)
 	r := proxy.NewResourceRender(ns, i.DNSDomain, infra.GetProxyInfra(), i.EnvoyGateway)
-=======
-	if i.EnvoyGateway.GatewayNamespaceMode() && i.Namespace == "" {
-		i.Namespace = infra.Proxy.Namespace
-	}
-
-	r := proxy.NewResourceRender(i.Namespace, i.DNSDomain, infra.GetProxyInfra(), i.EnvoyGateway)
->>>>>>> 445c3b09 (Revert "Add controller namespace to infra")
 	return i.delete(ctx, r)
 }
 

internal/xds/server/kubejwt/tokenreview.go

@@ -16,7 +16,8 @@ import (
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 
-	"github.com/envoyproxy/gateway/internal/infrastructure/kubernetes/proxy"
+	"github.com/envoyproxy/gateway/internal/envoygateway/config"
+	"github.com/envoyproxy/gateway/internal/utils"
 )
 
 // GetKubernetesClient creates a Kubernetes client using in-cluster configuration.
@@ -66,10 +67,16 @@ func (i *JWTAuthInterceptor) validateKubeJWT(ctx context.Context, token string)
 
 	irKeys := i.cache.GetIrKeys()
 	for _, irKey := range irKeys {
-		if proxy.ExpectedResourceHashedName(irKey) == sa {
+		if irKey2ServiceAccountName(irKey) == sa {
 			return nil
 		}
 	}
 
 	return fmt.Errorf("envoy service account %s not found in the cache", sa)
 }
+
+// this is the same logic used in infra pkg func ExpectedResourceHashedName to generate the resource name.
+func irKey2ServiceAccountName(irKey string) string {
+	hashedName := utils.GetHashedName(irKey, 48)
+	return fmt.Sprintf("%s-%s", config.EnvoyPrefix, hashedName)
+}