diff --git a/pkg/apis/hive/v1alpha1/installconfig.go b/pkg/apis/hive/v1alpha1/installconfig.go index b122d2d4115..18f9f5e9d8f 100644 --- a/pkg/apis/hive/v1alpha1/installconfig.go +++ b/pkg/apis/hive/v1alpha1/installconfig.go @@ -71,13 +71,7 @@ type AWSPlatform struct { // platform configuration. DefaultMachinePlatform *AWSMachinePoolPlatform `json:"defaultMachinePlatform,omitempty"` - // VPCID specifies the vpc to associate with the cluster. - // If empty, new vpc will be created. - // +optional - VPCID string `json:"vpcID"` - // VPCCIDRBlock - // +optional VPCCIDRBlock string `json:"vpcCIDRBlock"` } diff --git a/pkg/install/convertconfig.go b/pkg/install/convertconfig.go index c5d04e1185f..31f22e23447 100644 --- a/pkg/install/convertconfig.go +++ b/pkg/install/convertconfig.go @@ -50,7 +50,6 @@ func GenerateInstallConfig(cd *hivev1.ClusterDeployment, sshKey, pullSecret stri platform.AWS = &installeraws.Platform{ Region: aws.Region, UserTags: aws.UserTags, - VPCID: aws.VPCID, VPCCIDRBlock: aws.VPCCIDRBlock, } if aws.DefaultMachinePlatform != nil { diff --git a/pkg/install/convertconfig_test.go b/pkg/install/convertconfig_test.go index 14ebb47c7ba..bd7c722f0aa 100644 --- a/pkg/install/convertconfig_test.go +++ b/pkg/install/convertconfig_test.go @@ -43,7 +43,6 @@ const ( adminPassword = "adminpassword" adminSSHKey = "adminSSH" pullSecret = "pullSecret" - vpcID = "vpcID" vpcCIDRBlock = "10.1.0.0/16" awsInstanceType = "fake-aws-type" awsRegion = "us-east-1" @@ -72,7 +71,6 @@ func buildValidClusterDeployment() *hivev1.ClusterDeployment { UserTags: map[string]string{ "foo": "bar", }, - VPCID: vpcID, VPCCIDRBlock: vpcCIDRBlock, DefaultMachinePlatform: &hivev1.AWSMachinePoolPlatform{ InstanceType: awsInstanceType, @@ -153,7 +151,6 @@ func buildBaseExpectedInstallConfig() *installtypes.InstallConfig { UserTags: map[string]string{ "foo": "bar", }, - VPCID: vpcID, VPCCIDRBlock: vpcCIDRBlock, DefaultMachinePlatform: &installawstypes.MachinePool{ InstanceType: awsInstanceType,