Merge "Update to Kubernetes 1.11.6"
This commit is contained in:
commit
56f163895b
|
@ -16,7 +16,7 @@ release_group: null
|
||||||
|
|
||||||
images:
|
images:
|
||||||
tags:
|
tags:
|
||||||
apiserver: gcr.io/google_containers/hyperkube-amd64:v1.10.11
|
apiserver: gcr.io/google_containers/hyperkube-amd64:v1.11.6
|
||||||
kubernetes_keystone_webhook: docker.io/k8scloudprovider/k8s-keystone-auth:latest
|
kubernetes_keystone_webhook: docker.io/k8scloudprovider/k8s-keystone-auth:latest
|
||||||
scripted_test: docker.io/openstackhelm/heat:newton
|
scripted_test: docker.io/openstackhelm/heat:newton
|
||||||
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
|
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
|
||||||
|
|
|
@ -55,8 +55,8 @@ const:
|
||||||
|
|
||||||
images:
|
images:
|
||||||
tags:
|
tags:
|
||||||
anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.11
|
anchor: gcr.io/google_containers/hyperkube-amd64:v1.11.6
|
||||||
apiserver: gcr.io/google_containers/hyperkube-amd64:v1.10.11
|
apiserver: gcr.io/google_containers/hyperkube-amd64:v1.11.6
|
||||||
pull_policy: "IfNotPresent"
|
pull_policy: "IfNotPresent"
|
||||||
|
|
||||||
labels:
|
labels:
|
||||||
|
|
|
@ -16,8 +16,8 @@ release_group: null
|
||||||
|
|
||||||
images:
|
images:
|
||||||
tags:
|
tags:
|
||||||
anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.11
|
anchor: gcr.io/google_containers/hyperkube-amd64:v1.11.6
|
||||||
controller_manager: gcr.io/google_containers/hyperkube-amd64:v1.10.11
|
controller_manager: gcr.io/google_containers/hyperkube-amd64:v1.11.6
|
||||||
pull_policy: "IfNotPresent"
|
pull_policy: "IfNotPresent"
|
||||||
|
|
||||||
labels:
|
labels:
|
||||||
|
|
|
@ -23,8 +23,8 @@ conf:
|
||||||
|
|
||||||
images:
|
images:
|
||||||
tags:
|
tags:
|
||||||
coredns: coredns/coredns:1.1.2
|
coredns: coredns/coredns:1.1.3
|
||||||
test: coredns/coredns:1.1.2
|
test: coredns/coredns:1.1.3
|
||||||
pull_policy: "IfNotPresent"
|
pull_policy: "IfNotPresent"
|
||||||
|
|
||||||
labels:
|
labels:
|
||||||
|
|
|
@ -14,8 +14,8 @@
|
||||||
|
|
||||||
images:
|
images:
|
||||||
tags:
|
tags:
|
||||||
etcd: quay.io/coreos/etcd:v3.2.14
|
etcd: quay.io/coreos/etcd:v3.2.18
|
||||||
etcdctl: quay.io/coreos/etcd:v3.2.14
|
etcdctl: quay.io/coreos/etcd:v3.2.18
|
||||||
pull_policy: "IfNotPresent"
|
pull_policy: "IfNotPresent"
|
||||||
|
|
||||||
labels:
|
labels:
|
||||||
|
|
|
@ -59,7 +59,7 @@ conf:
|
||||||
|
|
||||||
images:
|
images:
|
||||||
tags:
|
tags:
|
||||||
anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.11
|
anchor: gcr.io/google_containers/hyperkube-amd64:v1.11.6
|
||||||
haproxy: haproxy:1.8.3
|
haproxy: haproxy:1.8.3
|
||||||
test: python:3.6
|
test: python:3.6
|
||||||
pull_policy: "IfNotPresent"
|
pull_policy: "IfNotPresent"
|
||||||
|
|
|
@ -41,7 +41,7 @@ pod:
|
||||||
|
|
||||||
images:
|
images:
|
||||||
tags:
|
tags:
|
||||||
proxy: gcr.io/google_containers/hyperkube-amd64:v1.10.11
|
proxy: gcr.io/google_containers/hyperkube-amd64:v1.11.6
|
||||||
pull_policy: "IfNotPresent"
|
pull_policy: "IfNotPresent"
|
||||||
|
|
||||||
command_prefix:
|
command_prefix:
|
||||||
|
|
|
@ -63,8 +63,8 @@ secrets:
|
||||||
|
|
||||||
images:
|
images:
|
||||||
tags:
|
tags:
|
||||||
anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.11
|
anchor: gcr.io/google_containers/hyperkube-amd64:v1.11.6
|
||||||
scheduler: gcr.io/google_containers/hyperkube-amd64:v1.10.11
|
scheduler: gcr.io/google_containers/hyperkube-amd64:v1.11.6
|
||||||
pull_policy: "IfNotPresent"
|
pull_policy: "IfNotPresent"
|
||||||
|
|
||||||
network:
|
network:
|
||||||
|
|
|
@ -39,12 +39,12 @@ Here is a complete sample document:
|
||||||
images:
|
images:
|
||||||
armada: quay.io/airshipit/armada:latest
|
armada: quay.io/airshipit/armada:latest
|
||||||
helm:
|
helm:
|
||||||
tiller: gcr.io/kubernetes-helm/tiller:v2.10.0
|
tiller: gcr.io/kubernetes-helm/tiller:v2.12.1
|
||||||
kubernetes:
|
kubernetes:
|
||||||
apiserver: gcr.io/google_containers/hyperkube-amd64:v1.10.11
|
apiserver: gcr.io/google_containers/hyperkube-amd64:v1.11.6
|
||||||
controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.10.11
|
controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.11.6
|
||||||
etcd: quay.io/coreos/etcd:v3.0.17
|
etcd: quay.io/coreos/etcd:v3.0.17
|
||||||
scheduler: gcr.io/google_containers/hyperkube-amd64:v1.10.11
|
scheduler: gcr.io/google_containers/hyperkube-amd64:v1.11.6
|
||||||
files:
|
files:
|
||||||
- path: /var/lib/anchor/calico-etcd-bootstrap
|
- path: /var/lib/anchor/calico-etcd-bootstrap
|
||||||
content: ""
|
content: ""
|
||||||
|
|
|
@ -16,15 +16,15 @@ Sample Document
|
||||||
data:
|
data:
|
||||||
files:
|
files:
|
||||||
- path: /opt/kubernetes/bin/kubelet
|
- path: /opt/kubernetes/bin/kubelet
|
||||||
tar_url: https://dl.k8s.io/v1.10.11/kubernetes-node-linux-amd64.tar.gz
|
tar_url: https://dl.k8s.io/v1.11.6/kubernetes-node-linux-amd64.tar.gz
|
||||||
tar_path: kubernetes/node/bin/kubelet
|
tar_path: kubernetes/node/bin/kubelet
|
||||||
mode: 0555
|
mode: 0555
|
||||||
images:
|
images:
|
||||||
haproxy: haproxy:1.8.3
|
haproxy: haproxy:1.8.3
|
||||||
helm:
|
helm:
|
||||||
helm: lachlanevenson/k8s-helm:v2.10.0
|
helm: lachlanevenson/k8s-helm:v2.12.1
|
||||||
kubernetes:
|
kubernetes:
|
||||||
kubectl: gcr.io/google_containers/hyperkube-amd64:v1.10.11
|
kubectl: gcr.io/google_containers/hyperkube-amd64:v1.11.6
|
||||||
packages:
|
packages:
|
||||||
repositories:
|
repositories:
|
||||||
- deb http://apt.dockerproject.org/repo ubuntu-xenial main
|
- deb http://apt.dockerproject.org/repo ubuntu-xenial main
|
||||||
|
|
|
@ -36,12 +36,12 @@ data:
|
||||||
images:
|
images:
|
||||||
armada: quay.io/airshipit/armada:master
|
armada: quay.io/airshipit/armada:master
|
||||||
helm:
|
helm:
|
||||||
tiller: gcr.io/kubernetes-helm/tiller:v2.10.0
|
tiller: gcr.io/kubernetes-helm/tiller:v2.12.1
|
||||||
kubernetes:
|
kubernetes:
|
||||||
apiserver: gcr.io/google_containers/hyperkube-amd64:v1.10.11
|
apiserver: gcr.io/google_containers/hyperkube-amd64:v1.11.6
|
||||||
controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.10.11
|
controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.11.6
|
||||||
etcd: quay.io/coreos/etcd:v3.2.14
|
etcd: quay.io/coreos/etcd:v3.2.18
|
||||||
scheduler: gcr.io/google_containers/hyperkube-amd64:v1.10.11
|
scheduler: gcr.io/google_containers/hyperkube-amd64:v1.11.6
|
||||||
files:
|
files:
|
||||||
- path: /var/lib/anchor/calico-etcd-bootstrap
|
- path: /var/lib/anchor/calico-etcd-bootstrap
|
||||||
content: "# placeholder for triggering calico etcd bootstrapping"
|
content: "# placeholder for triggering calico etcd bootstrapping"
|
||||||
|
|
|
@ -13,7 +13,7 @@ data:
|
||||||
enable: true
|
enable: true
|
||||||
files:
|
files:
|
||||||
- path: /opt/kubernetes/bin/kubelet
|
- path: /opt/kubernetes/bin/kubelet
|
||||||
tar_url: https://dl.k8s.io/v1.10.11/kubernetes-node-linux-amd64.tar.gz
|
tar_url: https://dl.k8s.io/v1.11.6/kubernetes-node-linux-amd64.tar.gz
|
||||||
tar_path: kubernetes/node/bin/kubelet
|
tar_path: kubernetes/node/bin/kubelet
|
||||||
mode: 0555
|
mode: 0555
|
||||||
- path: /etc/systemd/system/kube-cgroup.service
|
- path: /etc/systemd/system/kube-cgroup.service
|
||||||
|
@ -67,9 +67,9 @@ data:
|
||||||
images:
|
images:
|
||||||
haproxy: haproxy:1.8.3
|
haproxy: haproxy:1.8.3
|
||||||
helm:
|
helm:
|
||||||
helm: lachlanevenson/k8s-helm:v2.10.0
|
helm: lachlanevenson/k8s-helm:v2.12.1
|
||||||
kubernetes:
|
kubernetes:
|
||||||
kubectl: gcr.io/google_containers/hyperkube-amd64:v1.10.11
|
kubectl: gcr.io/google_containers/hyperkube-amd64:v1.11.6
|
||||||
packages:
|
packages:
|
||||||
repositories:
|
repositories:
|
||||||
- deb http://apt.dockerproject.org/repo ubuntu-xenial main
|
- deb http://apt.dockerproject.org/repo ubuntu-xenial main
|
||||||
|
|
|
@ -186,7 +186,7 @@ data:
|
||||||
values:
|
values:
|
||||||
images:
|
images:
|
||||||
tags:
|
tags:
|
||||||
proxy: gcr.io/google_containers/hyperkube-amd64:v1.10.11
|
proxy: gcr.io/google_containers/hyperkube-amd64:v1.11.6
|
||||||
network:
|
network:
|
||||||
kubernetes_netloc: 127.0.0.1:6553
|
kubernetes_netloc: 127.0.0.1:6553
|
||||||
source:
|
source:
|
||||||
|
@ -389,8 +389,8 @@ data:
|
||||||
filename: calico-etcd-bootstrap
|
filename: calico-etcd-bootstrap
|
||||||
images:
|
images:
|
||||||
tags:
|
tags:
|
||||||
etcd: quay.io/coreos/etcd:v3.2.14
|
etcd: quay.io/coreos/etcd:v3.2.18
|
||||||
etcdctl: quay.io/coreos/etcd:v3.2.14
|
etcdctl: quay.io/coreos/etcd:v3.2.18
|
||||||
nodes:
|
nodes:
|
||||||
- name: n0
|
- name: n0
|
||||||
tls:
|
tls:
|
||||||
|
@ -578,8 +578,8 @@ data:
|
||||||
|
|
||||||
images:
|
images:
|
||||||
tags:
|
tags:
|
||||||
coredns: coredns/coredns:1.1.2
|
coredns: coredns/coredns:1.1.3
|
||||||
test: coredns/coredns:1.1.2
|
test: coredns/coredns:1.1.3
|
||||||
source:
|
source:
|
||||||
type: local
|
type: local
|
||||||
location: /etc/genesis/armada/assets/charts
|
location: /etc/genesis/armada/assets/charts
|
||||||
|
@ -638,7 +638,7 @@ data:
|
||||||
|
|
||||||
images:
|
images:
|
||||||
tags:
|
tags:
|
||||||
anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.11
|
anchor: gcr.io/google_containers/hyperkube-amd64:v1.11.6
|
||||||
haproxy: haproxy:1.8.3
|
haproxy: haproxy:1.8.3
|
||||||
test: python:3.6
|
test: python:3.6
|
||||||
|
|
||||||
|
@ -724,8 +724,8 @@ data:
|
||||||
endpoints: https://127.0.0.1:2378
|
endpoints: https://127.0.0.1:2378
|
||||||
images:
|
images:
|
||||||
tags:
|
tags:
|
||||||
anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.11
|
anchor: gcr.io/google_containers/hyperkube-amd64:v1.11.6
|
||||||
apiserver: gcr.io/google_containers/hyperkube-amd64:v1.10.11
|
apiserver: gcr.io/google_containers/hyperkube-amd64:v1.11.6
|
||||||
network:
|
network:
|
||||||
kubernetes_service_ip: 10.96.0.1
|
kubernetes_service_ip: 10.96.0.1
|
||||||
pod_cidr: 10.97.0.0/16
|
pod_cidr: 10.97.0.0/16
|
||||||
|
@ -789,8 +789,8 @@ data:
|
||||||
values:
|
values:
|
||||||
images:
|
images:
|
||||||
tags:
|
tags:
|
||||||
anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.11
|
anchor: gcr.io/google_containers/hyperkube-amd64:v1.11.6
|
||||||
controller_manager: gcr.io/google_containers/hyperkube-amd64:v1.10.11
|
controller_manager: gcr.io/google_containers/hyperkube-amd64:v1.11.6
|
||||||
secrets:
|
secrets:
|
||||||
service_account:
|
service_account:
|
||||||
private_key: placeholder
|
private_key: placeholder
|
||||||
|
@ -862,8 +862,8 @@ data:
|
||||||
|
|
||||||
images:
|
images:
|
||||||
tags:
|
tags:
|
||||||
anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.11
|
anchor: gcr.io/google_containers/hyperkube-amd64:v1.11.6
|
||||||
scheduler: gcr.io/google_containers/hyperkube-amd64:v1.10.11
|
scheduler: gcr.io/google_containers/hyperkube-amd64:v1.11.6
|
||||||
|
|
||||||
source:
|
source:
|
||||||
type: local
|
type: local
|
||||||
|
@ -1058,8 +1058,8 @@ data:
|
||||||
host_etc_path: /etc/etcd/kubernetes
|
host_etc_path: /etc/etcd/kubernetes
|
||||||
images:
|
images:
|
||||||
tags:
|
tags:
|
||||||
etcd: quay.io/coreos/etcd:v3.2.14
|
etcd: quay.io/coreos/etcd:v3.2.18
|
||||||
etcdctl: quay.io/coreos/etcd:v3.2.14
|
etcdctl: quay.io/coreos/etcd:v3.2.18
|
||||||
nodes:
|
nodes:
|
||||||
- name: n0
|
- name: n0
|
||||||
tls:
|
tls:
|
||||||
|
@ -1133,7 +1133,7 @@ data:
|
||||||
values:
|
values:
|
||||||
images:
|
images:
|
||||||
tags:
|
tags:
|
||||||
tiller: gcr.io/kubernetes-helm/tiller:v2.10.0
|
tiller: gcr.io/kubernetes-helm/tiller:v2.12.1
|
||||||
labels:
|
labels:
|
||||||
node_selector_key: ucp-control-plane
|
node_selector_key: ucp-control-plane
|
||||||
node_selector_value: enabled
|
node_selector_value: enabled
|
||||||
|
|
|
@ -30,12 +30,12 @@ data:
|
||||||
images:
|
images:
|
||||||
armada: quay.io/airshipit/armada:master
|
armada: quay.io/airshipit/armada:master
|
||||||
helm:
|
helm:
|
||||||
tiller: gcr.io/kubernetes-helm/tiller:v2.10.0
|
tiller: gcr.io/kubernetes-helm/tiller:v2.12.1
|
||||||
kubernetes:
|
kubernetes:
|
||||||
apiserver: gcr.io/google_containers/hyperkube-amd64:v1.10.11
|
apiserver: gcr.io/google_containers/hyperkube-amd64:v1.11.6
|
||||||
controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.10.11
|
controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.11.6
|
||||||
etcd: quay.io/coreos/etcd:v3.2.14
|
etcd: quay.io/coreos/etcd:v3.2.18
|
||||||
scheduler: gcr.io/google_containers/hyperkube-amd64:v1.10.11
|
scheduler: gcr.io/google_containers/hyperkube-amd64:v1.11.6
|
||||||
files:
|
files:
|
||||||
- path: /var/lib/anchor/calico-etcd-bootstrap
|
- path: /var/lib/anchor/calico-etcd-bootstrap
|
||||||
content: "# placeholder for triggering calico etcd bootstrapping"
|
content: "# placeholder for triggering calico etcd bootstrapping"
|
||||||
|
|
|
@ -10,7 +10,7 @@ metadata:
|
||||||
data:
|
data:
|
||||||
files:
|
files:
|
||||||
- path: /opt/kubernetes/bin/kubelet
|
- path: /opt/kubernetes/bin/kubelet
|
||||||
tar_url: https://dl.k8s.io/v1.10.11/kubernetes-node-linux-amd64.tar.gz
|
tar_url: https://dl.k8s.io/v1.11.6/kubernetes-node-linux-amd64.tar.gz
|
||||||
tar_path: kubernetes/node/bin/kubelet
|
tar_path: kubernetes/node/bin/kubelet
|
||||||
mode: 0555
|
mode: 0555
|
||||||
- path: /etc/logrotate.d/json-logrotate
|
- path: /etc/logrotate.d/json-logrotate
|
||||||
|
@ -33,9 +33,9 @@ data:
|
||||||
images:
|
images:
|
||||||
haproxy: haproxy:1.8.3
|
haproxy: haproxy:1.8.3
|
||||||
helm:
|
helm:
|
||||||
helm: lachlanevenson/k8s-helm:v2.10.0
|
helm: lachlanevenson/k8s-helm:v2.12.1
|
||||||
kubernetes:
|
kubernetes:
|
||||||
kubectl: gcr.io/google_containers/hyperkube-amd64:v1.10.11
|
kubectl: gcr.io/google_containers/hyperkube-amd64:v1.11.6
|
||||||
packages:
|
packages:
|
||||||
repositories:
|
repositories:
|
||||||
- deb http://apt.dockerproject.org/repo ubuntu-xenial main
|
- deb http://apt.dockerproject.org/repo ubuntu-xenial main
|
||||||
|
|
|
@ -201,7 +201,7 @@ data:
|
||||||
values:
|
values:
|
||||||
images:
|
images:
|
||||||
tags:
|
tags:
|
||||||
proxy: gcr.io/google_containers/hyperkube-amd64:v1.10.11
|
proxy: gcr.io/google_containers/hyperkube-amd64:v1.11.6
|
||||||
network:
|
network:
|
||||||
kubernetes_netloc: 127.0.0.1:6553
|
kubernetes_netloc: 127.0.0.1:6553
|
||||||
source:
|
source:
|
||||||
|
@ -401,8 +401,8 @@ data:
|
||||||
filename: calico-etcd-bootstrap
|
filename: calico-etcd-bootstrap
|
||||||
images:
|
images:
|
||||||
tags:
|
tags:
|
||||||
etcd: quay.io/coreos/etcd:v3.2.14
|
etcd: quay.io/coreos/etcd:v3.2.18
|
||||||
etcdctl: quay.io/coreos/etcd:v3.2.14
|
etcdctl: quay.io/coreos/etcd:v3.2.18
|
||||||
nodes:
|
nodes:
|
||||||
- name: n0
|
- name: n0
|
||||||
tls:
|
tls:
|
||||||
|
@ -590,8 +590,8 @@ data:
|
||||||
|
|
||||||
images:
|
images:
|
||||||
tags:
|
tags:
|
||||||
coredns: coredns/coredns:1.1.2
|
coredns: coredns/coredns:1.1.3
|
||||||
test: coredns/coredns:1.1.2
|
test: coredns/coredns:1.1.3
|
||||||
source:
|
source:
|
||||||
type: local
|
type: local
|
||||||
location: /etc/genesis/armada/assets/charts
|
location: /etc/genesis/armada/assets/charts
|
||||||
|
@ -646,7 +646,7 @@ data:
|
||||||
|
|
||||||
images:
|
images:
|
||||||
tags:
|
tags:
|
||||||
anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.11
|
anchor: gcr.io/google_containers/hyperkube-amd64:v1.11.6
|
||||||
haproxy: haproxy:1.8.3
|
haproxy: haproxy:1.8.3
|
||||||
test: python:3.6
|
test: python:3.6
|
||||||
|
|
||||||
|
@ -732,8 +732,8 @@ data:
|
||||||
endpoints: https://127.0.0.1:2378
|
endpoints: https://127.0.0.1:2378
|
||||||
images:
|
images:
|
||||||
tags:
|
tags:
|
||||||
anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.11
|
anchor: gcr.io/google_containers/hyperkube-amd64:v1.11.6
|
||||||
apiserver: gcr.io/google_containers/hyperkube-amd64:v1.10.11
|
apiserver: gcr.io/google_containers/hyperkube-amd64:v1.11.6
|
||||||
secrets:
|
secrets:
|
||||||
service_account:
|
service_account:
|
||||||
public_key: placeholder
|
public_key: placeholder
|
||||||
|
@ -809,8 +809,8 @@ data:
|
||||||
values:
|
values:
|
||||||
images:
|
images:
|
||||||
tags:
|
tags:
|
||||||
anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.11
|
anchor: gcr.io/google_containers/hyperkube-amd64:v1.11.6
|
||||||
controller_manager: gcr.io/google_containers/hyperkube-amd64:v1.10.11
|
controller_manager: gcr.io/google_containers/hyperkube-amd64:v1.11.6
|
||||||
secrets:
|
secrets:
|
||||||
service_account:
|
service_account:
|
||||||
private_key: placeholder
|
private_key: placeholder
|
||||||
|
@ -882,8 +882,8 @@ data:
|
||||||
|
|
||||||
images:
|
images:
|
||||||
tags:
|
tags:
|
||||||
anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.11
|
anchor: gcr.io/google_containers/hyperkube-amd64:v1.11.6
|
||||||
scheduler: gcr.io/google_containers/hyperkube-amd64:v1.10.11
|
scheduler: gcr.io/google_containers/hyperkube-amd64:v1.11.6
|
||||||
|
|
||||||
source:
|
source:
|
||||||
type: local
|
type: local
|
||||||
|
@ -1079,8 +1079,8 @@ data:
|
||||||
host_etc_path: /etc/etcd/kubernetes
|
host_etc_path: /etc/etcd/kubernetes
|
||||||
images:
|
images:
|
||||||
tags:
|
tags:
|
||||||
etcd: quay.io/coreos/etcd:v3.2.14
|
etcd: quay.io/coreos/etcd:v3.2.18
|
||||||
etcdctl: quay.io/coreos/etcd:v3.2.14
|
etcdctl: quay.io/coreos/etcd:v3.2.18
|
||||||
nodes:
|
nodes:
|
||||||
- name: n0
|
- name: n0
|
||||||
tls:
|
tls:
|
||||||
|
@ -1687,7 +1687,7 @@ data:
|
||||||
values:
|
values:
|
||||||
images:
|
images:
|
||||||
tags:
|
tags:
|
||||||
tiller: gcr.io/kubernetes-helm/tiller:v2.10.0
|
tiller: gcr.io/kubernetes-helm/tiller:v2.12.1
|
||||||
labels:
|
labels:
|
||||||
node_selector_key: ucp-control-plane
|
node_selector_key: ucp-control-plane
|
||||||
node_selector_value: enabled
|
node_selector_value: enabled
|
||||||
|
|
|
@ -103,17 +103,17 @@ VALID_DOCS = [
|
||||||
'images': {
|
'images': {
|
||||||
'armada': 'quay.io/airshipit/armada:master',
|
'armada': 'quay.io/airshipit/armada:master',
|
||||||
'helm': {
|
'helm': {
|
||||||
'tiller': 'gcr.io/kubernetes-helm/tiller:v2.10.0'
|
'tiller': 'gcr.io/kubernetes-helm/tiller:v2.12.1'
|
||||||
},
|
},
|
||||||
'kubernetes': {
|
'kubernetes': {
|
||||||
'apiserver':
|
'apiserver':
|
||||||
'gcr.io/google_containers/hyperkube-amd64:v1.10.11',
|
'gcr.io/google_containers/hyperkube-amd64:v1.11.6',
|
||||||
'controller-manager':
|
'controller-manager':
|
||||||
'gcr.io/google_containers/hyperkube-amd64:v1.10.11',
|
'gcr.io/google_containers/hyperkube-amd64:v1.11.6',
|
||||||
'etcd':
|
'etcd':
|
||||||
'quay.io/coreos/etcd:v3.2.14',
|
'quay.io/coreos/etcd:v3.2.18',
|
||||||
'scheduler':
|
'scheduler':
|
||||||
'gcr.io/google_containers/hyperkube-amd64:v1.10.11'
|
'gcr.io/google_containers/hyperkube-amd64:v1.11.6'
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
'ip':
|
'ip':
|
||||||
|
@ -149,7 +149,7 @@ VALID_DOCS = [
|
||||||
'tar_path':
|
'tar_path':
|
||||||
'kubernetes/node/bin/kubelet',
|
'kubernetes/node/bin/kubelet',
|
||||||
'tar_url':
|
'tar_url':
|
||||||
'https://dl.k8s.io/v1.10.11/kubernetes-node-linux-amd64.tar.gz'
|
'https://dl.k8s.io/v1.11.6/kubernetes-node-linux-amd64.tar.gz'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
'content':
|
'content':
|
||||||
|
@ -162,11 +162,11 @@ VALID_DOCS = [
|
||||||
'images': {
|
'images': {
|
||||||
'haproxy': 'haproxy:1.8.3',
|
'haproxy': 'haproxy:1.8.3',
|
||||||
'helm': {
|
'helm': {
|
||||||
'helm': 'lachlanevenson/k8s-helm:v2.10.0'
|
'helm': 'lachlanevenson/k8s-helm:v2.12.1'
|
||||||
},
|
},
|
||||||
'kubernetes': {
|
'kubernetes': {
|
||||||
'kubectl':
|
'kubectl':
|
||||||
'gcr.io/google_containers/hyperkube-amd64:v1.10.11'
|
'gcr.io/google_containers/hyperkube-amd64:v1.11.6'
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
'packages': {
|
'packages': {
|
||||||
|
|
|
@ -32,12 +32,12 @@ data:
|
||||||
images:
|
images:
|
||||||
armada: quay.io/airshipit/armada:master
|
armada: quay.io/airshipit/armada:master
|
||||||
helm:
|
helm:
|
||||||
tiller: gcr.io/kubernetes-helm/tiller:v2.9.1
|
tiller: gcr.io/kubernetes-helm/tiller:v2.12.1
|
||||||
kubernetes:
|
kubernetes:
|
||||||
apiserver: gcr.io/google_containers/hyperkube-amd64:v1.10.11
|
apiserver: gcr.io/google_containers/hyperkube-amd64:v1.11.6
|
||||||
controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.10.11
|
controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.11.6
|
||||||
etcd: quay.io/coreos/etcd:v3.2.14
|
etcd: quay.io/coreos/etcd:v3.2.18
|
||||||
scheduler: gcr.io/google_containers/hyperkube-amd64:v1.10.11
|
scheduler: gcr.io/google_containers/hyperkube-amd64:v1.11.6
|
||||||
files:
|
files:
|
||||||
- path: /var/lib/anchor/calico-etcd-bootstrap
|
- path: /var/lib/anchor/calico-etcd-bootstrap
|
||||||
content: "# placeholder for triggering calico etcd bootstrapping"
|
content: "# placeholder for triggering calico etcd bootstrapping"
|
||||||
|
|
|
@ -14,7 +14,7 @@ data:
|
||||||
# attempt to actually run Kubernetes, only to construct the genesis and
|
# attempt to actually run Kubernetes, only to construct the genesis and
|
||||||
# join scripts.
|
# join scripts.
|
||||||
# - path: /opt/kubernetes/bin/kubelet
|
# - path: /opt/kubernetes/bin/kubelet
|
||||||
# tar_url: https://dl.k8s.io/v1.10.11/kubernetes-node-linux-amd64.tar.gz
|
# tar_url: https://dl.k8s.io/v1.11.6/kubernetes-node-linux-amd64.tar.gz
|
||||||
# tar_path: kubernetes/node/bin/kubelet
|
# tar_path: kubernetes/node/bin/kubelet
|
||||||
# mode: 0555
|
# mode: 0555
|
||||||
- path: /etc/logrotate.d/json-logrotate
|
- path: /etc/logrotate.d/json-logrotate
|
||||||
|
@ -37,9 +37,9 @@ data:
|
||||||
images:
|
images:
|
||||||
haproxy: haproxy:1.8.3
|
haproxy: haproxy:1.8.3
|
||||||
helm:
|
helm:
|
||||||
helm: lachlanevenson/k8s-helm:v2.9.1
|
helm: lachlanevenson/k8s-helm:v2.12.1
|
||||||
kubernetes:
|
kubernetes:
|
||||||
kubectl: gcr.io/google_containers/hyperkube-amd64:v1.10.11
|
kubectl: gcr.io/google_containers/hyperkube-amd64:v1.11.6
|
||||||
packages:
|
packages:
|
||||||
repositories:
|
repositories:
|
||||||
- deb http://apt.dockerproject.org/repo ubuntu-xenial main
|
- deb http://apt.dockerproject.org/repo ubuntu-xenial main
|
||||||
|
|
|
@ -186,7 +186,7 @@ data:
|
||||||
values:
|
values:
|
||||||
images:
|
images:
|
||||||
tags:
|
tags:
|
||||||
proxy: gcr.io/google_containers/hyperkube-amd64:v1.10.11
|
proxy: gcr.io/google_containers/hyperkube-amd64:v1.11.6
|
||||||
network:
|
network:
|
||||||
kubernetes_netloc: 127.0.0.1:6553
|
kubernetes_netloc: 127.0.0.1:6553
|
||||||
source:
|
source:
|
||||||
|
@ -329,8 +329,8 @@ data:
|
||||||
filename: calico-etcd-bootstrap
|
filename: calico-etcd-bootstrap
|
||||||
images:
|
images:
|
||||||
tags:
|
tags:
|
||||||
etcd: quay.io/coreos/etcd:v3.2.14
|
etcd: quay.io/coreos/etcd:v3.2.18
|
||||||
etcdctl: quay.io/coreos/etcd:v3.2.14
|
etcdctl: quay.io/coreos/etcd:v3.2.18
|
||||||
nodes:
|
nodes:
|
||||||
- name: n0
|
- name: n0
|
||||||
tls:
|
tls:
|
||||||
|
@ -502,8 +502,8 @@ data:
|
||||||
|
|
||||||
images:
|
images:
|
||||||
tags:
|
tags:
|
||||||
coredns: coredns/coredns:1.1.2
|
coredns: coredns/coredns:1.1.3
|
||||||
test: coredns/coredns:1.1.2
|
test: coredns/coredns:1.1.3
|
||||||
source:
|
source:
|
||||||
type: local
|
type: local
|
||||||
location: /etc/genesis/armada/assets/charts
|
location: /etc/genesis/armada/assets/charts
|
||||||
|
@ -562,7 +562,7 @@ data:
|
||||||
|
|
||||||
images:
|
images:
|
||||||
tags:
|
tags:
|
||||||
anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.11
|
anchor: gcr.io/google_containers/hyperkube-amd64:v1.11.6
|
||||||
haproxy: haproxy:1.8.3
|
haproxy: haproxy:1.8.3
|
||||||
test: python:3.6
|
test: python:3.6
|
||||||
|
|
||||||
|
@ -654,8 +654,8 @@ data:
|
||||||
endpoints: https://127.0.0.1:2378
|
endpoints: https://127.0.0.1:2378
|
||||||
images:
|
images:
|
||||||
tags:
|
tags:
|
||||||
anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.11
|
anchor: gcr.io/google_containers/hyperkube-amd64:v1.11.6
|
||||||
apiserver: gcr.io/google_containers/hyperkube-amd64:v1.10.11
|
apiserver: gcr.io/google_containers/hyperkube-amd64:v1.11.6
|
||||||
secrets:
|
secrets:
|
||||||
service_account:
|
service_account:
|
||||||
public_key: placeholder
|
public_key: placeholder
|
||||||
|
@ -731,8 +731,8 @@ data:
|
||||||
values:
|
values:
|
||||||
images:
|
images:
|
||||||
tags:
|
tags:
|
||||||
anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.11
|
anchor: gcr.io/google_containers/hyperkube-amd64:v1.11.6
|
||||||
controller_manager: gcr.io/google_containers/hyperkube-amd64:v1.10.11
|
controller_manager: gcr.io/google_containers/hyperkube-amd64:v1.11.6
|
||||||
secrets:
|
secrets:
|
||||||
service_account:
|
service_account:
|
||||||
private_key: placeholder
|
private_key: placeholder
|
||||||
|
@ -804,8 +804,8 @@ data:
|
||||||
|
|
||||||
images:
|
images:
|
||||||
tags:
|
tags:
|
||||||
anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.11
|
anchor: gcr.io/google_containers/hyperkube-amd64:v1.11.6
|
||||||
scheduler: gcr.io/google_containers/hyperkube-amd64:v1.10.11
|
scheduler: gcr.io/google_containers/hyperkube-amd64:v1.11.6
|
||||||
|
|
||||||
source:
|
source:
|
||||||
type: local
|
type: local
|
||||||
|
@ -943,8 +943,8 @@ data:
|
||||||
host_etc_path: /etc/etcd/kubernetes
|
host_etc_path: /etc/etcd/kubernetes
|
||||||
images:
|
images:
|
||||||
tags:
|
tags:
|
||||||
etcd: quay.io/coreos/etcd:v3.2.14
|
etcd: quay.io/coreos/etcd:v3.2.18
|
||||||
etcdctl: quay.io/coreos/etcd:v3.2.14
|
etcdctl: quay.io/coreos/etcd:v3.2.18
|
||||||
nodes:
|
nodes:
|
||||||
- name: n0
|
- name: n0
|
||||||
tls:
|
tls:
|
||||||
|
@ -1002,7 +1002,7 @@ data:
|
||||||
values:
|
values:
|
||||||
images:
|
images:
|
||||||
tags:
|
tags:
|
||||||
tiller: gcr.io/kubernetes-helm/tiller:v2.9.1
|
tiller: gcr.io/kubernetes-helm/tiller:v2.12.1
|
||||||
labels:
|
labels:
|
||||||
node_selector_key: ucp-control-plane
|
node_selector_key: ucp-control-plane
|
||||||
node_selector_value: enabled
|
node_selector_value: enabled
|
||||||
|
|
|
@ -3,11 +3,11 @@ IMAGE_CALICO_CNI=quay.io/calico/cni:v1.11.2
|
||||||
IMAGE_CALICO_CTL=quay.io/calico/ctl:v1.6.3
|
IMAGE_CALICO_CTL=quay.io/calico/ctl:v1.6.3
|
||||||
IMAGE_CALICO_KUBE_CONTROLLERS=quay.io/calico/kube-controllers:v1.0.2
|
IMAGE_CALICO_KUBE_CONTROLLERS=quay.io/calico/kube-controllers:v1.0.2
|
||||||
IMAGE_CALICO_NODE=quay.io/calico/node:v2.6.5
|
IMAGE_CALICO_NODE=quay.io/calico/node:v2.6.5
|
||||||
IMAGE_COREDNS=coredns/coredns:1.1.2
|
IMAGE_COREDNS=coredns/coredns:1.1.3
|
||||||
IMAGE_DEP_CHECK=quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
|
IMAGE_DEP_CHECK=quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
|
||||||
IMAGE_ETCD=quay.io/coreos/etcd:v3.2.14
|
IMAGE_ETCD=quay.io/coreos/etcd:v3.2.18
|
||||||
IMAGE_HAPROXY=haproxy:1.8.3
|
IMAGE_HAPROXY=haproxy:1.8.3
|
||||||
IMAGE_HELM=lachlanevenson/k8s-helm:v2.10.0
|
IMAGE_HELM=lachlanevenson/k8s-helm:v2.12.1
|
||||||
IMAGE_HYPERKUBE=gcr.io/google_containers/hyperkube-amd64:v1.10.11
|
IMAGE_HYPERKUBE=gcr.io/google_containers/hyperkube-amd64:v1.11.6
|
||||||
IMAGE_TILLER=gcr.io/kubernetes-helm/tiller:v2.10.0
|
IMAGE_TILLER=gcr.io/kubernetes-helm/tiller:v2.12.1
|
||||||
KUBELET_URL=https://dl.k8s.io/v1.10.11/kubernetes-node-linux-amd64.tar.gz
|
KUBELET_URL=https://dl.k8s.io/v1.11.6/kubernetes-node-linux-amd64.tar.gz
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
set -x
|
set -x
|
||||||
|
|
||||||
HELM=$1
|
HELM=$1
|
||||||
HELM_ARTIFACT_URL=${HELM_ARTIFACT_URL:-"https://storage.googleapis.com/kubernetes-helm/helm-v2.10.0-linux-amd64.tar.gz"}
|
HELM_ARTIFACT_URL=${HELM_ARTIFACT_URL:-"https://storage.googleapis.com/kubernetes-helm/helm-v2.12.1-linux-amd64.tar.gz"}
|
||||||
|
|
||||||
|
|
||||||
function install_helm_binary {
|
function install_helm_binary {
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
# source_name, tag, cache_name
|
# source_name, tag, cache_name
|
||||||
coredns/coredns,0.9.9,coredns
|
coredns/coredns,0.9.9,coredns
|
||||||
gcr.io/google_containers/hyperkube-amd64,v1.10.11,hyperkube
|
gcr.io/google_containers/hyperkube-amd64,v1.11.6,hyperkube
|
||||||
gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64,1.14.4,k8s-dns-dnsmasq-nanny-amd64
|
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-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
|
gcr.io/google_containers/k8s-dns-sidecar-amd64,1.14.4,k8s-dns-sidecar-amd64
|
||||||
gcr.io/kubernetes-helm/tiller,v2.10.0,tiller
|
gcr.io/kubernetes-helm/tiller,v2.12.1,tiller
|
||||||
lachlanevenson/k8s-helm,v2.10.0,helm
|
lachlanevenson/k8s-helm,v2.12.1,helm
|
||||||
quay.io/airshipit/armada,master,armada
|
quay.io/airshipit/armada,master,armada
|
||||||
quay.io/calico/cni,v1.11.0,calico-cni
|
quay.io/calico/cni,v1.11.0,calico-cni
|
||||||
quay.io/calico/ctl,v1.6.1,calico-ctl
|
quay.io/calico/ctl,v1.6.1,calico-ctl
|
||||||
|
|
Loading…
Reference in New Issue