airship
/
promenade
Code Issues Proposed changes

Merge "Upgrade Hyperkube version for k8s 1.16"

This commit is contained in:
Zuul 2019-12-23 22:33:00 +00:00 committed by Gerrit Code Review
parent 1a1c69c064 b77c6fe637
commit fe29812aca
29 changed files with 101 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charts/apiserver-webhook/values.yaml
View File

@ -17,7 +17,7 @@ release_uuid: null
images: images:
tags: tags:
apiserver: gcr.io/google_containers/hyperkube-amd64:v1.11.6 apiserver: gcr.io/google_containers/hyperkube-amd64:v1.16.2
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

8
charts/apiserver/values.yaml
View File

@ -58,9 +58,9 @@ const:
images: images:
tags: tags:
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
anchor: gcr.io/google_containers/hyperkube-amd64:v1.11.6 anchor: gcr.io/google_containers/hyperkube-amd64:v1.16.2
apiserver: gcr.io/google_containers/hyperkube-amd64:v1.11.6 apiserver: gcr.io/google_containers/hyperkube-amd64:v1.16.2
key_rotate: gcr.io/google_containers/hyperkube-amd64:v1.11.6 key_rotate: gcr.io/google_containers/hyperkube-amd64:v1.16.2
pull_policy: "IfNotPresent" pull_policy: "IfNotPresent"
local_registry: local_registry:
active: false active: false
@ -166,8 +166,6 @@ apiserver:
- --service-cluster-ip-range=10.96.0.0/16 - --service-cluster-ip-range=10.96.0.0/16
- --endpoint-reconciler-type=lease - --endpoint-reconciler-type=lease
- --feature-gates=PodShareProcessNamespace=true - --feature-gates=PodShareProcessNamespace=true
# NOTE(mark-burnett): This flag is removed in Kubernetes 1.11
- --repair-malformed-updates=false
- --v=3 - --v=3
etcd: etcd:
endpoints: https://kubernetes-etcd.kube-system.svc.cluster.local endpoints: https://kubernetes-etcd.kube-system.svc.cluster.local

4
charts/controller_manager/values.yaml
View File

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

2
charts/haproxy/values.yaml
View File

@ -64,7 +64,7 @@ conf:
images: images:
tags: tags:
anchor: gcr.io/google_containers/hyperkube-amd64:v1.11.6 anchor: gcr.io/google_containers/hyperkube-amd64:v1.16.2
haproxy: haproxy:1.8.19 haproxy: haproxy:1.8.19
test: python:3.6 test: python:3.6
pull_policy: "IfNotPresent" pull_policy: "IfNotPresent"

2
charts/promenade/values.yaml
View File

@ -49,7 +49,7 @@ conf:
images: images:
tags: tags:
monitoring_image: busybox:1.28.3 monitoring_image: busybox:1.28.3
hyperkube: gcr.io/google_containers/hyperkube-amd64:v1.11.6 hyperkube: gcr.io/google_containers/hyperkube-amd64:v1.16.2
promenade: quay.io/airshipit/promenade:latest promenade: quay.io/airshipit/promenade:latest
ks_user: docker.io/openstackhelm/heat:newton ks_user: docker.io/openstackhelm/heat:newton
ks_service: docker.io/openstackhelm/heat:newton ks_service: docker.io/openstackhelm/heat:newton

2
charts/proxy/values.yaml
View File

@ -50,7 +50,7 @@ pod:
images: images:
tags: tags:
proxy: gcr.io/google_containers/hyperkube-amd64:v1.11.6 proxy: gcr.io/google_containers/hyperkube-amd64:v1.16.2
pull_policy: "IfNotPresent" pull_policy: "IfNotPresent"
proxy: proxy:

4
charts/scheduler/values.yaml
View File

@ -77,8 +77,8 @@ secrets:
images: images:
tags: tags:
anchor: gcr.io/google_containers/hyperkube-amd64:v1.11.6 anchor: gcr.io/google_containers/hyperkube-amd64:v1.16.2
scheduler: gcr.io/google_containers/hyperkube-amd64:v1.11.6 scheduler: gcr.io/google_containers/hyperkube-amd64:v1.16.2
pull_policy: "IfNotPresent" pull_policy: "IfNotPresent"
network: network:

6
doc/source/configuration/genesis.rst
View File

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

