summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-12-18 18:05:40 +0000
committerGerrit Code Review <review@openstack.org>2018-12-18 18:05:40 +0000
commit3efe546ab6a574ca17ff85b69ea4be35b4e9bdc2 (patch)
treef81609917e54ab3724c4664ae51aba62d11223a9
parent22c58a5cfc3901031103219fb54608eff4dc77e3 (diff)
parentcdd1a6bd2849fd08ad0df818727d1314128ca71a (diff)
Merge "Update Kubernetes to 1.10.11"
-rw-r--r--charts/apiserver-webhook/values.yaml2
-rw-r--r--charts/apiserver/values.yaml4
-rw-r--r--charts/controller_manager/values.yaml4
-rw-r--r--charts/haproxy/values.yaml2
-rw-r--r--charts/proxy/values.yaml2
-rw-r--r--charts/scheduler/values.yaml4
-rw-r--r--doc/source/configuration/genesis.rst6
-rw-r--r--doc/source/configuration/host-system.rst4
-rw-r--r--examples/basic/Genesis.yaml6
-rw-r--r--examples/basic/HostSystem.yaml4
-rw-r--r--examples/basic/armada-resources.yaml16
-rw-r--r--examples/complete/Genesis.yaml6
-rw-r--r--examples/complete/HostSystem.yaml4
-rw-r--r--examples/complete/armada-resources.yaml16
-rw-r--r--tests/unit/api/test_validatedesign.py10
-rw-r--r--tests/unit/builder_data/simple/Genesis.yaml6
-rw-r--r--tests/unit/builder_data/simple/HostSystem.yaml4
-rw-r--r--tests/unit/builder_data/simple/armada-resources.yaml16
-rw-r--r--tools/gate/default-config-env4
-rw-r--r--tools/registry/IMAGES2
20 files changed, 61 insertions, 61 deletions
diff --git a/charts/apiserver-webhook/values.yaml b/charts/apiserver-webhook/values.yaml
index e83fd71..8d8a019 100644
--- a/charts/apiserver-webhook/values.yaml
+++ b/charts/apiserver-webhook/values.yaml
@@ -16,7 +16,7 @@ release_group: null
16 16
17images: 17images:
18 tags: 18 tags:
19 apiserver: gcr.io/google_containers/hyperkube-amd64:v1.10.2 19 apiserver: gcr.io/google_containers/hyperkube-amd64:v1.10.11
20 kubernetes_keystone_webhook: docker.io/k8scloudprovider/k8s-keystone-auth:latest 20 kubernetes_keystone_webhook: docker.io/k8scloudprovider/k8s-keystone-auth:latest
21 scripted_test: docker.io/openstackhelm/heat:newton 21 scripted_test: docker.io/openstackhelm/heat:newton
22 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 22 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
diff --git a/charts/apiserver/values.yaml b/charts/apiserver/values.yaml
index bd1935e..9c0556b 100644
--- a/charts/apiserver/values.yaml
+++ b/charts/apiserver/values.yaml
@@ -16,8 +16,8 @@ release_group: null
16 16
17images: 17images:
18 tags: 18 tags:
19 anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.2 19 anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.11
20 apiserver: gcr.io/google_containers/hyperkube-amd64:v1.10.2 20 apiserver: gcr.io/google_containers/hyperkube-amd64:v1.10.11
21 pull_policy: "IfNotPresent" 21 pull_policy: "IfNotPresent"
22 22
23labels: 23labels:
diff --git a/charts/controller_manager/values.yaml b/charts/controller_manager/values.yaml
index d19d5dc..416725b 100644
--- a/charts/controller_manager/values.yaml
+++ b/charts/controller_manager/values.yaml
@@ -16,8 +16,8 @@ release_group: null
16 16
17images: 17images:
18 tags: 18 tags:
19 anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.2 19 anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.11
20 controller_manager: gcr.io/google_containers/hyperkube-amd64:v1.10.2 20 controller_manager: gcr.io/google_containers/hyperkube-amd64:v1.10.11
21 pull_policy: "IfNotPresent" 21 pull_policy: "IfNotPresent"
22 22
23labels: 23labels:
diff --git a/charts/haproxy/values.yaml b/charts/haproxy/values.yaml
index 98400ce..9457c5e 100644
--- a/charts/haproxy/values.yaml
+++ b/charts/haproxy/values.yaml
@@ -59,7 +59,7 @@ conf:
59 59
60images: 60images:
61 tags: 61 tags:
62 anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.2 62 anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.11
63 haproxy: haproxy:1.8.3 63 haproxy: haproxy:1.8.3
64 test: python:3.6 64 test: python:3.6
65 pull_policy: "IfNotPresent" 65 pull_policy: "IfNotPresent"
diff --git a/charts/proxy/values.yaml b/charts/proxy/values.yaml
index 18d1f2d..aedd615 100644
--- a/charts/proxy/values.yaml
+++ b/charts/proxy/values.yaml
@@ -41,7 +41,7 @@ pod:
41 41
42images: 42images:
43 tags: 43 tags:
44 proxy: gcr.io/google_containers/hyperkube-amd64:v1.10.2 44 proxy: gcr.io/google_containers/hyperkube-amd64:v1.10.11
45 pull_policy: "IfNotPresent" 45 pull_policy: "IfNotPresent"
46 46
47command_prefix: 47command_prefix:
diff --git a/charts/scheduler/values.yaml b/charts/scheduler/values.yaml
index 39f19b6..1239b3e 100644
--- a/charts/scheduler/values.yaml
+++ b/charts/scheduler/values.yaml
@@ -63,8 +63,8 @@ secrets:
63 63
64images: 64images:
65 tags: 65 tags:
66 anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.2 66 anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.11
67 scheduler: gcr.io/google_containers/hyperkube-amd64:v1.10.2 67 scheduler: gcr.io/google_containers/hyperkube-amd64:v1.10.11
68 pull_policy: "IfNotPresent" 68 pull_policy: "IfNotPresent"
69 69
70network: 70network:
diff --git a/doc/source/configuration/genesis.rst b/doc/source/configuration/genesis.rst
index 77032bc..548abf8 100644
--- a/doc/source/configuration/genesis.rst
+++ b/doc/source/configuration/genesis.rst
@@ -41,10 +41,10 @@ Here is a complete sample document:
41 helm: 41 helm:
42 tiller: gcr.io/kubernetes-helm/tiller:v2.10.0 42 tiller: gcr.io/kubernetes-helm/tiller:v2.10.0
43 kubernetes: 43 kubernetes:
44 apiserver: gcr.io/google_containers/hyperkube-amd64:v1.10.2 44 apiserver: gcr.io/google_containers/hyperkube-amd64:v1.10.11
45 controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.10.2 45 controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.10.11
46 etcd: quay.io/coreos/etcd:v3.0.17 46 etcd: quay.io/coreos/etcd:v3.0.17
47 scheduler: gcr.io/google_containers/hyperkube-amd64:v1.10.2 47 scheduler: gcr.io/google_containers/hyperkube-amd64:v1.10.11
48 files: 48 files:
49 - path: /var/lib/anchor/calico-etcd-bootstrap 49 - path: /var/lib/anchor/calico-etcd-bootstrap
50 content: "" 50 content: ""
diff --git a/doc/source/configuration/host-system.rst b/doc/source/configuration/host-system.rst
index 29474b8..734d8cb 100644
--- a/doc/source/configuration/host-system.rst
+++ b/doc/source/configuration/host-system.rst
@@ -16,7 +16,7 @@ Sample Document
16 data: 16 data:
17 files: 17 files:
18 - path: /opt/kubernetes/bin/kubelet 18 - path: /opt/kubernetes/bin/kubelet
19 tar_url: https://dl.k8s.io/v1.10.2/kubernetes-node-linux-amd64.tar.gz 19 tar_url: https://dl.k8s.io/v1.10.11/kubernetes-node-linux-amd64.tar.gz
20 tar_path: kubernetes/node/bin/kubelet 20 tar_path: kubernetes/node/bin/kubelet
21 mode: 0555 21 mode: 0555
22 images: 22 images:
@@ -24,7 +24,7 @@ Sample Document
24 helm: 24 helm:
25 helm: lachlanevenson/k8s-helm:v2.10.0 25 helm: lachlanevenson/k8s-helm:v2.10.0
26 kubernetes: 26 kubernetes:
27 kubectl: gcr.io/google_containers/hyperkube-amd64:v1.10.2 27 kubectl: gcr.io/google_containers/hyperkube-amd64:v1.10.11
28 packages: 28 packages:
29 repositories: 29 repositories:
30 - deb http://apt.dockerproject.org/repo ubuntu-xenial main 30 - deb http://apt.dockerproject.org/repo ubuntu-xenial main
diff --git a/examples/basic/Genesis.yaml b/examples/basic/Genesis.yaml
index 9d64e05..823ae70 100644
--- a/examples/basic/Genesis.yaml
+++ b/examples/basic/Genesis.yaml
@@ -37,10 +37,10 @@ data:
37 helm: 37 helm:
38 tiller: gcr.io/kubernetes-helm/tiller:v2.10.0 38 tiller: gcr.io/kubernetes-helm/tiller:v2.10.0
39 kubernetes: 39 kubernetes:
40 apiserver: gcr.io/google_containers/hyperkube-amd64:v1.10.2 40 apiserver: gcr.io/google_containers/hyperkube-amd64:v1.10.11
41 controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.10.2 41 controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.10.11
42 etcd: quay.io/coreos/etcd:v3.2.14 42 etcd: quay.io/coreos/etcd:v3.2.14
43 scheduler: gcr.io/google_containers/hyperkube-amd64:v1.10.2 43 scheduler: gcr.io/google_containers/hyperkube-amd64:v1.10.11
44 files: 44 files:
45 - path: /var/lib/anchor/calico-etcd-bootstrap 45 - path: /var/lib/anchor/calico-etcd-bootstrap
46 content: "# placeholder for triggering calico etcd bootstrapping" 46 content: "# placeholder for triggering calico etcd bootstrapping"
diff --git a/examples/basic/HostSystem.yaml b/examples/basic/HostSystem.yaml
index 2f4cbb0..019aaa3 100644
--- a/examples/basic/HostSystem.yaml
+++ b/examples/basic/HostSystem.yaml
@@ -13,7 +13,7 @@ data:
13 enable: true 13 enable: true
14 files: 14 files:
15 - path: /opt/kubernetes/bin/kubelet 15 - path: /opt/kubernetes/bin/kubelet
16 tar_url: https://dl.k8s.io/v1.10.2/kubernetes-node-linux-amd64.tar.gz 16 tar_url: https://dl.k8s.io/v1.10.11/kubernetes-node-linux-amd64.tar.gz
17 tar_path: kubernetes/node/bin/kubelet 17 tar_path: kubernetes/node/bin/kubelet
18 mode: 0555 18 mode: 0555
19 - path: /etc/systemd/system/kube-cgroup.service 19 - path: /etc/systemd/system/kube-cgroup.service
@@ -69,7 +69,7 @@ data:
69 helm: 69 helm:
70 helm: lachlanevenson/k8s-helm:v2.10.0 70 helm: lachlanevenson/k8s-helm:v2.10.0
71 kubernetes: 71 kubernetes:
72 kubectl: gcr.io/google_containers/hyperkube-amd64:v1.10.2 72 kubectl: gcr.io/google_containers/hyperkube-amd64:v1.10.11
73 packages: 73 packages:
74 repositories: 74 repositories:
75 - deb http://apt.dockerproject.org/repo ubuntu-xenial main 75 - deb http://apt.dockerproject.org/repo ubuntu-xenial main
diff --git a/examples/basic/armada-resources.yaml b/examples/basic/armada-resources.yaml
index e431a72..f99fdd3 100644
--- a/examples/basic/armada-resources.yaml
+++ b/examples/basic/armada-resources.yaml
@@ -186,7 +186,7 @@ data:
186 values: 186 values:
187 images: 187 images:
188 tags: 188 tags:
189 proxy: gcr.io/google_containers/hyperkube-amd64:v1.10.2 189 proxy: gcr.io/google_containers/hyperkube-amd64:v1.10.11
190 network: 190 network:
191 kubernetes_netloc: 127.0.0.1:6553 191 kubernetes_netloc: 127.0.0.1:6553
192 source: 192 source:
@@ -638,7 +638,7 @@ data:
638 638
639 images: 639 images:
640 tags: 640 tags:
641 anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.2 641 anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.11
642 haproxy: haproxy:1.8.3 642 haproxy: haproxy:1.8.3
643 test: python:3.6 643 test: python:3.6
644 644
@@ -733,8 +733,8 @@ data:
733 endpoints: https://127.0.0.1:2378 733 endpoints: https://127.0.0.1:2378
734 images: 734 images:
735 tags: 735 tags:
736 anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.2 736 anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.11
737 apiserver: gcr.io/google_containers/hyperkube-amd64:v1.10.2 737 apiserver: gcr.io/google_containers/hyperkube-amd64:v1.10.11
738 network: 738 network:
739 kubernetes_service_ip: 10.96.0.1 739 kubernetes_service_ip: 10.96.0.1
740 pod_cidr: 10.97.0.0/16 740 pod_cidr: 10.97.0.0/16
@@ -798,8 +798,8 @@ data:
798 values: 798 values:
799 images: 799 images:
800 tags: 800 tags:
801 anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.2 801 anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.11
802 controller_manager: gcr.io/google_containers/hyperkube-amd64:v1.10.2 802 controller_manager: gcr.io/google_containers/hyperkube-amd64:v1.10.11
803 secrets: 803 secrets:
804 service_account: 804 service_account:
805 private_key: placeholder 805 private_key: placeholder
@@ -871,8 +871,8 @@ data:
871 871
872 images: 872 images:
873 tags: 873 tags:
874 anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.2 874 anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.11
875 scheduler: gcr.io/google_containers/hyperkube-amd64:v1.10.2 875 scheduler: gcr.io/google_containers/hyperkube-amd64:v1.10.11
876 876
877 source: 877 source:
878 type: local 878 type: local
diff --git a/examples/complete/Genesis.yaml b/examples/complete/Genesis.yaml
index 850e81d..d599332 100644
--- a/examples/complete/Genesis.yaml
+++ b/examples/complete/Genesis.yaml
@@ -32,10 +32,10 @@ data:
32 helm: 32 helm:
33 tiller: gcr.io/kubernetes-helm/tiller:v2.10.0 33 tiller: gcr.io/kubernetes-helm/tiller:v2.10.0
34 kubernetes: 34 kubernetes:
35 apiserver: gcr.io/google_containers/hyperkube-amd64:v1.10.2 35 apiserver: gcr.io/google_containers/hyperkube-amd64:v1.10.11
36 controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.10.2 36 controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.10.11
37 etcd: quay.io/coreos/etcd:v3.2.14 37 etcd: quay.io/coreos/etcd:v3.2.14
38 scheduler: gcr.io/google_containers/hyperkube-amd64:v1.10.2 38 scheduler: gcr.io/google_containers/hyperkube-amd64:v1.10.11
39 files: 39 files:
40 - path: /var/lib/anchor/calico-etcd-bootstrap 40 - path: /var/lib/anchor/calico-etcd-bootstrap
41 content: "# placeholder for triggering calico etcd bootstrapping" 41 content: "# placeholder for triggering calico etcd bootstrapping"
diff --git a/examples/complete/HostSystem.yaml b/examples/complete/HostSystem.yaml
index f6cd4e4..32346fa 100644
--- a/examples/complete/HostSystem.yaml
+++ b/examples/complete/HostSystem.yaml
@@ -10,7 +10,7 @@ metadata:
10data: 10data:
11 files: 11 files:
12 - path: /opt/kubernetes/bin/kubelet 12 - path: /opt/kubernetes/bin/kubelet
13 tar_url: https://dl.k8s.io/v1.10.2/kubernetes-node-linux-amd64.tar.gz 13 tar_url: https://dl.k8s.io/v1.10.11/kubernetes-node-linux-amd64.tar.gz
14 tar_path: kubernetes/node/bin/kubelet 14 tar_path: kubernetes/node/bin/kubelet
15 mode: 0555 15 mode: 0555
16 - path: /etc/logrotate.d/json-logrotate 16 - path: /etc/logrotate.d/json-logrotate
@@ -35,7 +35,7 @@ data:
35 helm: 35 helm:
36 helm: lachlanevenson/k8s-helm:v2.10.0 36 helm: lachlanevenson/k8s-helm:v2.10.0
37 kubernetes: 37 kubernetes:
38 kubectl: gcr.io/google_containers/hyperkube-amd64:v1.10.2 38 kubectl: gcr.io/google_containers/hyperkube-amd64:v1.10.11
39 packages: 39 packages:
40 repositories: 40 repositories:
41 - deb http://apt.dockerproject.org/repo ubuntu-xenial main 41 - deb http://apt.dockerproject.org/repo ubuntu-xenial main
diff --git a/examples/complete/armada-resources.yaml b/examples/complete/armada-resources.yaml
index 276db31..83967ab 100644
--- a/examples/complete/armada-resources.yaml
+++ b/examples/complete/armada-resources.yaml
@@ -201,7 +201,7 @@ data:
201 values: 201 values:
202 images: 202 images:
203 tags: 203 tags:
204 proxy: gcr.io/google_containers/hyperkube-amd64:v1.10.2 204 proxy: gcr.io/google_containers/hyperkube-amd64:v1.10.11
205 network: 205 network:
206 kubernetes_netloc: 127.0.0.1:6553 206 kubernetes_netloc: 127.0.0.1:6553
207 source: 207 source:
@@ -646,7 +646,7 @@ data:
646 646
647 images: 647 images:
648 tags: 648 tags:
649 anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.2 649 anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.11
650 haproxy: haproxy:1.8.3 650 haproxy: haproxy:1.8.3
651 test: python:3.6 651 test: python:3.6
652 652
@@ -732,8 +732,8 @@ data:
732 endpoints: https://127.0.0.1:2378 732 endpoints: https://127.0.0.1:2378
733 images: 733 images:
734 tags: 734 tags:
735 anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.2 735 anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.11
736 apiserver: gcr.io/google_containers/hyperkube-amd64:v1.10.2 736 apiserver: gcr.io/google_containers/hyperkube-amd64:v1.10.11
737 secrets: 737 secrets:
738 service_account: 738 service_account:
739 public_key: placeholder 739 public_key: placeholder
@@ -809,8 +809,8 @@ data:
809 values: 809 values:
810 images: 810 images:
811 tags: 811 tags:
812 anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.2 812 anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.11
813 controller_manager: gcr.io/google_containers/hyperkube-amd64:v1.10.2 813 controller_manager: gcr.io/google_containers/hyperkube-amd64:v1.10.11
814 secrets: 814 secrets:
815 service_account: 815 service_account:
816 private_key: placeholder 816 private_key: placeholder
@@ -882,8 +882,8 @@ data:
882 882
883 images: 883 images:
884 tags: 884 tags:
885 anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.2 885 anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.11
886 scheduler: gcr.io/google_containers/hyperkube-amd64:v1.10.2 886 scheduler: gcr.io/google_containers/hyperkube-amd64:v1.10.11
887 887
888 source: 888 source:
889 type: local 889 type: local
diff --git a/tests/unit/api/test_validatedesign.py b/tests/unit/api/test_validatedesign.py
index e099cd6..0381e44 100644
--- a/tests/unit/api/test_validatedesign.py
+++ b/tests/unit/api/test_validatedesign.py
@@ -107,13 +107,13 @@ VALID_DOCS = [
107 }, 107 },
108 'kubernetes': { 108 'kubernetes': {
109 'apiserver': 109 'apiserver':
110 'gcr.io/google_containers/hyperkube-amd64:v1.10.2', 110 'gcr.io/google_containers/hyperkube-amd64:v1.10.11',
111 'controller-manager': 111 'controller-manager':
112 'gcr.io/google_containers/hyperkube-amd64:v1.10.2', 112 'gcr.io/google_containers/hyperkube-amd64:v1.10.11',
113 'etcd': 113 'etcd':
114 'quay.io/coreos/etcd:v3.2.14', 114 'quay.io/coreos/etcd:v3.2.14',
115 'scheduler': 115 'scheduler':
116 'gcr.io/google_containers/hyperkube-amd64:v1.10.2' 116 'gcr.io/google_containers/hyperkube-amd64:v1.10.11'
117 } 117 }
118 }, 118 },
119 'ip': 119 'ip':
@@ -149,7 +149,7 @@ VALID_DOCS = [
149 'tar_path': 149 'tar_path':
150 'kubernetes/node/bin/kubelet', 150 'kubernetes/node/bin/kubelet',
151 'tar_url': 151 'tar_url':
152 'https://dl.k8s.io/v1.10.2/kubernetes-node-linux-amd64.tar.gz' 152 'https://dl.k8s.io/v1.10.11/kubernetes-node-linux-amd64.tar.gz'
153 }, 153 },
154 { 154 {
155 'content': 155 'content':
@@ -166,7 +166,7 @@ VALID_DOCS = [
166 }, 166 },
167 'kubernetes': { 167 'kubernetes': {
168 'kubectl': 168 'kubectl':
169 'gcr.io/google_containers/hyperkube-amd64:v1.10.2' 169 'gcr.io/google_containers/hyperkube-amd64:v1.10.11'
170 } 170 }
171 }, 171 },
172 'packages': { 172 'packages': {
diff --git a/tests/unit/builder_data/simple/Genesis.yaml b/tests/unit/builder_data/simple/Genesis.yaml
index bb67666..54c8a6f 100644
--- a/tests/unit/builder_data/simple/Genesis.yaml
+++ b/tests/unit/builder_data/simple/Genesis.yaml
@@ -34,10 +34,10 @@ data:
34 helm: 34 helm:
35 tiller: gcr.io/kubernetes-helm/tiller:v2.9.1 35 tiller: gcr.io/kubernetes-helm/tiller:v2.9.1
36 kubernetes: 36 kubernetes:
37 apiserver: gcr.io/google_containers/hyperkube-amd64:v1.10.2 37 apiserver: gcr.io/google_containers/hyperkube-amd64:v1.10.11
38 controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.10.2 38 controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.10.11
39 etcd: quay.io/coreos/etcd:v3.2.14 39 etcd: quay.io/coreos/etcd:v3.2.14
40 scheduler: gcr.io/google_containers/hyperkube-amd64:v1.10.2 40 scheduler: gcr.io/google_containers/hyperkube-amd64:v1.10.11
41 files: 41 files:
42 - path: /var/lib/anchor/calico-etcd-bootstrap 42 - path: /var/lib/anchor/calico-etcd-bootstrap
43 content: "# placeholder for triggering calico etcd bootstrapping" 43 content: "# placeholder for triggering calico etcd bootstrapping"
diff --git a/tests/unit/builder_data/simple/HostSystem.yaml b/tests/unit/builder_data/simple/HostSystem.yaml
index c38c899..4033fb5 100644
--- a/tests/unit/builder_data/simple/HostSystem.yaml
+++ b/tests/unit/builder_data/simple/HostSystem.yaml
@@ -14,7 +14,7 @@ data:
14 # attempt to actually run Kubernetes, only to construct the genesis and 14 # attempt to actually run Kubernetes, only to construct the genesis and
15 # join scripts. 15 # join scripts.
16 # - path: /opt/kubernetes/bin/kubelet 16 # - path: /opt/kubernetes/bin/kubelet
17 # tar_url: https://dl.k8s.io/v1.10.2/kubernetes-node-linux-amd64.tar.gz 17 # tar_url: https://dl.k8s.io/v1.10.11/kubernetes-node-linux-amd64.tar.gz
18 # tar_path: kubernetes/node/bin/kubelet 18 # tar_path: kubernetes/node/bin/kubelet
19 # mode: 0555 19 # mode: 0555
20 - path: /etc/logrotate.d/json-logrotate 20 - path: /etc/logrotate.d/json-logrotate
@@ -39,7 +39,7 @@ data:
39 helm: 39 helm:
40 helm: lachlanevenson/k8s-helm:v2.9.1 40 helm: lachlanevenson/k8s-helm:v2.9.1
41 kubernetes: 41 kubernetes:
42 kubectl: gcr.io/google_containers/hyperkube-amd64:v1.10.2 42 kubectl: gcr.io/google_containers/hyperkube-amd64:v1.10.11
43 packages: 43 packages:
44 repositories: 44 repositories:
45 - deb http://apt.dockerproject.org/repo ubuntu-xenial main 45 - deb http://apt.dockerproject.org/repo ubuntu-xenial main
diff --git a/tests/unit/builder_data/simple/armada-resources.yaml b/tests/unit/builder_data/simple/armada-resources.yaml
index e1fb113..56f7b71 100644
--- a/tests/unit/builder_data/simple/armada-resources.yaml
+++ b/tests/unit/builder_data/simple/armada-resources.yaml
@@ -186,7 +186,7 @@ data:
186 values: 186 values:
187 images: 187 images:
188 tags: 188 tags:
189 proxy: gcr.io/google_containers/hyperkube-amd64:v1.10.2 189 proxy: gcr.io/google_containers/hyperkube-amd64:v1.10.11
190 network: 190 network:
191 kubernetes_netloc: 127.0.0.1:6553 191 kubernetes_netloc: 127.0.0.1:6553
192 source: 192 source:
@@ -562,7 +562,7 @@ data:
562 562
563 images: 563 images:
564 tags: 564 tags:
565 anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.2 565 anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.11
566 haproxy: haproxy:1.8.3 566 haproxy: haproxy:1.8.3
567 test: python:3.6 567 test: python:3.6
568 568
@@ -654,8 +654,8 @@ data:
654 endpoints: https://127.0.0.1:2378 654 endpoints: https://127.0.0.1:2378
655 images: 655 images:
656 tags: 656 tags:
657 anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.2 657 anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.11
658 apiserver: gcr.io/google_containers/hyperkube-amd64:v1.10.2 658 apiserver: gcr.io/google_containers/hyperkube-amd64:v1.10.11
659 secrets: 659 secrets:
660 service_account: 660 service_account:
661 public_key: placeholder 661 public_key: placeholder
@@ -731,8 +731,8 @@ data:
731 values: 731 values:
732 images: 732 images:
733 tags: 733 tags:
734 anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.2 734 anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.11
735 controller_manager: gcr.io/google_containers/hyperkube-amd64:v1.10.2 735 controller_manager: gcr.io/google_containers/hyperkube-amd64:v1.10.11
736 secrets: 736 secrets:
737 service_account: 737 service_account:
738 private_key: placeholder 738 private_key: placeholder
@@ -804,8 +804,8 @@ data:
804 804
805 images: 805 images:
806 tags: 806 tags:
807 anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.2 807 anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.11
808 scheduler: gcr.io/google_containers/hyperkube-amd64:v1.10.2 808 scheduler: gcr.io/google_containers/hyperkube-amd64:v1.10.11
809 809
810 source: 810 source:
811 type: local 811 type: local
diff --git a/tools/gate/default-config-env b/tools/gate/default-config-env
index f770115..7b7e063 100644
--- a/tools/gate/default-config-env
+++ b/tools/gate/default-config-env
@@ -8,6 +8,6 @@ IMAGE_DEP_CHECK=quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
8IMAGE_ETCD=quay.io/coreos/etcd:v3.2.14 8IMAGE_ETCD=quay.io/coreos/etcd:v3.2.14
9IMAGE_HAPROXY=haproxy:1.8.3 9IMAGE_HAPROXY=haproxy:1.8.3
10IMAGE_HELM=lachlanevenson/k8s-helm:v2.10.0 10IMAGE_HELM=lachlanevenson/k8s-helm:v2.10.0
11IMAGE_HYPERKUBE=gcr.io/google_containers/hyperkube-amd64:v1.10.2 11IMAGE_HYPERKUBE=gcr.io/google_containers/hyperkube-amd64:v1.10.11
12IMAGE_TILLER=gcr.io/kubernetes-helm/tiller:v2.10.0 12IMAGE_TILLER=gcr.io/kubernetes-helm/tiller:v2.10.0
13KUBELET_URL=https://dl.k8s.io/v1.10.2/kubernetes-node-linux-amd64.tar.gz 13KUBELET_URL=https://dl.k8s.io/v1.10.11/kubernetes-node-linux-amd64.tar.gz
diff --git a/tools/registry/IMAGES b/tools/registry/IMAGES
index e203225..886517b 100644
--- a/tools/registry/IMAGES
+++ b/tools/registry/IMAGES
@@ -1,6 +1,6 @@
1# source_name, tag, cache_name 1# source_name, tag, cache_name
2coredns/coredns,0.9.9,coredns 2coredns/coredns,0.9.9,coredns
3gcr.io/google_containers/hyperkube-amd64,v1.10.2,hyperkube 3gcr.io/google_containers/hyperkube-amd64,v1.10.11,hyperkube
4gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64,1.14.4,k8s-dns-dnsmasq-nanny-amd64 4gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64,1.14.4,k8s-dns-dnsmasq-nanny-amd64
5gcr.io/google_containers/k8s-dns-kube-dns-amd64,1.14.4,k8s-dns-kube-dns-amd64 5gcr.io/google_containers/k8s-dns-kube-dns-amd64,1.14.4,k8s-dns-kube-dns-amd64
6gcr.io/google_containers/k8s-dns-sidecar-amd64,1.14.4,k8s-dns-sidecar-amd64 6gcr.io/google_containers/k8s-dns-sidecar-amd64,1.14.4,k8s-dns-sidecar-amd64