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 EncapsulationCalculator behavior when encapsulation is empty string #6494

Merged
merged 1 commit into from
Aug 3, 2022

Conversation

coutinhop
Copy link
Member

@coutinhop coutinhop commented Aug 3, 2022

Description

Related issues/PRs

#6442

Todos

  • Tests
  • Documentation
  • Release note

Release Note

Reminder for the reviewer

Make sure that this PR has the correct labels and milestone set.

Every PR needs one docs-* label.

  • docs-pr-required: This change requires a change to the documentation that has not been completed yet.
  • docs-completed: This change has all necessary documentation completed.
  • docs-not-required: This change has no user-facing impact and requires no docs.

Every PR needs one release-note-* label.

  • release-note-required: This PR has user-facing changes. Most PRs should have this label.
  • release-note-not-required: This PR has no user-facing changes.

Other optional labels:

  • cherry-pick-candidate: This PR should be cherry-picked to an earlier release. For bug fixes only.
  • needs-operator-pr: This PR is related to install and requires a corresponding change to the operator.

@coutinhop coutinhop added release-note-required Change has user-facing impact (no matter how small) docs-not-required Docs not required for this change labels Aug 3, 2022
@coutinhop coutinhop self-assigned this Aug 3, 2022
@coutinhop coutinhop requested a review from a team as a code owner August 3, 2022 17:59
@marvin-tigera marvin-tigera added this to the Calico v3.25.0 milestone Aug 3, 2022
@coutinhop coutinhop merged commit 226df17 into projectcalico:master Aug 3, 2022
@coutinhop coutinhop deleted the pedro-CORE-7903 branch August 3, 2022 19:58
coutinhop added a commit to coutinhop/calico that referenced this pull request Aug 4, 2022
…trings

Set IPIPMode and VXLANMode to the default "Never" if they are empty strings in convertIpPoolFromStorage() in clientv3/ippool.go (for when the IP pool was created by an older Calico version that did not have these fields).

Add tests for this to clientv3/ippool_e2e_test.go.

Roll back EncapsulationCalculator changes from projectcalico#6494 and add validation to EncapsulationCalculator.handleAPIPool in encapsulation_resolver.go. Also add tests for it in encapsulation_resolver_test.go
@coutinhop coutinhop added release-note-not-required Change has no user-facing impact and removed release-note-required Change has user-facing impact (no matter how small) labels Aug 4, 2022
coutinhop added a commit to coutinhop/calico that referenced this pull request Aug 10, 2022
…trings

Set IPIPMode and VXLANMode to the default "Never" if they are empty strings in convertIpPoolFromStorage() in clientv3/ippool.go (for when the IP pool was created by an older Calico version that did not have these fields).

Add tests for this to clientv3/ippool_e2e_test.go.

Roll back EncapsulationCalculator changes from projectcalico#6494 and add validation to EncapsulationCalculator.handleAPIPool in encapsulation_resolver.go. Also add tests for it in encapsulation_resolver_test.go
coutinhop added a commit to coutinhop/calico that referenced this pull request Aug 10, 2022
…trings

Set IPIPMode and VXLANMode to the default "Never" if they are empty strings in convertIpPoolFromStorage() in clientv3/ippool.go (for when the IP pool was created by an older Calico version that did not have these fields).

Add tests for this to clientv3/ippool_e2e_test.go.

Roll back EncapsulationCalculator changes from projectcalico#6494 and add validation to EncapsulationCalculator.handleAPIPool in encapsulation_resolver.go. Also add tests for it in encapsulation_resolver_test.go
coutinhop added a commit to coutinhop/calico that referenced this pull request Aug 14, 2022
…trings

Set IPIPMode and VXLANMode to the default "Never" if they are empty strings in convertIpPoolFromStorage() in clientv3/ippool.go (for when the IP pool was created by an older Calico version that did not have these fields).

Add tests for this to clientv3/ippool_e2e_test.go.

Roll back EncapsulationCalculator changes from projectcalico#6494 and add validation to EncapsulationCalculator.handleAPIPool in encapsulation_resolver.go. Also add tests for it in encapsulation_resolver_test.go
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
docs-not-required Docs not required for this change release-note-not-required Change has no user-facing impact
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants