Update k8s to v1.11.5 and v1.10.11

rancher · Dec 4, 2018 · 9b1efdb · 9b1efdb
1 parent a916491
commit 9b1efdb
Show file tree

Hide file tree

Showing 57 changed files with 115 additions and 63 deletions.
diff --git a/vendor.conf b/vendor.conf
@@ -33,10 +33,10 @@ github.com/smartystreets/go-aws-auth          8ef1316913ee4f44bc48c2456e44a5c1c6
 github.com/mcuadros/go-version                6d5863ca60fa6fe914b5fd43ed8533d7567c5b0b
 
 github.com/rancher/rdns-server                bf662911db6acce4d6a85d2878653f68413b9176
-github.com/rancher/types                      0f69ef3864faae2d4328c13a06b242817e4cbec6
+github.com/rancher/types                      5f30d6820903122f2e288fbc4abde1fd4deacf65
 
 
-github.com/rancher/norman                     643868f4a6c4a0803e287d48b111d39988cc19c0
+github.com/rancher/norman                     39d1bb2830de46f8ef2d1d87c6d315fe1676413a
 github.com/rancher/kontainer-engine           2b4ed633b1aa73a109db704264513bfe9210f52b
 github.com/rancher/rke                        bff7e0a2c3b792704020263927fb7d49b55a3017
 

