update sources of k8s and calico installation
move basic k8s setup to common
copy cni from hyperkube
configurable calico node image
use calico/cni image for obtaining cnis
use calico/ctl image for obtaining calicoctl binary
add cross requirement for k8s services and hyperkube
update metadata for new pillar model
update manifests to use hyperkube from common
Change-Id: I6e5e84cf252399120141ad941ac7aa6dae7c16ac
diff --git a/kubernetes/files/manifest/kube-scheduler.manifest b/kubernetes/files/manifest/kube-scheduler.manifest
index e2d5ba0..b2814e2 100644
--- a/kubernetes/files/manifest/kube-scheduler.manifest
+++ b/kubernetes/files/manifest/kube-scheduler.manifest
@@ -1,4 +1,5 @@
{%- from "kubernetes/map.jinja" import master with context %}
+{%- from "kubernetes/map.jinja" import common with context %}
apiVersion: v1
kind: Pod
metadata:
@@ -12,7 +13,7 @@
terminationGracePeriodSeconds: 30
containers:
- name: kube-scheduler
- image: {{ master.registry.host }}/hyperkube:{{ master.version }}
+ image: {{ common.hyperkube.image }}
imagePullPolicy: IfNotPresent
command:
- hyperkube
@@ -38,4 +39,4 @@
volumes:
- hostPath:
path: /var/log/kube-scheduler.log
- name: logfile
\ No newline at end of file
+ name: logfile