8
doc/source/configuration/host-system.rst
View File

@ -16,7 +16,7 @@ Sample Document to run containers in Docker runtime
data: data:
files: files:
- path: /opt/kubernetes/bin/kubelet - path: /opt/kubernetes/bin/kubelet
tar_url: https://dl.k8s.io/v1.11.6/kubernetes-node-linux-amd64.tar.gz tar_url: https://dl.k8s.io/v1.16.2/kubernetes-node-linux-amd64.tar.gz
tar_path: kubernetes/node/bin/kubelet tar_path: kubernetes/node/bin/kubelet
mode: 0555 mode: 0555
images: images:
@ -24,7 +24,7 @@ Sample Document to run containers in Docker runtime
helm: helm:
helm: lachlanevenson/k8s-helm:v2.14.0 helm: lachlanevenson/k8s-helm:v2.14.0
kubernetes: kubernetes:
kubectl: gcr.io/google_containers/hyperkube-amd64:v1.11.6 kubectl: gcr.io/google_containers/hyperkube-amd64:v1.16.2
packages: packages:
repositories: repositories:
- deb http://apt.dockerproject.org/repo ubuntu-xenial main - deb http://apt.dockerproject.org/repo ubuntu-xenial main
@ -83,7 +83,7 @@ Sample Document to run containers in Containerd runtime
data: data:
files: files:
- path: /opt/kubernetes/bin/kubelet - path: /opt/kubernetes/bin/kubelet
tar_url: https://dl.k8s.io/v1.11.6/kubernetes-node-linux-amd64.tar.gz tar_url: https://dl.k8s.io/v1.16.2/kubernetes-node-linux-amd64.tar.gz
tar_path: kubernetes/node/bin/kubelet tar_path: kubernetes/node/bin/kubelet
mode: 0555 mode: 0555
images: images:
@ -91,7 +91,7 @@ Sample Document to run containers in Containerd runtime
helm: helm:
helm: lachlanevenson/k8s-helm:v2.14.0 helm: lachlanevenson/k8s-helm:v2.14.0
kubernetes: kubernetes:
kubectl: gcr.io/google_containers/hyperkube-amd64:v1.11.6 kubectl: gcr.io/google_containers/hyperkube-amd64:v1.16.2
packages: packages:
additional: additional:
- curl - curl

8
examples/basic/Genesis.yaml
View File

@ -25,8 +25,6 @@ data:
- --service-cluster-ip-range=10.96.0.0/16 - --service-cluster-ip-range=10.96.0.0/16
- --endpoint-reconciler-type=lease - --endpoint-reconciler-type=lease
- --feature-gates=PodShareProcessNamespace=true - --feature-gates=PodShareProcessNamespace=true
# NOTE(mark-burnett): This flag is removed in Kubernetes 1.11
- --repair-malformed-updates=false
- --admission-control-config-file=/etc/kubernetes/apiserver/acconfig.yaml - --admission-control-config-file=/etc/kubernetes/apiserver/acconfig.yaml
- --experimental-encryption-provider-config=/etc/kubernetes/apiserver/encryption_provider.yaml - --experimental-encryption-provider-config=/etc/kubernetes/apiserver/encryption_provider.yaml
- --v=3 - --v=3
@ -53,10 +51,10 @@ data:
helm: helm:
tiller: gcr.io/kubernetes-helm/tiller:v2.16.1 tiller: gcr.io/kubernetes-helm/tiller:v2.16.1
kubernetes: kubernetes:
apiserver: gcr.io/google_containers/hyperkube-amd64:v1.11.6 apiserver: gcr.io/google_containers/hyperkube-amd64:v1.16.2
controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.11.6 controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.16.2
etcd: quay.io/coreos/etcd:v3.4.2 etcd: quay.io/coreos/etcd:v3.4.2
scheduler: gcr.io/google_containers/hyperkube-amd64:v1.11.6 scheduler: gcr.io/google_containers/hyperkube-amd64:v1.16.2
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"

5
examples/basic/HostSystem.yaml
View File

