change k8sgateway to gloo-gateway

arianaw66 · arianaw66 · commit 72ffa84a846a · 2024-11-15T11:55:53.000-05:00
diff --git a/changelog/v1.18.0-beta35/GG-CRD-categories.yaml b/changelog/v1.18.0-beta35/GG-CRD-categories.yaml
@@ -1,5 +1,5 @@
 changelog:
 - type: NEW_FEATURE
-  description: Adds a common category to all Gloo Gateway CRDs. `kubectl get k8sgateway -A` can now be used to list all GG CRs on your cluster. Also adds the "solo-io" category to GG enterprise CRDs.
+  description: Adds a common category to all Gloo Gateway CRDs. `kubectl get gloo-gateway -A` can now be used to list all GG CRs on your cluster. Also adds the "solo-io" category to GG enterprise CRDs.
   issueLink: https://github.com/solo-io/solo-projects/issues/6605
   resolvesIssue: false
diff --git a/install/helm/gloo/crds/enterprise.gloo.solo.io_v1_AuthConfig.yaml b/install/helm/gloo/crds/enterprise.gloo.solo.io_v1_AuthConfig.yaml
@@ -10,7 +10,7 @@ spec:
   names:
     categories:
     - solo-io
-    - k8sgateway
+    - gloo-gateway
     kind: AuthConfig
     listKind: AuthConfigList
     plural: authconfigs
diff --git a/install/helm/gloo/crds/gateway.gloo.solo.io_directresponses.yaml b/install/helm/gloo/crds/gateway.gloo.solo.io_directresponses.yaml
@@ -13,7 +13,6 @@ spec:
   names:
     categories:
     - gloo-gateway
-    - k8sgateway
     kind: DirectResponse
     listKind: DirectResponseList
     plural: directresponses
diff --git a/install/helm/gloo/crds/gateway.gloo.solo.io_gatewayparameters.yaml b/install/helm/gloo/crds/gateway.gloo.solo.io_gatewayparameters.yaml
@@ -13,7 +13,6 @@ spec:
   names:
     categories:
     - gloo-gateway
-    - k8sgateway
     kind: GatewayParameters
     listKind: GatewayParametersList
     plural: gatewayparameters
diff --git a/install/helm/gloo/crds/gateway.solo.io_v1_Gateway.yaml b/install/helm/gloo/crds/gateway.solo.io_v1_Gateway.yaml
@@ -9,7 +9,7 @@ spec:
   group: gateway.solo.io
   names:
     categories:
-    - k8sgateway
+    - gloo-gateway
     kind: Gateway
     listKind: GatewayList
     plural: gateways
diff --git a/install/helm/gloo/crds/gateway.solo.io_v1_HttpListenerOption.yaml b/install/helm/gloo/crds/gateway.solo.io_v1_HttpListenerOption.yaml
@@ -9,7 +9,7 @@ spec:
   group: gateway.solo.io
   names:
     categories:
-    - k8sgateway
+    - gloo-gateway
     kind: HttpListenerOption
     listKind: HttpListenerOptionList
     plural: httplisteneroptions
diff --git a/install/helm/gloo/crds/gateway.solo.io_v1_ListenerOption.yaml b/install/helm/gloo/crds/gateway.solo.io_v1_ListenerOption.yaml
@@ -9,7 +9,7 @@ spec:
   group: gateway.solo.io
   names:
     categories:
-    - k8sgateway
+    - gloo-gateway
     kind: ListenerOption
     listKind: ListenerOptionList
     plural: listeneroptions
diff --git a/install/helm/gloo/crds/gateway.solo.io_v1_MatchableHttpGateway.yaml b/install/helm/gloo/crds/gateway.solo.io_v1_MatchableHttpGateway.yaml
@@ -9,7 +9,7 @@ spec:
   group: gateway.solo.io
   names:
     categories:
-    - k8sgateway
+    - gloo-gateway
     kind: MatchableHttpGateway
     listKind: MatchableHttpGatewayList
     plural: httpgateways
