Skip to content

Backport of Configure Gateway Deployment Resources into release/1.2.x#2853

Closed
hc-github-team-consul-core wants to merge 132 commits intorelease/1.2.xfrom
backport/configure-gateway-depl-limits/perfectly-exotic-tapir
Closed

Backport of Configure Gateway Deployment Resources into release/1.2.x#2853
hc-github-team-consul-core wants to merge 132 commits intorelease/1.2.xfrom
backport/configure-gateway-depl-limits/perfectly-exotic-tapir

Conversation

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

Backport

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

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@t-eckert
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.

merge conflict error: POST https://api.github.com/repos/hashicorp/consul-k8s/merges: 409 Merge conflict []

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


Adds the ability for users to customize the resource requests and limits for the Pods deployed as part of the Gateway deployment.

Changes proposed in this PR:

  • Move resources into managedGatewayClass in Helm config
  • Add resource configuration to GatewayClassConfig
  • Regenerate CRDs
  • Pass resource configuration into the gateway-resources-job with a new gateway-resources-configmap
  • Pull in resources from GatewayClassConfig in Gatekeeper
  • Clean up some comments in existing code

How I've tested this PR:

I deployed Consul with the resources for the managedGatewayClass configured and saw that the resources were properly configured for the Pods when set, when omitted, and when the stanza was completely deleted.

How I expect reviewers to test this PR:

Try the same, with a deployment, create a Gateway that points to the consul GatewayClass and ensure that it has the resources you configured. You can also create your own GatewayClassConfig with custom resource settings.

Checklist:

Closes https://hashicorp.atlassian.net/browse/NET-5155


Overview of commits

curtbushko and others added 30 commits June 7, 2023 19:51
* Add FIPS builds for linux amd64

* add version check

* fix CI labels and add local dev commands

* fix ci version tagging

* switch to ubuntu 20.04

* add CLI version tag

* add gcompat for alpine glibc cgo compatibility

* remove FIPS version check from connect-init

* address comments
- making this trigger nightly until after 1.2.0 GA
- leaving 0.49.x active until after 1.2.0 GA
* first run through, needs help

* still need to make secure pass

* left something uncommented

* it works and also cleanup

* fix acceptance tests
* [API Gateway] Add acceptance test for cluster peering

* Fix linter

* Fix random unrelated linter errors to get CI to run: revert later?

* one more linter fix to later probably revert

* more linter fixes

* Revert "more linter fixes"

This reverts commit 6210dff.

* Revert "one more linter fix to later probably revert"

This reverts commit 030c563.

* Revert "Fix random unrelated linter errors to get CI to run: revert later?"

This reverts commit fdeccab.
…ersion of kind and k8s 1.27 (#2304)

* update cloud tests to use 1.24, 1.25 and 1.26 version of kubernetes for more coverage

* updated readme for supported kubernetes versions

* added changelog
* [API Gateway] WAN Federation test and fixes

* Fix unit tests
* Fix when gateways are deleted before we get services populated into cache

* a bit of cleanup
…assConfig are obeyed (#2272)

* Add unit tests verifying that scaling parameters on GatewayClassConfig are obeyed

* Add test case for scaling w/ no min or max configured
* Rename GatewayClassController to prevent name collision

* Use gateway instead of gatewayclass in name

* Use the constant in ownership checks

* Change GatewayClass name to "consul"

* Change GatewayClass name in cases

* Change ApiGatewayClass back
* Fix SupportedKinds array to be what Conformance test expects

* Fix cert validation status condition for listeners

* Add programmed condition for listeners

* Fix unit test

---------

Co-authored-by: Nathan Coleman <nathan.coleman@hashicorp.com>
* first pass at halting: got httproute and api-gateway done

* clean up test

* Handle all set for infinite reconcile check

* Add table tests for minimal setup

* Added some odd field names to test normalization is handled correctly

* Use funky casing http routes
* Added helm inputs for managing audit logs
* Remove unwanted changes from values
* fix: use correct flag when translating namespaces

* Use non-normalized namespace when deregistering services

* Guard against namespace queries when namespaces not enabled in cache
* added imagePullPolicy for images in values.yaml

* fix: renamed pullPolicy key according to image

* fixed dafault always in tmpl

* changed structure of image in yaml

* revert changes

* added global imagePullPolicy

* fixed typo

* added changelog file
This brings consul-k8s in line with consul.
Most importantly, the backport assistant was updated to automatically assign created PRs to the author of the PR that is being backported.
* update changelog based on changes made to 1.2.x

* fixed test cases
- enterprise cases were in the OSS test cases
* trigger conformance tests nightly, squash

* remove extra line

* Update nightly-api-gateway-conformance.yml
making scripts more robust and removing changing helm chart
* Fix cache and service deletion issue

* Add comments

* add in acceptance test

* Fix indentation

* Fix unit test for deleting gateway w/ consul services

* Remove redundant service deregistration code

* Exit loop early once registration is found for service

* Fix import blocking

* Set status on pods added to test

* Apply suggestions from code review

* Reduce count of test gateways to 10 from 100

---------

Co-authored-by: Nathan Coleman <nathan.coleman@hashicorp.com>
Co-authored-by: Sarah Alsmiller <sarah.alsmiller@hashicorp.com>
* Adding support for weighted k8s service

* Adding changelog

* if per-app weight is 0 then pull the weight to 1

* Addressing review comments

* Addressing review comments

* Addressing review comments

* Comment update

* Comment update

* Parameterized table test

* Parameterized table test

* fixing linting issue

* fixing linting issue

---------

Co-authored-by: srahul3 <rahulsharma@hashicorp.com>
* Bumping go-discover to the lastest version
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/configure-gateway-depl-limits/perfectly-exotic-tapir branch 2 times, most recently from b8b2fe0 to 33e1b01 Compare August 28, 2023 17:34
@hashicorp-cla
Copy link
Copy Markdown

hashicorp-cla commented Aug 28, 2023

CLA assistant check

Thank you for your submission! We require that all contributors sign our Contributor License Agreement ("CLA") before we can accept the contribution. Read and sign the agreement

Learn more about why HashiCorp requires a CLA and what the CLA includes


8 out of 9 committers have signed the CLA.

  • hc-github-team-consul-core
  • missylbytes
  • t-eckert
  • wilkermichael
  • zalimeni
  • nathancoleman
  • curtbushko
  • jm96441n
  • Paul Glass

Paul Glass seems not to be a GitHub user.
You need a GitHub account to be able to sign the CLA. If you already have a GitHub account, please add the email address used for this commit to your account.

Have you signed the CLA already but the status is still pending? Recheck it.

@david-yu
Copy link
Copy Markdown
Contributor

david-yu commented Sep 1, 2023

@t-eckert I assume this needs to be re-backported? I saw the PR I just raised #2891 is dependent on this PR merging.

@david-yu david-yu mentioned this pull request Sep 5, 2023
2 tasks
@t-eckert
Copy link
Copy Markdown
Contributor

t-eckert commented Sep 6, 2023

@t-eckert I assume this needs to be re-backported? I saw the PR I just raised #2891 is dependent on this PR merging.

Oh wow, I have no idea what happened here. I will re-backport.

@t-eckert
Copy link
Copy Markdown
Contributor

t-eckert commented Sep 7, 2023

Created the manual backport to fix this cursed mess.
Closing.

@t-eckert t-eckert closed this Sep 7, 2023
@github-actions github-actions bot deleted the backport/configure-gateway-depl-limits/perfectly-exotic-tapir branch September 1, 2025 06:08
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.