reconcile consul-k8s with changes made in Consul (#3543)

hashicorp · Feb 6, 2024 · 2364419 · 2364419
1 parent 0a82ff2
commit 2364419
Show file tree

Hide file tree

Showing 35 changed files with 41 additions and 287 deletions.
diff --git a/charts/consul/templates/crd-apigateways.yaml b/charts/consul/templates/crd-apigateways.yaml
@@ -114,13 +114,6 @@ spec:
                                       provide the wildcard value \"*\" to list resources
                                       across all partitions."
                                     type: string
-                                  peerName:
-                                    description: "PeerName identifies which peer the
-                                      resource is imported from. https://developer.hashicorp.com/consul/docs/connect/cluster-peering
-                                      \n When using the List and WatchList endpoints,
-                                      provide the wildcard value \"*\" to list resources
-                                      across all peers."
-                                    type: string
                                 type: object
                               type:
                                 description: Type identifies the resource's type.

diff --git a/charts/consul/templates/crd-grpcroutes.yaml b/charts/consul/templates/crd-grpcroutes.yaml
@@ -72,9 +72,10 @@ spec:
                   description: 'NOTE: roughly equivalent to structs.ResourceReference'
                   properties:
                     port:
-                      description: For east/west this is the name of the Consul Service
+                      description: "For east/west this is the name of the Consul Service
                         port to direct traffic to or empty to imply all. For north/south
-                        this is TBD.
+                        this is TBD. \n For more details on potential values of this
+                        field, see documentation for Service.ServicePort."
                       type: string
                     ref:
                       description: For east/west configuration, this should point
@@ -106,13 +107,6 @@ spec:
                                 the wildcard value \"*\" to list resources across
                                 all partitions."
                               type: string
-                            peerName:
-                              description: "PeerName identifies which peer the resource
-                                is imported from. https://developer.hashicorp.com/consul/docs/connect/cluster-peering
-                                \n When using the List and WatchList endpoints, provide
-                                the wildcard value \"*\" to list resources across
-                                all peers."
-                              type: string
                           type: object
                         type:
                           description: Type identifies the resource's type.
@@ -166,7 +160,9 @@ spec:
                                 description: "For east/west this is the name of the
                                   Consul Service port to direct traffic to or empty
                                   to imply using the same value as the parent ref.
-                                  \n For north/south this is TBD."
+                                  For north/south this is TBD. \n For more details
+                                  on potential values of this field, see documentation
+                                  for Service.ServicePort."
                                 type: string
                               ref:
                                 description: For east/west configuration, this should
@@ -199,13 +195,6 @@ spec:
                                           provide the wildcard value \"*\" to list
                                           resources across all partitions."
                                         type: string
-                                      peerName:
-                                        description: "PeerName identifies which peer
-                                          the resource is imported from. https://developer.hashicorp.com/consul/docs/connect/cluster-peering
-                                          \n When using the List and WatchList endpoints,
-                                          provide the wildcard value \"*\" to list
-                                          resources across all peers."
-                                        type: string
                                     type: object
                                   type:
                                     description: Type identifies the resource's type.

diff --git a/charts/consul/templates/crd-httproutes.yaml b/charts/consul/templates/crd-httproutes.yaml
@@ -72,9 +72,10 @@ spec:
                   description: 'NOTE: roughly equivalent to structs.ResourceReference'
                   properties:
                     port:
-                      description: For east/west this is the name of the Consul Service
+                      description: "For east/west this is the name of the Consul Service
                         port to direct traffic to or empty to imply all. For north/south
-                        this is TBD.
+                        this is TBD. \n For more details on potential values of this
+                        field, see documentation for Service.ServicePort."
                       type: string
                     ref:
                       description: For east/west configuration, this should point
@@ -106,13 +107,6 @@ spec:
                                 the wildcard value \"*\" to list resources across
                                 all partitions."
                               type: string
-                            peerName:
-                              description: "PeerName identifies which peer the resource
-                                is imported from. https://developer.hashicorp.com/consul/docs/connect/cluster-peering
-                                \n When using the List and WatchList endpoints, provide
-                                the wildcard value \"*\" to list resources across
-                                all peers."
-                              type: string
                           type: object
                         type:
                           description: Type identifies the resource's type.
@@ -169,7 +163,9 @@ spec:
                                 description: "For east/west this is the name of the
                                   Consul Service port to direct traffic to or empty
                                   to imply using the same value as the parent ref.
-                                  \n For north/south this is TBD."
+                                  For north/south this is TBD. \n For more details
+                                  on potential values of this field, see documentation
+                                  for Service.ServicePort."
                                 type: string
                               ref:
                                 description: For east/west configuration, this should
@@ -202,13 +198,6 @@ spec:
                                           provide the wildcard value \"*\" to list
                                           resources across all partitions."
                                         type: string
-                                      peerName:
-                                        description: "PeerName identifies which peer
-                                          the resource is imported from. https://developer.hashicorp.com/consul/docs/connect/cluster-peering
-                                          \n When using the List and WatchList endpoints,
-                                          provide the wildcard value \"*\" to list
-                                          resources across all peers."
-                                        type: string
                                     type: object
                                   type:
                                     description: Type identifies the resource's type.

diff --git a/charts/consul/templates/crd-tcproutes.yaml b/charts/consul/templates/crd-tcproutes.yaml
@@ -66,9 +66,10 @@ spec:
                   description: 'NOTE: roughly equivalent to structs.ResourceReference'
                   properties:
                     port:
-                      description: For east/west this is the name of the Consul Service
+                      description: "For east/west this is the name of the Consul Service
                         port to direct traffic to or empty to imply all. For north/south
-                        this is TBD.
+                        this is TBD. \n For more details on potential values of this
+                        field, see documentation for Service.ServicePort."
                       type: string
                     ref:
                       description: For east/west configuration, this should point
@@ -100,13 +101,6 @@ spec:
                                 the wildcard value \"*\" to list resources across
                                 all partitions."
                               type: string
-                            peerName:
-                              description: "PeerName identifies which peer the resource
-                                is imported from. https://developer.hashicorp.com/consul/docs/connect/cluster-peering
-                                \n When using the List and WatchList endpoints, provide
-                                the wildcard value \"*\" to list resources across
-                                all peers."
-                              type: string
                           type: object
                         type:
                           description: Type identifies the resource's type.
@@ -151,7 +145,9 @@ spec:
                                 description: "For east/west this is the name of the
                                   Consul Service port to direct traffic to or empty
                                   to imply using the same value as the parent ref.
-                                  \n For north/south this is TBD."
+                                  For north/south this is TBD. \n For more details
+                                  on potential values of this field, see documentation
+                                  for Service.ServicePort."
                                 type: string
                               ref:
                                 description: For east/west configuration, this should
@@ -184,13 +180,6 @@ spec:
                                           provide the wildcard value \"*\" to list
                                           resources across all partitions."
                                         type: string
-                                      peerName:
-                                        description: "PeerName identifies which peer
-                                          the resource is imported from. https://developer.hashicorp.com/consul/docs/connect/cluster-peering
-                                          \n When using the List and WatchList endpoints,
-                                          provide the wildcard value \"*\" to list
-                                          resources across all peers."
-                                        type: string
                                     type: object
                                   type:
                                     description: Type identifies the resource's type.

diff --git a/control-plane/api/auth/v2beta1/traffic_permissions_types.go b/control-plane/api/auth/v2beta1/traffic_permissions_types.go
@@ -19,7 +19,6 @@ import (
 
 	"github.com/hashicorp/consul-k8s/control-plane/api/common"
 	inject "github.com/hashicorp/consul-k8s/control-plane/connect-inject/common"
-	"github.com/hashicorp/consul-k8s/control-plane/connect-inject/constants"
 )
 
 const (
@@ -62,10 +61,6 @@ func (in *TrafficPermissions) ResourceID(namespace, partition string) *pbresourc
 		Tenancy: &pbresource.Tenancy{
 			Partition: partition,
 			Namespace: namespace,
-
-			// Because we are explicitly defining NS/partition, this will not default and must be explicit.
-			// At a future point, this will move out of the Tenancy block.
-			PeerName: constants.DefaultConsulPeer,
 		},
 	}
 }