diff --git a/install/helm/gloo/crds/gateway.solo.io_v1_MatchableTcpGateway.yaml b/install/helm/gloo/crds/gateway.solo.io_v1_MatchableTcpGateway.yaml
@@ -9,7 +9,7 @@ spec:
   group: gateway.solo.io
   names:
     categories:
-    - k8sgateway
+    - gloo-gateway
     kind: MatchableTcpGateway
     listKind: MatchableTcpGatewayList
     plural: tcpgateways
diff --git a/install/helm/gloo/crds/gateway.solo.io_v1_RouteOption.yaml b/install/helm/gloo/crds/gateway.solo.io_v1_RouteOption.yaml
@@ -9,7 +9,7 @@ spec:
   group: gateway.solo.io
   names:
     categories:
-    - k8sgateway
+    - gloo-gateway
     kind: RouteOption
     listKind: RouteOptionList
     plural: routeoptions
diff --git a/install/helm/gloo/crds/gateway.solo.io_v1_RouteTable.yaml b/install/helm/gloo/crds/gateway.solo.io_v1_RouteTable.yaml
@@ -9,7 +9,7 @@ spec:
   group: gateway.solo.io
   names:
     categories:
-    - k8sgateway
+    - gloo-gateway
     kind: RouteTable
     listKind: RouteTableList
     plural: routetables
diff --git a/install/helm/gloo/crds/gateway.solo.io_v1_VirtualHostOption.yaml b/install/helm/gloo/crds/gateway.solo.io_v1_VirtualHostOption.yaml
@@ -9,7 +9,7 @@ spec:
   group: gateway.solo.io
   names:
     categories:
-    - k8sgateway
+    - gloo-gateway
     kind: VirtualHostOption
     listKind: VirtualHostOptionList
     plural: virtualhostoptions
diff --git a/install/helm/gloo/crds/gateway.solo.io_v1_VirtualService.yaml b/install/helm/gloo/crds/gateway.solo.io_v1_VirtualService.yaml
@@ -9,7 +9,7 @@ spec:
   group: gateway.solo.io
   names:
     categories:
-    - k8sgateway
+    - gloo-gateway
     kind: VirtualService
     listKind: VirtualServiceList
     plural: virtualservices
diff --git a/install/helm/gloo/crds/gloo.solo.io_v1_Proxy.yaml b/install/helm/gloo/crds/gloo.solo.io_v1_Proxy.yaml
@@ -9,7 +9,7 @@ spec:
   group: gloo.solo.io
   names:
     categories:
-    - k8sgateway
+    - gloo-gateway
     kind: Proxy
     listKind: ProxyList
     plural: proxies
diff --git a/install/helm/gloo/crds/gloo.solo.io_v1_Settings.yaml b/install/helm/gloo/crds/gloo.solo.io_v1_Settings.yaml
@@ -11,7 +11,7 @@ spec:
   group: gloo.solo.io
   names:
     categories:
-    - k8sgateway
+    - gloo-gateway
     kind: Settings
     listKind: SettingsList
     plural: settings
diff --git a/install/helm/gloo/crds/gloo.solo.io_v1_Upstream.yaml b/install/helm/gloo/crds/gloo.solo.io_v1_Upstream.yaml
@@ -9,7 +9,7 @@ spec:
   group: gloo.solo.io
   names:
     categories:
-    - k8sgateway
+    - gloo-gateway
     kind: Upstream
     listKind: UpstreamList
     plural: upstreams
diff --git a/install/helm/gloo/crds/gloo.solo.io_v1_UpstreamGroup.yaml b/install/helm/gloo/crds/gloo.solo.io_v1_UpstreamGroup.yaml
@@ -9,7 +9,7 @@ spec:
   group: gloo.solo.io
   names:
     categories:
-    - k8sgateway
+    - gloo-gateway
     kind: UpstreamGroup
     listKind: UpstreamGroupList
     plural: upstreamgroups