@ -13,7 +13,7 @@ data:
enable: true enable: true
files: files:
- path: /opt/kubernetes/bin/hyperkube - path: /opt/kubernetes/bin/hyperkube
docker_image: gcr.io/google_containers/hyperkube-amd64:v1.11.6 docker_image: gcr.io/google_containers/hyperkube-amd64:v1.16.2
file_path: /hyperkube file_path: /hyperkube
mode: 0555 mode: 0555
- path: /opt/kubernetes/bin/kubelet - path: /opt/kubernetes/bin/kubelet
@ -48,8 +48,9 @@ data:
CPUSET_ABSPATH="/sys/fs/cgroup/cpuset/$KUBE_CGROUP" CPUSET_ABSPATH="/sys/fs/cgroup/cpuset/$KUBE_CGROUP"
CPU_ABSPATH="/sys/fs/cgroup/cpu/$KUBE_CGROUP" CPU_ABSPATH="/sys/fs/cgroup/cpu/$KUBE_CGROUP"
MEM_ABSPATH="/sys/fs/cgroup/memory/$KUBE_CGROUP" MEM_ABSPATH="/sys/fs/cgroup/memory/$KUBE_CGROUP"
PIDS_ABSPATH="/sys/fs/cgroup/pids/$KUBE_CGROUP"
for cg in $SYSTEMD_ABSPATH $CPUSET_ABSPATH $CPU_ABSPATH $MEM_ABSPATH for cg in $SYSTEMD_ABSPATH $CPUSET_ABSPATH $CPU_ABSPATH $MEM_ABSPATH $PIDS_ABSPATH
do do
mkdir -p "$cg" mkdir -p "$cg"
done done

16
examples/basic/armada-resources.yaml
View File

@ -160,7 +160,7 @@ data:
values: values:
images: images:
tags: tags:
proxy: gcr.io/google_containers/hyperkube-amd64:v1.11.6 proxy: gcr.io/google_containers/hyperkube-amd64:v1.16.2
network: network:
kubernetes_netloc: 127.0.0.1:6553 kubernetes_netloc: 127.0.0.1:6553
source: source:
@ -627,7 +627,7 @@ data:
images: images:
tags: tags:
anchor: gcr.io/google_containers/hyperkube-amd64:v1.11.6 anchor: gcr.io/google_containers/hyperkube-amd64:v1.16.2
haproxy: haproxy:1.8.3 haproxy: haproxy:1.8.3
test: python:3.6 test: python:3.6
@ -728,8 +728,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.11.6 anchor: gcr.io/google_containers/hyperkube-amd64:v1.16.2
apiserver: gcr.io/google_containers/hyperkube-amd64:v1.11.6 apiserver: gcr.io/google_containers/hyperkube-amd64:v1.16.2
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
@ -794,8 +794,8 @@ data:
values: values:
images: images:
tags: tags:
anchor: gcr.io/google_containers/hyperkube-amd64:v1.11.6 anchor: gcr.io/google_containers/hyperkube-amd64:v1.16.2
controller_manager: gcr.io/google_containers/hyperkube-amd64:v1.11.6 controller_manager: gcr.io/google_containers/hyperkube-amd64:v1.16.2
secrets: secrets:
service_account: service_account:
private_key: placeholder private_key: placeholder
@ -868,8 +868,8 @@ data:
images: images:
tags: tags:
anchor: gcr.io/google_containers/hyperkube-amd64:v1.11.6 anchor: gcr.io/google_containers/hyperkube-amd64:v1.16.2
scheduler: gcr.io/google_containers/hyperkube-amd64:v1.11.6 scheduler: gcr.io/google_containers/hyperkube-amd64:v1.16.2
source: source:
type: local type: local

6
examples/complete/Genesis.yaml
View File

@ -39,10 +39,10 @@ data:
helm: helm:
tiller: gcr.io/kubernetes-helm/tiller:v2.16.1 tiller: gcr.io/kubernetes-helm/tiller:v2.16.1
kubernetes: kubernetes:
apiserver: gcr.io/google_containers/hyperkube-amd64:v1.11.6 apiserver: gcr.io/google_containers/hyperkube-amd64:v1.16.2
controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.11.6 controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.16.2
etcd: quay.io/coreos/etcd:v3.4.2 etcd: quay.io/coreos/etcd:v3.4.2
scheduler: gcr.io/google_containers/hyperkube-amd64:v1.11.6 scheduler: gcr.io/google_containers/hyperkube-amd64:v1.16.2
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"

2
examples/complete/HostSystem.yaml
View File

