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

Backport of APIGW Normalize Status Conditions into release/1.15.x #17844

Conversation

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

@hc-github-team-consul-core hc-github-team-consul-core commented Jun 22, 2023

Backport

This PR is generated from #16994 to be assessed for backporting due to the inclusion of the label backport/1.15.

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


Description

We want to normalize status conditions for gateways and routes to more closely match the k8s spec. This PR also includes validations for combinations of status/type/reason. We deviate from the spec in a few places on routes and this is called out in the code.

Testing & Reproduction steps

Run the tests

Links

k8s spec
k8s shared types

PR Checklist

  • updated test coverage
  • external facing docs updated
  • appropriate backport labels added
  • not a security concern

Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/jm96441n/normalize-status-conditions/smoothly-grateful-crayfish branch 2 times, most recently from 4c0ebb2 to 27332fc Compare June 22, 2023 21:06
@hashicorp-cla
Copy link

hashicorp-cla commented Jun 22, 2023

CLA assistant check
All committers have signed the CLA.

Copy link

Choose a reason for hiding this comment

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

Auto approved Consul Bot automated PR

@vercel vercel bot temporarily deployed to Preview – consul-ui-staging June 22, 2023 21:10 Inactive
@vercel vercel bot temporarily deployed to Preview – consul June 22, 2023 21:17 Inactive
* normalize status conditions for gateways and routes

* Added tests for checking condition status and panic conditions for
validating combinations, added dummy code for fsm store

* get rid of unneeded gateway condition generator struct

* Remove unused file

* run go mod tidy

* Update tests, add conflicted gateway status

* put back removed status for test

* Fix linting violation, remove custom conflicted status

* Update fsm commands oss

* Fix incorrect combination of type/condition/status

* cleaning up from PR review

* Change "invalidCertificate" to be of accepted status

* Move status condition enums into api package

* Update gateways controller and generated code

* Update conditions in fsm oss tests

* run go mod tidy on consul-container module to fix linting

* Fix type for gateway endpoint test

* go mod tidy from changes to api

* go mod tidy on troubleshoot

* Fix route conflicted reason

* fix route conflict reason rename

* Fix text for gateway conflicted status

* Add valid certificate ref condition setting

* Revert change to resolved refs to be handled in future PR
@nathancoleman nathancoleman force-pushed the backport/jm96441n/normalize-status-conditions/smoothly-grateful-crayfish branch from 0b61e1e to ad67dae Compare June 23, 2023 15:12
@nathancoleman nathancoleman marked this pull request as ready for review June 23, 2023 17:37
@nathancoleman nathancoleman merged commit 65cc60e into release/1.15.x Jun 23, 2023
@nathancoleman nathancoleman deleted the backport/jm96441n/normalize-status-conditions/smoothly-grateful-crayfish branch June 23, 2023 18:05
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.

5 participants