diff --git a/k8s/crds/kops.k8s.io_clusters.yaml b/k8s/crds/kops.k8s.io_clusters.yaml index 2976d0b18a..0ff8be5b0b 100644 --- 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/v1alpha2/zz_generated.conversion.go b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go index 412043fcd2..6594627fb7 100644 --- a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go +++ b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go @@ -893,6 +893,16 @@ func RegisterConversions(s *runtime.Scheme) error { }); err != nil { return err } + if err := s.AddGeneratedConversionFunc((*OpenstackMetadata)(nil), (*kops.OpenstackMetadata)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha2_OpenstackMetadata_To_kops_OpenstackMetadata(a.(*OpenstackMetadata), b.(*kops.OpenstackMetadata), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*kops.OpenstackMetadata)(nil), (*OpenstackMetadata)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_kops_OpenstackMetadata_To_v1alpha2_OpenstackMetadata(a.(*kops.OpenstackMetadata), b.(*OpenstackMetadata), scope) + }); err != nil { + return err + } if err := s.AddGeneratedConversionFunc((*OpenstackMonitor)(nil), (*kops.OpenstackMonitor)(nil), func(a, b interface{}, scope conversion.Scope) error { return Convert_v1alpha2_OpenstackMonitor_To_kops_OpenstackMonitor(a.(*OpenstackMonitor), b.(*kops.OpenstackMonitor), scope) }); err != nil { @@ -6043,6 +6053,15 @@ func autoConvert_v1alpha2_OpenstackConfiguration_To_kops_OpenstackConfiguration( } else { out.Network = nil } + if in.Metadata != nil { + in, out := &in.Metadata, &out.Metadata + *out = new(kops.OpenstackMetadata) + if err := Convert_v1alpha2_OpenstackMetadata_To_kops_OpenstackMetadata(*in, *out, s); err != nil { + return err + } + } else { + out.Metadata = nil + } return nil } @@ -6098,6 +6117,15 @@ func autoConvert_kops_OpenstackConfiguration_To_v1alpha2_OpenstackConfiguration( } else { out.Network = nil } + if in.Metadata != nil { + in, out := &in.Metadata, &out.Metadata + *out = new(OpenstackMetadata) + if err := Convert_kops_OpenstackMetadata_To_v1alpha2_OpenstackMetadata(*in, *out, s); err != nil { + return err + } + } else { + out.Metadata = nil + } return nil } @@ -6140,6 +6168,26 @@ func Convert_kops_OpenstackLoadbalancerConfig_To_v1alpha2_OpenstackLoadbalancerC return autoConvert_kops_OpenstackLoadbalancerConfig_To_v1alpha2_OpenstackLoadbalancerConfig(in, out, s) } +func autoConvert_v1alpha2_OpenstackMetadata_To_kops_OpenstackMetadata(in *OpenstackMetadata, out *kops.OpenstackMetadata, s conversion.Scope) error { + out.ConfigDrive = in.ConfigDrive + return nil +} + +// Convert_v1alpha2_OpenstackMetadata_To_kops_OpenstackMetadata is an autogenerated conversion function. +func Convert_v1alpha2_OpenstackMetadata_To_kops_OpenstackMetadata(in *OpenstackMetadata, out *kops.OpenstackMetadata, s conversion.Scope) error { + return autoConvert_v1alpha2_OpenstackMetadata_To_kops_OpenstackMetadata(in, out, s) +} + +func autoConvert_kops_OpenstackMetadata_To_v1alpha2_OpenstackMetadata(in *kops.OpenstackMetadata, out *OpenstackMetadata, s conversion.Scope) error { + out.ConfigDrive = in.ConfigDrive + return nil +} + +// Convert_kops_OpenstackMetadata_To_v1alpha2_OpenstackMetadata is an autogenerated conversion function. +func Convert_kops_OpenstackMetadata_To_v1alpha2_OpenstackMetadata(in *kops.OpenstackMetadata, out *OpenstackMetadata, s conversion.Scope) error { + return autoConvert_kops_OpenstackMetadata_To_v1alpha2_OpenstackMetadata(in, out, s) +} + func autoConvert_v1alpha2_OpenstackMonitor_To_kops_OpenstackMonitor(in *OpenstackMonitor, out *kops.OpenstackMonitor, s conversion.Scope) error { out.Delay = in.Delay out.Timeout = in.Timeout diff --git a/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go b/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go index 2d12661e06..9ed6948271 100644 --- a/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go +++ b/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go @@ -4084,6 +4084,11 @@ func (in *OpenstackConfiguration) DeepCopyInto(out *OpenstackConfiguration) { *out = new(OpenstackNetwork) (*in).DeepCopyInto(*out) } + if in.Metadata != nil { + in, out := &in.Metadata, &out.Metadata + *out = new(OpenstackMetadata) + (*in).DeepCopyInto(*out) + } return } @@ -4153,6 +4158,27 @@ func (in *OpenstackLoadbalancerConfig) DeepCopy() *OpenstackLoadbalancerConfig { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *OpenstackMetadata) DeepCopyInto(out *OpenstackMetadata) { + *out = *in + if in.ConfigDrive != nil { + in, out := &in.ConfigDrive, &out.ConfigDrive + *out = new(bool) + **out = **in + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new OpenstackMetadata. +func (in *OpenstackMetadata) DeepCopy() *OpenstackMetadata { + if in == nil { + return nil + } + out := new(OpenstackMetadata) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *OpenstackMonitor) DeepCopyInto(out *OpenstackMonitor) { *out = *in diff --git a/pkg/apis/kops/zz_generated.deepcopy.go b/pkg/apis/kops/zz_generated.deepcopy.go index 3a94dee76b..19c2b32d9c 100644 --- a/pkg/apis/kops/zz_generated.deepcopy.go +++ b/pkg/apis/kops/zz_generated.deepcopy.go @@ -4266,6 +4266,11 @@ func (in *OpenstackConfiguration) DeepCopyInto(out *OpenstackConfiguration) { *out = new(OpenstackNetwork) (*in).DeepCopyInto(*out) } + if in.Metadata != nil { + in, out := &in.Metadata, &out.Metadata + *out = new(OpenstackMetadata) + (*in).DeepCopyInto(*out) + } return } @@ -4335,6 +4340,27 @@ func (in *OpenstackLoadbalancerConfig) DeepCopy() *OpenstackLoadbalancerConfig { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *OpenstackMetadata) DeepCopyInto(out *OpenstackMetadata) { + *out = *in + if in.ConfigDrive != nil { + in, out := &in.ConfigDrive, &out.ConfigDrive + *out = new(bool) + **out = **in + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new OpenstackMetadata. +func (in *OpenstackMetadata) DeepCopy() *OpenstackMetadata { + if in == nil { + return nil + } + out := new(OpenstackMetadata) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *OpenstackMonitor) DeepCopyInto(out *OpenstackMonitor) { *out = *in