Merge pull request #70 from droot/k8s-1.11

K8s 1.11
kubernetes-sigs · Sep 4, 2018 · 110fef4 · 110fef4
2 parents 62b5a17 + 8b69956
commit 110fef4
Show file tree

Hide file tree

Showing 1,370 changed files with 23,568 additions and 19,236 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -14,23 +14,23 @@ required = [
 
 [[constraint]]
   name="k8s.io/api"
-  version="kubernetes-1.10.1"
+  version="kubernetes-1.11.2"
 
 [[constraint]]
   name="k8s.io/apiextensions-apiserver"
-  version="kubernetes-1.10.1"
+  version="kubernetes-1.11.2"
 
 [[constraint]]
   name="k8s.io/apimachinery"
-  version="kubernetes-1.10.1"
+  version="kubernetes-1.11.2"
 
 [[constraint]]
   name="k8s.io/code-generator"
-  version="kubernetes-1.10.1"
+  version="kubernetes-1.11.2"
 
 [[constraint]]
   name="k8s.io/client-go"
-  version="kubernetes-1.10.1"
+  version="kubernetes-1.11.2"
 
 [[constraint]]
   name = "github.com/onsi/ginkgo"

diff --git a/pkg/crd/generator/generator_test.go b/pkg/crd/generator/generator_test.go
@@ -59,7 +59,7 @@ func TestGenerator(t *testing.T) {
 			t.Fatalf("reading file failed %v", err)
 		}
 		if !reflect.DeepEqual(crdContent, expectedContent) {
-			t.Fatalf("CRD output does not match exp:%v got:%v \n", expectedContent, crdContent)
+			t.Fatalf("CRD output does not match exp:%v got:%v \n", string(expectedContent), string(crdContent))
 		}
 	}
 	// examine content of the in-memory filesystem

diff --git a/pkg/crd/generator/testData/config/crds/fun_v1alpha1_toy.yaml b/pkg/crd/generator/testData/config/crds/fun_v1alpha1_toy.yaml
@@ -90,3 +90,4 @@ status:
     kind: ""
     plural: ""
   conditions: null
+  storedVersions: null
diff --git a/test.sh b/test.sh
@@ -38,7 +38,9 @@ else
   reset=''
 fi
 
-k8s_version=1.10.1
+k8s_version=1.11.0
+# keeping older version around to reproduce any issue (just in case)
+#k8s_version=1.10.1
 goarch=amd64
 goos="unknown"
 
@@ -146,4 +148,4 @@ header_text "running test package tests"
 
 cd test
 make
-cd -
+cd -
diff --git a/test/config/crds/creatures_v2alpha1_kraken.yaml b/test/config/crds/creatures_v2alpha1_kraken.yaml
@@ -30,3 +30,4 @@ status:
     kind: ""
     plural: ""
   conditions: null
+  storedVersions: null
diff --git a/test/config/crds/crew_v1_firstmate.yaml b/test/config/crds/crew_v1_firstmate.yaml
@@ -30,3 +30,4 @@ status:
     kind: ""
     plural: ""
   conditions: null
+  storedVersions: null
diff --git a/test/config/crds/policy_v1beta1_healthcheckpolicy.yaml b/test/config/crds/policy_v1beta1_healthcheckpolicy.yaml
@@ -30,3 +30,4 @@ status:
     kind: ""
     plural: ""
   conditions: null
+  storedVersions: null
diff --git a/test/config/crds/ship_v1beta1_frigate.yaml b/test/config/crds/ship_v1beta1_frigate.yaml
@@ -30,3 +30,4 @@ status:
     kind: ""
     plural: ""
   conditions: null
+  storedVersions: null
diff --git a/vendor/github.com/google/btree/.travis.yml b/vendor/github.com/google/btree/.travis.yml