Skip to content

Commit

Permalink
Migration from cm to CRs
Browse files Browse the repository at this point in the history
Signed-off-by: Fred Rolland <[email protected]>
  • Loading branch information
rollandf committed Aug 22, 2023
1 parent e2dcee6 commit 1f21aef
Show file tree
Hide file tree
Showing 3 changed files with 239 additions and 0 deletions.
17 changes: 17 additions & 0 deletions cmd/ipam-controller/app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ package app
import (
"context"
"fmt"
"os"

"github.com/go-logr/logr"
"github.com/spf13/cobra"
Expand All @@ -30,6 +31,7 @@ import (
"k8s.io/klog/v2"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/cache"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/event"
"sigs.k8s.io/controller-runtime/pkg/healthz"

Expand All @@ -45,6 +47,7 @@ import (
"github.com/Mellanox/nvidia-k8s-ipam/pkg/ipam-controller/allocator"
nodectrl "github.com/Mellanox/nvidia-k8s-ipam/pkg/ipam-controller/controllers/node"
poolctrl "github.com/Mellanox/nvidia-k8s-ipam/pkg/ipam-controller/controllers/pool"
"github.com/Mellanox/nvidia-k8s-ipam/pkg/ipam-controller/migrator"
"github.com/Mellanox/nvidia-k8s-ipam/pkg/version"
)

Expand Down Expand Up @@ -134,6 +137,20 @@ func RunController(ctx context.Context, config *rest.Config, opts *options.Optio
return err
}

directClient, err := client.New(config,
client.Options{Scheme: mgr.GetScheme(), Mapper: mgr.GetRESTMapper()})
if err != nil {
logger.Error(err, "failed to create direct client")
os.Exit(1)
}

if err := migrator.Migrate(ctx, directClient, opts.ConfigMapName,
opts.ConfigMapNamespace, opts.PoolsNamespace); err != nil {
logger.Error(err, fmt.Sprintf("failed to migrate NV-IPAM config from ConfigMap, "+
"set %s env variable to disable migration", migrator.EnvDisableMigration))
return err
}

netAllocator := allocator.New()
nodeEventCH := make(chan event.GenericEvent, 1)

Expand Down
2 changes: 2 additions & 0 deletions deploy/nv-ipam.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ rules:
- get
- list
- watch
- delete
- apiGroups:
- nv-ipam.nvidia.com
resources:
Expand All @@ -155,6 +156,7 @@ rules:
- get
- list
- watch
- create
- apiGroups:
- nv-ipam.nvidia.com
resources:
Expand Down
220 changes: 220 additions & 0 deletions pkg/ipam-controller/migrator/migrator.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,220 @@
/*
Copyright 2023, NVIDIA CORPORATION & AFFILIATES
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package migrator

import (
"context"
"encoding/json"
"fmt"
"net"
"os"
"reflect"
"strings"

corev1 "k8s.io/api/core/v1"
apiErrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
"sigs.k8s.io/controller-runtime/pkg/client"

ipamv1alpha1 "github.com/Mellanox/nvidia-k8s-ipam/api/v1alpha1"
"github.com/Mellanox/nvidia-k8s-ipam/pkg/ipam-controller/config"
"github.com/Mellanox/nvidia-k8s-ipam/pkg/pool"

"github.com/go-logr/logr"
)

const (
// EnvDisableMigration contains the name of the environment variable which can be used
// to disable migration
EnvDisableMigration = "MIGRATOR_DISABLE_MIGRATION"
)

func Migrate(ctx context.Context, c client.Client, cmName string, cmNamespace string, poolNamespace string) error {
logger := logr.FromContextOrDiscard(ctx).WithName("migrator")
if os.Getenv(EnvDisableMigration) != "" {
logger.Info(fmt.Sprintf("%s set, skip controller migration", EnvDisableMigration))
return nil
}

cfg := &corev1.ConfigMap{}
key := types.NamespacedName{
Name: cmName,
Namespace: cmNamespace,
}
err := c.Get(ctx, key, cfg)
if err != nil {
if apiErrors.IsNotFound(err) {
logger.Info("ConfigMap not found, skipping migration")
return nil
}
logger.Error(err, "failed to read ConfigMap object")
return err
}

confData, exist := cfg.Data[config.ConfigMapKey]
if !exist {
logger.Error(nil, fmt.Sprintf("invalid configuration: ConfigMap %s doesn't contain %s key",
key, config.ConfigMapKey))
return err
}
controllerConfig := &config.Config{}
if err := json.Unmarshal([]byte(confData), controllerConfig); err != nil {
logger.Error(err, fmt.Sprintf("invalid configuration: ConfigMap %s contains invalid JSON",
config.ConfigMapKey))
return err
}
if err := controllerConfig.Validate(); err != nil {
logger.Error(err, fmt.Sprintf("invalid configuration: ConfigMap %s contains invalid config",
config.ConfigMapKey))
return err
}

pools := buildIPPools(controllerConfig, poolNamespace)

for name, p := range pools {
err = c.Create(ctx, p)
logger.Info(fmt.Sprintf("Creating IPPool: %v", p))
if apiErrors.IsAlreadyExists(err) {
existingPool := &ipamv1alpha1.IPPool{}
err = c.Get(ctx, client.ObjectKeyFromObject(p), existingPool)
if err != nil {
logger.Info("fail to get existing pool", "pool name", name)
return err
}
if !reflect.DeepEqual(existingPool.Spec, p.Spec) {
logger.Info("existing pool has different spec than config map setting", "pool name", name)
return fmt.Errorf("existing pool has different spec than config map setting")
}
} else if err != nil {
logger.Info("fail to create pool", "pool name", name)
return err
}
}

err = updateAllocations(ctx, c, logger, pools, poolNamespace)
if err != nil {
return err
}

err = c.Delete(ctx, &corev1.ConfigMap{ObjectMeta: metav1.ObjectMeta{Namespace: cmNamespace, Name: cmName}})
if err != nil {
logger.Info("fail to delete nv-ipam config map")
return err
}

return nil
}

func updateAllocations(ctx context.Context, c client.Client,
logger logr.Logger, pools map[string]*ipamv1alpha1.IPPool, poolNamespace string) error {
nodeList := &corev1.NodeList{}
if err := c.List(ctx, nodeList); err != nil {
logger.Error(err, "failed to list nodes")
return err
}
for i := range nodeList.Items {
node := nodeList.Items[i]
nodeLog := logger.WithValues("node", node.Name)
poolCfg, err := pool.NewConfigReader(&node)
if err != nil {
nodeLog.Info("skip loading data from the node", "reason", err.Error())
continue
}
for poolName := range pools {
nodeIPPoolConfig := poolCfg.GetPoolByName(poolName)
if nodeIPPoolConfig == nil {
nodeLog.Info("skip loading data for pool from the node, pool not configured", "node", node.Name, "pool", poolName)
continue
}
p := &ipamv1alpha1.IPPool{}
key := types.NamespacedName{
Name: poolName,
Namespace: poolNamespace,
}
err := c.Get(ctx, key, p)
if err != nil {
nodeLog.Info("fail getting pool", "reason", err.Error())
return err
}
if len(p.Status.Allocations) == 0 {
p.Status.Allocations = make([]ipamv1alpha1.Allocation, 0)
}
alloc := ipamv1alpha1.Allocation{
NodeName: node.Name,
StartIP: nodeIPPoolConfig.StartIP,
EndIP: nodeIPPoolConfig.EndIP,
}
p.Status.Allocations = append(p.Status.Allocations, alloc)
logger.Info(fmt.Sprintf("Updating IPPool status: %v", p))
err = c.Status().Update(ctx, p)
if err != nil {
nodeLog.Info("fail to update pool allocation from node", "reason", err.Error())
return err
}
}
fmtKey := strings.ReplaceAll(pool.IPBlocksAnnotation, "/", "~1")
patch := []byte(fmt.Sprintf("[{\"op\": \"remove\", \"path\": \"/metadata/annotations/%s\"}]", fmtKey))
err = c.Patch(ctx, &corev1.Node{
ObjectMeta: metav1.ObjectMeta{
Name: node.Name,
},
}, client.RawPatch(types.JSONPatchType, patch))
if err != nil {
logger.Info("fail to remove IPBlocksAnnotation from node", "name", node.Name, "reason", err.Error())
return err
}
}
return nil
}

func buildIPPools(controllerConfig *config.Config, poolNamespace string) map[string]*ipamv1alpha1.IPPool {
var nodeSelector *corev1.NodeSelector
if len(controllerConfig.NodeSelector) > 0 {
nodeSelector = &corev1.NodeSelector{}
selectorsItems := make([]corev1.NodeSelectorTerm, 0, len(controllerConfig.NodeSelector))
for k, v := range controllerConfig.NodeSelector {
selector := corev1.NodeSelectorTerm{
MatchExpressions: []corev1.NodeSelectorRequirement{
{
Key: k,
Operator: corev1.NodeSelectorOpIn,
Values: []string{v},
},
},
MatchFields: nil,
}
selectorsItems = append(selectorsItems, selector)
}
nodeSelector.NodeSelectorTerms = selectorsItems
}
pools := make(map[string]*ipamv1alpha1.IPPool)
for pName, p := range controllerConfig.Pools {
// already validated by Validate function
_, subnet, _ := net.ParseCIDR(p.Subnet)
pools[pName] = &ipamv1alpha1.IPPool{
ObjectMeta: metav1.ObjectMeta{
Name: pName,
Namespace: poolNamespace,
},
Spec: ipamv1alpha1.IPPoolSpec{
Subnet: subnet.String(),
Gateway: p.Gateway,
PerNodeBlockSize: p.PerNodeBlockSize,
NodeSelector: nodeSelector,
},
}
}
return pools
}

0 comments on commit 1f21aef

Please sign in to comment.