diff --git a/api/v1beta1/ironic_webhook.go b/api/v1beta1/ironic_webhook.go index 3e019c3a..8ab4a57a 100644 --- a/api/v1beta1/ironic_webhook.go +++ b/api/v1beta1/ironic_webhook.go @@ -55,32 +55,6 @@ type netIPStartEnd struct { path *field.Path // Field path to DHCP Range in Ironic spec } -// IronicDefaults - TODO remove when openstack-operator has moved to IronicImages -type IronicDefaults struct { - APIContainerImageURL string - ConductorContainerImageURL string - InspectorContainerImageURL string - PXEContainerImageURL string - INAContainerImageURL string - IPAContainerImageURL string - NoVNCProxyContainerImageURL string - GraphicalConsoleContainerImageURL string -} - -// SetupIronicDefaults - TODO remove when openstack-operator has moved to SetupIronicImageDefaults -func SetupIronicDefaults(defaults IronicDefaults) { - SetupIronicImageDefaults(IronicImages{ - API: defaults.APIContainerImageURL, - Conductor: defaults.ConductorContainerImageURL, - Inspector: defaults.InspectorContainerImageURL, - Pxe: defaults.PXEContainerImageURL, - NeutronAgent: defaults.INAContainerImageURL, - IronicPythonAgent: defaults.IPAContainerImageURL, - NoVNCProxy: defaults.NoVNCProxyContainerImageURL, - GraphicalConsole: defaults.GraphicalConsoleContainerImageURL, - }) -} - var imageDefaults IronicImages // SetupIronicImageDefaults - initialize Ironic spec defaults for use with either internal or external webhooks diff --git a/api/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go index e96924d4..41b2e19e 100644 --- a/api/v1beta1/zz_generated.deepcopy.go +++ b/api/v1beta1/zz_generated.deepcopy.go @@ -435,21 +435,6 @@ func (in *IronicConductorTemplate) DeepCopy() *IronicConductorTemplate { return out } -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *IronicDefaults) DeepCopyInto(out *IronicDefaults) { - *out = *in -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new IronicDefaults. -func (in *IronicDefaults) DeepCopy() *IronicDefaults { - if in == nil { - return nil - } - out := new(IronicDefaults) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *IronicImages) DeepCopyInto(out *IronicImages) { *out = *in