Adding tests

2016-12-20 10:50:13 -05:00 · 2016-12-20 10:50:13 -05:00 · b2105c8812
parent aa3128ef96
commit b2105c8812
5 changed files with 212 additions and 2 deletions
--- a/upup/pkg/fi/cloudup/bootstrapchannelbuilder_test.go
+++ b/upup/pkg/fi/cloudup/bootstrapchannelbuilder_test.go
@ -19,11 +19,89 @@ package cloudup
 import (
 	"testing"

+	"io/ioutil"
 	api "k8s.io/kops/pkg/apis/kops"
+	"k8s.io/kops/pkg/diff"
+	"k8s.io/kops/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/fi/fitasks"
+	"path"
+	"strings"
+
+	// Register our APIs
+	_ "k8s.io/kops/pkg/apis/kops/install"
 )

 func TestBootstrapChanelBuilder_BuildTasks(t *testing.T) {
-	// TODO need to figure out how to mock Loader
+	runChannelBuilderTest(t, "simple")
+	runChannelBuilderTest(t, "kopeio-vxlan")
+}
+
+func runChannelBuilderTest(t *testing.T, key string) {
+	basedir := path.Join("tests/bootstrapchannelbuilder/", key)
+
+	clusterYamlPath := path.Join(basedir, "cluster.yaml")
+	clusterYaml, err := ioutil.ReadFile(clusterYamlPath)
+	if err != nil {
+		t.Fatalf("error reading cluster yaml file %q: %v", clusterYamlPath, err)
+	}
+	obj, _, err := api.ParseVersionedYaml(clusterYaml)
+	if err != nil {
+		t.Fatalf("error parsing cluster yaml %q: %v", clusterYamlPath, err)
+	}
+	cluster := obj.(*api.Cluster)
+	bcb := BootstrapChannelBuilder{cluster: cluster}
+
+	context := &fi.ModelBuilderContext{
+		Tasks: make(map[string]fi.Task),
+	}
+	err = bcb.Build(context)
+	if err != nil {
+		t.Fatalf("error from BootstrapChannelBuilder Build: %v", err)
+	}
+
+	name := cluster.ObjectMeta.Name + "-addons-bootstrap"
+	manifestTask := context.Tasks[name]
+	if manifestTask == nil {
+		t.Fatalf("manifest task not found (%q)", name)
+	}
+
+	manifestFileTask := manifestTask.(*fitasks.ManagedFile)
+	actualManifest, err := manifestFileTask.Contents.AsString()
+	if err != nil {
+		t.Fatalf("error getting manifest as string: %v", err)
+	}
+
+	//var keys []string
+	//for key := range context.Tasks {
+	//	keys = append(keys, key)
+	//}
+	//sort.Strings(keys)
+	//
+	//var yamls []string
+	//for _, key := range keys {
+	//	task := context.Tasks[key]
+	//	yaml, err := api.ToRawYaml(task)
+	//	if err != nil {
+	//		t.Fatalf("error serializing task: %v", err)
+	//	}
+	//	yamls = append(yamls, strings.TrimSpace(string(yaml)))
+	//}
+	//
+	//actualYaml := strings.Join(yamls, "\n---\n")
+
+	//tasksYamlPath := path.Join(basedir, "tasks.yaml")
+	expectedManifestPath := path.Join(basedir, "manifest.yaml")
+	expectedManifest, err := ioutil.ReadFile(expectedManifestPath)
+	if err != nil {
+		t.Fatalf("error reading file %q: %v", expectedManifestPath, err)
+	}
+
+	if strings.TrimSpace(string(expectedManifest)) != strings.TrimSpace(actualManifest) {
+		diffString := diff.FormatDiff(string(expectedManifest), actualManifest)
+		t.Logf("diff:\n%s\n", diffString)
+
+		t.Fatalf("manifest differed from expected for test %q", key)
+	}
 }

 func TestBootstrapChanelBuilder_buildManifest(t *testing.T) {
@ -49,7 +127,7 @@ func TestBootstrapChanelBuilder_buildManifest(t *testing.T) {
 			hasWeave = true
 		}

-		if *value.Name == "limit-range" {
+		if *value.Name == "limit-range.addons.k8s.io" {
 			hasLimit = true
 		}

--- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/kopeio-vxlan/cluster.yaml
+++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/kopeio-vxlan/cluster.yaml
@ -0,0 +1,37 @@
+apiVersion: kops/v1alpha2
+kind: Cluster
+metadata:
+  creationTimestamp: "2016-12-10T22:42:27Z"
+  name: minimal.example.com
+spec:
+  kubernetesApiAccess:
+  - 0.0.0.0/0
+  channel: stable
+  cloudProvider: aws
+  configBase: memfs://clusters.example.com/minimal.example.com
+  etcdClusters:
+  - etcdMembers:
+    - instanceGroup: master-us-test-1a
+      name: master-us-test-1a
+    name: main
+  - etcdMembers:
+    - instanceGroup: master-us-test-1a
+      name: master-us-test-1a
+    name: events
+  kubernetesVersion: v1.4.6
+  masterInternalName: api.internal.minimal.example.com
+  masterPublicName: api.minimal.example.com
+  networkCIDR: 172.20.0.0/16
+  networking:
+    kopeio: {}
+  nonMasqueradeCIDR: 100.64.0.0/10
+  sshAccess:
+    - 0.0.0.0/0
+  topology:
+    masters: public
+    nodes: public
+  subnets:
+  - cidr: 172.20.32.0/19
+    name: us-test-1a
+    type: Public
+    zone: us-test-1a
--- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/kopeio-vxlan/manifest.yaml
+++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/kopeio-vxlan/manifest.yaml
@ -0,0 +1,32 @@
+kind: Addons
+metadata:
+  creationTimestamp: null
+  name: bootstrap
+spec:
+  addons:
+  - manifest: core.addons.k8s.io/v1.4.0.yaml
+    name: core.addons.k8s.io
+    selector:
+      k8s-addon: core.addons.k8s.io
+    version: 1.4.0
+  - manifest: kube-dns.addons.k8s.io/v1.5.0.yaml
+    name: kube-dns.addons.k8s.io
+    selector:
+      k8s-addon: kube-dns.addons.k8s.io
+    version: 1.5.0
+  - manifest: limit-range.addons.k8s.io/v1.5.0.yaml
+    name: limit-range.addons.k8s.io
+    selector:
+      k8s-addon: limit-range.addons.k8s.io
+    version: 1.5.0
+  - manifest: dns-controller.addons.k8s.io/v1.4.1.yaml
+    name: dns-controller.addons.k8s.io
+    selector:
+      k8s-addon: dns-controller.addons.k8s.io
+    version: 1.4.1
+  - manifest: networking.kope.io/v1.0.20161116.yaml
+    name: networking.kope.io
+    selector:
+      k8s-addon: networking.kope.io
+    version: 1.0.20161116
+
--- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/cluster.yaml
+++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/cluster.yaml
@ -0,0 +1,37 @@
+apiVersion: kops/v1alpha2
+kind: Cluster
+metadata:
+  creationTimestamp: "2016-12-10T22:42:27Z"
+  name: minimal.example.com
+spec:
+  kubernetesApiAccess:
+  - 0.0.0.0/0
+  channel: stable
+  cloudProvider: aws
+  configBase: memfs://clusters.example.com/minimal.example.com
+  etcdClusters:
+  - etcdMembers:
+    - instanceGroup: master-us-test-1a
+      name: master-us-test-1a
+    name: main
+  - etcdMembers:
+    - instanceGroup: master-us-test-1a
+      name: master-us-test-1a
+    name: events
+  kubernetesVersion: v1.4.6
+  masterInternalName: api.internal.minimal.example.com
+  masterPublicName: api.minimal.example.com
+  networkCIDR: 172.20.0.0/16
+  networking:
+    kubenet: {}
+  nonMasqueradeCIDR: 100.64.0.0/10
+  sshAccess:
+    - 0.0.0.0/0
+  topology:
+    masters: public
+    nodes: public
+  subnets:
+  - cidr: 172.20.32.0/19
+    name: us-test-1a
+    type: Public
+    zone: us-test-1a
--- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml
+++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml
@ -0,0 +1,26 @@
+kind: Addons
+metadata:
+  creationTimestamp: null
+  name: bootstrap
+spec:
+  addons:
+  - manifest: core.addons.k8s.io/v1.4.0.yaml
+    name: core.addons.k8s.io
+    selector:
+      k8s-addon: core.addons.k8s.io
+    version: 1.4.0
+  - manifest: kube-dns.addons.k8s.io/v1.5.0.yaml
+    name: kube-dns.addons.k8s.io
+    selector:
+      k8s-addon: kube-dns.addons.k8s.io
+    version: 1.5.0
+  - manifest: limit-range.addons.k8s.io/v1.5.0.yaml
+    name: limit-range.addons.k8s.io
+    selector:
+      k8s-addon: limit-range.addons.k8s.io
+    version: 1.5.0
+  - manifest: dns-controller.addons.k8s.io/v1.4.1.yaml
+    name: dns-controller.addons.k8s.io
+    selector:
+      k8s-addon: dns-controller.addons.k8s.io
+    version: 1.4.1