move to gwv1api

Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com>
envoyproxy · Oct 19, 2023 · f593c80 · f593c80
1 parent 1d621ca
commit f593c80
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 24 deletions.
diff --git a/internal/gatewayapi/testdata/merge-invalid-multiple-gateways.out.yaml b/internal/gatewayapi/testdata/merge-invalid-multiple-gateways.out.yaml
@@ -7,6 +7,7 @@ gateways:
     namespace: envoy-gateway
   spec:
     gatewayClassName: envoy-gateway-class
+    infrastructure: {}
     listeners:
     - name: http
       port: 80
@@ -44,6 +45,7 @@ gateways:
     namespace: envoy-gateway
   spec:
     gatewayClassName: envoy-gateway-class
+    infrastructure: {}
     listeners:
     - name: http
       port: 80

diff --git a/internal/gatewayapi/testdata/merge-valid-multiple-gateways-multiple-routes.in.yaml b/internal/gatewayapi/testdata/merge-valid-multiple-gateways-multiple-routes.in.yaml
@@ -30,16 +30,16 @@ gateways:
   spec:
     gatewayClassName: envoy-gateway-class
     listeners:
-      - name: http-2
-        port: 8888
-        protocol: HTTP
-      - name: http-3
-        hostname: example.com
-        port: 8888
-        protocol: HTTP
-        allowedRoutes:
-          namespaces:
-            from: All
+    - name: http-2
+      port: 8888
+      protocol: HTTP
+    - name: http-3
+      hostname: example.com
+      port: 8888
+      protocol: HTTP
+      allowedRoutes:
+        namespaces:
+          from: All
 httpRoutes:
 - apiVersion: gateway.networking.k8s.io/v1beta1
   kind: HTTPRoute

diff --git a/internal/gatewayapi/testdata/merge-valid-multiple-gateways-multiple-routes.out.yaml b/internal/gatewayapi/testdata/merge-valid-multiple-gateways-multiple-routes.out.yaml
@@ -7,6 +7,7 @@ gateways:
     namespace: envoy-gateway
   spec:
     gatewayClassName: envoy-gateway-class
+    infrastructure: {}
     listeners:
     - allowedRoutes:
         namespaces:
@@ -48,6 +49,7 @@ gateways:
     namespace: envoy-gateway
   spec:
     gatewayClassName: envoy-gateway-class
+    infrastructure: {}
     listeners:
     - name: http-2
       port: 8888

diff --git a/internal/gatewayapi/testdata/merge-valid-multiple-gateways.out.yaml b/internal/gatewayapi/testdata/merge-valid-multiple-gateways.out.yaml
@@ -7,6 +7,7 @@ gateways:
     namespace: envoy-gateway
   spec:
     gatewayClassName: envoy-gateway-class
+    infrastructure: {}
     listeners:
     - allowedRoutes:
         namespaces:
@@ -47,6 +48,7 @@ gateways:
     namespace: envoy-gateway
   spec:
     gatewayClassName: envoy-gateway-class
+    infrastructure: {}
     listeners:
     - allowedRoutes:
         namespaces:

diff --git a/internal/gatewayapi/translator.go b/internal/gatewayapi/translator.go
@@ -219,7 +219,7 @@ func (t *Translator) InitIRs(gateways []*GatewayContext, resources *Resources) (
 }
 
 // XdsIR and InfraIR map keys by default are {GatewayNamespace}/{GatewayName}, but if mergeGateways is set, they are merged under {GatewayClassName} key.
