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

Adding additional CRD for Calico that was missing. #406

Merged
merged 1 commit into from
Apr 24, 2019
Merged

Adding additional CRD for Calico that was missing. #406

merged 1 commit into from
Apr 24, 2019

Conversation

wmorgan6796
Copy link
Contributor

Description of changes: The Calico deployment was missing a CRD causing it to have errors. I have added the missing CRD to remove the errors.

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

@mogren mogren added the calico Calico integration issue label Apr 24, 2019
@mogren
Copy link
Contributor

mogren commented Apr 24, 2019

@2ffs2nns or @caseydavenport, any comment on this? I'll try to take a look some time soon.

@caseydavenport
Copy link
Contributor

This looks right to me - should fix this issue: projectcalico/calico#2540

mogren
mogren approved these changes Apr 24, 2019
View reviewed changes
Copy link
Contributor

@mogren mogren left a comment

Choose a reason for hiding this comment

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

Thanks @caseydavenport, looks fine to me too, just wanted it confirmed.

@mogren mogren merged commit 34d677c into aws:master Apr 24, 2019
@mogren mogren mentioned this pull request Apr 24, 2019
Merged
@caseydavenport caseydavenport mentioned this pull request Apr 24, 2019
Closed
@tiffanyfay
Copy link
Contributor

@caseydavenport What about globalfelixconfigs and globalbgpconfigs?

@caseydavenport
Copy link
Contributor

Those are the old-style names - the current manifest has them listed as FelixConfigurations and BGPConfigurations: https:/wmorgan6796/amazon-vpc-cni-k8s/blob/92b46e1f8e8445370a72bdc68e880195fcb00c79/config/v1.4/calico.yaml#L149-L175

@tiffanyfay
Copy link
Contributor

@caseydavenport So should we remove lines 365 and 368? https:/wmorgan6796/amazon-vpc-cni-k8s/blob/92b46e1f8e8445370a72bdc68e880195fcb00c79/config/v1.4/calico.yaml#L365
Thanks

@caseydavenport
Copy link
Contributor

Yeah, I think we can.

@tiffanyfay tiffanyfay mentioned this pull request Apr 26, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mogren mogren mogren approved these changes

Assignees
No one assigned
Labels
calico Calico integration issue
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@wmorgan6796 @mogren @caseydavenport @tiffanyfay