Skip to content

Backport of Fix bug on service intention CRDs causing missed updates into release/1.0.x#2220

Merged
hc-github-team-consul-core merged 1 commit intorelease/1.0.xfrom
backport/fix-service-intention-crd-bug/kindly-in-starfish
Jun 6, 2023
Merged

Backport of Fix bug on service intention CRDs causing missed updates into release/1.0.x#2220
hc-github-team-consul-core merged 1 commit intorelease/1.0.xfrom
backport/fix-service-intention-crd-bug/kindly-in-starfish

Conversation

@hc-github-team-consul-core
Copy link
Copy Markdown
Collaborator

Backport

This PR is auto-generated from #2194 to be assessed for backporting due to the inclusion of the label backport/1.0.x.

The below text is copied from the body of the original PR.


Changes proposed in this PR:

  • Include partition and namespace in intention source equality checks
  • Include namespace in intention destination equality checks.

This code was originally added here to avoid modifying all intentions when upgrading from Consul pre-1.12 to 1.12+. Consul-K8s 1.0.x is compatible with Consul 1.14.x and Consul-K8s 1.1.x is compatible with Consul 1.15.x, so users should be past 1.12 when upgrading to either of the backported versions (compatibility matrix).

How I've tested this PR:

  • Unit tests
  • Manual tests in the sameness group demo environment.

Checklist:

  • Tests added
  • CHANGELOG entry added

Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/fix-service-intention-crd-bug/kindly-in-starfish branch from d8250a9 to 1d4eea4 Compare May 31, 2023 13:24
@hc-github-team-consul-core hc-github-team-consul-core enabled auto-merge (squash) May 31, 2023 13:24
@erichaberkorn erichaberkorn force-pushed the backport/fix-service-intention-crd-bug/kindly-in-starfish branch from 1d4eea4 to 925cb23 Compare May 31, 2023 18:12
@david-yu
Copy link
Copy Markdown
Contributor

david-yu commented Jun 2, 2023

@erichaberkorn Should this be merged?

@erichaberkorn erichaberkorn force-pushed the backport/fix-service-intention-crd-bug/kindly-in-starfish branch from 925cb23 to 0eef689 Compare June 6, 2023 01:08
@hc-github-team-consul-core hc-github-team-consul-core merged commit 03ecd62 into release/1.0.x Jun 6, 2023
@hc-github-team-consul-core hc-github-team-consul-core deleted the backport/fix-service-intention-crd-bug/kindly-in-starfish branch June 6, 2023 13:12
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