Update multicluster v2beta1 to v2 (#3560)

Co-authored-by: skpratt <sarah.pratt@hashicorp.com> (cherry picked from commit fdfb762)
hashicorp · Feb 8, 2024 · 6c48da7 · 6c48da7
1 parent c1f763d
commit 6c48da7
Show file tree

Hide file tree

Showing 19 changed files with 37 additions and 37 deletions.
diff --git a/acceptance/tests/vault/vault_wan_fed_test.go b/acceptance/tests/vault/vault_wan_fed_test.go
@@ -329,8 +329,8 @@ func TestVault_WANFederationViaGateways(t *testing.T) {
 	}
 	srvCAAuthRoleConfigSecondary.ConfigureK8SAuthRole(t, vaultClient)
 
-	// // Move Vault CA secret from primary to secondary so that we can mount it to pods in the
-	// // secondary cluster.
+	// Move Vault CA secret from primary to secondary so that we can mount it to pods in the
+	// secondary cluster.
 	vaultCASecretName := vault.CASecretName(vaultReleaseName)
 	logger.Logf(t, "retrieving Vault CA secret %s from the primary cluster and applying to the secondary", vaultCASecretName)
 	vaultCASecret, err := primaryCtx.KubernetesClient(t).CoreV1().Secrets(ns).Get(context.Background(), vaultCASecretName, metav1.GetOptions{})

diff --git a/charts/consul/templates/crd-exportedservices.yaml b/charts/consul/templates/crd-exportedservices.yaml
@@ -33,7 +33,7 @@ spec:
       jsonPath: .metadata.creationTimestamp
       name: Age
       type: date
-    name: v2beta1
+    name: v2
     schema:
       openAPIV3Schema:
         description: ExportedServices is the Schema for the Exported Services API

diff --git a/control-plane/api/mesh/v2beta1/api_gateway_types.go b/control-plane/api/mesh/v2beta1/api_gateway_types.go
@@ -1,5 +1,5 @@
-// // Copyright (c) HashiCorp, Inc.
-// // SPDX-License-Identifier: MPL-2.0
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
 package v2beta1
 
 import (

diff --git a/control-plane/api/mesh/v2beta1/gateway_class_config_types.go b/control-plane/api/mesh/v2beta1/gateway_class_config_types.go
@@ -1,5 +1,5 @@
-// // Copyright (c) HashiCorp, Inc.
-// // SPDX-License-Identifier: MPL-2.0
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
 
 package v2beta1
 

diff --git a/control-plane/api/mesh/v2beta1/gateway_class_types.go b/control-plane/api/mesh/v2beta1/gateway_class_types.go
@@ -1,5 +1,5 @@
-// // Copyright (c) HashiCorp, Inc.
-// // SPDX-License-Identifier: MPL-2.0
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
 package v2beta1
 
 import (

diff --git a/control-plane/api/mesh/v2beta1/grpc_route_types.go b/control-plane/api/mesh/v2beta1/grpc_route_types.go
@@ -1,5 +1,5 @@
-// // Copyright (c) HashiCorp, Inc.
-// // SPDX-License-Identifier: MPL-2.0
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
 package v2beta1
 
 import (

diff --git a/control-plane/api/mesh/v2beta1/http_route_types.go b/control-plane/api/mesh/v2beta1/http_route_types.go
@@ -1,5 +1,5 @@
-// // Copyright (c) HashiCorp, Inc.
-// // SPDX-License-Identifier: MPL-2.0
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
 package v2beta1
 
 import (

diff --git a/control-plane/api/mesh/v2beta1/mesh_configuration_types.go b/control-plane/api/mesh/v2beta1/mesh_configuration_types.go
@@ -1,5 +1,5 @@
-// // Copyright (c) HashiCorp, Inc.
-// // SPDX-License-Identifier: MPL-2.0
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
 package v2beta1
 
 import (

diff --git a/control-plane/api/mesh/v2beta1/mesh_gateway_types.go b/control-plane/api/mesh/v2beta1/mesh_gateway_types.go
@@ -1,5 +1,5 @@
-// // Copyright (c) HashiCorp, Inc.
-// // SPDX-License-Identifier: MPL-2.0
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
 package v2beta1
 
 import (

diff --git a/control-plane/api/mesh/v2beta1/proxy_configuration_types.go b/control-plane/api/mesh/v2beta1/proxy_configuration_types.go
@@ -1,5 +1,5 @@
-// // Copyright (c) HashiCorp, Inc.
-// // SPDX-License-Identifier: MPL-2.0
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
 package v2beta1
 
 import (

diff --git a/control-plane/api/mesh/v2beta1/tcp_route_types.go b/control-plane/api/mesh/v2beta1/tcp_route_types.go
@@ -1,5 +1,5 @@
-// // Copyright (c) HashiCorp, Inc.
-// // SPDX-License-Identifier: MPL-2.0
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
 package v2beta1
 
 import (

diff --git a/...luster/v2beta1/exported_services_types.go → ...ulticluster/v2/exported_services_types.go b/...luster/v2beta1/exported_services_types.go → ...ulticluster/v2/exported_services_types.go
@@ -1,6 +1,6 @@
-// // Copyright (c) HashiCorp, Inc.
-// // SPDX-License-Identifier: MPL-2.0
-package v2beta1
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
+package v2
 
 import (
 	"fmt"

diff --git a/...v2beta1/multicluster_groupversion_info.go → ...ster/v2/multicluster_groupversion_info.go b/...v2beta1/multicluster_groupversion_info.go → ...ster/v2/multicluster_groupversion_info.go
@@ -1,10 +1,10 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
 
-// Package v2beta1 contains API Schema definitions for the consul.hashicorp.com v2beta1 API group
+// Package v2 contains API Schema definitions for the consul.hashicorp.com v2 API group
 // +kubebuilder:object:generate=true
 // +groupName=multicluster.consul.hashicorp.com
-package v2beta1
+package v2
 
 import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -17,7 +17,7 @@ var (
 	MultiClusterGroup = "multicluster.consul.hashicorp.com"
 
 	// MultiClusterGroupVersion is group version used to register these objects.
-	MultiClusterGroupVersion = schema.GroupVersion{Group: MultiClusterGroup, Version: "v2beta1"}
+	MultiClusterGroupVersion = schema.GroupVersion{Group: MultiClusterGroup, Version: "v2"}
 
 	// MultiClusterSchemeBuilder is used to add go types to the GroupVersionKind scheme.
 	MultiClusterSchemeBuilder = &scheme.Builder{GroupVersion: MultiClusterGroupVersion}

diff --git a/.../api/multicluster/v2beta1/shared_types.go → ...plane/api/multicluster/v2/shared_types.go b/.../api/multicluster/v2beta1/shared_types.go → ...plane/api/multicluster/v2/shared_types.go
@@ -1,7 +1,7 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
 
-package v2beta1
+package v2
 
 import (
 	"github.com/hashicorp/consul-k8s/control-plane/api/common"

diff --git a/...-plane/api/multicluster/v2beta1/status.go → control-plane/api/multicluster/v2/status.go b/...-plane/api/multicluster/v2beta1/status.go → control-plane/api/multicluster/v2/status.go
@@ -1,7 +1,7 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
 
-package v2beta1
+package v2
 
 import (
 	corev1 "k8s.io/api/core/v1"

diff --git a/...icluster/v2beta1/zz_generated.deepcopy.go → .../multicluster/v2/zz_generated.deepcopy.go b/...icluster/v2beta1/zz_generated.deepcopy.go → .../multicluster/v2/zz_generated.deepcopy.go
diff --git a/control-plane/config/crd/bases/multicluster.consul.hashicorp.com_exportedservices.yaml b/control-plane/config/crd/bases/multicluster.consul.hashicorp.com_exportedservices.yaml
@@ -29,7 +29,7 @@ spec:
       jsonPath: .metadata.creationTimestamp
       name: Age
       type: date
-    name: v2beta1
+    name: v2
     schema:
       openAPIV3Schema:
         description: ExportedServices is the Schema for the Exported Services API

diff --git a/control-plane/controllers/resources/exported_services_controller.go b/control-plane/controllers/resources/exported_services_controller.go
@@ -12,7 +12,7 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	multiclusterv2beta1 "github.com/hashicorp/consul-k8s/control-plane/api/multicluster/v2beta1"
+	multiclusterv2 "github.com/hashicorp/consul-k8s/control-plane/api/multicluster/v2"
 	"github.com/hashicorp/consul-k8s/control-plane/gateways"
 )
 
@@ -29,7 +29,7 @@ type ExportedServicesController struct {
 // +kubebuilder:rbac:groups=multicluster.consul.hashicorp.com,resources=exportedservices/status,verbs=get;update;patch
 
 func (r *ExportedServicesController) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
-	return r.Controller.ReconcileResource(ctx, r, req, &multiclusterv2beta1.ExportedServices{})
+	return r.Controller.ReconcileResource(ctx, r, req, &multiclusterv2.ExportedServices{})
 }
 
 func (r *ExportedServicesController) Logger(name types.NamespacedName) logr.Logger {
@@ -41,5 +41,5 @@ func (r *ExportedServicesController) UpdateStatus(ctx context.Context, obj clien
 }
 
 func (r *ExportedServicesController) SetupWithManager(mgr ctrl.Manager) error {
-	return setupWithManager(mgr, &multiclusterv2beta1.ExportedServices{}, r)
+	return setupWithManager(mgr, &multiclusterv2.ExportedServices{}, r)
 }
diff --git a/control-plane/subcommand/inject-connect/command.go b/control-plane/subcommand/inject-connect/command.go
@@ -32,7 +32,7 @@ import (
 
 	authv2beta1 "github.com/hashicorp/consul-k8s/control-plane/api/auth/v2beta1"
 	meshv2beta1 "github.com/hashicorp/consul-k8s/control-plane/api/mesh/v2beta1"
-	multiclusterv2beta1 "github.com/hashicorp/consul-k8s/control-plane/api/multicluster/v2beta1"
+	multiclusterv2 "github.com/hashicorp/consul-k8s/control-plane/api/multicluster/v2"
 	"github.com/hashicorp/consul-k8s/control-plane/api/v1alpha1"
 	"github.com/hashicorp/consul-k8s/control-plane/connect-inject/constants"
 	"github.com/hashicorp/consul-k8s/control-plane/subcommand/common"
@@ -171,9 +171,9 @@ func init() {
 	// V2 resources
 	utilruntime.Must(authv2beta1.AddAuthToScheme(scheme))
 	utilruntime.Must(meshv2beta1.AddMeshToScheme(scheme))
-	utilruntime.Must(multiclusterv2beta1.AddMultiClusterToScheme(scheme))
+	utilruntime.Must(multiclusterv2.AddMultiClusterToScheme(scheme))
 
-	//+kubebuilder:scaffold:scheme
+	// +kubebuilder:scaffold:scheme
 }
 
 func (c *Command) init() {