update CRDS and reorganize code in api gateway type

hashicorp · Feb 8, 2024 · 6f44ddb · 6f44ddb
1 parent cbc14c4
commit 6f44ddb
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 22 deletions.
diff --git a/charts/consul/templates/crd-apigateways.yaml b/charts/consul/templates/crd-apigateways.yaml
@@ -293,9 +293,6 @@ spec:
                     format: date-time
                     type: string
                 type: object
-            required:
-            - addresses
-            - listeners
             type: object
         type: object
     served: true

diff --git a/control-plane/api/mesh/v2beta1/api_gateway_types.go b/control-plane/api/mesh/v2beta1/api_gateway_types.go
@@ -46,22 +46,8 @@ type APIGateway struct {
 
 type APIGatewayStatus struct {
 	Status    `json:"status,omitempty"`
-	Addresses []GatewayAddress `json:"addresses"`
-	Listeners []ListenerStatus `json:"listeners"`
-}
-
-func (in *APIGatewayList) ReconcileRequests() []reconcile.Request {
-	requests := make([]reconcile.Request, 0, len(in.Items))
-
-	for _, item := range in.Items {
-		requests = append(requests, reconcile.Request{
-			NamespacedName: types.NamespacedName{
-				Name:      item.Name,
-				Namespace: item.Namespace,
-			},
-		})
-	}
-	return requests
+	Addresses []GatewayAddress `json:"addresses,omitempty"`
+	Listeners []ListenerStatus `json:"listeners,omitempty"`
 }
 
 type ListenerStatus struct {
@@ -85,6 +71,20 @@ type APIGatewayList struct {
 	Items           []*APIGateway `json:"items"`
 }
 
+func (in *APIGatewayList) ReconcileRequests() []reconcile.Request {
+	requests := make([]reconcile.Request, 0, len(in.Items))
+
+	for _, item := range in.Items {
+		requests = append(requests, reconcile.Request{
+			NamespacedName: types.NamespacedName{
+				Name:      item.Name,
+				Namespace: item.Namespace,
+			},
+		})
+	}
+	return requests
+}
+
 func (in *APIGateway) ResourceID(namespace, partition string) *pbresource.ID {
 	return &pbresource.ID{
 		Name: in.Name,

diff --git a/control-plane/config/crd/bases/mesh.consul.hashicorp.com_apigateways.yaml b/control-plane/config/crd/bases/mesh.consul.hashicorp.com_apigateways.yaml
@@ -289,9 +289,6 @@ spec:
                     format: date-time
                     type: string
                 type: object
-            required:
-            - addresses
-            - listeners
             type: object
         type: object
     served: true

diff --git a/control-plane/controllers/resources/api-gateway-controller.go b/control-plane/controllers/resources/api-gateway-controller.go
@@ -64,6 +64,7 @@ func (r *APIGatewayController) Reconcile(ctx context.Context, req ctrl.Request)
 			gcc:           gcc,
 			gatewayConfig: r.GatewayConfig,
 		}, resource); err != nil {
+			logger.Error(err, "unable to create/update gateway")
 			return ctrl.Result{}, err
 		}
 	}

diff --git a/control-plane/controllers/resources/api-gateway-controller_test.go b/control-plane/controllers/resources/api-gateway-controller_test.go
@@ -1,3 +1,6 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
+
 package resources
 
 import (

diff --git a/control-plane/controllers/resources/gateway_controller_crud.go b/control-plane/controllers/resources/gateway_controller_crud.go
@@ -1,3 +1,6 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
+
 package resources
 
 import (

diff --git a/control-plane/controllers/resources/gateway_controller_setup.go b/control-plane/controllers/resources/gateway_controller_setup.go
@@ -1,3 +1,6 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
+
 package resources
 
 import (