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.

Sign up for GitHub

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

Jump to bottom

fix: honor cacheready condition #20

Merged
merged 2 commits into from
Feb 16, 2024
Merged

fix: honor cacheready condition #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
194ff4b
fix: honor cacheready condition
starbops Feb 2, 2024
3b33854
refactor: improve vmnetcfg allocate reconcile loop
starbops Feb 15, 2024
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
9 changes: 6 additions & 3 deletions pkg/agent/ippool/ippool.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
package ippool

import (
"fmt"

"github.com/sirupsen/logrus"

networkv1 "github.com/harvester/vm-dhcp-controller/pkg/apis/network.harvesterhci.io/v1alpha1"
"github.com/harvester/vm-dhcp-controller/pkg/util"
)

func (c *Controller) Update(ipPool *networkv1.IPPool) error {
if !networkv1.CacheReady.IsTrue(ipPool) {
logrus.Warningf("ippool %s/%s is not ready", ipPool.Namespace, ipPool.Name)
return nil
}
if ipPool.Status.IPv4 == nil {
return fmt.Errorf("ippool status has no records")
logrus.Warningf("ippool %s/%s status has no records", ipPool.Namespace, ipPool.Name)
return nil
}
allocated := ipPool.Status.IPv4.Allocated
filterExcluded(allocated)
Expand Down
271 changes: 154 additions & 117 deletions pkg/controller/ippool/controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,9 @@ import (
"github.com/stretchr/testify/assert"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
k8sfake "k8s.io/client-go/kubernetes/fake"

networkv1 "github.com/harvester/vm-dhcp-controller/pkg/apis/network.harvesterhci.io/v1alpha1"
"github.com/harvester/vm-dhcp-controller/pkg/cache"
"github.com/harvester/vm-dhcp-controller/pkg/config"
"github.com/harvester/vm-dhcp-controller/pkg/generated/clientset/versioned/fake"
Expand Down Expand Up @@ -87,145 +85,184 @@ func newTestNetworkAttachmentDefinitionBuilder() *NetworkAttachmentDefinitionBui
}

func TestHandler_OnChange(t *testing.T) {
type input struct {
key string
ipAllocator *ipam.IPAllocator
ipPool *networkv1.IPPool
pods []*corev1.Pod
}

type output struct {
ipPool *networkv1.IPPool
pods []*corev1.Pod
err error
}

testCases := []struct {
name string
given input
expected output
}{
{
name: "new ippool",
given: input{
key: testIPPoolNamespace + "/" + testIPPoolName,
ipAllocator: newTestIPAllocatorBuilder().
Build(),
ipPool: newTestIPPoolBuilder().
Build(),
},
expected: output{
ipPool: newTestIPPoolBuilder().
StoppedCondition(corev1.ConditionFalse, "", "").
CacheReadyCondition(corev1.ConditionFalse, "NotInitialized", "").
Build(),
},
},
{
name: "ippool with ipam initialized",
given: input{
key: testIPPoolNamespace + "/" + testIPPoolName,
ipAllocator: newTestIPAllocatorBuilder().
IPSubnet(testNetworkName, testCIDR, testStartIP, testEndIP).
Build(),
ipPool: newTestIPPoolBuilder().
ServerIP(testServerIP).
CIDR(testCIDR).
PoolRange(testStartIP, testEndIP).
NetworkName(testNetworkName).
Build(),
},
expected: output{
ipPool: newTestIPPoolBuilder().
ServerIP(testServerIP).
CIDR(testCIDR).
PoolRange(testStartIP, testEndIP).
NetworkName(testNetworkName).
Available(100).
Used(0).
StoppedCondition(corev1.ConditionFalse, "", "").
Build(),
},
},
{
name: "pause ippool",
given: input{
key: testIPPoolNamespace + "/" + testIPPoolName,
ipAllocator: newTestIPAllocatorBuilder().
Build(),
ipPool: newTestIPPoolBuilder().
Paused().
AgentPodRef("default", "default-ippool-1-agent", testImage, "").
Build(),
pods: []*corev1.Pod{
newTestPodBuilder().
Build(),
},
},
expected: output{
ipPool: newTestIPPoolBuilder().
Paused().
StoppedCondition(corev1.ConditionTrue, "", "").
Build(),
},
},
{
name: "resume ippool",
given: input{
key: testIPPoolNamespace + "/" + testIPPoolName,
ipAllocator: newTestIPAllocatorBuilder().
Build(),
ipPool: newTestIPPoolBuilder().
UnPaused().
Build(),
},
expected: output{
ipPool: newTestIPPoolBuilder().
UnPaused().
StoppedCondition(corev1.ConditionFalse, "", "").
CacheReadyCondition(corev1.ConditionFalse, "NotInitialized", "").
Build(),
t.Run("new ippool", func(t *testing.T) {
key := testIPPoolNamespace + "/" + testIPPoolName
givenIPAllocator := newTestIPAllocatorBuilder().Build()
givenIPPool := newTestIPPoolBuilder().Build()

expectedIPPool := newTestIPPoolBuilder().
StoppedCondition(corev1.ConditionFalse, "", "").
CacheReadyCondition(corev1.ConditionFalse, "NotInitialized", "").Build()

clientset := fake.NewSimpleClientset()
err := clientset.Tracker().Add(givenIPPool)
if err != nil {
t.Fatal(err)
}

handler := Handler{
agentNamespace: "default",
agentImage: &config.Image{
Repository: "rancher/harvester-vm-dhcp-controller",
Tag: "main",
},
},
}
ipAllocator: givenIPAllocator,
ippoolClient: fakeclient.IPPoolClient(clientset.NetworkV1alpha1().IPPools),
}

ipPool, err := handler.OnChange(key, givenIPPool)
assert.Nil(t, err)

SanitizeStatus(&expectedIPPool.Status)
SanitizeStatus(&ipPool.Status)

assert.Equal(t, expectedIPPool, ipPool)
})

t.Run("ippool with ipam initialized", func(t *testing.T) {
key := testIPPoolNamespace + "/" + testIPPoolName
givenIPAllocator := newTestIPAllocatorBuilder().
IPSubnet(testNetworkName, testCIDR, testStartIP, testEndIP).
Build()
givenIPPool := newTestIPPoolBuilder().
ServerIP(testServerIP).
CIDR(testCIDR).
PoolRange(testStartIP, testEndIP).
NetworkName(testNetworkName).
CacheReadyCondition(corev1.ConditionTrue, "", "").Build()

expectedIPPool := newTestIPPoolBuilder().
ServerIP(testServerIP).
CIDR(testCIDR).
PoolRange(testStartIP, testEndIP).
NetworkName(testNetworkName).
Available(100).
Used(0).
CacheReadyCondition(corev1.ConditionTrue, "", "").
StoppedCondition(corev1.ConditionFalse, "", "").Build()

for _, tc := range testCases {
clientset := fake.NewSimpleClientset()
err := clientset.Tracker().Add(tc.given.ipPool)
err := clientset.Tracker().Add(givenIPPool)
if err != nil {
t.Fatal(err)
}

var pods []runtime.Object
for _, pod := range tc.given.pods {
pods = append(pods, pod)
handler := Handler{
agentNamespace: "default",
agentImage: &config.Image{
Repository: "rancher/harvester-vm-dhcp-controller",
Tag: "main",
},
ipAllocator: givenIPAllocator,
metricsAllocator: metrics.New(),
ippoolClient: fakeclient.IPPoolClient(clientset.NetworkV1alpha1().IPPools),
}
k8sclientset := k8sfake.NewSimpleClientset(pods...)

ipPool, err := handler.OnChange(key, givenIPPool)
assert.Nil(t, err)

SanitizeStatus(&expectedIPPool.Status)
SanitizeStatus(&ipPool.Status)

assert.Equal(t, expectedIPPool, ipPool)
})

t.Run("pause ippool", func(t *testing.T) {
key := testIPPoolNamespace + "/" + testIPPoolName
givenIPAllocator := newTestIPAllocatorBuilder().
IPSubnet(testNetworkName, testCIDR, testStartIP, testEndIP).Build()
givenIPPool := newTestIPPoolBuilder().
NetworkName(testNetworkName).
Paused().
AgentPodRef(testPodNamespace, testPodName, testImage, "").Build()
givenPod := newTestPodBuilder().Build()

expectedIPAllocator := newTestIPAllocatorBuilder().Build()
expectedIPPool := newTestIPPoolBuilder().
NetworkName(testNetworkName).
Paused().
StoppedCondition(corev1.ConditionTrue, "", "").Build()

clientset := fake.NewSimpleClientset()
err := clientset.Tracker().Add(givenIPPool)
if err != nil {
t.Fatal(err)
}

k8sclientset := k8sfake.NewSimpleClientset()
err = k8sclientset.Tracker().Add(givenPod)
assert.Nil(t, err, "mock resource should add into fake controller tracker")

handler := Handler{
agentNamespace: "default",
agentImage: &config.Image{
Repository: "rancher/harvester-vm-dhcp-controller",
Tag: "main",
},
ipAllocator: givenIPAllocator,
cacheAllocator: cache.New(),
ipAllocator: tc.given.ipAllocator,
metricsAllocator: metrics.New(),
ippoolClient: fakeclient.IPPoolClient(clientset.NetworkV1alpha1().IPPools),
podClient: fakeclient.PodClient(k8sclientset.CoreV1().Pods),
}

var actual output
ipPool, err := handler.OnChange(key, givenIPPool)
assert.Nil(t, err)

actual.ipPool, actual.err = handler.OnChange(tc.given.key, tc.given.ipPool)
assert.Nil(t, actual.err)
SanitizeStatus(&expectedIPPool.Status)
SanitizeStatus(&ipPool.Status)

SanitizeStatus(&tc.expected.ipPool.Status)
SanitizeStatus(&actual.ipPool.Status)
assert.Equal(t, expectedIPPool, ipPool)

assert.Equal(t, tc.expected.ipPool, actual.ipPool, tc.name)
assert.Equal(t, expectedIPAllocator, handler.ipAllocator)

_, err = handler.podClient.Get(testPodNamespace, testPodName, metav1.GetOptions{})
assert.Equal(t, fmt.Sprintf("pods \"%s\" not found", testPodName), err.Error())
})

assert.Equal(t, tc.expected.pods, actual.pods)
}
t.Run("resume ippool", func(t *testing.T) {
key := testIPPoolNamespace + "/" + testIPPoolName
givenIPAllocator := newTestIPAllocatorBuilder().
IPSubnet(testNetworkName, testCIDR, testStartIP, testEndIP).
Build()
givenIPPool := newTestIPPoolBuilder().
NetworkName(testNetworkName).
UnPaused().
CacheReadyCondition(corev1.ConditionTrue, "", "").Build()

expectedIPPool := newTestIPPoolBuilder().
NetworkName(testNetworkName).
UnPaused().
Available(100).
Used(0).
CacheReadyCondition(corev1.ConditionTrue, "", "").
StoppedCondition(corev1.ConditionFalse, "", "").Build()

clientset := fake.NewSimpleClientset()
err := clientset.Tracker().Add(givenIPPool)
if err != nil {
t.Fatal(err)
}

handler := Handler{
agentNamespace: "default",
agentImage: &config.Image{
Repository: "rancher/harvester-vm-dhcp-controller",
Tag: "main",
},
ipAllocator: givenIPAllocator,
metricsAllocator: metrics.New(),
ippoolClient: fakeclient.IPPoolClient(clientset.NetworkV1alpha1().IPPools),
}

ipPool, err := handler.OnChange(key, givenIPPool)
assert.Nil(t, err)

SanitizeStatus(&expectedIPPool.Status)
SanitizeStatus(&ipPool.Status)

assert.Equal(t, expectedIPPool, ipPool)
})
}

func TestHandler_DeployAgent(t *testing.T) {
Expand Down
Loading
Loading