-func (t *Translator) getIRKey(gateway *v1beta1.Gateway) string {
+func (t *Translator) getIRKey(gateway *gwapiv1.Gateway) string {
 	irKey := irStringKey(gateway.Namespace, gateway.Name)
 	if t.MergeGateways {
 		return string(t.GatewayClassName)

diff --git a/internal/gatewayapi/validate.go b/internal/gatewayapi/validate.go
@@ -538,16 +538,16 @@ func (t *Translator) validateConflictedMergedListeners(gateways []*GatewayContex
 	listenerSets := sets.Set[string]{}
 	for _, gateway := range gateways {
 		for _, listener := range gateway.listeners {
-			hostname := new(v1beta1.Hostname)
+			hostname := new(gwapiv1.Hostname)
 			if listener.Hostname != nil {
 				hostname = listener.Hostname
 			}
 			portProtocolHostname := fmt.Sprintf("%s:%s:%d", listener.Protocol, *hostname, listener.Port)
 			if listenerSets.Has(portProtocolHostname) {
 				listener.SetCondition(
-					v1beta1.ListenerConditionConflicted,
+					gwapiv1.ListenerConditionConflicted,
 					metav1.ConditionTrue,
-					v1beta1.ListenerReasonHostnameConflict,
+					gwapiv1.ListenerReasonHostnameConflict,
 					"Port, protocol and hostname tuple must be unique for every listener",
 				)
 			}

diff --git a/internal/provider/kubernetes/controller.go b/internal/provider/kubernetes/controller.go
@@ -70,6 +70,7 @@ type gatewayAPIReconciler struct {
 	namespace       string
 	namespaceLabels []string
 	envoyGateway    *egv1a1.EnvoyGateway
+	mergeGateways   bool
 
 	resources *message.ProviderResources
 	extGVKs   []schema.GroupVersionKind
@@ -334,6 +335,10 @@ func (r *gatewayAPIReconciler) Reconcile(ctx context.Context, _ reconcile.Reques
 		}
 	}
 
+	if resourceTree.EnvoyProxy != nil && resourceTree.EnvoyProxy.Spec.MergeGateways != nil {
+		r.mergeGateways = *resourceTree.EnvoyProxy.Spec.MergeGateways
+	}
+
 	if err := r.gatewayClassUpdater(ctx, acceptedGC, true, string(gwapiv1.GatewayClassReasonAccepted), status.MsgValidGatewayClass); err != nil {
 		r.log.Error(err, "unable to update GatewayClass status")
 		return reconcile.Result{}, err
@@ -407,20 +412,16 @@ func (r *gatewayAPIReconciler) statusUpdateForGateway(ctx context.Context, gtw *
 	if r.statusUpdater == nil {
 		return
 	}
-	var merged bool
-	res, _ := r.resources.GatewayAPIResources.Load(string(gtw.Spec.GatewayClassName))
-	if res.EnvoyProxy != nil && res.EnvoyProxy.Spec.MergeGateways != nil && *res.EnvoyProxy.Spec.MergeGateways {
-		merged = true
-	}
+
 	// Get deployment
-	deploy, err := r.envoyDeploymentForGateway(ctx, gtw, merged)
+	deploy, err := r.envoyDeploymentForGateway(ctx, gtw)
 	if err != nil {
 		r.log.Info("failed to get Deployment for gateway",
 			"namespace", gtw.Namespace, "name", gtw.Name)
 	}
 
 	// Get service
-	svc, err := r.envoyServiceForGateway(ctx, gtw, merged)
+	svc, err := r.envoyServiceForGateway(ctx, gtw)
 	if err != nil {
 		r.log.Info("failed to get Service for gateway",
 			"namespace", gtw.Namespace, "name", gtw.Name)

diff --git a/internal/provider/kubernetes/helpers.go b/internal/provider/kubernetes/helpers.go
@@ -199,7 +199,7 @@ func refsSecret(ref *gwapiv1.SecretObjectReference) bool {
 // infraName returns expected name for the EnvoyProxy infra resources.
 // By default it returns hashed string from {GatewayNamespace}/{GatewayName},
 // but if mergeGateways is set, it will return hashed string of {GatewayClassName}.
-func infraName(gateway *gwapiv1b1.Gateway, merged bool) string {
+func infraName(gateway *gwapiv1.Gateway, merged bool) string {
 	if merged {
 		return proxy.ExpectedResourceHashedName(string(gateway.Spec.GatewayClassName))
 	}

diff --git a/internal/provider/kubernetes/predicates.go b/internal/provider/kubernetes/predicates.go
@@ -398,7 +398,7 @@ func (r *gatewayAPIReconciler) filterHTTPRoutesByNamespaceLabels(httpRoutes []gw
 }
 
 // envoyDeploymentForGateway returns the Envoy Deployment, returning nil if the Deployment doesn't exist.
-func (r *gatewayAPIReconciler) envoyDeploymentForGateway(ctx context.Context, gateway *gwapiv1b1.Gateway) (*appsv1.Deployment, error) {
+func (r *gatewayAPIReconciler) envoyDeploymentForGateway(ctx context.Context, gateway *gwapiv1.Gateway) (*appsv1.Deployment, error) {
 	key := types.NamespacedName{
 		Namespace: r.namespace,
 		Name:      infraName(gateway, r.mergeGateways),
@@ -414,7 +414,7 @@ func (r *gatewayAPIReconciler) envoyDeploymentForGateway(ctx context.Context, ga
 }
 
 // envoyServiceForGateway returns the Envoy service, returning nil if the service doesn't exist.
-func (r *gatewayAPIReconciler) envoyServiceForGateway(ctx context.Context, gateway *gwapiv1b1.Gateway) (*corev1.Service, error) {
+func (r *gatewayAPIReconciler) envoyServiceForGateway(ctx context.Context, gateway *gwapiv1.Gateway) (*corev1.Service, error) {
 	key := types.NamespacedName{
 		Namespace: r.namespace,
 		Name:      infraName(gateway, r.mergeGateways),