change k8s images to images from packages
diff --git a/kubernetes/files/manifest/kube-apiserver.manifest b/kubernetes/files/manifest/kube-apiserver.manifest
index b05ebcf..6560c79 100644
--- a/kubernetes/files/manifest/kube-apiserver.manifest
+++ b/kubernetes/files/manifest/kube-apiserver.manifest
@@ -11,11 +11,11 @@
terminationGracePeriodSeconds: 30
containers:
- name: kube-apiserver
- image: {{ master.registry }}/kube-apiserver:{{ master.version }}
+ image: {{ master.registry }}/kube-master:{{ master.version }}
command:
- /bin/sh
- -c
- - /usr/local/bin/kube-apiserver
+ - kube-apiserver
--insecure-bind-address={{ master.apiserver.insecure_address }}
--etcd-servers={% for member in master.etcd.members %}http://{{ member.host }}:4001{% if not loop.last %},{% endif %}{% endfor %}
--admission-control=NamespaceLifecycle,LimitRanger,SecurityContextDeny,ServiceAccount,ResourceQuota
diff --git a/kubernetes/files/manifest/kube-controller-manager.manifest b/kubernetes/files/manifest/kube-controller-manager.manifest
index 6361712..7f2f250 100644
--- a/kubernetes/files/manifest/kube-controller-manager.manifest
+++ b/kubernetes/files/manifest/kube-controller-manager.manifest
@@ -11,11 +11,11 @@
terminationGracePeriodSeconds: 30
containers:
- name: kube-controller-manager
- image: {{ master.registry }}/kube-controller-manager:{{ master.version }}
+ image: {{ master.registry }}/kube-master:{{ master.version }}
command:
- /bin/sh
- -c
- - /usr/local/bin/kube-controller-manager
+ - kube-controller-manager
--master={{ master.apiserver.insecure_address }}:8080
--cluster-name=kubernetes
--service-account-private-key-file=/etc/ssl/private/kubernetes-server.key
diff --git a/kubernetes/files/manifest/kube-proxy.manifest.pool b/kubernetes/files/manifest/kube-proxy.manifest.pool
index 92e1602..54442f8 100644
--- a/kubernetes/files/manifest/kube-proxy.manifest.pool
+++ b/kubernetes/files/manifest/kube-proxy.manifest.pool
@@ -8,7 +8,7 @@
hostNetwork: true
containers:
- name: kube-proxy
- image: {{ pool.registry }}/kube-proxy:{{ pool.version }}
+ image: {{ pool.registry }}/kube-pool:{{ pool.version }}
resources:
requests:
cpu: 200m
diff --git a/kubernetes/files/manifest/kube-scheduler.manifest b/kubernetes/files/manifest/kube-scheduler.manifest
index a8f4e5a..905c170 100644
--- a/kubernetes/files/manifest/kube-scheduler.manifest
+++ b/kubernetes/files/manifest/kube-scheduler.manifest
@@ -12,12 +12,12 @@
terminationGracePeriodSeconds: 30
containers:
- name: kube-scheduler
- image: {{ master.registry }}/kube-scheduler:{{ master.version }}
+ image: {{ master.registry }}/kube-master:{{ master.version }}
imagePullPolicy: IfNotPresent
command:
- /bin/sh
- -c
- - /usr/local/bin/kube-scheduler
+ - kube-scheduler
--master={{ master.apiserver.insecure_address }}:8080
--v=2
--leader-elect=true