nmstate: Switch to v1beta1 for NodeNetworkState

pkg/nmstate/nodenetworkstate.go

@@ -12,7 +12,7 @@ import (
 	"github.com/openshift-kni/eco-goinfra/pkg/clients"
 	"github.com/openshift-kni/eco-goinfra/pkg/msg"
 
-	nmstateV1alpha1 "github.com/nmstate/kubernetes-nmstate/api/v1alpha1"
+	nmstateV1beta1 "github.com/nmstate/kubernetes-nmstate/api/v1beta1"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	goclient "sigs.k8s.io/controller-runtime/pkg/client"
@@ -27,7 +27,7 @@ var (
 // StateBuilder provides struct for the NodeNetworkState object containing connection to the cluster.
 type StateBuilder struct {
 	// Created NodeNetworkState object on the cluster.
-	Object *nmstateV1alpha1.NodeNetworkState
+	Object *nmstateV1beta1.NodeNetworkState
 	// API client to interact with the cluster.
 	apiClient goclient.Client
 	// errorMsg is processed before NodeNetworkState object is created.
@@ -53,14 +53,14 @@ func (builder *StateBuilder) Exists() bool {
 }
 
 // Get returns NodeNetworkState object if found.
-func (builder *StateBuilder) Get() (*nmstateV1alpha1.NodeNetworkState, error) {
+func (builder *StateBuilder) Get() (*nmstateV1beta1.NodeNetworkState, error) {
 	if valid, err := builder.validate(); !valid {
 		return nil, err
 	}
 
 	glog.V(100).Infof("Collecting NodeNetworkState object %s", builder.Object.Name)
 
-	nodeNetworkState := &nmstateV1alpha1.NodeNetworkState{}
+	nodeNetworkState := &nmstateV1beta1.NodeNetworkState{}
 	err := builder.apiClient.Get(context.TODO(), goclient.ObjectKey{
 		Name: builder.Object.Name,
 	}, nodeNetworkState)
@@ -188,7 +188,7 @@ func PullNodeNetworkState(apiClient *clients.Settings, name string) (*StateBuild
 		return nil, fmt.Errorf("the apiClient cannot be nil")
 	}
 
-	err := apiClient.AttachScheme(nmstateV1alpha1.AddToScheme)
+	err := apiClient.AttachScheme(nmstateV1beta1.AddToScheme)
 	if err != nil {
 		glog.V(100).Infof("Failed to add nmstate v1 scheme to client schemes")
 
@@ -197,7 +197,7 @@ func PullNodeNetworkState(apiClient *clients.Settings, name string) (*StateBuild
 
 	stateBuilder := &StateBuilder{
 		apiClient: apiClient.Client,
-		Object: &nmstateV1alpha1.NodeNetworkState{
+		Object: &nmstateV1beta1.NodeNetworkState{
 			ObjectMeta: metav1.ObjectMeta{
 				Name: name,
 			},

pkg/nmstate/nodenetworkstate_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/nmstate/kubernetes-nmstate/api/shared"
-	nmstateV1alpha1 "github.com/nmstate/kubernetes-nmstate/api/v1alpha1"
+	nmstateV1beta1 "github.com/nmstate/kubernetes-nmstate/api/v1beta1"
 	"github.com/openshift-kni/eco-goinfra/pkg/clients"
 	"github.com/stretchr/testify/assert"
 	"gopkg.in/yaml.v2"
@@ -14,16 +14,16 @@ import (
 )
 
 var (
-	nmstateV1alpha1TestSchemes = []clients.SchemeAttacher{
-		nmstateV1alpha1.AddToScheme,
+	nmstateV1beta1TestSchemes = []clients.SchemeAttacher{
+		nmstateV1beta1.AddToScheme,
 	}
 	sriovExistingInterface = "ensf0"
 	vfNumber               = 10
 )
 
 func TestPullNodeNetworkState(t *testing.T) {
-	generateNodeNetState := func(name string) *nmstateV1alpha1.NodeNetworkState {
-		return &nmstateV1alpha1.NodeNetworkState{
+	generateNodeNetState := func(name string) *nmstateV1beta1.NodeNetworkState {
+		return &nmstateV1beta1.NodeNetworkState{
 			ObjectMeta: metav1.ObjectMeta{
 				Name: name,
 			},
@@ -82,7 +82,7 @@ func TestPullNodeNetworkState(t *testing.T) {
 		if testCase.client {
 			testSettings = clients.GetTestClients(clients.TestClientParams{
 				K8sMockObjects:  runtimeObjects,
-				SchemeAttachers: nmstateV1alpha1TestSchemes,
+				SchemeAttachers: nmstateV1beta1TestSchemes,
 			})
 		}
 
@@ -276,12 +276,12 @@ func buildValidNodeNetworkStateTestBuilder(apiClient *clients.Settings) *StateBu
 func buildTestClientWithDummyNodeNetworkStateObject() *clients.Settings {
 	return clients.GetTestClients(clients.TestClientParams{
 		K8sMockObjects:  buildDummyNodeNetworkStateObject(),
-		SchemeAttachers: nmstateV1alpha1TestSchemes,
+		SchemeAttachers: nmstateV1beta1TestSchemes,
 	})
 }
 
 func buildDummyNodeNetworkStateObject() []runtime.Object {
-	return append([]runtime.Object{}, &nmstateV1alpha1.NodeNetworkState{
+	return append([]runtime.Object{}, &nmstateV1beta1.NodeNetworkState{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: defaultNMStateName,
 		},
@@ -309,15 +309,15 @@ func newNodeNetworkStateBuilder(apiClient *clients.Settings, name string) *State
 		},
 	}
 	byteDesiredState, _ := yaml.Marshal(desiredState)
-	err := apiClient.AttachScheme(nmstateV1alpha1.AddToScheme)
+	err := apiClient.AttachScheme(nmstateV1beta1.AddToScheme)
 
 	if err != nil {
 		return nil
 	}
 
 	builder := StateBuilder{
 		apiClient: apiClient.Client,
-		Object: &nmstateV1alpha1.NodeNetworkState{
+		Object: &nmstateV1beta1.NodeNetworkState{
 			ObjectMeta: metav1.ObjectMeta{
 				Name: name,
 			},