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

[kubeadm] add tests for package patchnode #91158

Merged
merged 1 commit into from May 18, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 14 additions & 1 deletion cmd/kubeadm/app/phases/patchnode/BUILD
@@ -1,4 +1,4 @@
load("@io_bazel_rules_go//go:def.bzl", "go_library")
load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")

go_library(
name = "go_default_library",
Expand Down Expand Up @@ -27,3 +27,16 @@ filegroup(
tags = ["automanaged"],
visibility = ["//visibility:public"],
)

go_test(
name = "go_default_test",
srcs = ["patchnode_test.go"],
embed = [":go_default_library"],
deps = [
"//cmd/kubeadm/app/constants:go_default_library",
"//staging/src/k8s.io/api/core/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//staging/src/k8s.io/client-go/kubernetes:go_default_library",
"//staging/src/k8s.io/client-go/rest:go_default_library",
],
)
124 changes: 124 additions & 0 deletions cmd/kubeadm/app/phases/patchnode/patchnode_test.go
@@ -0,0 +1,124 @@
/*
Copyright 2020 The Kubernetes Authors.

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 patchnode

import (
"bytes"
"encoding/json"
"net/http"
"net/http/httptest"
"testing"

v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
clientset "k8s.io/client-go/kubernetes"
restclient "k8s.io/client-go/rest"
kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants"
)

func TestAnnotateCRISocket(t *testing.T) {
tests := []struct {
name string
currentCRISocketAnnotation string
newCRISocketAnnotation string
expectedPatch string
}{
{
name: "CRI-socket annotation missing",
currentCRISocketAnnotation: "",
newCRISocketAnnotation: "/run/containerd/containerd.sock",
expectedPatch: `{"metadata":{"annotations":{"kubeadm.alpha.kubernetes.io/cri-socket":"/run/containerd/containerd.sock"}}}`,
},
{
name: "CRI-socket annotation already exists",
currentCRISocketAnnotation: "/run/containerd/containerd.sock",
newCRISocketAnnotation: "/run/containerd/containerd.sock",
expectedPatch: `{}`,
},
{
name: "CRI-socket annotation needs to be updated",
currentCRISocketAnnotation: "/var/run/dockershim.sock",
newCRISocketAnnotation: "/run/containerd/containerd.sock",
expectedPatch: `{"metadata":{"annotations":{"kubeadm.alpha.kubernetes.io/cri-socket":"/run/containerd/containerd.sock"}}}`,
},
Copy link
Member

@neolit123 neolit123 May 17, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ideally the test should have cases where the error is expected, for example if the node does not exist, PatchNode would fail:

func PatchNode(client clientset.Interface, nodeName string, patchFn func(*v1.Node)) error {

the problem with such a test is that we don't want the test to run for 2 minutes:

PatchNodeTimeout = 2 * time.Minute

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right. If the node doesn't exist the test would time out. So are you mostly just thinking out loud or do we want to come up with a solution for this as part of this PR?
Other than this comment, I have addressed everything else and pushed up a commit.

Copy link
Member

@neolit123 neolit123 May 18, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, thinking out loud. it's out of scope for this PR to make the functions better for unit testing, so let's not touch AnnotateCRISocket and PatchNode(Once) for now.

}

for _, tc := range tests {
t.Run(tc.name, func(t *testing.T) {

nodename := "node01"
node := &v1.Node{
ObjectMeta: metav1.ObjectMeta{
Name: nodename,
Labels: map[string]string{
v1.LabelHostname: nodename,
},
Annotations: map[string]string{},
},
}

if tc.currentCRISocketAnnotation != "" {
node.ObjectMeta.Annotations[kubeadmconstants.AnnotationKubeadmCRISocket] = tc.currentCRISocketAnnotation
}

jsonNode, err := json.Marshal(node)
if err != nil {
t.Fatalf("unexpected encoding error: %v", err)
}

var patchRequest string
s := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
w.Header().Set("Content-Type", "application/json")

if req.URL.Path != "/api/v1/nodes/"+nodename {
t.Errorf("request for unexpected HTTP resource: %v", req.URL.Path)
http.Error(w, "", http.StatusNotFound)
return
}

switch req.Method {
case "GET":
case "PATCH":
buf := new(bytes.Buffer)
buf.ReadFrom(req.Body)
patchRequest = buf.String()
default:
t.Errorf("request for unexpected HTTP verb: %v", req.Method)
http.Error(w, "", http.StatusNotFound)
return
}

w.WriteHeader(http.StatusOK)
w.Write(jsonNode)
}))
defer s.Close()

cs, err := clientset.NewForConfig(&restclient.Config{Host: s.URL})
if err != nil {
t.Fatalf("unexpected error building clientset: %v", err)
}

if err := AnnotateCRISocket(cs, nodename, tc.newCRISocketAnnotation); err != nil {
t.Errorf("unexpected error: %v", err)
}

if tc.expectedPatch != patchRequest {
t.Errorf("expected patch %v, got %v", tc.expectedPatch, patchRequest)
}
})
}
}