Skip to content

Commit 00d544f

Browse files
Update imports and refs
1 parent 6189ba6 commit 00d544f

1 file changed

Lines changed: 2 additions & 6 deletions

File tree

test/extended/internalreleaseimage/helper.go

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@ import (
1919

2020
configv1 "github.com/openshift/api/config/v1"
2121
v1 "github.com/openshift/api/machineconfiguration/v1"
22-
machineconfigv1alpha1types "github.com/openshift/api/machineconfiguration/v1alpha1"
2322
machineconfigv1 "github.com/openshift/client-go/machineconfiguration/clientset/versioned/typed/machineconfiguration/v1"
24-
machineconfigv1alpha1 "github.com/openshift/client-go/machineconfiguration/clientset/versioned/typed/machineconfiguration/v1alpha1"
2523
exutil "github.com/openshift/origin/test/extended/util"
2624
)
2725

@@ -33,7 +31,6 @@ const (
3331
type IRITestHelper struct {
3432
oc *exutil.CLI
3533
McClientV1 machineconfigv1.MachineconfigurationV1Interface
36-
McClientV1alpha1 machineconfigv1alpha1.MachineconfigurationV1alpha1Interface
3734
}
3835

3936
// MCInfo holds MachineConfig metadata for reconciliation verification
@@ -47,12 +44,11 @@ func NewIRITestHelper(oc *exutil.CLI) *IRITestHelper {
4744
return &IRITestHelper{
4845
oc: oc,
4946
McClientV1: oc.MachineConfigurationClient().MachineconfigurationV1(),
50-
McClientV1alpha1: oc.MachineConfigurationClient().MachineconfigurationV1alpha1(),
5147
}
5248
}
5349

5450
// GetIRI gets the InternalReleaseImage resource and fails the test if not found
55-
func (h *IRITestHelper) GetIRI() *machineconfigv1alpha1types.InternalReleaseImage {
51+
func (h *IRITestHelper) GetIRI() *v1.InternalReleaseImage {
5652
iri, err := h.McClientV1alpha1.InternalReleaseImages().Get(context.Background(), IRIResourceName, metav1.GetOptions{})
5753
o.Expect(err).NotTo(o.HaveOccurred(), "Failed to get InternalReleaseImage resource")
5854
return iri
@@ -245,7 +241,7 @@ func skipIfNoRegistryFeatureUnsupported(oc *exutil.CLI) {
245241
}
246242

247243
// Check if InternalReleaseImage resource is present. If not present, the feature is not enabled.
248-
_, err = oc.MachineConfigurationClient().MachineconfigurationV1alpha1().InternalReleaseImages().Get(context.Background(), IRIResourceName, metav1.GetOptions{})
244+
_, err = oc.MachineConfigurationClient().MachineconfigurationV1().InternalReleaseImages().Get(context.Background(), IRIResourceName, metav1.GetOptions{})
249245
if err != nil {
250246
if apierrors.IsNotFound(err) {
251247
g.Skip("InternalReleaseImage resource not found, feature not enabled")

0 commit comments

Comments
 (0)