Merge pull request #39 from tidbcloud/shiori/vpc-peering-import-custo…

…m-route feat: support to enable import custom route for vpc peering
tidbcloud · Dec 2, 2022 · f7ccbb4 · f7ccbb4
2 parents 35878e1 + 134f66e
commit f7ccbb4
Show file tree

Hide file tree

Showing 44 changed files with 6,851 additions and 1,089 deletions.
diff --git a/apis/cache/v1beta1/zz_generated.deepcopy.go b/apis/cache/v1beta1/zz_generated.deepcopy.go
diff --git a/apis/compute/v1beta1/zz_generated.deepcopy.go b/apis/compute/v1beta1/zz_generated.deepcopy.go
diff --git a/apis/container/v1alpha1/zz_generated.deepcopy.go b/apis/container/v1alpha1/zz_generated.deepcopy.go
diff --git a/apis/container/v1beta1/zz_generated.deepcopy.go b/apis/container/v1beta1/zz_generated.deepcopy.go
diff --git a/apis/database/v1beta1/zz_generated.deepcopy.go b/apis/database/v1beta1/zz_generated.deepcopy.go
diff --git a/apis/dns/v1alpha1/zz_generated.deepcopy.go b/apis/dns/v1alpha1/zz_generated.deepcopy.go
diff --git a/apis/generate.go b/apis/generate.go
@@ -1,3 +1,4 @@
+//go:build generate
 // +build generate
 
 /*
@@ -23,7 +24,7 @@ limitations under the License.
 //go:generate rm -rf ../package/crds
 
 // Generate deepcopy methodsets and CRD manifests
-//go:generate go run -tags generate sigs.k8s.io/controller-tools/cmd/controller-gen object:headerFile=../hack/boilerplate.go.txt paths=./... crd:trivialVersions=true,crdVersions=v1 output:artifacts:config=../package/crds
+//go:generate go run -tags generate sigs.k8s.io/controller-tools/cmd/controller-gen object:headerFile=../hack/boilerplate.go.txt paths=./... crd:crdVersions=v1 output:artifacts:config=../package/crds
 
 // Generate crossplane-runtime methodsets (resource.Managed, etc)
 //go:generate go run -tags generate github.com/crossplane/crossplane-tools/cmd/angryjet generate-methodsets --header-file=../hack/boilerplate.go.txt ./...

diff --git a/apis/iam/v1alpha1/zz_generated.deepcopy.go b/apis/iam/v1alpha1/zz_generated.deepcopy.go
diff --git a/apis/kms/v1alpha1/zz_generated.deepcopy.go b/apis/kms/v1alpha1/zz_generated.deepcopy.go
diff --git a/apis/pubsub/v1alpha1/zz_generated.deepcopy.go b/apis/pubsub/v1alpha1/zz_generated.deepcopy.go
diff --git a/apis/servicenetworking/v1beta1/zz_generated.deepcopy.go b/apis/servicenetworking/v1beta1/zz_generated.deepcopy.go
diff --git a/apis/storage/v1alpha1/zz_generated.deepcopy.go b/apis/storage/v1alpha1/zz_generated.deepcopy.go
diff --git a/apis/storage/v1alpha3/zz_generated.deepcopy.go b/apis/storage/v1alpha3/zz_generated.deepcopy.go
diff --git a/apis/v1alpha3/zz_generated.deepcopy.go b/apis/v1alpha3/zz_generated.deepcopy.go
diff --git a/apis/v1beta1/zz_generated.deepcopy.go b/apis/v1beta1/zz_generated.deepcopy.go
diff --git a/apis/vpcpeering/v1beta1/peering_types.go b/apis/vpcpeering/v1beta1/peering_types.go
@@ -8,7 +8,7 @@ import (
 
 type PeeringParameters struct {
 	Project string `json:"project"`
-	
+
 	Network string `json:"network"`
 
 	// Name: Name of the peering, which should conform to RFC1035.
@@ -28,6 +28,17 @@ type PeeringParameters struct {
 	// routes between two networks when peering state is ACTIVE.
 	AutoCreateRoutes bool `json:"autoCreateRoutes,omitempty"`
 
+	// ImportCustomRoutes: Whether to import the custom routes from peer
+	// network. The default value is false.
+	// NOTE: only used when creating the peering.
+	ImportCustomRoutes bool `json:"importCustomRoutes,omitempty"`
+
+	// ImportSubnetRoutesWithPublicIp: Whether subnet routes with public IP
+	// range are imported. The default value is false. IPv4 special-use
+	// ranges are always imported from peers and are not controlled by this
+	// field.
+	// NOTE: only used when creating the peering.
+	ImportSubnetRoutesWithPublicIp bool `json:"importSubnetRoutesWithPublicIp,omitempty"`
 }
 
 // A Peering is a managed resource that represents a Google Cloud Service

diff --git a/apis/vpcpeering/v1beta1/zz_generated.deepcopy.go b/apis/vpcpeering/v1beta1/zz_generated.deepcopy.go
diff --git a/go.mod b/go.mod
@@ -31,7 +31,7 @@ require (
 	k8s.io/apimachinery v0.25.2
 	k8s.io/client-go v0.25.0
 	sigs.k8s.io/controller-runtime v0.13.0
-	sigs.k8s.io/controller-tools v0.8.0
+	sigs.k8s.io/controller-tools v0.9.2
 )
 
 replace github.com/crossplane/provider-gcp/apis/vpcpeering/v1beta1 => ./apis/vpcpeering/v1beta1