Browse Source

Bump Kubernetes version from 1.8.6 to 1.10.2

* Updates version references
* Increase memory of test VMs due to higher usage with bump
* Move etcd chart scripts from /tmp to /tmp/bin
* Remove certificate signing options for controller manager
* Remove -a from `kubectl get pods`, since that is deprecated in 1.10
* Shorten liveness/readiness probe times for CoreDNS

Change-Id: I16db0370f1c619e16002dd58e29025eb1538691f
Mark Burnett 11 months ago
parent
commit
8a7791e13a

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

@@ -16,8 +16,8 @@ release_group: null
16 16
 
17 17
 images:
18 18
   tags:
19
-    anchor: gcr.io/google_containers/hyperkube-amd64:v1.8.6
20
-    apiserver: gcr.io/google_containers/hyperkube-amd64:v1.8.6
19
+    anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.2
20
+    apiserver: gcr.io/google_containers/hyperkube-amd64:v1.10.2
21 21
     dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
22 22
   pull_policy: "IfNotPresent"
23 23
 

+ 2
- 2
charts/controller_manager/values.yaml View File

@@ -16,8 +16,8 @@ release_group: null
16 16
 
17 17
 images:
18 18
   tags:
19
-    anchor: gcr.io/google_containers/hyperkube-amd64:v1.8.6
20
-    controller_manager: gcr.io/google_containers/hyperkube-amd64:v1.8.6
19
+    anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.2
20
+    controller_manager: gcr.io/google_containers/hyperkube-amd64:v1.10.2
21 21
     dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
22 22
   pull_policy: "IfNotPresent"
23 23
 

+ 3
- 3
charts/coredns/templates/deployment.yaml View File

@@ -76,7 +76,7 @@ spec:
76 76
             path: /health
77 77
             port: 8080
78 78
             scheme: HTTP
79
-          initialDelaySeconds: 5
79
+          initialDelaySeconds: 2
80 80
           timeoutSeconds: 5
81 81
           successThreshold: 1
82 82
         livenessProbe:
@@ -84,10 +84,10 @@ spec:
84 84
             path: /health
85 85
             port: 8080
86 86
             scheme: HTTP
87
-          initialDelaySeconds: 60
87
+          initialDelaySeconds: 10
88 88
           timeoutSeconds: 5
89 89
           successThreshold: 1
90
-          failureThreshold: 5
90
+          failureThreshold: 3
91 91
       dnsPolicy: Default
92 92
       volumes:
93 93
         - name: config-volume

+ 4
- 4
charts/etcd/templates/daemonset-anchor.yaml View File

@@ -49,7 +49,7 @@ spec:
49 49
           imagePullPolicy: {{ .Values.images.pull_policy }}
50 50
 {{ tuple $envAll $envAll.Values.pod.resources.daemonset_anchor | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
51 51
           command:
52
-            - /tmp/etcdctl_anchor
52
+            - /tmp/bin/etcdctl_anchor
53 53
           env:
54 54
             - name: ETCD_NAME
55 55
               valueFrom:
@@ -80,17 +80,17 @@ spec:
80 80
           readinessProbe:
81 81
             exec:
82 82
               command:
83
-                - /tmp/readiness
83
+                - /tmp/bin/readiness
84 84
             initialDelaySeconds: 15
85 85
             periodSeconds: 30
86 86
           lifecycle:
87 87
             preStop:
88 88
               exec:
89 89
                 command:
90
-                  - /tmp/pre_stop
90
+                  - /tmp/bin/pre_stop
91 91
           volumeMounts:
92 92
             - name: {{ .Values.service.name }}-bin
93
-              mountPath: /tmp
93
+              mountPath: /tmp/bin
94 94
             {{- if .Values.bootstrapping.enabled }}
95 95
             - name: bootstrapping
96 96
               mountPath: /bootstrapping

+ 1
- 1
charts/haproxy/values.yaml View File

@@ -59,7 +59,7 @@ conf:
59 59
 
60 60
 images:
61 61
   tags:
62
-    anchor: gcr.io/google_containers/hyperkube-amd64:v1.8.6
62
+    anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.2
63 63
     haproxy: haproxy:1.8.3
64 64
     test: busybox:1.28.3
65 65
   pull_policy: "IfNotPresent"

+ 4
- 0
charts/promenade/templates/tests/test-promenade-api.yaml View File

@@ -16,6 +16,8 @@
16 16
 {{/*
17 17
 Test that the API is up and the health endpoint returns a 2XX code */}}
18 18
 {{- if .Values.manifests.test_promenade_api }}
19
+{{- $envAll := . }}
20
+{{- $dependencies := .Values.dependencies.test }}
19 21
 ---
20 22
 apiVersion: v1
21 23
 kind: Pod
@@ -25,6 +27,8 @@ metadata:
25 27
     "helm.sh/hook": "test-success"
26 28
 spec:
27 29
   restartPolicy: Never
30
+  initContainers:
31
+{{ tuple $envAll $dependencies list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 4 }}
28 32
   containers:
29 33
     - name: "{{ .Release.Name }}-api-test"
30 34
       env:

+ 5
- 0
charts/promenade/values.yaml View File

@@ -40,6 +40,11 @@ images:
40 40
     ks_endpoints: docker.io/openstackhelm/heat:newton
41 41
   pull_policy: IfNotPresent
42 42
 
43
+dependencies:
44
+  test:
45
+    services:
46
+      - service: promenade-api
47
+
43 48
 labels:
44 49
   node_selector_key: ucp-control-plane
45 50
   node_selector_value: enabled

+ 1
- 1
charts/proxy/values.yaml View File

@@ -41,7 +41,7 @@ pod:
41 41
 
42 42
 images:
43 43
   tags:
44
-    proxy: gcr.io/google_containers/hyperkube-amd64:v1.8.6
44
+    proxy: gcr.io/google_containers/hyperkube-amd64:v1.10.2
45 45
   pull_policy: "IfNotPresent"
46 46
 
47 47
 command_prefix:

+ 2
- 2
charts/scheduler/values.yaml View File

@@ -63,8 +63,8 @@ secrets:
63 63
 
64 64
 images:
65 65
   tags:
66
-    anchor: gcr.io/google_containers/hyperkube-amd64:v1.8.6
67
-    scheduler: gcr.io/google_containers/hyperkube-amd64:v1.8.6
66
+    anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.2
67
+    scheduler: gcr.io/google_containers/hyperkube-amd64:v1.10.2
68 68
   pull_policy: "IfNotPresent"
69 69
 
70 70
 network:

+ 3
- 3
docs/source/configuration/genesis.rst View File

@@ -41,10 +41,10 @@ Here is a complete sample document:
41 41
         helm:
42 42
           tiller: gcr.io/kubernetes-helm/tiller:v2.7.2
43 43
         kubernetes:
44
-          apiserver: gcr.io/google_containers/hyperkube-amd64:v1.8.6
45
-          controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.8.6
44
+          apiserver: gcr.io/google_containers/hyperkube-amd64:v1.10.2
45
+          controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.10.2
46 46
           etcd: quay.io/coreos/etcd:v3.0.17
47
-          scheduler: gcr.io/google_containers/hyperkube-amd64:v1.8.6
47
+          scheduler: gcr.io/google_containers/hyperkube-amd64:v1.10.2
48 48
       files:
49 49
         - path: /var/lib/anchor/calico-etcd-bootstrap
50 50
           content: ""

+ 2
- 2
docs/source/configuration/host-system.rst View File

@@ -16,7 +16,7 @@ Sample Document
16 16
     data:
17 17
       files:
18 18
         - path: /opt/kubernetes/bin/kubelet
19
-          tar_url: https://dl.k8s.io/v1.8.6/kubernetes-node-linux-amd64.tar.gz
19
+          tar_url: https://dl.k8s.io/v1.10.2/kubernetes-node-linux-amd64.tar.gz
20 20
           tar_path: kubernetes/node/bin/kubelet
21 21
           mode: 0555
22 22
       images:
@@ -24,7 +24,7 @@ Sample Document
24 24
         helm:
25 25
           helm: lachlanevenson/k8s-helm:v2.7.2
26 26
         kubernetes:
27
-          kubectl: gcr.io/google_containers/hyperkube-amd64:v1.8.6
27
+          kubectl: gcr.io/google_containers/hyperkube-amd64:v1.10.2
28 28
       packages:
29 29
         repositories:
30 30
           - deb http://apt.dockerproject.org/repo ubuntu-xenial main

+ 3
- 3
examples/basic/Genesis.yaml View File

@@ -26,10 +26,10 @@ data:
26 26
     helm:
27 27
       tiller: gcr.io/kubernetes-helm/tiller:v2.7.2
28 28
     kubernetes:
29
-      apiserver: gcr.io/google_containers/hyperkube-amd64:v1.8.6
30
-      controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.8.6
29
+      apiserver: gcr.io/google_containers/hyperkube-amd64:v1.10.2
30
+      controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.10.2
31 31
       etcd: quay.io/coreos/etcd:v3.2.14
32
-      scheduler: gcr.io/google_containers/hyperkube-amd64:v1.8.6
32
+      scheduler: gcr.io/google_containers/hyperkube-amd64:v1.10.2
33 33
   files:
34 34
     - path: /var/lib/anchor/calico-etcd-bootstrap
35 35
       content: "# placeholder for triggering calico etcd bootstrapping"

+ 2
- 2
examples/basic/HostSystem.yaml View File

@@ -9,7 +9,7 @@ metadata:
9 9
 data:
10 10
   files:
11 11
     - path: /opt/kubernetes/bin/kubelet
12
-      tar_url: https://dl.k8s.io/v1.8.6/kubernetes-node-linux-amd64.tar.gz
12
+      tar_url: https://dl.k8s.io/v1.10.2/kubernetes-node-linux-amd64.tar.gz
13 13
       tar_path: kubernetes/node/bin/kubelet
14 14
       mode: 0555
15 15
     - path: /etc/logrotate.d/json-logrotate
@@ -34,7 +34,7 @@ data:
34 34
     helm:
35 35
       helm: lachlanevenson/k8s-helm:v2.7.2
36 36
     kubernetes:
37
-      kubectl: gcr.io/google_containers/hyperkube-amd64:v1.8.6
37
+      kubectl: gcr.io/google_containers/hyperkube-amd64:v1.10.2
38 38
   packages:
39 39
     repositories:
40 40
       - deb http://apt.dockerproject.org/repo ubuntu-xenial main

+ 8
- 8
examples/basic/armada-resources.yaml View File

@@ -161,7 +161,7 @@ data:
161 161
   values:
162 162
     images:
163 163
       tags:
164
-        proxy: gcr.io/google_containers/hyperkube-amd64:v1.8.6
164
+        proxy: gcr.io/google_containers/hyperkube-amd64:v1.10.2
165 165
     network:
166 166
       kubernetes_netloc: 127.0.0.1:6553
167 167
   source:
@@ -611,7 +611,7 @@ data:
611 611
 
612 612
     images:
613 613
       tags:
614
-        anchor: gcr.io/google_containers/hyperkube-amd64:v1.8.6
614
+        anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.2
615 615
         haproxy: haproxy:1.8.3
616 616
         test: busybox:1.28.3
617 617
 
@@ -697,8 +697,8 @@ data:
697 697
         endpoints: https://127.0.0.1:2378
698 698
     images:
699 699
       tags:
700
-        anchor: gcr.io/google_containers/hyperkube-amd64:v1.8.6
701
-        apiserver: gcr.io/google_containers/hyperkube-amd64:v1.8.6
700
+        anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.2
701
+        apiserver: gcr.io/google_containers/hyperkube-amd64:v1.10.2
702 702
     secrets:
703 703
       service_account:
704 704
         public_key: placeholder
@@ -774,8 +774,8 @@ data:
774 774
   values:
775 775
     images:
776 776
       tags:
777
-        anchor: gcr.io/google_containers/hyperkube-amd64:v1.8.6
778
-        controller_manager: gcr.io/google_containers/hyperkube-amd64:v1.8.6
777
+        anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.2
778
+        controller_manager: gcr.io/google_containers/hyperkube-amd64:v1.10.2
779 779
     secrets:
780 780
       service_account:
781 781
         private_key: placeholder
@@ -847,8 +847,8 @@ data:
847 847
 
848 848
     images:
849 849
       tags:
850
-        anchor: gcr.io/google_containers/hyperkube-amd64:v1.8.6
851
-        scheduler: gcr.io/google_containers/hyperkube-amd64:v1.8.6
850
+        anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.2
851
+        scheduler: gcr.io/google_containers/hyperkube-amd64:v1.10.2
852 852
 
853 853
   source:
854 854
     type: local

+ 3
- 3
examples/complete/Genesis.yaml View File

@@ -32,10 +32,10 @@ data:
32 32
     helm:
33 33
       tiller: gcr.io/kubernetes-helm/tiller:v2.7.2
34 34
     kubernetes:
35
-      apiserver: gcr.io/google_containers/hyperkube-amd64:v1.8.6
36
-      controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.8.6
35
+      apiserver: gcr.io/google_containers/hyperkube-amd64:v1.10.2
36
+      controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.10.2
37 37
       etcd: quay.io/coreos/etcd:v3.2.14
38
-      scheduler: gcr.io/google_containers/hyperkube-amd64:v1.8.6
38
+      scheduler: gcr.io/google_containers/hyperkube-amd64:v1.10.2
39 39
   files:
40 40
     - path: /var/lib/anchor/calico-etcd-bootstrap
41 41
       content: "# placeholder for triggering calico etcd bootstrapping"

+ 2
- 2
examples/complete/HostSystem.yaml View File

@@ -10,7 +10,7 @@ metadata:
10 10
 data:
11 11
   files:
12 12
     - path: /opt/kubernetes/bin/kubelet
13
-      tar_url: https://dl.k8s.io/v1.8.6/kubernetes-node-linux-amd64.tar.gz
13
+      tar_url: https://dl.k8s.io/v1.10.2/kubernetes-node-linux-amd64.tar.gz
14 14
       tar_path: kubernetes/node/bin/kubelet
15 15
       mode: 0555
16 16
     - path: /etc/logrotate.d/json-logrotate
@@ -35,7 +35,7 @@ data:
35 35
     helm:
36 36
       helm: lachlanevenson/k8s-helm:v2.7.2
37 37
     kubernetes:
38
-      kubectl: gcr.io/google_containers/hyperkube-amd64:v1.8.6
38
+      kubectl: gcr.io/google_containers/hyperkube-amd64:v1.10.2
39 39
   packages:
40 40
     repositories:
41 41
       - deb http://apt.dockerproject.org/repo ubuntu-xenial main

+ 8
- 8
examples/complete/armada-resources.yaml View File

@@ -201,7 +201,7 @@ data:
201 201
   values:
202 202
     images:
203 203
       tags:
204
-        proxy: gcr.io/google_containers/hyperkube-amd64:v1.8.6
204
+        proxy: gcr.io/google_containers/hyperkube-amd64:v1.10.2
205 205
     network:
206 206
       kubernetes_netloc: 127.0.0.1:6553
207 207
   source:
@@ -645,7 +645,7 @@ data:
645 645
 
646 646
     images:
647 647
       tags:
648
-        anchor: gcr.io/google_containers/hyperkube-amd64:v1.8.6
648
+        anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.2
649 649
         haproxy: haproxy:1.8.3
650 650
         test: busybox:1.28.3
651 651
 
@@ -731,8 +731,8 @@ data:
731 731
         endpoints: https://127.0.0.1:2378
732 732
     images:
733 733
       tags:
734
-        anchor: gcr.io/google_containers/hyperkube-amd64:v1.8.6
735
-        apiserver: gcr.io/google_containers/hyperkube-amd64:v1.8.6
734
+        anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.2
735
+        apiserver: gcr.io/google_containers/hyperkube-amd64:v1.10.2
736 736
     secrets:
737 737
       service_account:
738 738
         public_key: placeholder
@@ -808,8 +808,8 @@ data:
808 808
   values:
809 809
     images:
810 810
       tags:
811
-        anchor: gcr.io/google_containers/hyperkube-amd64:v1.8.6
812
-        controller_manager: gcr.io/google_containers/hyperkube-amd64:v1.8.6
811
+        anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.2
812
+        controller_manager: gcr.io/google_containers/hyperkube-amd64:v1.10.2
813 813
     secrets:
814 814
       service_account:
815 815
         private_key: placeholder
@@ -881,8 +881,8 @@ data:
881 881
 
882 882
     images:
883 883
       tags:
884
-        anchor: gcr.io/google_containers/hyperkube-amd64:v1.8.6
885
-        scheduler: gcr.io/google_containers/hyperkube-amd64:v1.8.6
884
+        anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.2
885
+        scheduler: gcr.io/google_containers/hyperkube-amd64:v1.10.2
886 886
 
887 887
   source:
888 888
     type: local

+ 3
- 3
promenade/templates/include/utils.sh View File

@@ -195,19 +195,19 @@ function wait_for_pod_termination {
195 195
 
196 196
     end=$(($(date +%s) + $SEC))
197 197
     while true; do
198
-        POD_PHASE=$(kubectl --request-timeout 10s --namespace $NAMESPACE get -a -o jsonpath="${POD_PHASE_JSONPATH}" pod $POD_NAME)
198
+        POD_PHASE=$(kubectl --request-timeout 10s --namespace $NAMESPACE get -o jsonpath="${POD_PHASE_JSONPATH}" pod $POD_NAME)
199 199
         if [ "x$POD_PHASE" = "xSucceeded" ]; then
200 200
             log Pod $POD_NAME succeeded.
201 201
             break
202 202
         elif [ "x$POD_PHASE" = "xFailed" ]; then
203 203
             log Pod $POD_NAME failed.
204
-            kubectl --request-timeout 10s --namespace $NAMESPACE get -a -o yaml pod $POD_NAME 1>&2
204
+            kubectl --request-timeout 10s --namespace $NAMESPACE get -o yaml pod $POD_NAME 1>&2
205 205
             fail
206 206
         else
207 207
             now=$(date +%s)
208 208
             if [ $now -gt $end ]; then
209 209
                 log Pod did not terminate before timeout.
210
-                kubectl --request-timeout 10s --namespace $NAMESPACE get -a -o yaml pod $POD_NAME 1>&2
210
+                kubectl --request-timeout 10s --namespace $NAMESPACE get -o yaml pod $POD_NAME 1>&2
211 211
                 fail
212 212
             fi
213 213
             sleep 1

+ 0
- 2
promenade/templates/roles/genesis/etc/kubernetes/manifests/kubernetes-controller-manager.yaml View File

@@ -18,8 +18,6 @@ spec:
18 18
       - kube-controller-manager
19 19
       - --allocate-node-cidrs=true
20 20
       - --cluster-cidr={{ config['KubernetesNetwork:kubernetes.pod_cidr'] }}
21
-      - --cluster-signing-cert-file=/etc/kubernetes/controller-manager/pki/cluster-ca.pem
22
-      - --cluster-signing-key-file=/etc/kubernetes/controller-manager/pki/cluster-ca-key.pem
23 21
       - --configure-cloud-routes=false
24 22
       - --leader-elect=true
25 23
       - --kubeconfig=/etc/kubernetes/controller-manager/kubeconfig.yaml

+ 1
- 1
tools/g2/manifests/resiliency.json View File

@@ -117,7 +117,7 @@
117 117
     }
118 118
   ],
119 119
   "vm": {
120
-    "memory": 2048,
120
+    "memory": 3072,
121 121
     "names": [
122 122
       "n0",
123 123
       "n1",

+ 2
- 2
tools/gate/default-config-env View File

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

+ 1
- 1
tools/registry/IMAGES View File

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

Loading…
Cancel
Save