Merge "Update Kubernetes to 1.10.11"

This commit is contained in:
Zuul 2018-12-18 18:05:40 +00:00 committed by Gerrit Code Review
commit 3efe546ab6
20 changed files with 61 additions and 61 deletions

View File

@ -16,7 +16,7 @@ release_group: null
images:
tags:
apiserver: gcr.io/google_containers/hyperkube-amd64:v1.10.2
apiserver: gcr.io/google_containers/hyperkube-amd64:v1.10.11
kubernetes_keystone_webhook: docker.io/k8scloudprovider/k8s-keystone-auth:latest
scripted_test: docker.io/openstackhelm/heat:newton
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1

View File

@ -16,8 +16,8 @@ release_group: null
images:
tags:
anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.2
apiserver: gcr.io/google_containers/hyperkube-amd64:v1.10.2
anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.11
apiserver: gcr.io/google_containers/hyperkube-amd64:v1.10.11
pull_policy: "IfNotPresent"
labels:

View File

@ -16,8 +16,8 @@ release_group: null
images:
tags:
anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.2
controller_manager: gcr.io/google_containers/hyperkube-amd64:v1.10.2
anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.11
controller_manager: gcr.io/google_containers/hyperkube-amd64:v1.10.11
pull_policy: "IfNotPresent"
labels:

View File

@ -59,7 +59,7 @@ conf:
images:
tags:
anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.2
anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.11
haproxy: haproxy:1.8.3
test: python:3.6
pull_policy: "IfNotPresent"

View File

@ -41,7 +41,7 @@ pod:
images:
tags:
proxy: gcr.io/google_containers/hyperkube-amd64:v1.10.2
proxy: gcr.io/google_containers/hyperkube-amd64:v1.10.11
pull_policy: "IfNotPresent"
command_prefix:

View File

@ -63,8 +63,8 @@ secrets:
images:
tags:
anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.2
scheduler: gcr.io/google_containers/hyperkube-amd64:v1.10.2
anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.11
scheduler: gcr.io/google_containers/hyperkube-amd64:v1.10.11
pull_policy: "IfNotPresent"
network:

View File

@ -41,10 +41,10 @@ Here is a complete sample document:
helm:
tiller: gcr.io/kubernetes-helm/tiller:v2.10.0
kubernetes:
apiserver: gcr.io/google_containers/hyperkube-amd64:v1.10.2
controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.10.2
apiserver: gcr.io/google_containers/hyperkube-amd64:v1.10.11
controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.10.11
etcd: quay.io/coreos/etcd:v3.0.17
scheduler: gcr.io/google_containers/hyperkube-amd64:v1.10.2
scheduler: gcr.io/google_containers/hyperkube-amd64:v1.10.11
files:
- path: /var/lib/anchor/calico-etcd-bootstrap
content: ""

View File

@ -16,7 +16,7 @@ Sample Document
data:
files:
- path: /opt/kubernetes/bin/kubelet
tar_url: https://dl.k8s.io/v1.10.2/kubernetes-node-linux-amd64.tar.gz
tar_url: https://dl.k8s.io/v1.10.11/kubernetes-node-linux-amd64.tar.gz
tar_path: kubernetes/node/bin/kubelet
mode: 0555
images:
@ -24,7 +24,7 @@ Sample Document
helm:
helm: lachlanevenson/k8s-helm:v2.10.0
kubernetes:
kubectl: gcr.io/google_containers/hyperkube-amd64:v1.10.2
kubectl: gcr.io/google_containers/hyperkube-amd64:v1.10.11
packages:
repositories:
- deb http://apt.dockerproject.org/repo ubuntu-xenial main

View File