diff --git a/vendor/github.com/rancher/norman/Dockerfile.dapper b/vendor/github.com/rancher/norman/Dockerfile.dapper
diff --git a/vendor/github.com/rancher/types/Dockerfile.dapper b/vendor/github.com/rancher/types/Dockerfile.dapper
diff --git a/vendor/github.com/rancher/types/apis/batch/v1/zz_generated_job_controller.go b/vendor/github.com/rancher/types/apis/batch/v1/zz_generated_job_controller.go
diff --git a/vendor/github.com/rancher/types/apis/batch/v1/zz_generated_job_lifecycle_adapter.go b/vendor/github.com/rancher/types/apis/batch/v1/zz_generated_job_lifecycle_adapter.go
diff --git a/vendor/github.com/rancher/types/apis/cluster.cattle.io/v3/schema/schema.go b/vendor/github.com/rancher/types/apis/cluster.cattle.io/v3/schema/schema.go
diff --git a/vendor/github.com/rancher/types/apis/core/v1/zz_generated_component_status_controller.go b/vendor/github.com/rancher/types/apis/core/v1/zz_generated_component_status_controller.go
diff --git a/.../github.com/rancher/types/apis/core/v1/zz_generated_component_status_lifecycle_adapter.go b/.../github.com/rancher/types/apis/core/v1/zz_generated_component_status_lifecycle_adapter.go
diff --git a/vendor/github.com/rancher/types/apis/core/v1/zz_generated_config_map_controller.go b/vendor/github.com/rancher/types/apis/core/v1/zz_generated_config_map_controller.go
diff --git a/vendor/github.com/rancher/types/apis/core/v1/zz_generated_config_map_lifecycle_adapter.go b/vendor/github.com/rancher/types/apis/core/v1/zz_generated_config_map_lifecycle_adapter.go
diff --git a/vendor/github.com/rancher/types/apis/core/v1/zz_generated_endpoints_controller.go b/vendor/github.com/rancher/types/apis/core/v1/zz_generated_endpoints_controller.go
diff --git a/vendor/github.com/rancher/types/apis/core/v1/zz_generated_endpoints_lifecycle_adapter.go b/vendor/github.com/rancher/types/apis/core/v1/zz_generated_endpoints_lifecycle_adapter.go
diff --git a/vendor/github.com/rancher/types/apis/core/v1/zz_generated_event_controller.go b/vendor/github.com/rancher/types/apis/core/v1/zz_generated_event_controller.go
diff --git a/vendor/github.com/rancher/types/apis/core/v1/zz_generated_event_lifecycle_adapter.go b/vendor/github.com/rancher/types/apis/core/v1/zz_generated_event_lifecycle_adapter.go
diff --git a/vendor/github.com/rancher/types/apis/core/v1/zz_generated_namespace_controller.go b/vendor/github.com/rancher/types/apis/core/v1/zz_generated_namespace_controller.go
diff --git a/vendor/github.com/rancher/types/apis/core/v1/zz_generated_namespace_lifecycle_adapter.go b/vendor/github.com/rancher/types/apis/core/v1/zz_generated_namespace_lifecycle_adapter.go
diff --git a/vendor/github.com/rancher/types/apis/core/v1/zz_generated_node_controller.go b/vendor/github.com/rancher/types/apis/core/v1/zz_generated_node_controller.go
diff --git a/vendor/github.com/rancher/types/apis/core/v1/zz_generated_node_lifecycle_adapter.go b/vendor/github.com/rancher/types/apis/core/v1/zz_generated_node_lifecycle_adapter.go
diff --git a/.../github.com/rancher/types/apis/core/v1/zz_generated_persistent_volume_claim_controller.go b/.../github.com/rancher/types/apis/core/v1/zz_generated_persistent_volume_claim_controller.go
diff --git a/....com/rancher/types/apis/core/v1/zz_generated_persistent_volume_claim_lifecycle_adapter.go b/....com/rancher/types/apis/core/v1/zz_generated_persistent_volume_claim_lifecycle_adapter.go
diff --git a/vendor/github.com/rancher/types/apis/core/v1/zz_generated_pod_controller.go b/vendor/github.com/rancher/types/apis/core/v1/zz_generated_pod_controller.go
diff --git a/vendor/github.com/rancher/types/apis/core/v1/zz_generated_pod_lifecycle_adapter.go b/vendor/github.com/rancher/types/apis/core/v1/zz_generated_pod_lifecycle_adapter.go
diff --git a/...r/github.com/rancher/types/apis/core/v1/zz_generated_replication_controller_controller.go b/...r/github.com/rancher/types/apis/core/v1/zz_generated_replication_controller_controller.go
diff --git a/...b.com/rancher/types/apis/core/v1/zz_generated_replication_controller_lifecycle_adapter.go b/...b.com/rancher/types/apis/core/v1/zz_generated_replication_controller_lifecycle_adapter.go
diff --git a/vendor/github.com/rancher/types/apis/core/v1/zz_generated_resource_quota_controller.go b/vendor/github.com/rancher/types/apis/core/v1/zz_generated_resource_quota_controller.go
diff --git a/...or/github.com/rancher/types/apis/core/v1/zz_generated_resource_quota_lifecycle_adapter.go b/...or/github.com/rancher/types/apis/core/v1/zz_generated_resource_quota_lifecycle_adapter.go
diff --git a/vendor/github.com/rancher/types/apis/core/v1/zz_generated_secret_controller.go b/vendor/github.com/rancher/types/apis/core/v1/zz_generated_secret_controller.go
diff --git a/vendor/github.com/rancher/types/apis/core/v1/zz_generated_secret_lifecycle_adapter.go b/vendor/github.com/rancher/types/apis/core/v1/zz_generated_secret_lifecycle_adapter.go
diff --git a/vendor/github.com/rancher/types/apis/core/v1/zz_generated_service_account_controller.go b/vendor/github.com/rancher/types/apis/core/v1/zz_generated_service_account_controller.go
diff --git a/...r/github.com/rancher/types/apis/core/v1/zz_generated_service_account_lifecycle_adapter.go b/...r/github.com/rancher/types/apis/core/v1/zz_generated_service_account_lifecycle_adapter.go
diff --git a/vendor/github.com/rancher/types/apis/core/v1/zz_generated_service_controller.go b/vendor/github.com/rancher/types/apis/core/v1/zz_generated_service_controller.go
diff --git a/vendor/github.com/rancher/types/apis/core/v1/zz_generated_service_lifecycle_adapter.go b/vendor/github.com/rancher/types/apis/core/v1/zz_generated_service_lifecycle_adapter.go
diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/authz_types.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/authz_types.go
diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/catalog_types.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/catalog_types.go
diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/cluster_types.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/cluster_types.go
diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/compose_types.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/compose_types.go