@ -10,7 +10,7 @@ metadata:
data: data:
files: files:
- path: /opt/kubernetes/bin/hyperkube - path: /opt/kubernetes/bin/hyperkube
docker_image: gcr.io/google_containers/hyperkube-amd64:v1.11.6 docker_image: gcr.io/google_containers/hyperkube-amd64:v1.16.2
file_path: /hyperkube file_path: /hyperkube
mode: 0555 mode: 0555
- path: /opt/kubernetes/bin/kubelet - path: /opt/kubernetes/bin/kubelet

16
examples/complete/armada-resources.yaml
View File

@ -201,7 +201,7 @@ data:
values: values:
images: images:
tags: tags:
proxy: gcr.io/google_containers/hyperkube-amd64:v1.11.6 proxy: gcr.io/google_containers/hyperkube-amd64:v1.16.2
network: network:
kubernetes_netloc: 127.0.0.1:6553 kubernetes_netloc: 127.0.0.1:6553
source: source:
@ -644,7 +644,7 @@ data:
images: images:
tags: tags:
anchor: gcr.io/google_containers/hyperkube-amd64:v1.11.6 anchor: gcr.io/google_containers/hyperkube-amd64:v1.16.2
haproxy: haproxy:1.8.3 haproxy: haproxy:1.8.3
test: python:3.6 test: python:3.6
@ -730,8 +730,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.11.6 anchor: gcr.io/google_containers/hyperkube-amd64:v1.16.2
apiserver: gcr.io/google_containers/hyperkube-amd64:v1.11.6 apiserver: gcr.io/google_containers/hyperkube-amd64:v1.16.2
secrets: secrets:
service_account: service_account:
public_key: placeholder public_key: placeholder
@ -807,8 +807,8 @@ data:
values: values:
images: images:
tags: tags:
anchor: gcr.io/google_containers/hyperkube-amd64:v1.11.6 anchor: gcr.io/google_containers/hyperkube-amd64:v1.16.2
controller_manager: gcr.io/google_containers/hyperkube-amd64:v1.11.6 controller_manager: gcr.io/google_containers/hyperkube-amd64:v1.16.2
secrets: secrets:
service_account: service_account:
private_key: placeholder private_key: placeholder
@ -880,8 +880,8 @@ data:
images: images:
tags: tags:
anchor: gcr.io/google_containers/hyperkube-amd64:v1.11.6 anchor: gcr.io/google_containers/hyperkube-amd64:v1.16.2
scheduler: gcr.io/google_containers/hyperkube-amd64:v1.11.6 scheduler: gcr.io/google_containers/hyperkube-amd64:v1.16.2
source: source:
type: local type: local

8
examples/containerd/Genesis.yaml
View File

@ -25,8 +25,6 @@ data:
- --service-cluster-ip-range=10.96.0.0/16 - --service-cluster-ip-range=10.96.0.0/16
- --endpoint-reconciler-type=lease - --endpoint-reconciler-type=lease
- --feature-gates=PodShareProcessNamespace=true - --feature-gates=PodShareProcessNamespace=true
# NOTE(segorov): This flag is removed in Kubernetes 1.14
- --repair-malformed-updates=false
- --admission-control-config-file=/etc/kubernetes/apiserver/acconfig.yaml - --admission-control-config-file=/etc/kubernetes/apiserver/acconfig.yaml
- --experimental-encryption-provider-config=/etc/kubernetes/apiserver/encryption_provider.yaml - --experimental-encryption-provider-config=/etc/kubernetes/apiserver/encryption_provider.yaml
- --v=3 - --v=3
@ -53,10 +51,10 @@ data:
helm: helm:
tiller: gcr.io/kubernetes-helm/tiller:v2.16.1 tiller: gcr.io/kubernetes-helm/tiller:v2.16.1
kubernetes: kubernetes:
apiserver: gcr.io/google_containers/hyperkube-amd64:v1.11.6 apiserver: gcr.io/google_containers/hyperkube-amd64:v1.16.2
controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.11.6 controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.16.2
etcd: quay.io/coreos/etcd:v3.4.2 etcd: quay.io/coreos/etcd:v3.4.2
scheduler: gcr.io/google_containers/hyperkube-amd64:v1.11.6 scheduler: gcr.io/google_containers/hyperkube-amd64:v1.16.2
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"

5
examples/containerd/HostSystem.yaml
View File

