diff --git a/go.mod b/go.mod index 92f361af1c8..48118dd4d62 100644 --- a/go.mod +++ b/go.mod @@ -56,7 +56,7 @@ require ( github.com/microsoftgraph/msgraph-sdk-go v0.47.0 github.com/nutanix-cloud-native/prism-go-client v0.2.1-0.20220804130801-c8a253627c64 github.com/onsi/gomega v1.28.1 - github.com/openshift/api v0.0.0-20231019121755-0c5924392281 + github.com/openshift/api v0.0.0-20231020115248-f404f2bc3524 github.com/openshift/assisted-image-service v0.0.0-20230829160050-0b98ec74397b github.com/openshift/assisted-service/api v0.0.0 github.com/openshift/assisted-service/client v0.0.0 diff --git a/go.sum b/go.sum index 70a59231f25..c7c9ca47f43 100644 --- a/go.sum +++ b/go.sum @@ -949,8 +949,8 @@ github.com/opencontainers/selinux v1.8.2/go.mod h1:MUIHuUEvKB1wtJjQdOyYRgOnLD2xA github.com/openshift/api v0.0.0-20200326160804-ecb9283fe820/go.mod h1:RKMJ5CBnljLfnej+BJ/xnOWc3kZDvJUaIAEq2oKSPtE= github.com/openshift/api v0.0.0-20200827090112-c05698d102cf/go.mod h1:M3xexPhgM8DISzzRpuFUy+jfPjQPIcs9yqEYj17mXV8= github.com/openshift/api v0.0.0-20200829102639-8a3a835f1acf/go.mod h1:M3xexPhgM8DISzzRpuFUy+jfPjQPIcs9yqEYj17mXV8= -github.com/openshift/api v0.0.0-20231019121755-0c5924392281 h1:49ccho6DQLZpqxlFWyXpHRoLsQl0KVma+Ir+2zC9qSY= -github.com/openshift/api v0.0.0-20231019121755-0c5924392281/go.mod h1:qNtV0315F+f8ld52TLtPvrfivZpdimOzTi3kn9IVbtU= +github.com/openshift/api v0.0.0-20231020115248-f404f2bc3524 h1:+hOy0dbg/WIQ2TpBh+aWmoKTHYB82nSM8CfIZtjBmr8= +github.com/openshift/api v0.0.0-20231020115248-f404f2bc3524/go.mod h1:qNtV0315F+f8ld52TLtPvrfivZpdimOzTi3kn9IVbtU= github.com/openshift/assisted-image-service v0.0.0-20230829160050-0b98ec74397b h1:wLVEgmzQjs3t4Z96gZzSLF/ws6ULliAks7z1lozNJrE= github.com/openshift/assisted-image-service v0.0.0-20230829160050-0b98ec74397b/go.mod h1:KTt/pnfs9gt0McDPrb0zVTkwd0xIFNik/ZJROIBzsbc= github.com/openshift/assisted-service/api v0.0.0-20230831114549-1922eda29cf8 h1:+fZLKbycDo4JeLwPGVSAgf2XPaJGLM341l9ZfrrlxG0= diff --git a/pkg/asset/machines/aws/machines.go b/pkg/asset/machines/aws/machines.go index d6db4fb5b1e..3a6cc49d67c 100644 --- a/pkg/asset/machines/aws/machines.go +++ b/pkg/asset/machines/aws/machines.go @@ -149,7 +149,7 @@ func Machines(clusterID string, region string, subnets map[string]string, pool * Template: machinev1.ControlPlaneMachineSetTemplate{ MachineType: machinev1.OpenShiftMachineV1Beta1MachineType, OpenShiftMachineV1Beta1Machine: &machinev1.OpenShiftMachineV1Beta1MachineTemplate{ - FailureDomains: machinev1.FailureDomains{ + FailureDomains: &machinev1.FailureDomains{ Platform: v1.AWSPlatformType, AWS: &failureDomains, }, diff --git a/pkg/asset/machines/azure/machines.go b/pkg/asset/machines/azure/machines.go index 66986f458e2..763eb266b85 100644 --- a/pkg/asset/machines/azure/machines.go +++ b/pkg/asset/machines/azure/machines.go @@ -142,7 +142,7 @@ func Machines(clusterID string, config *types.InstallConfig, pool *types.Machine } if len(failureDomains) > 0 { - controlPlaneMachineSet.Spec.Template.OpenShiftMachineV1Beta1Machine.FailureDomains = machinev1.FailureDomains{ + controlPlaneMachineSet.Spec.Template.OpenShiftMachineV1Beta1Machine.FailureDomains = &machinev1.FailureDomains{ Platform: v1.AzurePlatformType, Azure: &failureDomains, } diff --git a/pkg/asset/machines/gcp/machines.go b/pkg/asset/machines/gcp/machines.go index cf24e9197a1..401524ea300 100644 --- a/pkg/asset/machines/gcp/machines.go +++ b/pkg/asset/machines/gcp/machines.go @@ -106,7 +106,7 @@ func Machines(clusterID string, config *types.InstallConfig, pool *types.Machine Template: machinev1.ControlPlaneMachineSetTemplate{ MachineType: machinev1.OpenShiftMachineV1Beta1MachineType, OpenShiftMachineV1Beta1Machine: &machinev1.OpenShiftMachineV1Beta1MachineTemplate{ - FailureDomains: machinev1.FailureDomains{ + FailureDomains: &machinev1.FailureDomains{ Platform: v1.GCPPlatformType, GCP: &failureDomains, }, diff --git a/pkg/asset/machines/openstack/machines.go b/pkg/asset/machines/openstack/machines.go index 168165535f9..e05b7ce4bbf 100644 --- a/pkg/asset/machines/openstack/machines.go +++ b/pkg/asset/machines/openstack/machines.go @@ -156,7 +156,7 @@ func Machines(clusterID string, config *types.InstallConfig, pool *types.Machine } if CPMSFailureDomains := pruneFailureDomains(failureDomains); CPMSFailureDomains != nil { - controlPlaneMachineSet.Spec.Template.OpenShiftMachineV1Beta1Machine.FailureDomains = machinev1.FailureDomains{ + controlPlaneMachineSet.Spec.Template.OpenShiftMachineV1Beta1Machine.FailureDomains = &machinev1.FailureDomains{ Platform: v1.OpenStackPlatformType, OpenStack: CPMSFailureDomains, } diff --git a/scripts/openstack/manifest-tests/base-case/test_cpms.py b/scripts/openstack/manifest-tests/base-case/test_cpms.py index 663b4dc9a51..6a4ec96edfc 100755 --- a/scripts/openstack/manifest-tests/base-case/test_cpms.py +++ b/scripts/openstack/manifest-tests/base-case/test_cpms.py @@ -18,7 +18,7 @@ def setUp(self): def test_compute_zones(self): """Assert that the OpenStack CPMS failureDomains value is empty.""" - self.assertNotIn("openstack", self.cpms["spec"]["template"]["machines_v1beta1_machine_openshift_io"]["failureDomains"]) + self.assertIsNone(self.cpms["spec"]["template"]["machines_v1beta1_machine_openshift_io"].get("failureDomains")) if __name__ == '__main__': diff --git a/scripts/openstack/manifest-tests/zero-workers/test_cpms.py b/scripts/openstack/manifest-tests/zero-workers/test_cpms.py index 663b4dc9a51..6a4ec96edfc 100755 --- a/scripts/openstack/manifest-tests/zero-workers/test_cpms.py +++ b/scripts/openstack/manifest-tests/zero-workers/test_cpms.py @@ -18,7 +18,7 @@ def setUp(self): def test_compute_zones(self): """Assert that the OpenStack CPMS failureDomains value is empty.""" - self.assertNotIn("openstack", self.cpms["spec"]["template"]["machines_v1beta1_machine_openshift_io"]["failureDomains"]) + self.assertIsNone(self.cpms["spec"]["template"]["machines_v1beta1_machine_openshift_io"].get("failureDomains")) if __name__ == '__main__': diff --git a/vendor/github.com/openshift/api/machine/v1/types_controlplanemachineset.go b/vendor/github.com/openshift/api/machine/v1/types_controlplanemachineset.go index e46c39b552f..4c110b6ad23 100644 --- a/vendor/github.com/openshift/api/machine/v1/types_controlplanemachineset.go +++ b/vendor/github.com/openshift/api/machine/v1/types_controlplanemachineset.go @@ -138,7 +138,7 @@ type OpenShiftMachineV1Beta1MachineTemplate struct { // This will be merged into the ProviderSpec given in the template. // This field is optional on platforms that do not require placement information. // +optional - FailureDomains FailureDomains `json:"failureDomains,omitempty"` + FailureDomains *FailureDomains `json:"failureDomains,omitempty"` // ObjectMeta is the standard object metadata // More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata diff --git a/vendor/github.com/openshift/api/machine/v1/zz_generated.deepcopy.go b/vendor/github.com/openshift/api/machine/v1/zz_generated.deepcopy.go index ca31843272e..f4f3a8b8975 100644 --- a/vendor/github.com/openshift/api/machine/v1/zz_generated.deepcopy.go +++ b/vendor/github.com/openshift/api/machine/v1/zz_generated.deepcopy.go @@ -717,7 +717,11 @@ func (in *NutanixResourceIdentifier) DeepCopy() *NutanixResourceIdentifier { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *OpenShiftMachineV1Beta1MachineTemplate) DeepCopyInto(out *OpenShiftMachineV1Beta1MachineTemplate) { *out = *in - in.FailureDomains.DeepCopyInto(&out.FailureDomains) + if in.FailureDomains != nil { + in, out := &in.FailureDomains, &out.FailureDomains + *out = new(FailureDomains) + (*in).DeepCopyInto(*out) + } in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) in.Spec.DeepCopyInto(&out.Spec) return diff --git a/vendor/modules.txt b/vendor/modules.txt index 977809fc7d1..b65d3815d58 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -8758,7 +8758,7 @@ github.com/opencontainers/go-digest ## explicit; go 1.17 github.com/opencontainers/image-spec/specs-go github.com/opencontainers/image-spec/specs-go/v1 -# github.com/openshift/api v0.0.0-20231019121755-0c5924392281 +# github.com/openshift/api v0.0.0-20231020115248-f404f2bc3524 ## explicit; go 1.20 github.com/openshift/api/config/v1 github.com/openshift/api/config/v1alpha1