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

Split Calico manifest into two #1410

Merged
merged 1 commit into from
Apr 2, 2021

Conversation

caseydavenport
Copy link
Contributor

What type of PR is this?

bug

Which issue does this PR fix:

As mentioned in this discussion: #1297 (comment)

The current manifest includes both the Installation CRD as well as an
instance of an Insatllation CR. Since they are both in the same
manfiest, the API server doesn't have time to register the CRD before
the CR is sent, and so the CR is rejected.

They should be in two manfiests, so the user can apply the CRD first and
then apply the CR.

This change will include a corresponding documentation change.

What does this PR do / Why do we need it:

Splits calico.yaml into two so they can be properly ordered.

Testing done on this change:

Automation added to e2e:

Will this break upgrades or downgrades. Has updating a running cluster been tested?:

Does this change require updates to the CNI daemonset config files to work?:

Does this PR introduce any user-facing change?:

calico.yaml is split into two manifests - calico-operator.yaml and calico-crs.yaml

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

Copy link
Contributor

@tmjd tmjd left a comment

Choose a reason for hiding this comment

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

LGTM
Thank you

@jayanthvn
Copy link
Contributor

Thanks @caseydavenport . Can you please update the branch so that I can merge.

Copy link
Contributor

@jayanthvn jayanthvn left a comment

Choose a reason for hiding this comment

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

Can you please point me to a documentation so that I can update in our readme and release notes? LGTM, thanks :)

@caseydavenport
Copy link
Contributor Author

@jayanthvn this PR has the corresponding documentation updates: awsdocs/amazon-eks-user-guide#341

@jayanthvn
Copy link
Contributor

@caseydavenport - awesome, thank you so much.

@jayanthvn jayanthvn merged commit 0b6436f into aws:master Apr 2, 2021
@jayanthvn jayanthvn added this to the v1.8.0 milestone Apr 2, 2021
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.

3 participants