remove gloo prefix for deployed objs (#10629)

kgateway-dev · Feb 14, 2025 · 57e7ae8 · 57e7ae8
1 parent e95c051
commit 57e7ae8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 20 deletions.
diff --git a/internal/kgateway/deployer/deployer_test.go b/internal/kgateway/deployer/deployer_test.go
@@ -115,10 +115,6 @@ func (objs *clientObjects) getEnvoyConfig(namespace, name string) *envoy_config_
 	return &bootstrapCfg
 }
 
-func proxyName(name string) string {
-	return fmt.Sprintf("gloo-proxy-%s", name)
-}
-
 // containMapElements produces a matcher that will only match if all provided map elements
 // are completely accounted for. The actual value is expected to not be nil or empty since
 // there are other, more appropriate matchers for those cases.
@@ -251,7 +247,7 @@ var _ = Describe("Deployer", func() {
 			}
 		}
 
-		defaultDeploymentName     = proxyName(defaultGateway().Name)
+		defaultDeploymentName     = defaultGateway().Name
 		defaultConfigMapName      = defaultDeploymentName
 		defaultServiceName        = defaultDeploymentName
 		defaultServiceAccountName = defaultDeploymentName
@@ -332,10 +328,10 @@ var _ = Describe("Deployer", func() {
 			objs, err = d.GetObjsToDeploy(context.Background(), gw)
 			Expect(err).NotTo(HaveOccurred())
 			Expect(objs).To(HaveLen(4))
-			Expect(objs.findDeployment(defaultNamespace, proxyName(gw.Name))).ToNot(BeNil())
-			Expect(objs.findService(defaultNamespace, proxyName(gw.Name))).ToNot(BeNil())
-			Expect(objs.findConfigMap(defaultNamespace, proxyName(gw.Name))).ToNot(BeNil())
-			Expect(objs.findServiceAccount(defaultNamespace, proxyName(gw.Name))).ToNot(BeNil())
+			Expect(objs.findDeployment(defaultNamespace, gw.Name)).ToNot(BeNil())
+			Expect(objs.findService(defaultNamespace, gw.Name)).ToNot(BeNil())
+			Expect(objs.findConfigMap(defaultNamespace, gw.Name)).ToNot(BeNil())
+			Expect(objs.findServiceAccount(defaultNamespace, gw.Name)).ToNot(BeNil())
 		})
 	})
 
@@ -508,24 +504,24 @@ var _ = Describe("Deployer", func() {
 			objs1, err = d1.GetObjsToDeploy(context.Background(), gw1)
 			Expect(err).NotTo(HaveOccurred())
 			Expect(objs1).NotTo(BeEmpty())
-			Expect(objs1.findDeployment(defaultNamespace, proxyName(gw1.Name))).ToNot(BeNil())
-			Expect(objs1.findService(defaultNamespace, proxyName(gw1.Name))).ToNot(BeNil())
-			Expect(objs1.findConfigMap(defaultNamespace, proxyName(gw1.Name))).ToNot(BeNil())
-			Expect(objs1.findServiceAccount(defaultNamespace, proxyName(gw1.Name))).ToNot(BeNil())
+			Expect(objs1.findDeployment(defaultNamespace, gw1.Name)).ToNot(BeNil())
+			Expect(objs1.findService(defaultNamespace, gw1.Name)).ToNot(BeNil())
+			Expect(objs1.findConfigMap(defaultNamespace, gw1.Name)).ToNot(BeNil())
+			Expect(objs1.findServiceAccount(defaultNamespace, gw1.Name)).ToNot(BeNil())
 
 			objs2, err = d2.GetObjsToDeploy(context.Background(), gw2)
 			Expect(err).NotTo(HaveOccurred())
 			Expect(objs2).NotTo(BeEmpty())
-			Expect(objs2.findDeployment(defaultNamespace, proxyName(gw2.Name))).ToNot(BeNil())
-			Expect(objs2.findService(defaultNamespace, proxyName(gw2.Name))).ToNot(BeNil())
-			Expect(objs2.findConfigMap(defaultNamespace, proxyName(gw2.Name))).ToNot(BeNil())
-			Expect(objs2.findServiceAccount(defaultNamespace, proxyName(gw2.Name))).ToNot(BeNil())
+			Expect(objs2.findDeployment(defaultNamespace, gw2.Name)).ToNot(BeNil())
+			Expect(objs2.findService(defaultNamespace, gw2.Name)).ToNot(BeNil())
+			Expect(objs2.findConfigMap(defaultNamespace, gw2.Name)).ToNot(BeNil())
+			Expect(objs2.findServiceAccount(defaultNamespace, gw2.Name)).ToNot(BeNil())
 
 			for _, obj := range objs1 {
-				Expect(obj.GetName()).To(Equal("gloo-proxy-foo"))
+				Expect(obj.GetName()).To(Equal(gw1.Name))
 			}
 			for _, obj := range objs2 {
-				Expect(obj.GetName()).To(Equal("gloo-proxy-bar"))
+				Expect(obj.GetName()).To(Equal(gw2.Name))
 			}
 		})
 	})

diff --git a/internal/kgateway/helm/gloo-gateway/templates/_helpers.tpl b/internal/kgateway/helm/gloo-gateway/templates/_helpers.tpl
@@ -31,7 +31,7 @@ If release name contains chart name it will be used as a full name.
 {{- .Values.gateway.fullnameOverride | trunc 63 | trimSuffix "-" }}
 {{- else }}
 {{- $name := default .Release.Name .Values.gateway.nameOverride }}
-{{- .Release.Name | printf "gloo-proxy-%s" | trunc 63 | trimSuffix "-" }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
 {{- end }}
 {{- end }}