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.

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

Don't load nonexistent calico-client cert when CNI is Cilium #8338

Merged
merged 1 commit into from
Jan 27, 2020

Conversation

johngmyers
Copy link
Member

/kind bug

6d01336 stopped generating the "calico-client" keypair and certificate when the CNI was set to Cilium, as the new version of Cilium no longer needed to use the apiserver's etcd cluster. Unfortunately, it failed to stop adding the EtcdTLSBuilder in that case. The result of this is that if the cluster is not using etcd-manager and has etcd TLS enabled, masters will fail to come up looking for "calico-client" certificates that don't exist.

@k8s-ci-robot k8s-ci-robot added kind/bug Categorizes issue or PR as related to a bug. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jan 15, 2020
@olemarkus
Copy link
Member

That diff is a part of #8220 too

@johngmyers
Copy link
Member Author

So it is. It is, however, a separate concern that may need to be backported further.

@olemarkus
Copy link
Member

Newer Cilium support doesn't really go back that far though. But just merge in this one if this can make it into the releases that are supposed to be cut this week

@olemarkus
Copy link
Member

I removed this change from my PR. It was not really related anyway. So /lgtm

@justinsb
Copy link
Member

Thanks for figuring this out @johngmyers & @olemarkus !

/approve
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 27, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: johngmyers, justinsb

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 27, 2020
@justinsb
Copy link
Member

This one is likely to fail aws e2e tests due to the issue being addressed in kubernetes/test-infra#16029 (i.e. not due to this PR)

@johngmyers
Copy link
Member Author

/test pull-kops-e2e-kubernetes-aws

1 similar comment
@johngmyers
Copy link
Member Author

/test pull-kops-e2e-kubernetes-aws

@k8s-ci-robot k8s-ci-robot merged commit bf40b0a into kubernetes:master Jan 27, 2020
@k8s-ci-robot k8s-ci-robot added this to the v1.18 milestone Jan 27, 2020
@johngmyers johngmyers deleted the etcd-tls branch January 27, 2020 14:25
k8s-ci-robot added a commit that referenced this pull request Jan 27, 2020
…38-upstream-release-1.17

Automated cherry pick of #8338: Don't load nonexistent calico-client cert when CNI is Cilium
k8s-ci-robot added a commit that referenced this pull request Jan 27, 2020
…38-upstream-release-1.15

Automated cherry pick of #8338: Don't load nonexistent calico-client cert when CNI is Cilium
k8s-ci-robot added a commit that referenced this pull request Jan 27, 2020
…38-upstream-release-1.16

Automated cherry pick of #8338: Don't load nonexistent calico-client cert when CNI is Cilium
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants