Skip to content
This repository was archived by the owner on Jul 30, 2021. It is now read-only.

Commit 6c09559

Browse files
author
Yifan Gu
authored
Merge pull request #408 from yifan-gu/release-0.3
*.*: Bump k8s version v1.5.6.
2 parents b33e707 + f679e6b commit 6c09559

File tree

119 files changed

+67653
-22942
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+67653
-22942
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ conformance-%: clean all
5454
#TODO(aaron): the k8s.io/client-go upstream package is a symlink with relative path. Making note because we change symlink path.
5555
# This will naively try and create a vendor dir from a k8s release
5656
# USE: make vendor VENDOR_VERSION=vX.Y.Z
57-
VENDOR_VERSION = v1.5.5+coreos.0
57+
VENDOR_VERSION = v1.5.6+coreos.0
5858
ETCD_OPERATOR_VERSION = v0.2.1
5959
vendor:
6060
@echo "Creating k8s vendor for: $(VENDOR_VERSION)"

hack/multi-node/user-data.sample

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ coreos:
99
[Service]
1010
EnvironmentFile=/etc/environment
1111
Environment=KUBELET_IMAGE_URL=quay.io/coreos/hyperkube
12-
Environment=KUBELET_IMAGE_TAG=v1.5.5_coreos.0
12+
Environment=KUBELET_IMAGE_TAG=v1.5.6_coreos.0
1313
Environment="RKT_RUN_ARGS=--uuid-file-save=/var/run/kubelet-pod.uuid \
1414
--volume var-lib-cni,kind=host,source=/var/lib/cni \
1515
--mount volume=var-lib-cni,target=/var/lib/cni"

hack/quickstart/init-worker.sh

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -13,33 +13,17 @@ function usage() {
1313
exit 1
1414
}
1515

16-
function extract_master_endpoint (){
17-
grep 'certificate-authority-data' ${KUBECONFIG} | awk '{print $2}' | base64 -d > /home/core/ca.crt
18-
grep 'client-certificate-data' ${KUBECONFIG} | awk '{print $2}'| base64 -d > /home/core/client.crt
19-
grep 'client-key-data' ${KUBECONFIG} | awk '{print $2}'| base64 -d > /home/core/client.key
20-
21-
MASTER_PUB="$(awk '/server:/ {print $2}' ${KUBECONFIG} | awk -F/ '{print $3}' | awk -F: '{print $1}')"
22-
# TODO (aaron): The -k was added with the gce conformance tests - figure out why it's needed here.
23-
# The certs are seemingly signed correctly, but says no SAN for MASTER_PUB
24-
MASTER_PRIV=$(curl -k https://${MASTER_PUB}:443/api/v1/namespaces/default/endpoints/kubernetes \
25-
--cacert /home/core/ca.crt --cert /home/core/client.crt --key /home/core/client.key \
26-
| jq -r '.subsets[0].addresses[0].ip')
27-
rm -f /home/core/client.crt /home/core/client.key
28-
}
29-
3016
# Initialize a worker node
3117
function init_worker_node() {
32-
extract_master_endpoint
3318

3419
# Setup kubeconfig
3520
mkdir -p /etc/kubernetes
3621
cp ${KUBECONFIG} /etc/kubernetes/kubeconfig
37-
# Pulled out of the kubeconfig in extract_master_endpoint. Other installations should
38-
# place the root CA here manually.
39-
mv /home/core/ca.crt /etc/kubernetes/ca.crt
22+
# Pulled out of the kubeconfig. Other installations should place the root
23+
# CA here manually.
24+
grep 'certificate-authority-data' ${KUBECONFIG} | awk '{print $2}' | base64 -d > /etc/kubernetes/ca.crt
4025

41-
sed "s/{{apiserver}}/${MASTER_PRIV}/" /home/core/kubelet.worker > /etc/systemd/system/kubelet.service
42-
rm /home/core/kubelet.worker
26+
mv /home/core/kubelet.worker /etc/systemd/system/kubelet.service
4327

4428
# Start services
4529
systemctl daemon-reload

hack/quickstart/kubelet.master

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ ExecStartPre=/bin/mkdir -p /srv/kubernetes/manifests
1313
ExecStartPre=/bin/mkdir -p /var/lib/cni
1414
ExecStartPre=-/usr/bin/rkt rm --uuid-file=/var/run/kubelet-pod.uuid
1515
ExecStart=/usr/lib/coreos/kubelet-wrapper \
16-
--api-servers=https://${COREOS_PRIVATE_IPV4}:443 \
1716
--kubeconfig=/etc/kubernetes/kubeconfig \
17+
--require-kubeconfig \
1818
--client-ca-file=/etc/kubernetes/ca.crt \
1919
--anonymous-auth=false \
2020
--cni-conf-dir=/etc/kubernetes/cni/net.d \

hack/quickstart/kubelet.worker

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ ExecStartPre=/bin/mkdir -p /etc/kubernetes/cni/net.d
1111
ExecStartPre=/bin/mkdir -p /var/lib/cni
1212
ExecStartPre=-/usr/bin/rkt rm --uuid-file=/var/run/kubelet-pod.uuid
1313
ExecStart=/usr/lib/coreos/kubelet-wrapper \
14-
--api-servers=https://{{apiserver}}:443 \
1514
--kubeconfig=/etc/kubernetes/kubeconfig \
15+
--require-kubeconfig \
1616
--client-ca-file=/etc/kubernetes/ca.crt \
1717
--anonymous-auth=false \
1818
--cni-conf-dir=/etc/kubernetes/cni/net.d \

hack/single-node/user-data.sample

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ coreos:
1717
[Service]
1818
EnvironmentFile=/etc/environment
1919
Environment=KUBELET_IMAGE_URL=quay.io/coreos/hyperkube
20-
Environment=KUBELET_IMAGE_TAG=v1.5.5_coreos.0
20+
Environment=KUBELET_IMAGE_TAG=v1.5.6_coreos.0
2121
Environment="RKT_RUN_ARGS=--uuid-file-save=/var/run/kubelet-pod.uuid \
2222
--volume var-lib-cni,kind=host,source=/var/lib/cni \
2323
--mount volume=var-lib-cni,target=/var/lib/cni"

hack/tests/conformance-test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
set -euo pipefail
33

44
CONFORMANCE_REPO=${CONFORMANCE_REPO:-github.com/coreos/kubernetes}
5-
CONFORMANCE_VERSION=${CONFORMANCE_VERSION:-v1.5.5+coreos.0}
5+
CONFORMANCE_VERSION=${CONFORMANCE_VERSION:-v1.5.6+coreos.0}
66

77
usage() {
88
echo "USAGE:"

pkg/asset/internal/templates.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ spec:
5050
spec:
5151
containers:
5252
- name: kubelet
53-
image: quay.io/coreos/hyperkube:v1.5.5_coreos.0
53+
image: quay.io/coreos/hyperkube:v1.5.6_coreos.0
5454
command:
5555
- ./hyperkube
5656
- kubelet
@@ -147,7 +147,7 @@ spec:
147147
hostNetwork: true
148148
containers:
149149
- name: kube-apiserver
150-
image: quay.io/coreos/hyperkube:v1.5.5_coreos.0
150+
image: quay.io/coreos/hyperkube:v1.5.6_coreos.0
151151
command:
152152
- /usr/bin/flock
153153
- --exclusive
@@ -291,7 +291,7 @@ spec:
291291
master: "true"
292292
containers:
293293
- name: kube-controller-manager
294-
image: quay.io/coreos/hyperkube:v1.5.5_coreos.0
294+
image: quay.io/coreos/hyperkube:v1.5.6_coreos.0
295295
command:
296296
- ./hyperkube
297297
- controller-manager
@@ -347,7 +347,7 @@ spec:
347347
master: "true"
348348
containers:
349349
- name: kube-scheduler
350-
image: quay.io/coreos/hyperkube:v1.5.5_coreos.0
350+
image: quay.io/coreos/hyperkube:v1.5.6_coreos.0
351351
command:
352352
- ./hyperkube
353353
- scheduler
@@ -380,7 +380,7 @@ spec:
380380
hostNetwork: true
381381
containers:
382382
- name: kube-proxy
383-
image: quay.io/coreos/hyperkube:v1.5.5_coreos.0
383+
image: quay.io/coreos/hyperkube:v1.5.6_coreos.0
384384
command:
385385
- /hyperkube
386386
- proxy
@@ -600,7 +600,7 @@ spec:
600600
spec:
601601
containers:
602602
- name: etcd-operator
603-
image: quay.io/coreos/etcd-operator:v0.2.1
603+
image: quay.io/coreos/etcd-operator:v0.2.4
604604
env:
605605
- name: MY_POD_NAMESPACE
606606
valueFrom:

0 commit comments

Comments
 (0)