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

Backport of NET-9178-Consul-api-gateway-not-starting-after-restart into release/1.4.x #3985

Merged
merged 11 commits into from
May 22, 2024
Merged

Backport of NET-9178-Consul-api-gateway-not-starting-after-restart into release/1.4.x #3985

merged 11 commits into from
May 22, 2024

Conversation

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

Backport

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

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

Changes proposed in this PR

  • If role already exists, don't error out of connect inject.

How I've tested this PR

  • Local build, create api gateway, delete connect inject. Before this change, connect inject would crash with 'role already exists', after this change, connect inject ignores that the role already exists and continues to operate as expected.

How I expect reviewers to test this PR

  • Local Build, CI passes

Checklist

Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/NET-9178-Consul-api-gateway-not-starting-after-restart/routinely-sought-seasnail branch from 76790d8 to 19c71c3 Compare May 9, 2024 19:15
sarahalsmiller and others added 8 commits May 21, 2024 13:21
@sarahalsmiller
Merge branch 'release/1.4.x' into backport/NET-9178-Consul-api-gatewa…
8f1b2e3 
…y-not-starting-after-restart/routinely-sought-seasnail
@sarahalsmiller
fix duplicate
a602553
@sarahalsmiller
Merge branch 'release/1.4.x' into backport/NET-9178-Consul-api-gatewa…
c1ade8f 
…y-not-starting-after-restart/routinely-sought-seasnail
@sarahalsmiller
lint
40c2dfd
@sarahalsmiller
Merge branch 'backport/NET-9178-Consul-api-gateway-not-starting-after…
917c435 
…-restart/routinely-sought-seasnail' of github.com:hashicorp/consul-k8s into backport/NET-9178-Consul-api-gateway-not-starting-after-restart/routinely-sought-seasnail
@sarahalsmiller
Merge branch 'release/1.4.x' into backport/NET-9178-Consul-api-gatewa…
bf3861b 
…y-not-starting-after-restart/routinely-sought-seasnail
@sarahalsmiller
Merge branch 'release/1.4.x' into backport/NET-9178-Consul-api-gatewa…
d1c5d34 
…y-not-starting-after-restart/routinely-sought-seasnail
@sarahalsmiller
update changelog
61dd350
@hc-github-team-consul-core hc-github-team-consul-core merged commit 84cdf3d into release/1.4.x May 22, 2024
50 checks passed
@hc-github-team-consul-core hc-github-team-consul-core deleted the backport/NET-9178-Consul-api-gateway-not-starting-after-restart/routinely-sought-seasnail branch May 22, 2024 17:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sarahalsmiller sarahalsmiller sarahalsmiller approved these changes

Assignees

@sarahalsmiller sarahalsmiller

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@hc-github-team-consul-core @sarahalsmiller