Update tests; add to bazel

kubernetes · Oct 23, 2017 · 15d50af · 15d50af
1 parent 4bd9974
commit 15d50af
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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: