Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cherry picking PRs 481, 483, 526, and 527 into v2.6 #532

Merged
merged 5 commits into from
May 24, 2018
Merged

Cherry picking PRs 481, 483, 526, and 527 into v2.6 #532

merged 5 commits into from
May 24, 2018

Conversation

tmjd
Copy link
Member

@tmjd tmjd commented May 24, 2018

Description

Cherry picking #481, #483, #526, and #527 into the v2.6 branch.

Todos

Release Note

The install-cni container now maintains the original mode on certificates copied from Kubernetes secrets. (@caseydavenport)

The install-cni container now writes the calico-kubeconfig file with mode 600 by default. It can be configured by setting the KUBECONFIG_MODE option. (@caseydavenport)

The install-cni container now only writes the calico-kubeconfig file when running as a Kubernetes pod. (@caseydavenport)

Fix etcd cert file existence check in calico/cni (@bjhaid)

When ran as a pod CNI will be configured with K8s CA for tls verification.

caseydavenport and others added 5 commits May 24, 2018 17:06
@caseydavenport @tmjd
Move more into kubeconfig file
00a6e1d
@tmjd
Ensure kubeconfig server works for IPv6
8ff3007
@bjhaid @tmjd
BUG FIX: Make install-cni.sh check if the etcd cert file exist.
c5d5e43 
This will prevent it from terminating because stat returns non-zero
when called a non-existing file and also stat_output ends up being an
unbound variable.

Affected Component: install-cni container.
@bjhaid @tmjd
Consistently use spaces for indentation.
b8d7208
@tmjd
Enable config of K8s CA in kubeconfig
759f0fa
@tmjd tmjd added this to the Calico v2.6.10 milestone May 24, 2018
@CLAassistant
Copy link

CLAassistant commented May 24, 2018 •
edited
Loading

CLA assistant check
All committers have signed the CLA.

@caseydavenport caseydavenport merged commit bececf0 into projectcalico:release-v2.6 May 24, 2018
@tmjd tmjd deleted the cp-481-483-526-527-to-v2.6 branch May 25, 2018 13:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@caseydavenport caseydavenport caseydavenport approved these changes

Assignees
No one assigned
Labels
release-note-required
Projects
None yet
Milestone
Calico v2.6.10
Development

Successfully merging this pull request may close these issues.
4 participants
@tmjd @CLAassistant @caseydavenport @bjhaid