gce: configure: use 'amd64' in kube core images manifest

This commit is contained in:
Javier Pérez Hernández 2019-07-16 12:55:15 -07:00
parent c1ebabed42
commit 288ea10a59
5 changed files with 4 additions and 13 deletions

View File

@ -381,15 +381,6 @@ function load-docker-images {
else
try-load-docker-image "${img_dir}/kube-proxy.tar"
fi
# When we load from a docker archive, the image is tagged with the arch, we don't have docker manifests here.
# The resource manifest is expecting something like 'registry/kube-controller-manager:v1.2.3', no arch specified.
local -r images=$(docker images --format "{{.Repository}}:{{.Tag}}" | egrep 'kube-apiserver|kube-controller-manager|kube-scheduler|kube-proxy' | grep amd64)
for image in $images ; do
local manifest_name="${image/-amd64/}"
if ! docker images --format "{{.Repository}}:{{.Tag}}" | grep -q ${manifest_name} ; then
docker tag $image $manifest_name
fi
done
}
# Downloads kubernetes binaries and kube-system manifest tarball, unpacks them,

View File

@ -18,7 +18,7 @@
"containers":[
{
"name": "kube-apiserver",
"image": "{{pillar['kube_docker_registry']}}/kube-apiserver:{{pillar['kube-apiserver_docker_tag']}}",
"image": "{{pillar['kube_docker_registry']}}/kube-apiserver-amd64:{{pillar['kube-apiserver_docker_tag']}}",
"resources": {
"requests": {
"cpu": "250m"

View File

@ -18,7 +18,7 @@
"containers":[
{
"name": "kube-controller-manager",
"image": "{{pillar['kube_docker_registry']}}/kube-controller-manager:{{pillar['kube-controller-manager_docker_tag']}}",
"image": "{{pillar['kube_docker_registry']}}/kube-controller-manager-amd64:{{pillar['kube-controller-manager_docker_tag']}}",
"resources": {
"requests": {
"cpu": "{{cpurequest}}"

View File

@ -16,7 +16,7 @@ spec:
effect: "NoSchedule"
containers:
- name: kube-proxy
image: {{pillar['kube_docker_registry']}}/kube-proxy:{{pillar['kube-proxy_docker_tag']}}
image: {{pillar['kube_docker_registry']}}/kube-proxy-amd64:{{pillar['kube-proxy_docker_tag']}}
resources:
requests:
cpu: {{ cpurequest }}

View File

@ -18,7 +18,7 @@
"containers":[
{
"name": "kube-scheduler",
"image": "{{pillar['kube_docker_registry']}}/kube-scheduler:{{pillar['kube-scheduler_docker_tag']}}",
"image": "{{pillar['kube_docker_registry']}}/kube-scheduler-amd64:{{pillar['kube-scheduler_docker_tag']}}",
"resources": {
"requests": {
"cpu": "{{cpurequest}}"