diff --git a/control-plane/api/auth/v2beta1/traffic_permissions_types_test.go b/control-plane/api/auth/v2beta1/traffic_permissions_types_test.go
@@ -317,10 +317,6 @@ func TestTrafficPermissions_MatchesConsul(t *testing.T) {
 					Tenancy: &pbresource.Tenancy{
 						Partition: constants.DefaultConsulNS,
 						Namespace: constants.DefaultConsulPartition,
-
-						// Because we are explicitly defining NS/partition, this will not default and must be explicit.
-						// At a future point, this will move out of the Tenancy block.
-						PeerName: constants.DefaultConsulPeer,
 					},
 				},
 				Data:     inject.ToProtoAny(&pbmesh.ProxyConfiguration{}),
@@ -1021,10 +1017,6 @@ func constructTrafficPermissionResource(tp *pbauth.TrafficPermissions, name, nam
 		Tenancy: &pbresource.Tenancy{
 			Partition: partition,
 			Namespace: namespace,
-
-			// Because we are explicitly defining NS/partition, this will not default and must be explicit.
-			// At a future point, this will move out of the Tenancy block.
-			PeerName: constants.DefaultConsulPeer,
 		},
 		Uid: "ABCD", // We add this to show it does not factor into the comparison
 	}

diff --git a/control-plane/api/mesh/v2beta1/api_gateway_types.go b/control-plane/api/mesh/v2beta1/api_gateway_types.go
@@ -16,7 +16,6 @@ import (
 
 	"github.com/hashicorp/consul-k8s/control-plane/api/common"
 	inject "github.com/hashicorp/consul-k8s/control-plane/connect-inject/common"
-	"github.com/hashicorp/consul-k8s/control-plane/connect-inject/constants"
 )
 
 const (
@@ -77,10 +76,6 @@ func (in *APIGateway) ResourceID(namespace, partition string) *pbresource.ID {
 		Tenancy: &pbresource.Tenancy{
 			Partition: partition,
 			Namespace: namespace,
-
-			// Because we are explicitly defining NS/partition, this will not default and must be explicit.
-			// At a future point, this will move out of the Tenancy block.
-			PeerName: constants.DefaultConsulPeer,
 		},
 	}
 }

