From 15d50aff4892f6c134302625697cadc8483b5714 Mon Sep 17 00:00:00 2001
From: Justin Santa Barbara <justin@fathomdb.com>
Date: Mon, 23 Oct 2017 00:33:50 -0400
Subject: [PATCH] Update tests; add to bazel

---
 pkg/model/BUILD.bazel                                      | 1 +
 upup/pkg/fi/cloudup/BUILD.bazel                            | 7 ++++---
 .../bootstrapchannelbuilder/kopeio-vxlan/manifest.yaml     | 7 +++++++
 .../tests/bootstrapchannelbuilder/simple/manifest.yaml     | 7 +++++++
 .../tests/bootstrapchannelbuilder/weave/manifest.yaml      | 7 +++++++
 5 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/pkg/model/BUILD.bazel b/pkg/model/BUILD.bazel
index 2a74321d6b..a2e026e2a0 100644
--- a/pkg/model/BUILD.bazel
+++ b/pkg/model/BUILD.bazel
@@ -43,6 +43,7 @@ go_library(
         "//vendor/k8s.io/apimachinery/pkg/util/net:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library",
         "//vendor/k8s.io/apiserver/pkg/authentication/user:go_default_library",
+        "//vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/aws:go_default_library",
     ],
 )
 
diff --git a/upup/pkg/fi/cloudup/BUILD.bazel b/upup/pkg/fi/cloudup/BUILD.bazel
index 27b03c6b64..defdd2901b 100644
--- a/upup/pkg/fi/cloudup/BUILD.bazel
+++ b/upup/pkg/fi/cloudup/BUILD.bazel
@@ -73,6 +73,7 @@ go_library(
 
 go_test(
     name = "go_default_test",
+    size = "small",
     srcs = [
         "bootstrapchannelbuilder_test.go",
         "deepvalidate_test.go",
@@ -85,6 +86,9 @@ go_test(
         "tagbuilder_test.go",
         "validation_test.go",
     ],
+    data = [
+        "//upup/pkg/fi/cloudup/tests:exported_testdata",  # keep
+    ],
     library = ":go_default_library",
     deps = [
         "//pkg/apis/kops:go_default_library",
@@ -103,7 +107,4 @@ go_test(
         "//vendor/github.com/golang/glog:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library",
     ],
-    data = [
-        "//upup/pkg/fi/cloudup/tests:exported_testdata",  # keep
-    ],
 )
diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/kopeio-vxlan/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/kopeio-vxlan/manifest.yaml
index ebedbe911c..b6cdcf8a0c 100644
--- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/kopeio-vxlan/manifest.yaml
+++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/kopeio-vxlan/manifest.yaml
@@ -23,6 +23,13 @@ spec:
     selector:
       k8s-addon: kube-dns.addons.k8s.io
     version: 1.14.5
+  - id: k8s-1.8
+    kubernetesVersion: '>=1.8.0'
+    manifest: rbac.addons.k8s.io/k8s-1.8.yaml
+    name: rbac.addons.k8s.io
+    selector:
+      k8s-addon: rbac.addons.k8s.io
+    version: 1.8.0
   - manifest: limit-range.addons.k8s.io/v1.5.0.yaml
     name: limit-range.addons.k8s.io
     selector:
diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml
index 9f965cf67f..c3962934b7 100644
--- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml
+++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml
@@ -23,6 +23,13 @@ spec:
     selector:
       k8s-addon: kube-dns.addons.k8s.io
     version: 1.14.5
+  - id: k8s-1.8
+    kubernetesVersion: '>=1.8.0'
+    manifest: rbac.addons.k8s.io/k8s-1.8.yaml
+    name: rbac.addons.k8s.io
+    selector:
+      k8s-addon: rbac.addons.k8s.io
+    version: 1.8.0
   - manifest: limit-range.addons.k8s.io/v1.5.0.yaml
     name: limit-range.addons.k8s.io
     selector:
diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml
index a5418a7de2..4f53f01236 100644
--- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml
+++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml
@@ -23,6 +23,13 @@ spec:
     selector:
       k8s-addon: kube-dns.addons.k8s.io
     version: 1.14.5
+  - id: k8s-1.8
+    kubernetesVersion: '>=1.8.0'
+    manifest: rbac.addons.k8s.io/k8s-1.8.yaml
+    name: rbac.addons.k8s.io
+    selector:
+      k8s-addon: rbac.addons.k8s.io
+    version: 1.8.0
   - manifest: limit-range.addons.k8s.io/v1.5.0.yaml
     name: limit-range.addons.k8s.io
     selector: