Replace CIDR type alias with string

gardener-attic · Sep 6, 2019 · 5c329d4 · 5c329d4
1 parent 4eac2fd
commit 5c329d4
Show file tree

Hide file tree

Showing 29 changed files with 66 additions and 124 deletions.
diff --git a/controllers/provider-alicloud/pkg/apis/alicloud/types_infrastructure.go b/controllers/provider-alicloud/pkg/apis/alicloud/types_infrastructure.go
@@ -15,7 +15,6 @@
 package alicloud
 
 import (
-	gardencorev1alpha1 "github.com/gardener/gardener/pkg/apis/core/v1alpha1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -45,7 +44,7 @@ type VPC struct {
 	ID *string
 	// CIDR is the CIDR of a VPC to create.
 	// +optional
-	CIDR *gardencorev1alpha1.CIDR
+	CIDR *string
 }
 
 // VPCStatus contains output information about the VPC.
@@ -91,7 +90,7 @@ type Zone struct {
 	// Name is the name of a zone.
 	Name string
 	// Worker specifies the worker CIDR to use.
-	Worker gardencorev1alpha1.CIDR
+	Worker string
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object

diff --git a/controllers/provider-alicloud/pkg/apis/alicloud/v1alpha1/types_infrastructure.go b/controllers/provider-alicloud/pkg/apis/alicloud/v1alpha1/types_infrastructure.go
@@ -15,7 +15,6 @@
 package v1alpha1
 
 import (
-	gardencorev1alpha1 "github.com/gardener/gardener/pkg/apis/core/v1alpha1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -45,7 +44,7 @@ type VPC struct {
 	ID *string `json:"id,omitempty"`
 	// CIDR is the CIDR of a VPC to create.
 	// +optional
-	CIDR *gardencorev1alpha1.CIDR `json:"cidr,omitempty"`
+	CIDR *string `json:"cidr,omitempty"`
 }
 
 // VPCStatus contains output information about the VPC.
@@ -91,7 +90,7 @@ type Zone struct {
 	// Name is the name of a zone.
 	Name string `json:"name"`
 	// Worker specifies the worker CIDR to use.
-	Worker gardencorev1alpha1.CIDR `json:"worker"`
+	Worker string `json:"worker"`
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object

diff --git a/controllers/provider-alicloud/pkg/apis/alicloud/v1alpha1/zz_generated.conversion.go b/controllers/provider-alicloud/pkg/apis/alicloud/v1alpha1/zz_generated.conversion.go
diff --git a/controllers/provider-alicloud/pkg/apis/alicloud/v1alpha1/zz_generated.deepcopy.go b/controllers/provider-alicloud/pkg/apis/alicloud/v1alpha1/zz_generated.deepcopy.go
diff --git a/controllers/provider-alicloud/pkg/apis/alicloud/zz_generated.deepcopy.go b/controllers/provider-alicloud/pkg/apis/alicloud/zz_generated.deepcopy.go
diff --git a/controllers/provider-alicloud/pkg/controller/infrastructure/actuator_test.go b/controllers/provider-alicloud/pkg/controller/infrastructure/actuator_test.go
@@ -37,7 +37,6 @@ import (
 	"github.com/gardener/gardener-extensions/pkg/util/chart"
 
 	"github.com/aliyun/alibaba-cloud-sdk-go/services/vpc"
-	gardencorev1alpha1 "github.com/gardener/gardener/pkg/apis/core/v1alpha1"
 	extensionsv1alpha1 "github.com/gardener/gardener/pkg/apis/extensions/v1alpha1"
 	"github.com/gardener/gardener/pkg/chartrenderer"
 	"github.com/golang/mock/gomock"
@@ -108,11 +107,11 @@ var _ = Describe("Actuator", func() {
 
 					chartRenderer = mockgardenerchartrenderer.NewMockInterface(ctrl)
 
-					gardenCoreCIDR = gardencorev1alpha1.CIDR("192.168.0.0/16")
-					config         = alicloudv1alpha1.InfrastructureConfig{
+					cidr   = "192.168.0.0/16"
+					config = alicloudv1alpha1.InfrastructureConfig{
 						Networks: alicloudv1alpha1.Networks{
 							VPC: alicloudv1alpha1.VPC{
-								CIDR: &gardenCoreCIDR,
+								CIDR: &cidr,
 							},
 						},
 					}

diff --git a/controllers/provider-alicloud/pkg/controller/infrastructure/terraform_test.go b/controllers/provider-alicloud/pkg/controller/infrastructure/terraform_test.go
@@ -17,7 +17,6 @@ package infrastructure_test
 import (
 	"github.com/gardener/gardener-extensions/controllers/provider-alicloud/pkg/apis/alicloud/v1alpha1"
 	. "github.com/gardener/gardener-extensions/controllers/provider-alicloud/pkg/controller/infrastructure"
-	gardencorev1alpha1 "github.com/gardener/gardener/pkg/apis/core/v1alpha1"
 	extensionsv1alpha1 "github.com/gardener/gardener/pkg/apis/extensions/v1alpha1"
 	"github.com/golang/mock/gomock"
 	. "github.com/onsi/ginkgo"
@@ -40,7 +39,7 @@ var _ = Describe("TerraformChartOps", func() {
 	Describe("#ComputeCreateVPCInitializerValues", func() {
 		It("should compute the values from the config", func() {
 			var (
-				cidr               = gardencorev1alpha1.CIDR("192.168.0.0/16")
+				cidr               = "192.168.0.0/16"
 				internetChargeType = "foo"
 				config             = v1alpha1.InfrastructureConfig{
 					Networks: v1alpha1.Networks{
@@ -121,11 +120,11 @@ var _ = Describe("TerraformChartOps", func() {
 						Zones: []v1alpha1.Zone{
 							{
 								Name:   zone1Name,
-								Worker: gardencorev1alpha1.CIDR(zone1Worker),
+								Worker: zone1Worker,
 							},
 							{
 								Name:   zone2Name,
-								Worker: gardencorev1alpha1.CIDR(zone2Worker),
+								Worker: zone2Worker,
 							},
 						},
 					},

diff --git a/controllers/provider-aws/pkg/apis/aws/types_infrastructure.go b/controllers/provider-aws/pkg/apis/aws/types_infrastructure.go
@@ -15,8 +15,6 @@
 package aws
 
 import (
-	gardencore "github.com/gardener/gardener/pkg/apis/core"
-
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -57,11 +55,11 @@ type Zone struct {
 	// Name is the name for this zone.
 	Name string
 	// Internal is the private subnet range to create (used for internal load balancers).
-	Internal gardencore.CIDR
+	Internal string
 	// Public is the public subnet range to create (used for bastion and load balancers).
-	Public gardencore.CIDR
+	Public string
 	// Workers isis the workers subnet range to create  (used for the VMs).
-	Workers gardencore.CIDR
+	Workers string
 }
 
 // EC2 contains information about the AWS EC2 resources.
@@ -82,8 +80,8 @@ type IAM struct {
 type VPC struct {
 	// ID is the VPC id.
 	ID *string
-	// CIDR is the VPC CIDR
-	CIDR *gardencore.CIDR
+	// CIDR is the VPC CIDR.
+	CIDR *string
 }
 
 // VPCStatus contains information about a generated VPC or resources inside an existing VPC.

diff --git a/controllers/provider-aws/pkg/apis/aws/v1alpha1/types_infrastructure.go b/controllers/provider-aws/pkg/apis/aws/v1alpha1/types_infrastructure.go
@@ -15,8 +15,6 @@
 package v1alpha1
 
 import (
-	gardencorev1alpha1 "github.com/gardener/gardener/pkg/apis/core/v1alpha1"
-
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -57,11 +55,11 @@ type Zone struct {
 	// Name is the name for this zone.
 	Name string `json:"name"`
 	// Internal is  the  private subnet range to create (used for internal load balancers).
-	Internal gardencorev1alpha1.CIDR `json:"internal"`
+	Internal string `json:"internal"`
 	// Public is the  public subnet range to create (used for bastion and load balancers).
-	Public gardencorev1alpha1.CIDR `json:"public"`
+	Public string `json:"public"`
 	// Workers is the  workers  subnet range  to create (used for the VMs).
-	Workers gardencorev1alpha1.CIDR `json:"workers"`
+	Workers string `json:"workers"`
 }
 
 // EC2 contains information about the  AWS EC2 resources.
@@ -83,9 +81,9 @@ type VPC struct {
 	// ID is the VPC id.
 	// +optional
 	ID *string `json:"id,omitempty"`
-	// gardencorev1alpha1.CIDR is the VPC gardencorev1alpha1.CIDR
+	// CIDR is the VPC CIDR.
 	// +optional
-	CIDR *gardencorev1alpha1.CIDR `json:"cidr,omitempty"`
+	CIDR *string `json:"cidr,omitempty"`
 }
 
 // VPCStatus contains information about a generated VPC or resources inside an existing VPC.

diff --git a/controllers/provider-aws/pkg/apis/aws/v1alpha1/zz_generated.conversion.go b/controllers/provider-aws/pkg/apis/aws/v1alpha1/zz_generated.conversion.go
diff --git a/controllers/provider-aws/pkg/apis/aws/v1alpha1/zz_generated.deepcopy.go b/controllers/provider-aws/pkg/apis/aws/v1alpha1/zz_generated.deepcopy.go
diff --git a/controllers/provider-aws/pkg/apis/aws/zz_generated.deepcopy.go b/controllers/provider-aws/pkg/apis/aws/zz_generated.deepcopy.go
diff --git a/controllers/provider-azure/pkg/apis/azure/types_infrastructure.go b/controllers/provider-azure/pkg/apis/azure/types_infrastructure.go
@@ -15,8 +15,6 @@
 package azure
 
 import (
-	gardencorev1alpha1 "github.com/gardener/gardener/pkg/apis/core/v1alpha1"
-
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -42,7 +40,7 @@ type NetworkConfig struct {
 	// VNet indicates whether to use an existing VNet or create a new one.
 	VNet VNet
 	// Workers is the worker subnet range to create (used for the VMs).
-	Workers gardencorev1alpha1.CIDR
+	Workers string
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
@@ -119,7 +117,7 @@ type VNet struct {
 	// Name is the VNet name.
 	Name *string
 	// CIDR is the VNet CIDR
-	CIDR *gardencorev1alpha1.CIDR
+	CIDR *string
 }
 
 // VNetStatus contains the VNet name.

diff --git a/controllers/provider-azure/pkg/apis/azure/v1alpha1/types_infrastructure.go b/controllers/provider-azure/pkg/apis/azure/v1alpha1/types_infrastructure.go
@@ -15,8 +15,6 @@
 package v1alpha1
 
 import (
-	gardencorev1alpha1 "github.com/gardener/gardener/pkg/apis/core/v1alpha1"
-
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -43,7 +41,7 @@ type NetworkConfig struct {
 	// VNet indicates whether to use an existing VNet or create a new one.
 	VNet VNet `json:"vnet"`
 	// Workers is the worker subnet range to create (used for the VMs).
-	Workers gardencorev1alpha1.CIDR `json:"workers"`
+	Workers string `json:"workers"`
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
@@ -123,7 +121,7 @@ type VNet struct {
 	Name *string `json:"name,omitempty"`
 	// CIDR is the VNet CIDR
 	// +optional
-	CIDR *gardencorev1alpha1.CIDR `json:"cidr,omitempty"`
+	CIDR *string `json:"cidr,omitempty"`
 }
 
 // VNetStatus contains the VNet name.