diff --git a/control-plane/api/mesh/v2beta1/gateway_class_types.go b/control-plane/api/mesh/v2beta1/gateway_class_types.go
@@ -15,7 +15,6 @@ import (
 
 	"github.com/hashicorp/consul-k8s/control-plane/api/common"
 	inject "github.com/hashicorp/consul-k8s/control-plane/connect-inject/common"
-	"github.com/hashicorp/consul-k8s/control-plane/connect-inject/constants"
 )
 
 const (
@@ -58,10 +57,6 @@ func (in *GatewayClass) ResourceID(namespace, partition string) *pbresource.ID {
 		Tenancy: &pbresource.Tenancy{
 			Partition: partition,
 			Namespace: namespace,
-
-			// Because we are explicitly defining NS/partition, this will not default and must be explicit.
-			// At a future point, this will move out of the Tenancy block.
-			PeerName: constants.DefaultConsulPeer,
 		},
 	}
 }

diff --git a/control-plane/api/mesh/v2beta1/grpc_route_types.go b/control-plane/api/mesh/v2beta1/grpc_route_types.go
@@ -18,7 +18,6 @@ import (
 
 	"github.com/hashicorp/consul-k8s/control-plane/api/common"
 	inject "github.com/hashicorp/consul-k8s/control-plane/connect-inject/common"
-	"github.com/hashicorp/consul-k8s/control-plane/connect-inject/constants"
 )
 
 const (
@@ -61,10 +60,6 @@ func (in *GRPCRoute) ResourceID(namespace, partition string) *pbresource.ID {
 		Tenancy: &pbresource.Tenancy{
 			Partition: partition,
 			Namespace: namespace,
-
-			// Because we are explicitly defining NS/partition, this will not default and must be explicit.
-			// At a future point, this will move out of the Tenancy block.
-			PeerName: constants.DefaultConsulPeer,
 		},
 	}
 }

diff --git a/control-plane/api/mesh/v2beta1/grpc_route_types_test.go b/control-plane/api/mesh/v2beta1/grpc_route_types_test.go
@@ -277,10 +277,6 @@ func TestGRPCRoute_MatchesConsul(t *testing.T) {
 					Tenancy: &pbresource.Tenancy{
 						Partition: constants.DefaultConsulNS,
 						Namespace: constants.DefaultConsulPartition,
-
-						// Because we are explicitly defining NS/partition, this will not default and must be explicit.
-						// At a future point, this will move out of the Tenancy block.
-						PeerName: constants.DefaultConsulPeer,
 					},
 				},
 				Data:     inject.ToProtoAny(&pbmesh.ProxyConfiguration{}),
@@ -1174,10 +1170,6 @@ func constructGRPCRouteResource(tp *pbmesh.GRPCRoute, name, namespace, partition
 		Tenancy: &pbresource.Tenancy{
 			Partition: partition,
 			Namespace: namespace,
-
-			// Because we are explicitly defining NS/partition, this will not default and must be explicit.
-			// At a future point, this will move out of the Tenancy block.
-			PeerName: constants.DefaultConsulPeer,
 		},
 		Uid: "ABCD", // We add this to show it does not factor into the comparison
 	}

diff --git a/control-plane/api/mesh/v2beta1/http_route_types.go b/control-plane/api/mesh/v2beta1/http_route_types.go
@@ -20,7 +20,6 @@ import (
 
 	"github.com/hashicorp/consul-k8s/control-plane/api/common"
 	inject "github.com/hashicorp/consul-k8s/control-plane/connect-inject/common"
-	"github.com/hashicorp/consul-k8s/control-plane/connect-inject/constants"
 )
 
 const (
@@ -63,10 +62,6 @@ func (in *HTTPRoute) ResourceID(namespace, partition string) *pbresource.ID {
 		Tenancy: &pbresource.Tenancy{
 			Partition: partition,
 			Namespace: namespace,
-
-			// Because we are explicitly defining NS/partition, this will not default and must be explicit.
-			// At a future point, this will move out of the Tenancy block.
-			PeerName: constants.DefaultConsulPeer,
 		},
 	}
 }