@ -37,10 +37,10 @@ data:
helm:
tiller: gcr.io/kubernetes-helm/tiller:v2.10.0
kubernetes:
apiserver: gcr.io/google_containers/hyperkube-amd64:v1.10.2
controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.10.2
apiserver: gcr.io/google_containers/hyperkube-amd64:v1.10.11
controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.10.11
etcd: quay.io/coreos/etcd:v3.2.14
scheduler: gcr.io/google_containers/hyperkube-amd64:v1.10.2
scheduler: gcr.io/google_containers/hyperkube-amd64:v1.10.11
files:
- path: /var/lib/anchor/calico-etcd-bootstrap
content: "# placeholder for triggering calico etcd bootstrapping"

View File

@ -13,7 +13,7 @@ data:
enable: true
files:
- path: /opt/kubernetes/bin/kubelet
tar_url: https://dl.k8s.io/v1.10.2/kubernetes-node-linux-amd64.tar.gz
tar_url: https://dl.k8s.io/v1.10.11/kubernetes-node-linux-amd64.tar.gz
tar_path: kubernetes/node/bin/kubelet
mode: 0555
- path: /etc/systemd/system/kube-cgroup.service
@ -69,7 +69,7 @@ data:
helm:
helm: lachlanevenson/k8s-helm:v2.10.0
kubernetes:
kubectl: gcr.io/google_containers/hyperkube-amd64:v1.10.2
kubectl: gcr.io/google_containers/hyperkube-amd64:v1.10.11
packages:
repositories:
- deb http://apt.dockerproject.org/repo ubuntu-xenial main

View File

@ -186,7 +186,7 @@ data:
values:
images:
tags:
proxy: gcr.io/google_containers/hyperkube-amd64:v1.10.2
proxy: gcr.io/google_containers/hyperkube-amd64:v1.10.11
network:
kubernetes_netloc: 127.0.0.1:6553
source:
@ -638,7 +638,7 @@ data:
images:
tags:
anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.2
anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.11
haproxy: haproxy:1.8.3
test: python:3.6
@ -733,8 +733,8 @@ data:
endpoints: https://127.0.0.1:2378
images:
tags:
anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.2
apiserver: gcr.io/google_containers/hyperkube-amd64:v1.10.2
anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.11
apiserver: gcr.io/google_containers/hyperkube-amd64:v1.10.11
network:
kubernetes_service_ip: 10.96.0.1
pod_cidr: 10.97.0.0/16
@ -798,8 +798,8 @@ data:
values:
images:
tags:
anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.2
controller_manager: gcr.io/google_containers/hyperkube-amd64:v1.10.2
anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.11
controller_manager: gcr.io/google_containers/hyperkube-amd64:v1.10.11
secrets:
service_account:
private_key: placeholder
@ -871,8 +871,8 @@ data:
images:
tags:
anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.2
scheduler: gcr.io/google_containers/hyperkube-amd64:v1.10.2
anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.11
scheduler: gcr.io/google_containers/hyperkube-amd64:v1.10.11
source:
type: local

View File

@ -32,10 +32,10 @@ data:
helm:
tiller: gcr.io/kubernetes-helm/tiller:v2.10.0
kubernetes:
apiserver: gcr.io/google_containers/hyperkube-amd64:v1.10.2
controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.10.2
apiserver: gcr.io/google_containers/hyperkube-amd64:v1.10.11
controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.10.11
etcd: quay.io/coreos/etcd:v3.2.14
scheduler: gcr.io/google_containers/hyperkube-amd64:v1.10.2
scheduler: gcr.io/google_containers/hyperkube-amd64:v1.10.11
files:
- path: /var/lib/anchor/calico-etcd-bootstrap
content: "# placeholder for triggering calico etcd bootstrapping"

View File

