mirror of https://github.com/kubernetes/kops.git
8eac358795
Automatic merge from submit-queue. Updating Calico manifests to Calico release 2.6.2 Renamed the k8s-1.8 manifest to a k8s-1.7. This is required because of config change that occurs between k8s 1.6 and k8s 1.7. This refactor will also be re-used when Calico Kubernetes data source support is added to kops. Updated bootstrapchannelbuilder with the new Calico version numbers. The diffs for the k8s-1.6 version is pretty rough, tried to make it cleaner, but nada. FIXES: https://github.com/kubernetes/kops/issues/3866 FIXES: https://github.com/kubernetes/kops/issues/3867 Line: https://github.com/kubernetes/kops/compare/master...chrislovecnm:calico-2.6-update?expand=1#diff-891cbc61587adb202b66b7c9bc6896daR209 is why Calico would not start on k8s 1.6 - thanks @caseydavenport **TODO** Testing K8s versions - [x] test 1.5 - [x] test 1.6 - [x] test 1.7 - [x] test 1.8 /cc @blakebarnett @itajaja |
||
|---|---|---|
| .. | ||
| cloudup/resources/addons | ||
| config/components/docker | ||
| nodeup | ||
| BUILD.bazel | ||
| vfs.go | ||