diff --git a/install/helm/gloo/crds/graphql.gloo.solo.io_v1beta1_GraphQLApi.yaml b/install/helm/gloo/crds/graphql.gloo.solo.io_v1beta1_GraphQLApi.yaml
@@ -10,7 +10,7 @@ spec:
   names:
     categories:
     - solo-io
-    - k8sgateway
+    - gloo-gateway
     kind: GraphQLApi
     listKind: GraphQLApiList
     plural: graphqlapis
diff --git a/install/helm/gloo/crds/ratelimit_config.yaml b/install/helm/gloo/crds/ratelimit_config.yaml
@@ -7,7 +7,7 @@ spec:
   names:
     categories:
     - solo-io
-    - k8sgateway
+    - gloo-gateway
     kind: RateLimitConfig
     listKind: RateLimitConfigList
     plural: ratelimitconfigs
diff --git a/projects/gateway2/api/v1alpha1/direct_response_types.go b/projects/gateway2/api/v1alpha1/direct_response_types.go
@@ -8,7 +8,7 @@ import (
 //
 // +kubebuilder:object:root=true
 // +kubebuilder:metadata:labels={app=gloo-gateway,app.kubernetes.io/name=gloo-gateway}
-// +kubebuilder:resource:categories={gloo-gateway,k8sgateway},shortName=dr
+// +kubebuilder:resource:categories=gloo-gateway,shortName=dr
 // +kubebuilder:subresource:status
 type DirectResponse struct {
 	metav1.TypeMeta   `json:",inline"`
diff --git a/projects/gateway2/api/v1alpha1/gateway_parameters_types.go b/projects/gateway2/api/v1alpha1/gateway_parameters_types.go
@@ -11,7 +11,7 @@ import (
 //
 // +kubebuilder:object:root=true
 // +kubebuilder:metadata:labels={app=gloo-gateway,app.kubernetes.io/name=gloo-gateway}
-// +kubebuilder:resource:categories={gloo-gateway,k8sgateway},shortName=gwp
+// +kubebuilder:resource:categories=gloo-gateway,shortName=gwp
 // +kubebuilder:subresource:status
 type GatewayParameters struct {
 	metav1.TypeMeta   `json:",inline"`
diff --git a/test/kubernetes/e2e/features/CRD_categories/suite.go b/test/kubernetes/e2e/features/CRD_categories/suite.go
@@ -40,7 +40,7 @@ func (s *testingSuite) TearDownSuite() {
 }
 
 // See TestApplyCRDs() helm test for a future-proofed common category test,
-// which ensures all CRDs in our helm chart include the k8sgateway category.
+// which ensures all CRDs in our helm chart include the gloo-gateway category.
 // This test uses one of those CRs to assert that the resulting end user experience is as desired.
 func (s *testingSuite) TestCommonCategory() {
 	cmd := s.ti.Actions.Kubectl().Command(s.ctx, "get", helm.CommonCRDCategory, "-o", "name")
diff --git a/test/kubernetes/e2e/features/helm/suite.go b/test/kubernetes/e2e/features/helm/suite.go
@@ -108,7 +108,7 @@ func (s *testingSuite) TestApplyCRDs() {
 		s.NoError(err)
 		s.Contains(out, crd.GetName())
 
-		// Ensure the CRD has the k8sgateway category
+		// Ensure the CRD has the gloo-gateway category
 		out, _, err = s.TestHelper.Execute(s.Ctx, "get", "crd", crd.GetName(), "-o", "json")
 		s.NoError(err)
 
diff --git a/test/kubernetes/e2e/features/helm/types.go b/test/kubernetes/e2e/features/helm/types.go
@@ -20,7 +20,7 @@ var (
 	}
 
 	enterpriseCRDCategory = "solo-io"
-	CommonCRDCategory     = "k8sgateway"
+	CommonCRDCategory     = "gloo-gateway"
 
 	enterpriseCRDs = []string{
 		"authconfigs.enterprise.gloo.solo.io",