@ -10,7 +10,7 @@ metadata:
data:
files:
- path: /opt/kubernetes/bin/kubelet
tar_url: https://dl.k8s.io/v1.10.2/kubernetes-node-linux-amd64.tar.gz
tar_url: https://dl.k8s.io/v1.10.11/kubernetes-node-linux-amd64.tar.gz
tar_path: kubernetes/node/bin/kubelet
mode: 0555
- path: /etc/logrotate.d/json-logrotate
@ -35,7 +35,7 @@ data:
helm:
helm: lachlanevenson/k8s-helm:v2.10.0
kubernetes:
kubectl: gcr.io/google_containers/hyperkube-amd64:v1.10.2
kubectl: gcr.io/google_containers/hyperkube-amd64:v1.10.11
packages:
repositories:
- deb http://apt.dockerproject.org/repo ubuntu-xenial main

View File

@ -201,7 +201,7 @@ data:
values:
images:
tags:
proxy: gcr.io/google_containers/hyperkube-amd64:v1.10.2
proxy: gcr.io/google_containers/hyperkube-amd64:v1.10.11
network:
kubernetes_netloc: 127.0.0.1:6553
source:
@ -646,7 +646,7 @@ data:
images:
tags:
anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.2
anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.11
haproxy: haproxy:1.8.3
test: python:3.6
@ -732,8 +732,8 @@ data:
endpoints: https://127.0.0.1:2378
images:
tags:
anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.2
apiserver: gcr.io/google_containers/hyperkube-amd64:v1.10.2
anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.11
apiserver: gcr.io/google_containers/hyperkube-amd64:v1.10.11
secrets:
service_account:
public_key: placeholder
@ -809,8 +809,8 @@ data:
values:
images:
tags:
anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.2
controller_manager: gcr.io/google_containers/hyperkube-amd64:v1.10.2
anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.11
controller_manager: gcr.io/google_containers/hyperkube-amd64:v1.10.11
secrets:
service_account:
private_key: placeholder
@ -882,8 +882,8 @@ data:
images:
tags:
anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.2
scheduler: gcr.io/google_containers/hyperkube-amd64:v1.10.2
anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.11
scheduler: gcr.io/google_containers/hyperkube-amd64:v1.10.11
source:
type: local

View File

