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

Downgrade updates after testing #1544

Merged
merged 1 commit into from
Dec 22, 2017
Merged

Conversation

tmjd
Copy link
Member

@tmjd tmjd commented Dec 21, 2017

I tried to model this a little after some of the other upgrade docs.

Release Note

None required

@tmjd tmjd requested a review from emanic December 21, 2017 01:50
before downgrading the {{site.prodname}} components.
1. Follow the steps in
[Aborting the upgrade](#aborting-the-upgrade-when-using-the-etcd-datastore)
can be done before downgrading the {{site.prodname}} components.
Copy link
Member

Choose a reason for hiding this comment

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

During my test, I found reuse of Aborting the upgrade section could cause confusion because user is not actually aborting upgrade. Maybe something like Run `calico-upgrade abort` to instruct calico to use previous version datastore.

_Docs for this coming soon!_

## Aborting the upgrade
## Aborting the upgrade when using the etcd datastore

If you have not upgraded the {{site.prodname}} components then follow
Copy link
Member Author

Choose a reason for hiding this comment

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

This is a little confusing after being directed here by the Downgrade instructions. I'll rework or remove it.

> before downgrading will lose networking.
{: .alert .alert-danger}

- Follow the steps to [Abort the upgrade when using the etcd
Copy link
Contributor

Choose a reason for hiding this comment

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

The abort procedure is discussed in the migrate section so I don't think it belongs here, I think we can delete this.

Copy link
Member Author

Choose a reason for hiding this comment

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

Is what you are talking about in a PR still? In master I don't see an abort procedure, the only abort mention is a reference to it in the Errors note.

@tmjd tmjd added this to the Calico v3.0.0 milestone Dec 21, 2017
@bcreane bcreane self-requested a review December 21, 2017 23:07
Copy link
Contributor

@bcreane bcreane left a comment

Choose a reason for hiding this comment

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

The content looks correct (and helpful!). It looks like there are a couple of broken links in the htmlproofer check. Also would like to see Emily's comment resolved, either in favor of or against including the downgrade info in this section.

- `bgpconfigurations.crd.projectcalico.org`
- `felixconfigurations.crd.projectcalico.org`
- `clusterinformations.crd.projectcalico.org`
Copy link
Contributor

Choose a reason for hiding this comment

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

what about networkpolicies.crd.projectcalico.org?

to try again.

## Deleting Calico data from the Kubernetes API datastore after a downgrade
Copy link
Contributor

Choose a reason for hiding this comment

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

Need to add a bullet around line 17 explaining when you might need to execute this procedure and linking to the anchor link here (like the other bullets)

- `felixconfigurations.crd.projectcalico.org`
- `clusterinformations.crd.projectcalico.org`

Copy link
Contributor

Choose a reason for hiding this comment

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

I would put the expected output below the command that returns it

@@ -14,6 +14,9 @@ following conditions.

- [A data migration attempt failed partway through, leaving the etcdv3 datastore
with some, but not all of your etcvd2 data](#deleting-calico-data-from-etcdv3-after-a-partial-migration).

- [You upgraded to Calico v3.0 but then downgraded to your previous version
Copy link
Contributor

Choose a reason for hiding this comment

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

Since they upgraded from v2.6.4, then we know their previous version and can change "your previous version" to "v2.6.4"

Copy link
Contributor

Choose a reason for hiding this comment

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

I think you should specify in this bullet text that this is for the "Kubernetes API datastore" (versus etcd)

@@ -14,6 +14,9 @@ following conditions.

- [A data migration attempt failed partway through, leaving the etcdv3 datastore
with some, but not all of your etcvd2 data](#deleting-calico-data-from-etcdv3-after-a-partial-migration).

- [You upgraded to Calico v3.0 but then downgraded to your previous version
but need to clean up before upgrading again](#deleting-calico-data-from-the-kubernetes-api-datastore-after-a-downgrade).
Copy link
Contributor

Choose a reason for hiding this comment

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

I would change "but" to "and" here, I think it's more correct

- Add steps to delete v3.0 KDD CRDs after downgrade
Copy link
Contributor

@emanic emanic left a comment

Choose a reason for hiding this comment

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

Thanks @tmjd

@emanic emanic merged commit d8dca1b into projectcalico:master Dec 22, 2017
@tmjd tmjd deleted the fixup-downgrade branch January 2, 2018 13:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants