Skip to content

Commit 721a07c

Browse files
authored
[openstack] Config drive option (#457)
* [openstack] Config drive auto-detection Signed-off-by: Andrey Klimentyev <andrey.klimentyev@flant.com> * rebase and API re-generation
1 parent 8881b03 commit 721a07c

File tree

8 files changed

+26
-2
lines changed

8 files changed

+26
-2
lines changed

kubernetes/crds/machine.sapcloud.io_openstackmachineclasses.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,8 @@ spec:
102102
additionalProperties:
103103
type: string
104104
type: object
105+
useConfigDrive:
106+
type: boolean
105107
required:
106108
- availabilityZone
107109
- flavorName

pkg/apis/machine/types.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -638,6 +638,7 @@ type OpenStackMachineClassSpec struct {
638638
SecretRef *corev1.SecretReference
639639
PodNetworkCidr string
640640
RootDiskSize int // in GB
641+
UseConfigDrive *bool
641642
}
642643

643644
type OpenStackNetwork struct {

pkg/apis/machine/v1alpha1/openstack_machineclass_types.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ type OpenStackMachineClassSpec struct {
101101
SecretRef *corev1.SecretReference `json:"secretRef,omitempty"`
102102
PodNetworkCidr string `json:"podNetworkCidr"`
103103
RootDiskSize int `json:"rootDiskSize,omitempty"` // in GB
104+
UseConfigDrive *bool `json:"useConfigDrive,omitempty"`
104105
}
105106

106107
type OpenStackNetwork struct {

pkg/apis/machine/v1alpha1/zz_generated.conversion.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/apis/machine/v1alpha1/zz_generated.deepcopy.go

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/apis/machine/zz_generated.deepcopy.go

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/driver/driver_openstack.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,9 @@ import (
2525
"runtime"
2626
"strings"
2727

28-
"github.com/gophercloud/gophercloud/openstack/networking/v2/networks"
29-
3028
"github.com/gardener/machine-controller-manager/pkg/apis/machine/v1alpha1"
3129
"github.com/gardener/machine-controller-manager/pkg/metrics"
30+
"github.com/gophercloud/gophercloud/openstack/networking/v2/networks"
3231
"github.com/prometheus/client_golang/prometheus"
3332
corev1 "k8s.io/api/core/v1"
3433
"k8s.io/klog"
@@ -113,6 +112,7 @@ func (d *OpenStackDriver) Create() (string, string, error) {
113112
metadata := d.OpenStackMachineClass.Spec.Tags
114113
podNetworkCidr := d.OpenStackMachineClass.Spec.PodNetworkCidr
115114
rootDiskSize := d.OpenStackMachineClass.Spec.RootDiskSize
115+
useConfigDrive := d.OpenStackMachineClass.Spec.UseConfigDrive
116116

117117
var createOpts servers.CreateOptsBuilder
118118
var imageRef string
@@ -170,6 +170,7 @@ func (d *OpenStackDriver) Create() (string, string, error) {
170170
Metadata: metadata,
171171
UserData: []byte(d.UserData),
172172
AvailabilityZone: availabilityZone,
173+
ConfigDrive: useConfigDrive,
173174
}
174175

175176
createOpts = &keypairs.CreateOptsExt{

pkg/openapi/openapi_generated.go

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)