@ -107,13 +107,13 @@ VALID_DOCS = [
},
'kubernetes': {
'apiserver':
'gcr.io/google_containers/hyperkube-amd64:v1.10.2',
'gcr.io/google_containers/hyperkube-amd64:v1.10.11',
'controller-manager':
'gcr.io/google_containers/hyperkube-amd64:v1.10.2',
'gcr.io/google_containers/hyperkube-amd64:v1.10.11',
'etcd':
'quay.io/coreos/etcd:v3.2.14',
'scheduler':
'gcr.io/google_containers/hyperkube-amd64:v1.10.2'
'gcr.io/google_containers/hyperkube-amd64:v1.10.11'
}
},
'ip':
@ -149,7 +149,7 @@ VALID_DOCS = [
'tar_path':
'kubernetes/node/bin/kubelet',
'tar_url':
'https://dl.k8s.io/v1.10.2/kubernetes-node-linux-amd64.tar.gz'
'https://dl.k8s.io/v1.10.11/kubernetes-node-linux-amd64.tar.gz'
},
{
'content':
@ -166,7 +166,7 @@ VALID_DOCS = [
},
'kubernetes': {
'kubectl':
'gcr.io/google_containers/hyperkube-amd64:v1.10.2'
'gcr.io/google_containers/hyperkube-amd64:v1.10.11'
}
},
'packages': {

View File

@ -34,10 +34,10 @@ data:
helm:
tiller: gcr.io/kubernetes-helm/tiller:v2.9.1
kubernetes:
apiserver: gcr.io/google_containers/hyperkube-amd64:v1.10.2
controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.10.2
apiserver: gcr.io/google_containers/hyperkube-amd64:v1.10.11
controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.10.11
etcd: quay.io/coreos/etcd:v3.2.14
scheduler: gcr.io/google_containers/hyperkube-amd64:v1.10.2
scheduler: gcr.io/google_containers/hyperkube-amd64:v1.10.11
files:
- path: /var/lib/anchor/calico-etcd-bootstrap
content: "# placeholder for triggering calico etcd bootstrapping"

View File

@ -14,7 +14,7 @@ data:
# attempt to actually run Kubernetes, only to construct the genesis and
# join scripts.
# - path: /opt/kubernetes/bin/kubelet
# tar_url: https://dl.k8s.io/v1.10.2/kubernetes-node-linux-amd64.tar.gz
# tar_url: https://dl.k8s.io/v1.10.11/kubernetes-node-linux-amd64.tar.gz
# tar_path: kubernetes/node/bin/kubelet
# mode: 0555
- path: /etc/logrotate.d/json-logrotate
@ -39,7 +39,7 @@ data:
helm:
helm: lachlanevenson/k8s-helm:v2.9.1
kubernetes:
kubectl: gcr.io/google_containers/hyperkube-amd64:v1.10.2
kubectl: gcr.io/google_containers/hyperkube-amd64:v1.10.11
packages:
repositories:
- deb http://apt.dockerproject.org/repo ubuntu-xenial main

View File

@ -186,7 +186,7 @@ data:
values:
images:
tags:
proxy: gcr.io/google_containers/hyperkube-amd64:v1.10.2
proxy: gcr.io/google_containers/hyperkube-amd64:v1.10.11
network:
kubernetes_netloc: 127.0.0.1:6553
source:
@ -562,7 +562,7 @@ data:
images:
tags:
anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.2
anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.11
haproxy: haproxy:1.8.3
test: python:3.6
@ -654,8 +654,8 @@ data:
endpoints: https://127.0.0.1:2378
images:
tags:
anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.2
apiserver: gcr.io/google_containers/hyperkube-amd64:v1.10.2
anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.11
apiserver: gcr.io/google_containers/hyperkube-amd64:v1.10.11
secrets:
service_account:
public_key: placeholder
@ -731,8 +731,8 @@ data:
values:
images:
tags:
anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.2
controller_manager: gcr.io/google_containers/hyperkube-amd64:v1.10.2
anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.11
controller_manager: gcr.io/google_containers/hyperkube-amd64:v1.10.11
secrets:
service_account:
private_key: placeholder
@ -804,8 +804,8 @@ data:
images:
tags:
anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.2
scheduler: gcr.io/google_containers/hyperkube-amd64:v1.10.2
anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.11
scheduler: gcr.io/google_containers/hyperkube-amd64:v1.10.11
source:
type: local

View File

@ -8,6 +8,6 @@ IMAGE_DEP_CHECK=quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
IMAGE_ETCD=quay.io/coreos/etcd:v3.2.14
IMAGE_HAPROXY=haproxy:1.8.3
IMAGE_HELM=lachlanevenson/k8s-helm:v2.10.0
IMAGE_HYPERKUBE=gcr.io/google_containers/hyperkube-amd64:v1.10.2
IMAGE_HYPERKUBE=gcr.io/google_containers/hyperkube-amd64:v1.10.11
IMAGE_TILLER=gcr.io/kubernetes-helm/tiller:v2.10.0
KUBELET_URL=https://dl.k8s.io/v1.10.2/kubernetes-node-linux-amd64.tar.gz
KUBELET_URL=https://dl.k8s.io/v1.10.11/kubernetes-node-linux-amd64.tar.gz

View File

@ -1,6 +1,6 @@
# source_name, tag, cache_name
coredns/coredns,0.9.9,coredns
gcr.io/google_containers/hyperkube-amd64,v1.10.2,hyperkube
gcr.io/google_containers/hyperkube-amd64,v1.10.11,hyperkube
gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64,1.14.4,k8s-dns-dnsmasq-nanny-amd64
gcr.io/google_containers/k8s-dns-kube-dns-amd64,1.14.4,k8s-dns-kube-dns-amd64
gcr.io/google_containers/k8s-dns-sidecar-amd64,1.14.4,k8s-dns-sidecar-amd64