Merge pull request #35 from infonova/cherrypick-pr11784-pr11743-into-…

…release-1.20-bp Cherry pick PRs kubernetes#11784, kubernetes#11757 into release 1.20 bp
infonova · Oct 13, 2021 · bcd3dd5 · bcd3dd5
2 parents d677f97 + f80d168
commit bcd3dd5
Show file tree

Hide file tree

Showing 27 changed files with 245 additions and 8 deletions.
diff --git a/k8s/crds/kops.k8s.io_clusters.yaml b/k8s/crds/kops.k8s.io_clusters.yaml
@@ -374,6 +374,16 @@ spec:
                           useOctavia:
                             type: boolean
                         type: object
+                      metadata:
+                        description: OpenstackMetadata defines config for metadata
+                          service related settings
+                        properties:
+                          configDrive:
+                            description: ConfigDrive specifies to use config drive
+                              for retrieving user data instead of the metadata service
+                              when launching instances
+                            type: boolean
+                        type: object
                       monitor:
                         description: OpenstackMonitor defines the config for a health
                           monitor

diff --git a/pkg/apis/kops/componentconfig.go b/pkg/apis/kops/componentconfig.go
@@ -762,6 +762,12 @@ type OpenstackNetwork struct {
 	AvailabilityZoneHints []*string `json:"availabilityZoneHints,omitempty"`
 }
 
