Bump Kubernetes version to 1.8.5-4
Also fixed image locations for k8s-compact model.
Change-Id: Ia8ca074a55455cc0bd59059b7066dacd28e85b00
diff --git a/classes/cluster/k8s-compact/kubernetes/init.yml b/classes/cluster/k8s-compact/kubernetes/init.yml
index 8aab8bf..70b2cf9 100644
--- a/classes/cluster/k8s-compact/kubernetes/init.yml
+++ b/classes/cluster/k8s-compact/kubernetes/init.yml
@@ -27,11 +27,11 @@
kubernetes_controller-manager_token: uXrdZ1YKF6qlYm3sHje2iEXMGAGDWOIU
kubernetes_dns_token: 0S1I4iJeFjq5fopPwwCwTp3xFpEZfeUl
kubernetes_docker_package: docker-engine=1.12.6-0~ubuntu-xenial
- kubernetes_calicoctl_image: docker-dev-virtual.docker.mirantis.net/mirantis/projectcalico/calico/ctl:latest
- kubernetes_calico_image: docker-dev-virtual.docker.mirantis.net/mirantis/projectcalico/calico/node:latest
- kubernetes_calico_cni_image: docker-dev-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
+ kubernetes_calicoctl_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/ctl:latest
+ kubernetes_calico_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/node:latest
+ kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
kubernetes_calico_policy_image: calico/kube-policy-controller:v0.5.4
- kubernetes_hyperkube_image: docker-dev-local.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.4-3
+ kubernetes_hyperkube_image: docker-prod-local.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.5-4
kubernetes_virtlet_image: mirantis/virtlet:latest
kubernetes_netchecker_agent_image: mirantis/k8s-netchecker-agent:stable
kubernetes_netchecker_server_image: mirantis/k8s-netchecker-server:stable