Skip to content

Commit

Permalink
fix: kubectl-ko does't work when ovn-nb, ovn-sb and ovn-northd maste…
Browse files Browse the repository at this point in the history
…r slave Switchover (#1669)
  • Loading branch information
gugulee committed Jul 7, 2022
1 parent b4f8901 commit d690248
Show file tree
Hide file tree
Showing 2 changed files with 119 additions and 7 deletions.
9 changes: 2 additions & 7 deletions pkg/ovn_leader_checker/ovn.go
Original file line number Diff line number Diff line change
Expand Up @@ -295,13 +295,8 @@ func stealLock() {

func patchPodLabels(cfg *Configuration, pod *v1.Pod, labels map[string]string) error {
oriPod := pod.DeepCopy()
if pod.Labels == nil {
pod.Labels = labels
} else {
for k, v := range labels {
pod.Labels[k] = v
}
}
pod.Labels = labels

patch, err := util.GenerateStrategicMergePatchPayload(oriPod, pod)
if err != nil {
return err
Expand Down
117 changes: 117 additions & 0 deletions pkg/ovn_leader_checker/ovn_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
package ovn_leader_checker

import (
"context"
"testing"

"github.com/stretchr/testify/require"

v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes/fake"
)

func mockPod(namespace, name string, labels map[string]string) *v1.Pod {
return &v1.Pod{
ObjectMeta: metav1.ObjectMeta{
Name: name,
Namespace: namespace,
Labels: labels,
},
Status: v1.PodStatus{
Phase: v1.PodRunning,
},
}
}

func Test_patchPodLabels(t *testing.T) {
t.Parallel()
t.Run("patch new labels", func(t *testing.T) {
t.Parallel()
podName := "ovn-central-123"
podNamespace := "default"
pod := mockPod(podName, podNamespace, map[string]string{
"app": "nginx"})
clientset := fake.NewSimpleClientset(pod)

cfg := &Configuration{
KubeClient: clientset,
}

err := patchPodLabels(cfg, pod, map[string]string{
"app": "nginx",
"ovn-nb-leader": "true",
"ovn-sb-leader": "true",
"ovn-northd-leader": "true",
})

require.NoError(t, err)

newPod, err := clientset.CoreV1().Pods(podName).Get(context.Background(), podNamespace, metav1.GetOptions{})
require.NoError(t, err)
require.Equal(t, map[string]string{
"ovn-nb-leader": "true",
"ovn-sb-leader": "true",
"ovn-northd-leader": "true",
"app": "nginx",
}, newPod.Labels)
})

t.Run("delete some labels", func(t *testing.T) {
t.Parallel()
podName := "ovn-central-123"
podNamespace := "default"
pod := mockPod(podName, podNamespace, map[string]string{
"app": "nginx",
"ovn-nb-leader": "true",
"ovn-sb-leader": "true",
"ovn-northd-leader": "true",
})

clientset := fake.NewSimpleClientset(pod)

cfg := &Configuration{
KubeClient: clientset,
}

err := patchPodLabels(cfg, pod, map[string]string{
"ovn-northd-leader": "true",
"app": "nginx",
})

require.NoError(t, err)

newPod, err := clientset.CoreV1().Pods(podName).Get(context.Background(), podNamespace, metav1.GetOptions{})
require.NoError(t, err)
require.Equal(t, map[string]string{
"ovn-northd-leader": "true",
"app": "nginx",
}, newPod.Labels)
})

t.Run("pod's labels is empty", func(t *testing.T) {
t.Parallel()
podName := "ovn-central-123"
podNamespace := "default"
pod := mockPod(podName, podNamespace, nil)

clientset := fake.NewSimpleClientset(pod)

cfg := &Configuration{
KubeClient: clientset,
}

err := patchPodLabels(cfg, pod, map[string]string{
"ovn-northd-leader": "true",
"app": "nginx",
})
require.NoError(t, err)

newPod, err := clientset.CoreV1().Pods(podName).Get(context.Background(), podNamespace, metav1.GetOptions{})
require.NoError(t, err)
require.Equal(t, map[string]string{
"ovn-northd-leader": "true",
"app": "nginx",
}, newPod.Labels)
})
}

0 comments on commit d690248

Please sign in to comment.