move everything over

Azure · Dec 19, 2024 · aad0c2c · aad0c2c
1 parent 750f8c5
commit aad0c2c
Show file tree

Hide file tree

Showing 28 changed files with 284 additions and 284 deletions.
diff --git a/pkg/cluster/networkprofile_test.go b/pkg/cluster/networkprofile_test.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"testing"
 
-	mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1"
+	mcfgv1 "github.com/openshift/api/machineconfiguration/v1"
 	mcofake "github.com/openshift/machine-config-operator/pkg/generated/clientset/versioned/fake"
 	"github.com/stretchr/testify/assert"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -163,7 +163,7 @@ func TestEnsureMTUSize(t *testing.T) {
 					},
 				},
 				mcocli: mcofake.NewSimpleClientset(
-					&mcv1.MachineConfig{
+					&mcfgv1.MachineConfig{
 						ObjectMeta: metav1.ObjectMeta{
 							Name: "master",
 						},
@@ -197,7 +197,7 @@ func TestEnsureMTUSize(t *testing.T) {
 					},
 				},
 				mcocli: mcofake.NewSimpleClientset(
-					&mcv1.MachineConfig{
+					&mcfgv1.MachineConfig{
 						ObjectMeta: metav1.ObjectMeta{
 							Name: "master",
 						},
@@ -228,7 +228,7 @@ func TestEnsureMTUSize(t *testing.T) {
 					},
 				},
 				mcocli: mcofake.NewSimpleClientset(
-					&mcv1.MachineConfig{
+					&mcfgv1.MachineConfig{
 						ObjectMeta: metav1.ObjectMeta{
 							Name: "99-master-mtu",
 						},
@@ -259,7 +259,7 @@ func TestEnsureMTUSize(t *testing.T) {
 					},
 				},
 				mcocli: mcofake.NewSimpleClientset(
-					&mcv1.MachineConfig{
+					&mcfgv1.MachineConfig{
 						ObjectMeta: metav1.ObjectMeta{
 							Name: "master",
 						},

diff --git a/pkg/monitor/cluster/machineconfigpool_test.go b/pkg/monitor/cluster/machineconfigpool_test.go
@@ -7,7 +7,7 @@ import (
 	"context"
 	"testing"
 
-	mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1"
+	mcfgv1 "github.com/openshift/api/machineconfiguration/v1"
 	mcofake "github.com/openshift/machine-config-operator/pkg/generated/clientset/versioned/fake"
 	"go.uber.org/mock/gomock"
 	corev1 "k8s.io/api/core/v1"
@@ -35,11 +35,11 @@ func TestEmitMachineConfigPoolUnmanagedNodes(t *testing.T) {
 					Name: "aro-master-0",
 				},
 			},
-			mcps: &mcv1.MachineConfigPool{
+			mcps: &mcfgv1.MachineConfigPool{
 				ObjectMeta: metav1.ObjectMeta{
 					Name: "machine-config-pool",
 				},
-				Status: mcv1.MachineConfigPoolStatus{
+				Status: mcfgv1.MachineConfigPoolStatus{
 					MachineCount: 0,
 				},
 			},
@@ -52,11 +52,11 @@ func TestEmitMachineConfigPoolUnmanagedNodes(t *testing.T) {
 					Name: "aro-master-0",
 				},
 			},
-			mcps: &mcv1.MachineConfigPool{
+			mcps: &mcfgv1.MachineConfigPool{
 				ObjectMeta: metav1.ObjectMeta{
 					Name: "machine-config-pool",
 				},
-				Status: mcv1.MachineConfigPoolStatus{
+				Status: mcfgv1.MachineConfigPoolStatus{
 					MachineCount: 2,
 				},
 			},

diff --git a/pkg/monitor/cluster/machineconfigpoolconditions.go b/pkg/monitor/cluster/machineconfigpoolconditions.go
@@ -6,18 +6,18 @@ package cluster
 import (
 	"context"
 
-	mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1"
+	mcfgv1 "github.com/openshift/api/machineconfiguration/v1"
 	"github.com/sirupsen/logrus"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-var machineConfigPoolConditionsExpected = map[mcv1.MachineConfigPoolConditionType]corev1.ConditionStatus{
-	mcv1.MachineConfigPoolDegraded:       corev1.ConditionFalse,
-	mcv1.MachineConfigPoolNodeDegraded:   corev1.ConditionFalse,
-	mcv1.MachineConfigPoolRenderDegraded: corev1.ConditionFalse,
-	mcv1.MachineConfigPoolUpdated:        corev1.ConditionTrue,
-	mcv1.MachineConfigPoolUpdating:       corev1.ConditionFalse,
+var machineConfigPoolConditionsExpected = map[mcfgv1.MachineConfigPoolConditionType]corev1.ConditionStatus{
+	mcfgv1.MachineConfigPoolDegraded:       corev1.ConditionFalse,
+	mcfgv1.MachineConfigPoolNodeDegraded:   corev1.ConditionFalse,
+	mcfgv1.MachineConfigPoolRenderDegraded: corev1.ConditionFalse,
+	mcfgv1.MachineConfigPoolUpdated:        corev1.ConditionTrue,
+	mcfgv1.MachineConfigPoolUpdating:       corev1.ConditionFalse,
 }
 
 func (mon *Monitor) emitMachineConfigPoolConditions(ctx context.Context) error {

diff --git a/pkg/monitor/cluster/machineconfigpoolconditions_test.go b/pkg/monitor/cluster/machineconfigpoolconditions_test.go
@@ -7,7 +7,7 @@ import (
 	"context"
 	"testing"
 
-	mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1"
+	mcfgv1 "github.com/openshift/api/machineconfiguration/v1"
 	mcofake "github.com/openshift/machine-config-operator/pkg/generated/clientset/versioned/fake"
 	"go.uber.org/mock/gomock"
 	corev1 "k8s.io/api/core/v1"
@@ -19,30 +19,30 @@ import (
 func TestEmitMachineConfigPoolConditions(t *testing.T) {
 	ctx := context.Background()
 
-	mcocli := mcofake.NewSimpleClientset(&mcv1.MachineConfigPool{
+	mcocli := mcofake.NewSimpleClientset(&mcfgv1.MachineConfigPool{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: "machine-config-pool",
 		},
-		Status: mcv1.MachineConfigPoolStatus{
-			Conditions: []mcv1.MachineConfigPoolCondition{
+		Status: mcfgv1.MachineConfigPoolStatus{
+			Conditions: []mcfgv1.MachineConfigPoolCondition{
 				{
-					Type:   mcv1.MachineConfigPoolDegraded,
+					Type:   mcfgv1.MachineConfigPoolDegraded,
 					Status: corev1.ConditionTrue,
 				},
 				{
-					Type:   mcv1.MachineConfigPoolNodeDegraded,
+					Type:   mcfgv1.MachineConfigPoolNodeDegraded,
 					Status: corev1.ConditionTrue,
 				},
 				{
-					Type:   mcv1.MachineConfigPoolRenderDegraded,
+					Type:   mcfgv1.MachineConfigPoolRenderDegraded,
 					Status: corev1.ConditionTrue,
 				},
 				{
-					Type:   mcv1.MachineConfigPoolUpdated,
+					Type:   mcfgv1.MachineConfigPoolUpdated,
 					Status: corev1.ConditionFalse,
 				},
 				{
-					Type:   mcv1.MachineConfigPoolUpdating,
+					Type:   mcfgv1.MachineConfigPoolUpdating,
 					Status: corev1.ConditionTrue,
 				},
 			},

diff --git a/pkg/operator/controllers/autosizednodes/autosizednodes_controller.go b/pkg/operator/controllers/autosizednodes/autosizednodes_controller.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 
 	"github.com/Azure/go-autorest/autorest/to"
-	mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1"
+	mcfgv1 "github.com/openshift/api/machineconfiguration/v1"
 	"github.com/sirupsen/logrus"
 	kerrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -61,7 +61,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, request ctrl.Request) (ctrl.
 
 	if !aro.Spec.OperatorFlags.GetSimpleBoolean(operator.AutosizedNodesEnabled) {
 		// defaults to deleting the config
-		config := mcv1.KubeletConfig{
+		config := mcfgv1.KubeletConfig{
 			ObjectMeta: metav1.ObjectMeta{
 				Name: configName,
 			},
@@ -75,7 +75,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, request ctrl.Request) (ctrl.
 
 	defaultConfig := makeConfig()
 
-	var config mcv1.KubeletConfig
+	var config mcfgv1.KubeletConfig
 	err = r.client.Get(ctx, key, &config)
 	if kerrors.IsNotFound(err) {
 		// If config doesn't exist, create a new one
@@ -105,17 +105,17 @@ func (r *Reconciler) SetupWithManager(mgr ctrl.Manager) error {
 	// Any changes will trigger reconcile, but only for that config.
 	return ctrl.NewControllerManagedBy(mgr).
 		For(&arov1alpha1.Cluster{}, builder.WithPredicates(predicate.And(predicates.AROCluster, predicate.GenerationChangedPredicate{}))).
-		Owns(&mcv1.KubeletConfig{}).
+		Owns(&mcfgv1.KubeletConfig{}).
 		Named(ControllerName).
 		Complete(r)
 }
 
-func makeConfig() mcv1.KubeletConfig {
-	return mcv1.KubeletConfig{
+func makeConfig() mcfgv1.KubeletConfig {
+	return mcfgv1.KubeletConfig{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: configName,
 		},
-		Spec: mcv1.KubeletConfigSpec{
+		Spec: mcfgv1.KubeletConfigSpec{
 			AutoSizingReserved: to.BoolPtr(true),
 			MachineConfigPoolSelector: &metav1.LabelSelector{
 				MatchExpressions: []metav1.LabelSelectorRequirement{

diff --git a/pkg/operator/controllers/autosizednodes/autosizednodes_controller_test.go b/pkg/operator/controllers/autosizednodes/autosizednodes_controller_test.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/Azure/go-autorest/autorest/to"
 	"github.com/google/go-cmp/cmp"
-	mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1"
+	mcfgv1 "github.com/openshift/api/machineconfiguration/v1"
 	"github.com/sirupsen/logrus"
 	kerrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -43,20 +43,20 @@ func TestAutosizednodesReconciler(t *testing.T) {
 		}
 	}
 
-	emptyConfig := mcv1.KubeletConfig{}
+	emptyConfig := mcfgv1.KubeletConfig{}
 	config := makeConfig()
 
 	tests := []struct {
 		name       string
 		wantErrMsg string
 		client     client.Client
-		wantConfig *mcv1.KubeletConfig
+		wantConfig *mcfgv1.KubeletConfig
 	}{
 		{
 			name:       "is not needed",
 			client:     fake.NewClientBuilder().WithRuntimeObjects(aro(false)).Build(),
 			wantConfig: &emptyConfig,
-			wantErrMsg: kerrors.NewNotFound(mcv1.Resource("kubeletconfigs"), "dynamic-node").Error(),
+			wantErrMsg: kerrors.NewNotFound(mcfgv1.Resource("kubeletconfigs"), "dynamic-node").Error(),
 		},
 		{
 			name:       "is needed and not present already",
@@ -72,17 +72,17 @@ func TestAutosizednodesReconciler(t *testing.T) {
 			name:       "is not needed and is present",
 			client:     fake.NewClientBuilder().WithRuntimeObjects(aro(false), &config).Build(),
 			wantConfig: &emptyConfig,
-			wantErrMsg: kerrors.NewNotFound(mcv1.Resource("kubeletconfigs"), "dynamic-node").Error(),
+			wantErrMsg: kerrors.NewNotFound(mcfgv1.Resource("kubeletconfigs"), "dynamic-node").Error(),
 		},
 		{
 			name: "is needed and config got modified",
 			client: fake.NewClientBuilder().WithRuntimeObjects(
 				aro(true),
-				&mcv1.KubeletConfig{
+				&mcfgv1.KubeletConfig{
 					ObjectMeta: metav1.ObjectMeta{
 						Name: configName,
 					},
-					Spec: mcv1.KubeletConfigSpec{
+					Spec: mcfgv1.KubeletConfigSpec{
 						AutoSizingReserved: to.BoolPtr(false),
 						MachineConfigPoolSelector: &metav1.LabelSelector{
 							MatchExpressions: []metav1.LabelSelectorRequirement{
@@ -113,7 +113,7 @@ func TestAutosizednodesReconciler(t *testing.T) {
 			key := types.NamespacedName{
 				Name: configName,
 			}
-			var c mcv1.KubeletConfig
+			var c mcfgv1.KubeletConfig
 
 			err = r.client.Get(ctx, key, &c)
 			utilerror.AssertErrorMessage(t, err, test.wantErrMsg)

diff --git a/pkg/operator/controllers/dnsmasq/cluster_controller.go b/pkg/operator/controllers/dnsmasq/cluster_controller.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 
 	configv1 "github.com/openshift/api/config/v1"
-	mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1"
+	mcfgv1 "github.com/openshift/api/machineconfiguration/v1"
 	"github.com/sirupsen/logrus"
 	kerrors "k8s.io/apimachinery/pkg/api/errors"
 	kruntime "k8s.io/apimachinery/pkg/runtime"
@@ -74,7 +74,7 @@ func (r *ClusterReconciler) Reconcile(ctx context.Context, request ctrl.Request)
 	}
 
 	r.Log.Debug("running")
-	mcps := &mcv1.MachineConfigPoolList{}
+	mcps := &mcfgv1.MachineConfigPoolList{}
 	err = r.Client.List(ctx, mcps)
 	if err != nil {
 		r.Log.Error(err)
@@ -110,7 +110,7 @@ func (r *ClusterReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		Complete(r)
 }
 
-func reconcileMachineConfigs(ctx context.Context, instance *arov1alpha1.Cluster, ch clienthelper.Interface, c client.Client, allowReconcile bool, restartDnsmasq bool, mcps ...mcv1.MachineConfigPool) error {
+func reconcileMachineConfigs(ctx context.Context, instance *arov1alpha1.Cluster, ch clienthelper.Interface, c client.Client, allowReconcile bool, restartDnsmasq bool, mcps ...mcfgv1.MachineConfigPool) error {
 	var resources []kruntime.Object
 	for _, mcp := range mcps {
 		resource, err := dnsmasqMachineConfig(instance.Spec.Domain, instance.Spec.APIIntIP, instance.Spec.IngressIP, mcp.Name, instance.Spec.GatewayDomains, instance.Spec.GatewayPrivateEndpointIP, restartDnsmasq)