Merge refs/heads/main into stevenctl/allow-custom-translator

kgateway-dev · Jun 17, 2024 · 3dd15e2 · 3dd15e2
2 parents 7cb0ba8 + 7e85ba5
commit 3dd15e2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 83 deletions.
diff --git a/changelog/v1.18.0-beta1/stop-status-spamming.yaml b/changelog/v1.18.0-beta1/stop-status-spamming.yaml
@@ -0,0 +1,5 @@
+changelog:
+  - type: FIX
+    issueLink: https://github.com/solo-io/solo-projects/issues/6252
+    resolvesIssue: false
+    description: Fix issue where Kube Gateway proxies would have errors regarding status logged constantly
diff --git a/projects/gloo/pkg/syncer/envoy_translator_syncer.go b/projects/gloo/pkg/syncer/envoy_translator_syncer.go
@@ -16,19 +16,16 @@ import (
 
 	"github.com/solo-io/go-utils/contextutils"
 	"github.com/solo-io/go-utils/hashutils"
-	"github.com/solo-io/solo-kit/pkg/api/v1/control-plane/cache"
 	envoycache "github.com/solo-io/solo-kit/pkg/api/v1/control-plane/cache"
 	"github.com/solo-io/solo-kit/pkg/api/v1/control-plane/types"
 	"github.com/solo-io/solo-kit/pkg/api/v1/resources/core"
 	"github.com/solo-io/solo-kit/pkg/api/v2/reporter"
 
 	"github.com/solo-io/gloo/pkg/utils/syncutil"
 	"github.com/solo-io/gloo/projects/gateway2/translator/translatorutils"
-	gloov1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1"
 	v1snap "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/gloosnapshot"
 	"github.com/solo-io/gloo/projects/gloo/pkg/plugins"
 	syncerstats "github.com/solo-io/gloo/projects/gloo/pkg/syncer/stats"
-	"github.com/solo-io/gloo/projects/gloo/pkg/utils"
 	"github.com/solo-io/gloo/projects/gloo/pkg/xds"
 )
 
@@ -58,7 +55,7 @@ func init() {
 const emptyVersionKey = "empty"
 
 var (
-	emptyResource = cache.Resources{
+	emptyResource = envoycache.Resources{
 		Version: emptyVersionKey,
 		Items:   map[string]envoycache.Resource{},
 	}
@@ -128,7 +125,7 @@ func (s *translatorSyncer) syncEnvoy(ctx context.Context, snap *v1snap.ApiSnapsh
 	var proxiesWithReports []translatorutils.ProxyWithReports
 	for _, proxy := range snap.Proxies {
 		proxyCtx := ctx
-		metaKey := GetKeyFromProxyMeta(proxy)
+		metaKey := xds.SnapshotCacheKey(proxy)
 		if ctxWithTags, err := tag.New(proxyCtx, tag.Insert(syncerstats.ProxyNameKey, metaKey)); err == nil {
 			proxyCtx = ctxWithTags
 		}
@@ -234,17 +231,3 @@ func prettify(original interface{}) string {
 
 	return string(b)
 }
-
-func GetKeyFromProxyMeta(proxy *gloov1.Proxy) string {
-	meta := proxy.GetMetadata()
-	metaKey := meta.Ref().Key()
-	labels := proxy.GetMetadata().GetLabels()
-	if labels != nil && labels[utils.ProxyTypeKey] == utils.GatewayApiProxyValue {
-		proxyNamespace := labels[utils.GatewayNamespaceKey]
-		if proxyNamespace != "" {
-			meta.Namespace = proxyNamespace
-			metaKey = meta.Ref().Key()
-		}
-	}
-	return metaKey
-}
diff --git a/projects/gloo/pkg/syncer/translator_syncer_test.go b/projects/gloo/pkg/syncer/translator_syncer_test.go
@@ -7,8 +7,6 @@ import (
 	"github.com/solo-io/gloo/projects/gloo/pkg/servers/iosnapshot"
 
 	"github.com/solo-io/gloo/pkg/bootstrap/leaderelector/singlereplica"
-	gloov1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1"
-	"github.com/solo-io/gloo/projects/gloo/pkg/utils"
 
 	gloo_translator "github.com/solo-io/gloo/projects/gloo/pkg/translator"
 
@@ -344,68 +342,6 @@ var _ = Describe("Translate multiple proxies with errors", func() {
 
 		Expect(xdsCache.Called).To(BeTrue())
 	})
-
-	Describe("correctl returns metaKey for proxies", func() {
-		It("returns the correct key", func() {
-			// Create a proxy with metadata and labels
-			proxy := &gloov1.Proxy{
-				Metadata: &core.Metadata{
-					Name:      "test-proxy",
-					Namespace: "test-namespace",
-					Labels: map[string]string{
-						utils.ProxyTypeKey:        utils.GatewayApiProxyValue,
-						utils.GatewayNamespaceKey: "custom-namespace",
-					},
-				},
-			}
-
-			key := GetKeyFromProxyMeta(proxy)
-
-			// Assert that the returned key matches the expected value
-			expectedKey := "custom-namespace.test-proxy"
-			Expect(key).To(Equal(expectedKey))
-		})
-
-		It("returns the correct key when proxy has no custom namespace label", func() {
-
-			// Create a proxy with metadata and labels
-			proxy := &gloov1.Proxy{
-				Metadata: &core.Metadata{
-					Name:      "test-proxy",
-					Namespace: "test-namespace",
-					Labels: map[string]string{
-						utils.ProxyTypeKey: utils.GatewayApiProxyValue,
-					},
-				},
-			}
-
-			key := GetKeyFromProxyMeta(proxy)
-
-			// Assert that the returned key matches the expected value
-			expectedKey := "test-namespace.test-proxy"
-			Expect(key).To(Equal(expectedKey))
-		})
-
-		It("returns the correct key when proxy is not a Gloo gateway proxy", func() {
-			// Create a proxy with metadata and labels
-			proxy := &gloov1.Proxy{
-				Metadata: &core.Metadata{
-					Name:      "test-proxy",
-					Namespace: "test-namespace",
-					Labels: map[string]string{
-						utils.ProxyTypeKey:        "some-other-value",
-						utils.GatewayNamespaceKey: "custom-namespace",
-					},
-				},
-			}
-
-			key := GetKeyFromProxyMeta(proxy)
-
-			// Assert that the returned key matches the expected value
-			expectedKey := "test-namespace.test-proxy"
-			Expect(key).To(Equal(expectedKey))
-		})
-	})
 })
 
 type mockTranslator struct {