diff --git a/control-plane/api/mesh/v2beta1/http_route_types_test.go b/control-plane/api/mesh/v2beta1/http_route_types_test.go
@@ -435,10 +435,6 @@ func TestHTTPRoute_MatchesConsul(t *testing.T) {
 					Tenancy: &pbresource.Tenancy{
 						Partition: constants.DefaultConsulNS,
 						Namespace: constants.DefaultConsulPartition,
-
-						// Because we are explicitly defining NS/partition, this will not default and must be explicit.
-						// At a future point, this will move out of the Tenancy block.
-						PeerName: constants.DefaultConsulPeer,
 					},
 				},
 				Data:     inject.ToProtoAny(&pbmesh.ProxyConfiguration{}),
@@ -1311,10 +1307,6 @@ func constructHTTPRouteResource(tp *pbmesh.HTTPRoute, name, namespace, partition
 		Tenancy: &pbresource.Tenancy{
 			Partition: partition,
 			Namespace: namespace,
-
-			// Because we are explicitly defining NS/partition, this will not default and must be explicit.
-			// At a future point, this will move out of the Tenancy block.
-			PeerName: constants.DefaultConsulPeer,
 		},
 		Uid: "ABCD", // We add this to show it does not factor into the comparison
 	}

diff --git a/control-plane/api/mesh/v2beta1/mesh_configuration_types.go b/control-plane/api/mesh/v2beta1/mesh_configuration_types.go
@@ -9,7 +9,6 @@ import (
 	"github.com/google/go-cmp/cmp/cmpopts"
 	"github.com/hashicorp/consul-k8s/control-plane/api/common"
 	inject "github.com/hashicorp/consul-k8s/control-plane/connect-inject/common"
-	"github.com/hashicorp/consul-k8s/control-plane/connect-inject/constants"
 	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
 	"github.com/hashicorp/consul/proto-public/pbresource"
 	"google.golang.org/protobuf/testing/protocmp"
@@ -57,10 +56,6 @@ func (in *MeshConfiguration) ResourceID(_, partition string) *pbresource.ID {
 		Tenancy: &pbresource.Tenancy{
 			// we don't pass a namespace here because MeshConfiguration is partition-scoped
 			Partition: partition,
-
-			// Because we are explicitly defining NS/partition, this will not default and must be explicit.
-			// At a future point, this will move out of the Tenancy block.
-			PeerName: constants.DefaultConsulPeer,
 		},
 	}
 }

diff --git a/control-plane/api/mesh/v2beta1/mesh_gateway_types.go b/control-plane/api/mesh/v2beta1/mesh_gateway_types.go
@@ -16,7 +16,6 @@ import (
 
 	"github.com/hashicorp/consul-k8s/control-plane/api/common"
 	inject "github.com/hashicorp/consul-k8s/control-plane/connect-inject/common"
-	"github.com/hashicorp/consul-k8s/control-plane/connect-inject/constants"
 )
 
 const (
@@ -59,10 +58,6 @@ func (in *MeshGateway) ResourceID(_, partition string) *pbresource.ID {
 		Tenancy: &pbresource.Tenancy{
 			Partition: partition,
 			Namespace: "", // Namespace is always unset because MeshGateway is partition-scoped
-
-			// Because we are explicitly defining NS/partition, this will not default and must be explicit.
-			// At a future point, this will move out of the Tenancy block.
-			PeerName: constants.DefaultConsulPeer,
 		},
 	}
 }

diff --git a/control-plane/api/mesh/v2beta1/proxy_configuration_types.go b/control-plane/api/mesh/v2beta1/proxy_configuration_types.go
@@ -18,7 +18,6 @@ import (
 
 	"github.com/hashicorp/consul-k8s/control-plane/api/common"
 	inject "github.com/hashicorp/consul-k8s/control-plane/connect-inject/common"
-	"github.com/hashicorp/consul-k8s/control-plane/connect-inject/constants"
 )
 
 const (
@@ -61,10 +60,6 @@ func (in *ProxyConfiguration) ResourceID(namespace, partition string) *pbresourc
 		Tenancy: &pbresource.Tenancy{
 			Partition: partition,
 			Namespace: namespace,
-
-			// Because we are explicitly defining NS/partition, this will not default and must be explicit.
-			// At a future point, this will move out of the Tenancy block.
-			PeerName: constants.DefaultConsulPeer,
 		},
 	}
 }