@ -13,7 +13,7 @@ data:
enable: true enable: true
files: files:
- path: /opt/kubernetes/bin/hyperkube - path: /opt/kubernetes/bin/hyperkube
docker_image: gcr.io/google_containers/hyperkube-amd64:v1.11.6 docker_image: gcr.io/google_containers/hyperkube-amd64:v1.16.2
file_path: /hyperkube file_path: /hyperkube
mode: 0555 mode: 0555
- path: /opt/kubernetes/bin/kubelet - path: /opt/kubernetes/bin/kubelet
@ -48,8 +48,9 @@ data:
CPUSET_ABSPATH="/sys/fs/cgroup/cpuset/$KUBE_CGROUP" CPUSET_ABSPATH="/sys/fs/cgroup/cpuset/$KUBE_CGROUP"
CPU_ABSPATH="/sys/fs/cgroup/cpu/$KUBE_CGROUP" CPU_ABSPATH="/sys/fs/cgroup/cpu/$KUBE_CGROUP"
MEM_ABSPATH="/sys/fs/cgroup/memory/$KUBE_CGROUP" MEM_ABSPATH="/sys/fs/cgroup/memory/$KUBE_CGROUP"
PIDS_ABSPATH="/sys/fs/cgroup/pids/$KUBE_CGROUP"
for cg in $SYSTEMD_ABSPATH $CPUSET_ABSPATH $CPU_ABSPATH $MEM_ABSPATH for cg in $SYSTEMD_ABSPATH $CPUSET_ABSPATH $CPU_ABSPATH $MEM_ABSPATH $PIDS_ABSPATH
do do
mkdir -p "$cg" mkdir -p "$cg"
done done

16
examples/containerd/armada-resources.yaml
View File

@ -160,7 +160,7 @@ data:
values: values:
images: images:
tags: tags:
proxy: gcr.io/google_containers/hyperkube-amd64:v1.11.6 proxy: gcr.io/google_containers/hyperkube-amd64:v1.16.2
network: network:
kubernetes_netloc: 127.0.0.1:6553 kubernetes_netloc: 127.0.0.1:6553
source: source:
@ -524,7 +524,7 @@ data:
images: images:
tags: tags:
anchor: gcr.io/google_containers/hyperkube-amd64:v1.11.6 anchor: gcr.io/google_containers/hyperkube-amd64:v1.16.2
haproxy: haproxy:1.8.3 haproxy: haproxy:1.8.3
test: python:3.6 test: python:3.6
@ -626,8 +626,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.11.6 anchor: gcr.io/google_containers/hyperkube-amd64:v1.16.2
apiserver: gcr.io/google_containers/hyperkube-amd64:v1.11.6 apiserver: gcr.io/google_containers/hyperkube-amd64:v1.16.2
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
@ -692,8 +692,8 @@ data:
values: values:
images: images:
tags: tags:
anchor: gcr.io/google_containers/hyperkube-amd64:v1.11.6 anchor: gcr.io/google_containers/hyperkube-amd64:v1.16.2
controller_manager: gcr.io/google_containers/hyperkube-amd64:v1.11.6 controller_manager: gcr.io/google_containers/hyperkube-amd64:v1.16.2
secrets: secrets:
service_account: service_account:
private_key: placeholder private_key: placeholder
@ -766,8 +766,8 @@ data:
images: images:
tags: tags:
anchor: gcr.io/google_containers/hyperkube-amd64:v1.11.6 anchor: gcr.io/google_containers/hyperkube-amd64:v1.16.2
scheduler: gcr.io/google_containers/hyperkube-amd64:v1.11.6 scheduler: gcr.io/google_containers/hyperkube-amd64:v1.16.2
source: source:
type: local type: local

8
examples/gate/Genesis.yaml
View File

