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

Fix cilium etcd migration #9451

Merged
merged 3 commits into from
Jun 27, 2020

Conversation

olemarkus
Copy link
Member

This PR fixes two issues:

  • One where we have changed the etcd-manager cert files, but forgotten to change the names in the cilium manifest
  • One where the check used for deploying cilium cert files used etcdManaged instead of testing for the the existence of the cilium cluster making a graceful migration from CRD to etcd impossible.
    This PR also adds some documentation around migrating to etcd and about migrating to/from nodeport.

Fixes #9448
Fixes #9446

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jun 27, 2020
docs/networking/cilium.md Outdated Show resolved Hide resolved
nodeup/pkg/model/networking/cilium.go Outdated Show resolved Hide resolved
pkg/model/iam/iam_builder.go Outdated Show resolved Hide resolved

if err := b.buildBPFMount(c); err != nil {
return err
for _, cluster := range b.Cluster.Spec.EtcdClusters {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps move this to a new method on KopsModelContext?

Co-authored-by: John Gardiner Myers <jgmyers@proofpoint.com>
@johngmyers
Copy link
Member

/lgtm

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

/assign @rifelpet

@rifelpet
Copy link
Member

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: olemarkus, rifelpet

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 Jun 27, 2020
@k8s-ci-robot k8s-ci-robot merged commit 764881c into kubernetes:master Jun 27, 2020
@k8s-ci-robot k8s-ci-robot added this to the v1.19 milestone Jun 27, 2020
k8s-ci-robot added a commit that referenced this pull request Jun 29, 2020
…1-origin-release-1.18

Automated cherry pick of #9451: Deploy cilium etcd credentials if the cilium cluster
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. area/addons area/documentation area/nodeup cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
4 participants