Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Look for annotation on NAD to set transfer route #1244

Merged
merged 2 commits into from
Dec 6, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 51 additions & 4 deletions pkg/controller/plan/kubevirt.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@ package plan

import (
"context"
"encoding/json"
"encoding/xml"
"errors"
"fmt"
"io"
"math/rand"
"net"
"net/http"
"os"
"path"
Expand All @@ -15,6 +17,7 @@ import (
"strings"
"time"

k8snet "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/apis/k8s.cni.cncf.io/v1"
planbase "github.com/konveyor/forklift-controller/pkg/controller/plan/adapter/base"
"github.com/konveyor/forklift-controller/pkg/controller/plan/util"
"github.com/konveyor/forklift-controller/pkg/controller/provider/web"
Expand Down Expand Up @@ -55,6 +58,9 @@ import (
const (
// Transfer network annotation (value=network-attachment-definition name)
AnnTransferNetwork = "k8s.v1.cni.cncf.io/networks"
// Annotation to specify the default route for the transfer network.
// To be set on the transfer network NAD by the end user.
AnnForkliftNetworkRoute = "forklift.konveyor.io/route"
// Contains validations for a Kubevirt VM. Needs to be removed when
// creating a VM from a template.
AnnKubevirtValidations = "vm.kubevirt.io/validations"
Expand Down Expand Up @@ -1227,9 +1233,12 @@ func (r *KubeVirt) dataVolumes(vm *plan.VMStatus, secret *core.Secret, configMap
annotations[planbase.AnnRetainAfterCompletion] = "true"
}
if r.Plan.Spec.TransferNetwork != nil {
annotations[AnnTransferNetwork] = path.Join(
r.Plan.Spec.TransferNetwork.Namespace, r.Plan.Spec.TransferNetwork.Name)
err = r.setTransferNetwork(annotations)
if err != nil {
return
}
}

if r.Plan.Spec.Warm || !r.Destination.Provider.IsHost() || r.Plan.IsSourceProviderOCP() {
// Set annotation for WFFC storage classes. Note that we create data volumes while
// running a cold migration to the local cluster only when the source is either OpenShift
Expand Down Expand Up @@ -1757,8 +1766,10 @@ func (r *KubeVirt) guestConversionPod(vm *plan.VMStatus, vmVolumes []cnv.Volume,
// pod annotations
annotations := map[string]string{}
if r.Plan.Spec.TransferNetwork != nil {
annotations[AnnTransferNetwork] = path.Join(
r.Plan.Spec.TransferNetwork.Namespace, r.Plan.Spec.TransferNetwork.Name)
err = r.setTransferNetwork(annotations)
if err != nil {
return
}
}
// pod
pod = &core.Pod{
Expand Down Expand Up @@ -2351,6 +2362,42 @@ func (r *KubeVirt) vmAllButMigrationLabels(vmRef ref.Ref) (labels map[string]str
return
}

func (r *KubeVirt) setTransferNetwork(annotations map[string]string) (err error) {
key := client.ObjectKey{
Namespace: r.Plan.Spec.TransferNetwork.Namespace,
Name: r.Plan.Spec.TransferNetwork.Name,
}
netAttachDef := &k8snet.NetworkAttachmentDefinition{}
err = r.Get(context.TODO(), key, netAttachDef)
if err != nil {
err = liberr.Wrap(err)
return
}
nse := k8snet.NetworkSelectionElement{
Namespace: r.Plan.Spec.TransferNetwork.Namespace,
Name: r.Plan.Spec.TransferNetwork.Name,
}
route, found := netAttachDef.Annotations[AnnForkliftNetworkRoute]
if found {
ip := net.ParseIP(route)
if ip != nil {
nse.GatewayRequest = []net.IP{ip}
} else {
err = liberr.New(
"Transfer network default route annotation is not a valid IP address.",
"route", route)
return
}
}
transferNetwork, err := json.Marshal([]k8snet.NetworkSelectionElement{nse})
if err != nil {
err = liberr.Wrap(err)
return
}
annotations[AnnTransferNetwork] = string(transferNetwork)
return
}

// Represents a CDI DataVolume, its associated PVC, and added behavior.
type ExtendedDataVolume struct {
*cdi.DataVolume
Expand Down
21 changes: 19 additions & 2 deletions pkg/controller/plan/validation.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ import (
"encoding/hex"
"errors"
"fmt"
"net"
"path"
"strconv"

net "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/apis/k8s.cni.cncf.io/v1"
k8snet "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/apis/k8s.cni.cncf.io/v1"
api "github.com/konveyor/forklift-controller/pkg/apis/forklift/v1beta1"
refapi "github.com/konveyor/forklift-controller/pkg/apis/forklift/v1beta1/ref"
"github.com/konveyor/forklift-controller/pkg/controller/plan/adapter"
Expand Down Expand Up @@ -640,11 +641,18 @@ func (r *Reconciler) validateTransferNetwork(plan *api.Plan) (err error) {
Reason: NotFound,
Message: "Transfer network is not valid.",
}
notValid := libcnd.Condition{
Type: TransferNetNotValid,
Status: True,
Category: Critical,
Reason: NotValid,
Message: "Transfer network default route annotation is not a valid IP address.",
}
key := client.ObjectKey{
Namespace: plan.Spec.TransferNetwork.Namespace,
Name: plan.Spec.TransferNetwork.Name,
}
netAttachDef := &net.NetworkAttachmentDefinition{}
netAttachDef := &k8snet.NetworkAttachmentDefinition{}
err = r.Get(context.TODO(), key, netAttachDef)
if k8serr.IsNotFound(err) {
err = nil
Expand All @@ -653,6 +661,15 @@ func (r *Reconciler) validateTransferNetwork(plan *api.Plan) (err error) {
}
if err != nil {
err = liberr.Wrap(err)
return
}
route, found := netAttachDef.Annotations[AnnForkliftNetworkRoute]
if !found {
return
}
ip := net.ParseIP(route)
if ip == nil {
plan.Status.SetCondition(notValid)
}

return
Expand Down
Loading