@ -25,8 +25,6 @@ data:
- --service-cluster-ip-range=10.96.0.0/16 - --service-cluster-ip-range=10.96.0.0/16
- --endpoint-reconciler-type=lease - --endpoint-reconciler-type=lease
- --feature-gates=PodShareProcessNamespace=true - --feature-gates=PodShareProcessNamespace=true
# NOTE(mark-burnett): This flag is removed in Kubernetes 1.11
- --repair-malformed-updates=false
- --admission-control-config-file=/etc/kubernetes/apiserver/acconfig.yaml - --admission-control-config-file=/etc/kubernetes/apiserver/acconfig.yaml
- --experimental-encryption-provider-config=/etc/kubernetes/apiserver/encryption_provider.yaml - --experimental-encryption-provider-config=/etc/kubernetes/apiserver/encryption_provider.yaml
- --v=3 - --v=3
@ -53,10 +51,10 @@ data:
helm: helm:
tiller: gcr.io/kubernetes-helm/tiller:v2.16.1 tiller: gcr.io/kubernetes-helm/tiller:v2.16.1
kubernetes: kubernetes:
apiserver: gcr.io/google_containers/hyperkube-amd64:v1.11.6 apiserver: gcr.io/google_containers/hyperkube-amd64:v1.16.2
controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.11.6 controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.16.2
etcd: quay.io/coreos/etcd:v3.4.2 etcd: quay.io/coreos/etcd:v3.4.2
scheduler: gcr.io/google_containers/hyperkube-amd64:v1.11.6 scheduler: gcr.io/google_containers/hyperkube-amd64:v1.16.2
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"

5
examples/gate/HostSystem.yaml
View File

@ -13,7 +13,7 @@ data:
enable: true enable: true
files: files:
- path: /opt/kubernetes/bin/hyperkube - path: /opt/kubernetes/bin/hyperkube
docker_image: gcr.io/google_containers/hyperkube-amd64:v1.11.6 docker_image: gcr.io/google_containers/hyperkube-amd64:v1.16.2
file_path: /hyperkube file_path: /hyperkube
mode: 0555 mode: 0555
- path: /opt/kubernetes/bin/kubelet - path: /opt/kubernetes/bin/kubelet
@ -48,8 +48,9 @@ data:
CPUSET_ABSPATH="/sys/fs/cgroup/cpuset/$KUBE_CGROUP" CPUSET_ABSPATH="/sys/fs/cgroup/cpuset/$KUBE_CGROUP"
CPU_ABSPATH="/sys/fs/cgroup/cpu/$KUBE_CGROUP" CPU_ABSPATH="/sys/fs/cgroup/cpu/$KUBE_CGROUP"
MEM_ABSPATH="/sys/fs/cgroup/memory/$KUBE_CGROUP" MEM_ABSPATH="/sys/fs/cgroup/memory/$KUBE_CGROUP"
PIDS_ABSPATH="/sys/fs/cgroup/pids/$KUBE_CGROUP"
for cg in $SYSTEMD_ABSPATH $CPUSET_ABSPATH $CPU_ABSPATH $MEM_ABSPATH for cg in $SYSTEMD_ABSPATH $CPUSET_ABSPATH $CPU_ABSPATH $MEM_ABSPATH $PIDS_ABSPATH
do do
mkdir -p "$cg" mkdir -p "$cg"
done done

24
examples/gate/armada-resources.yaml
View File

@ -160,7 +160,7 @@ data:
values: values:
images: images:
tags: tags:
proxy: gcr.io/google_containers/hyperkube-amd64:v1.11.6 proxy: gcr.io/google_containers/hyperkube-amd64:v1.16.2
network: network:
kubernetes_netloc: 127.0.0.1:6553 kubernetes_netloc: 127.0.0.1:6553
source: source:
@ -252,6 +252,12 @@ data:
upgrade: upgrade:
no_hooks: true no_hooks: true
values: values:
pod:
# Disables AppArmor for calico-etcd
mandatory_access_control:
type: apparmor
example-etcd:
etcd: null
anchor: anchor:
etcdctl_endpoint: 10.96.232.136 etcdctl_endpoint: 10.96.232.136
labels: labels:
@ -365,7 +371,7 @@ data:
no_hooks: true no_hooks: true
values: values:
pod: pod:
# Disables AppArmor in the gate # Disables AppArmor for calico
mandatory_access_control: mandatory_access_control:
type: apparmor type: apparmor
calico-node: calico-node:
@ -524,7 +530,7 @@ data:
images: images:
tags: tags:
anchor: gcr.io/google_containers/hyperkube-amd64:v1.11.6 anchor: gcr.io/google_containers/hyperkube-amd64:v1.16.2
haproxy: haproxy:1.8.3 haproxy: haproxy:1.8.3
test: python:3.6 test: python:3.6
@ -626,8 +632,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.11.6 anchor: gcr.io/google_containers/hyperkube-amd64:v1.16.2
apiserver: gcr.io/google_containers/hyperkube-amd64:v1.11.6 apiserver: gcr.io/google_containers/hyperkube-amd64:v1.16.2
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
@ -692,8 +698,8 @@ data:
values: values:
images: images:
tags: tags:
anchor: gcr.io/google_containers/hyperkube-amd64:v1.11.6 anchor: gcr.io/google_containers/hyperkube-amd64:v1.16.2
controller_manager: gcr.io/google_containers/hyperkube-amd64:v1.11.6 controller_manager: gcr.io/google_containers/hyperkube-amd64:v1.16.2
secrets: secrets:
service_account: service_account:
private_key: placeholder private_key: placeholder
@ -766,8 +772,8 @@ data:
images: images:
tags: tags:
anchor: gcr.io/google_containers/hyperkube-amd64:v1.11.6 anchor: gcr.io/google_containers/hyperkube-amd64:v1.16.2
scheduler: gcr.io/google_containers/hyperkube-amd64:v1.11.6 scheduler: gcr.io/google_containers/hyperkube-amd64:v1.16.2
source: source:
type: local type: local

10
tests/unit/api/test_validatedesign.py
View File

@ -107,13 +107,13 @@ VALID_DOCS = [
}, },
'kubernetes': { 'kubernetes': {
'apiserver': 'apiserver':
'gcr.io/google_containers/hyperkube-amd64:v1.11.6', 'gcr.io/google_containers/hyperkube-amd64:v1.16.2',
'controller-manager': 'controller-manager':
'gcr.io/google_containers/hyperkube-amd64:v1.11.6', 'gcr.io/google_containers/hyperkube-amd64:v1.16.2',
'etcd': 'etcd':
'quay.io/coreos/etcd:v3.4.2', 'quay.io/coreos/etcd:v3.4.2',
'scheduler': 'scheduler':
'gcr.io/google_containers/hyperkube-amd64:v1.11.6' 'gcr.io/google_containers/hyperkube-amd64:v1.16.2'
} }
}, },
'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.11.6/kubernetes-node-linux-amd64.tar.gz' 'https://dl.k8s.io/v1.16.2/kubernetes-node-linux-amd64.tar.gz'
}, },
{ {
'content': 'content':
@ -166,7 +166,7 @@ VALID_DOCS = [
}, },
'kubernetes': { 'kubernetes': {
'kubectl': 'kubectl':
'gcr.io/google_containers/hyperkube-amd64:v1.11.6' 'gcr.io/google_containers/hyperkube-amd64:v1.16.2'
} }
}, },
'packages': { 'packages': {

6
tests/unit/builder_data/simple/Genesis.yaml
View File

@ -36,10 +36,10 @@ data:
helm: helm:
tiller: gcr.io/kubernetes-helm/tiller:v2.16.1 tiller: gcr.io/kubernetes-helm/tiller:v2.16.1
kubernetes: kubernetes:
apiserver: gcr.io/google_containers/hyperkube-amd64:v1.11.6 apiserver: gcr.io/google_containers/hyperkube-amd64:v1.16.2
controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.11.6 controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.16.2
etcd: quay.io/coreos/etcd:v3.4.2 etcd: quay.io/coreos/etcd:v3.4.2
scheduler: gcr.io/google_containers/hyperkube-amd64:v1.11.6 scheduler: gcr.io/google_containers/hyperkube-amd64:v1.16.2
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"

2
tests/unit/builder_data/simple/HostSystem.yaml
View File

@ -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.11.6/kubernetes-node-linux-amd64.tar.gz # tar_url: https://dl.k8s.io/v1.16.2/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

16
tests/unit/builder_data/simple/armada-resources.yaml
View File

@ -161,7 +161,7 @@ data:
values: values:
images: images:
tags: tags:
proxy: gcr.io/google_containers/hyperkube-amd64:v1.11.6 proxy: gcr.io/google_containers/hyperkube-amd64:v1.16.2
network: network:
kubernetes_netloc: 127.0.0.1:6553 kubernetes_netloc: 127.0.0.1:6553
source: source:
@ -537,7 +537,7 @@ data:
images: images:
tags: tags:
anchor: gcr.io/google_containers/hyperkube-amd64:v1.11.6 anchor: gcr.io/google_containers/hyperkube-amd64:v1.16.2
haproxy: haproxy:1.8.3 haproxy: haproxy:1.8.3
test: python:3.6 test: python:3.6
@ -629,8 +629,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.11.6 anchor: gcr.io/google_containers/hyperkube-amd64:v1.16.2
apiserver: gcr.io/google_containers/hyperkube-amd64:v1.11.6 apiserver: gcr.io/google_containers/hyperkube-amd64:v1.16.2
secrets: secrets:
service_account: service_account:
public_key: placeholder public_key: placeholder
@ -706,8 +706,8 @@ data:
values: values:
images: images:
tags: tags:
anchor: gcr.io/google_containers/hyperkube-amd64:v1.11.6 anchor: gcr.io/google_containers/hyperkube-amd64:v1.16.2
controller_manager: gcr.io/google_containers/hyperkube-amd64:v1.11.6 controller_manager: gcr.io/google_containers/hyperkube-amd64:v1.16.2
secrets: secrets:
service_account: service_account:
private_key: placeholder private_key: placeholder
@ -779,8 +779,8 @@ data:
images: images:
tags: tags:
anchor: gcr.io/google_containers/hyperkube-amd64:v1.11.6 anchor: gcr.io/google_containers/hyperkube-amd64:v1.16.2
scheduler: gcr.io/google_containers/hyperkube-amd64:v1.11.6 scheduler: gcr.io/google_containers/hyperkube-amd64:v1.16.2
source: source:
type: local type: local

2
tools/g2/lib/config.sh
View File

@ -2,7 +2,7 @@ export TEMP_DIR=${TEMP_DIR:-$(mktemp -d)}
export BASE_IMAGE_SIZE=${BASE_IMAGE_SIZE:-68719476736} export BASE_IMAGE_SIZE=${BASE_IMAGE_SIZE:-68719476736}
export BASE_IMAGE_URL=${BASE_IMAGE_URL:-https://cloud-images.ubuntu.com/releases/16.04/release/ubuntu-16.04-server-cloudimg-amd64-disk1.img} export BASE_IMAGE_URL=${BASE_IMAGE_URL:-https://cloud-images.ubuntu.com/releases/16.04/release/ubuntu-16.04-server-cloudimg-amd64-disk1.img}
export IMAGE_PROMENADE=${IMAGE_PROMENADE:-quay.io/airshipit/promenade:master} export IMAGE_PROMENADE=${IMAGE_PROMENADE:-quay.io/airshipit/promenade:master}
export IMAGE_HYPERKUBE=${IMAGE_HYPERKUBE:-gcr.io/google_containers/hyperkube-amd64:v1.11.6} export IMAGE_HYPERKUBE=${IMAGE_HYPERKUBE:-gcr.io/google_containers/hyperkube-amd64:v1.16.2}
export NGINX_DIR="${TEMP_DIR}/nginx" export NGINX_DIR="${TEMP_DIR}/nginx"
export NGINX_URL="http://192.168.77.1:7777" export NGINX_URL="http://192.168.77.1:7777"
export PROMENADE_BASE_URL="http://promenade-api.ucp.svc.cluster.local" export PROMENADE_BASE_URL="http://promenade-api.ucp.svc.cluster.local"

4
tools/gate/default-config-env
View File

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

2
tools/registry/IMAGES
View File

@ -1,6 +1,6 @@
# 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.11.6,hyperkube gcr.io/google_containers/hyperkube-amd64,v1.16.2,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

2
tools/simple-deployment.sh
View File

@ -3,7 +3,7 @@
set -eux set -eux
IMAGE_PROMENADE=${IMAGE_PROMENADE:-quay.io/airshipit/promenade:master} IMAGE_PROMENADE=${IMAGE_PROMENADE:-quay.io/airshipit/promenade:master}
IMAGE_HYPERKUBE=${IMAGE_HYPERKUBE:-gcr.io/google_containers/hyperkube-amd64:v1.11.6} IMAGE_HYPERKUBE=${IMAGE_HYPERKUBE:-gcr.io/google_containers/hyperkube-amd64:v1.16.2}
PROMENADE_DEBUG=${PROMENADE_DEBUG:-0} PROMENADE_DEBUG=${PROMENADE_DEBUG:-0}
SCRIPT_DIR=$(realpath $(dirname $0)) SCRIPT_DIR=$(realpath $(dirname $0))