C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Renaming hyperkube image vars

Browse source
This commit is contained in:
Smaine Kahlouch 2015-12-14 09:54:58 +01:00
parent f908309739
commit 5efc09710b
5 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2
View file

@ -6,7 +6,7 @@ spec:
hostNetwork: true hostNetwork: true
containers: containers:
- name: kube-apiserver - name: kube-apiserver
image: {{ hyperkube_image.name }}:{{ hyperkube_image.tag }} image: {{ hyperkube_image_repo }}:{{ hyperkube_image_tag }}
command: command:
- /hyperkube - /hyperkube
- apiserver - apiserver

2
roles/kubernetes/master/templates/manifests/kube-controller-manager.manifest.j2
View file

@ -7,7 +7,7 @@ spec:
hostNetwork: true hostNetwork: true
containers: containers:
- name: kube-controller-manager - name: kube-controller-manager
image: {{ hyperkube_image.name }}:{{ hyperkube_image.tag }} image: {{ hyperkube_image_repo }}:{{ hyperkube_image_tag }}
command: command:
- /hyperkube - /hyperkube
- controller-manager - controller-manager

2
roles/kubernetes/master/templates/manifests/kube-scheduler.manifest.j2
View file

@ -7,7 +7,7 @@ spec:
hostNetwork: true hostNetwork: true
containers: containers:
- name: kube-scheduler - name: kube-scheduler
image: {{ hyperkube_image.name }}:{{ hyperkube_image.tag }} image: {{ hyperkube_image_repo }}:{{ hyperkube_image_tag }}
command: command:
- /hyperkube - /hyperkube
- scheduler - scheduler

7
roles/kubernetes/node/defaults/main.yml
View file

@ -32,11 +32,10 @@ dns_domain: "{{ cluster_name }}"
kube_proxy_mode: userspace kube_proxy_mode: userspace
hyperkube_image:
# Temporary image, waiting for official google release # Temporary image, waiting for official google release
# name: gcr.io/google_containers/hyperkube # hyperkube_image_repo: gcr.io/google_containers/hyperkube
name: quay.io/smana/hyperkube hyperkube_image_repo: quay.io/smana/hyperkube
tag: v1.1.3 hyperkube_image_tag: v1.1.3
# IP address of the DNS server. # IP address of the DNS server.
# Kubernetes will create a pod with several containers, serving as the DNS # Kubernetes will create a pod with several containers, serving as the DNS

2
roles/kubernetes/node/templates/manifests/kube-proxy.manifest.j2
View file

@ -7,7 +7,7 @@ spec:
hostNetwork: true hostNetwork: true
containers: containers:
- name: kube-proxy - name: kube-proxy
image: {{ hyperkube_image.name }}:{{ hyperkube_image.tag }} image: {{ hyperkube_image_repo }}:{{ hyperkube_image_tag }}
command: command:
- /hyperkube - /hyperkube
- proxy - proxy