+// OpenstackMetadata defines config for metadata service related settings
+type OpenstackMetadata struct {
+	// ConfigDrive specifies to use config drive for retrieving user data instead of the metadata service when launching instances
+	ConfigDrive *bool `json:"configDrive,omitempty"`
+}
+
 // OpenstackConfiguration defines cloud config elements for the openstack cloud provider
 type OpenstackConfiguration struct {
 	Loadbalancer       *OpenstackLoadbalancerConfig `json:"loadbalancer,omitempty"`
@@ -770,6 +776,7 @@ type OpenstackConfiguration struct {
 	BlockStorage       *OpenstackBlockStorageConfig `json:"blockStorage,omitempty"`
 	InsecureSkipVerify *bool                        `json:"insecureSkipVerify,omitempty"`
 	Network            *OpenstackNetwork            `json:"network,omitempty"`
+	Metadata           *OpenstackMetadata           `json:"metadata,omitempty"`
 }
 
 // AzureConfiguration defines Azure specific cluster configuration.

diff --git a/pkg/apis/kops/v1alpha2/componentconfig.go b/pkg/apis/kops/v1alpha2/componentconfig.go
@@ -761,6 +761,12 @@ type OpenstackNetwork struct {
 	AvailabilityZoneHints []*string `json:"availabilityZoneHints,omitempty"`
 }
 
+// OpenstackMetadata defines config for metadata service related settings
+type OpenstackMetadata struct {
+	// ConfigDrive specifies to use config drive for retrieving user data instead of the metadata service when launching instances
+	ConfigDrive *bool `json:"configDrive,omitempty"`
+}
+
 // OpenstackConfiguration defines cloud config elements for the openstack cloud provider
 type OpenstackConfiguration struct {
 	Loadbalancer       *OpenstackLoadbalancerConfig `json:"loadbalancer,omitempty"`
@@ -769,6 +775,7 @@ type OpenstackConfiguration struct {
 	BlockStorage       *OpenstackBlockStorageConfig `json:"blockStorage,omitempty"`
 	InsecureSkipVerify *bool                        `json:"insecureSkipVerify,omitempty"`
 	Network            *OpenstackNetwork            `json:"network,omitempty"`
+	Metadata           *OpenstackMetadata           `json:"metadata,omitempty"`
 }
 
 // AzureConfiguration defines Azure specific cluster configuration.

diff --git a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go
diff --git a/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go b/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go
diff --git a/pkg/apis/kops/zz_generated.deepcopy.go b/pkg/apis/kops/zz_generated.deepcopy.go
diff --git a/pkg/model/components/openstack.go b/pkg/model/components/openstack.go
@@ -52,6 +52,13 @@ func (b *OpenStackOptionsBulder) BuildOptions(o interface{}) error {
 		clusterSpec.CloudConfig.Openstack.BlockStorage.CreateStorageClass = fi.Bool(true)
 	}
 
+	if clusterSpec.CloudConfig.Openstack.Metadata == nil {
+		clusterSpec.CloudConfig.Openstack.Metadata = &kops.OpenstackMetadata{}
+	}
+	if clusterSpec.CloudConfig.Openstack.Metadata.ConfigDrive == nil {
+		clusterSpec.CloudConfig.Openstack.Metadata.ConfigDrive = fi.Bool(false)
+	}
+
 	if clusterSpec.ExternalCloudControllerManager == nil {
 		clusterSpec.ExternalCloudControllerManager = &kops.CloudControllerManagerConfig{}
 	}

diff --git a/pkg/model/openstackmodel/servergroup.go b/pkg/model/openstackmodel/servergroup.go
@@ -162,6 +162,7 @@ func (b *ServerGroupModelBuilder) buildInstances(c *fi.ModelBuilderContext, sg *
 			Metadata:         metaWithName,
 			SecurityGroups:   ig.Spec.AdditionalSecurityGroups,
 			AvailabilityZone: az,
+			ConfigDrive:      b.Cluster.Spec.CloudConfig.Openstack.Metadata.ConfigDrive,
 		}
 		c.AddTask(instanceTask)
 

diff --git a/pkg/model/openstackmodel/servergroup_test.go b/pkg/model/openstackmodel/servergroup_test.go
@@ -54,6 +54,9 @@ func getServerGroupModelBuilderTestInput() []serverGroupModelBuilderTestInput {
 							Router: &kops.OpenstackRouter{
 								ExternalNetwork: fi.String("test"),
 							},
+							Metadata: &kops.OpenstackMetadata{
+								ConfigDrive: fi.Bool(false),
+							},
 						},
 					},
 					Subnets: []kops.ClusterSubnetSpec{
@@ -108,6 +111,9 @@ func getServerGroupModelBuilderTestInput() []serverGroupModelBuilderTestInput {
 							Router: &kops.OpenstackRouter{
 								ExternalNetwork: fi.String("test"),
 							},
+							Metadata: &kops.OpenstackMetadata{
+								ConfigDrive: fi.Bool(false),
+							},
 						},
 					},
 					Subnets: []kops.ClusterSubnetSpec{
@@ -190,6 +196,9 @@ func getServerGroupModelBuilderTestInput() []serverGroupModelBuilderTestInput {
 							Router: &kops.OpenstackRouter{
 								ExternalNetwork: fi.String("test"),
 							},
+							Metadata: &kops.OpenstackMetadata{
+								ConfigDrive: fi.Bool(false),
+							},
 						},
 					},
 					Subnets: []kops.ClusterSubnetSpec{
@@ -309,6 +318,9 @@ func getServerGroupModelBuilderTestInput() []serverGroupModelBuilderTestInput {
 							Router: &kops.OpenstackRouter{
 								ExternalNetwork: fi.String("test"),
 							},
+							Metadata: &kops.OpenstackMetadata{
+								ConfigDrive: fi.Bool(false),
+							},
 						},
 					},
 					Topology: &kops.TopologySpec{
@@ -429,7 +441,11 @@ func getServerGroupModelBuilderTestInput() []serverGroupModelBuilderTestInput {
 				Spec: kops.ClusterSpec{
 					MasterPublicName: "master-public-name",
 					CloudConfig: &kops.CloudConfiguration{
-						Openstack: &kops.OpenstackConfiguration{},
+						Openstack: &kops.OpenstackConfiguration{
+							Metadata: &kops.OpenstackMetadata{
+								ConfigDrive: fi.Bool(false),
+							},
+						},
 					},
 					Subnets: []kops.ClusterSubnetSpec{
 						{
@@ -547,6 +563,9 @@ func getServerGroupModelBuilderTestInput() []serverGroupModelBuilderTestInput {
 							Router: &kops.OpenstackRouter{
 								ExternalNetwork: fi.String("test"),
 							},
+							Metadata: &kops.OpenstackMetadata{
+								ConfigDrive: fi.Bool(false),
+							},
 						},
 					},
 					Subnets: []kops.ClusterSubnetSpec{
@@ -625,6 +644,9 @@ func getServerGroupModelBuilderTestInput() []serverGroupModelBuilderTestInput {
 							Router: &kops.OpenstackRouter{
 								ExternalNetwork: fi.String("test"),
 							},
+							Metadata: &kops.OpenstackMetadata{
+								ConfigDrive: fi.Bool(false),
+							},
 						},
 					},
 					Subnets: []kops.ClusterSubnetSpec{
@@ -681,6 +703,9 @@ func getServerGroupModelBuilderTestInput() []serverGroupModelBuilderTestInput {
 							Router: &kops.OpenstackRouter{
 								ExternalNetwork: fi.String("test"),
 							},
+							Metadata: &kops.OpenstackMetadata{
+								ConfigDrive: fi.Bool(false),
+							},
 						},
 					},
 					Subnets: []kops.ClusterSubnetSpec{
@@ -759,7 +784,11 @@ func getServerGroupModelBuilderTestInput() []serverGroupModelBuilderTestInput {
 				Spec: kops.ClusterSpec{
 					MasterPublicName: "master-public-name",
 					CloudConfig: &kops.CloudConfiguration{
-						Openstack: &kops.OpenstackConfiguration{},
+						Openstack: &kops.OpenstackConfiguration{
+							Metadata: &kops.OpenstackMetadata{
+								ConfigDrive: fi.Bool(false),
+							},
+						},
 					},
 					Subnets: []kops.ClusterSubnetSpec{
 						{
@@ -798,7 +827,11 @@ func getServerGroupModelBuilderTestInput() []serverGroupModelBuilderTestInput {
 				Spec: kops.ClusterSpec{
 					MasterPublicName: "master-public-name",
 					CloudConfig: &kops.CloudConfiguration{
-						Openstack: &kops.OpenstackConfiguration{},
+						Openstack: &kops.OpenstackConfiguration{
+							Metadata: &kops.OpenstackMetadata{
+								ConfigDrive: fi.Bool(false),
+							},
+						},
 					},
 					Subnets: []kops.ClusterSubnetSpec{
 						{
@@ -839,7 +872,11 @@ func getServerGroupModelBuilderTestInput() []serverGroupModelBuilderTestInput {
 				Spec: kops.ClusterSpec{
 					MasterPublicName: "master-public-name",
 					CloudConfig: &kops.CloudConfiguration{
-						Openstack: &kops.OpenstackConfiguration{},
+						Openstack: &kops.OpenstackConfiguration{
+							Metadata: &kops.OpenstackMetadata{
+								ConfigDrive: fi.Bool(false),
+							},
+						},
 					},
 					Subnets: []kops.ClusterSubnetSpec{
 						{
@@ -878,7 +915,11 @@ func getServerGroupModelBuilderTestInput() []serverGroupModelBuilderTestInput {
 				Spec: kops.ClusterSpec{
 					MasterPublicName: "master-public-name",
 					CloudConfig: &kops.CloudConfiguration{
-						Openstack: &kops.OpenstackConfiguration{},
+						Openstack: &kops.OpenstackConfiguration{
+							Metadata: &kops.OpenstackMetadata{
+								ConfigDrive: fi.Bool(false),
+							},
+						},
 					},
 					Subnets: []kops.ClusterSubnetSpec{
 						{
@@ -917,7 +958,11 @@ func getServerGroupModelBuilderTestInput() []serverGroupModelBuilderTestInput {
 				Spec: kops.ClusterSpec{
 					MasterPublicName: "master-public-name",
 					CloudConfig: &kops.CloudConfiguration{
-						Openstack: &kops.OpenstackConfiguration{},
+						Openstack: &kops.OpenstackConfiguration{
+							Metadata: &kops.OpenstackMetadata{
+								ConfigDrive: fi.Bool(false),
+							},
+						},
 					},
 					Subnets: []kops.ClusterSubnetSpec{
 						{

diff --git a/pkg/model/openstackmodel/tests/servergroup/adds-additional-security-groups.yaml b/pkg/model/openstackmodel/tests/servergroup/adds-additional-security-groups.yaml
@@ -1,6 +1,7 @@
 Name: node
 ---
 AvailabilityZone: zone-1
+ConfigDrive: false
 Flavor: blc.2-4
 FloatingIP: null
 ForAPIServer: false