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 10114 consul is under resourced when deploying to crc local version of open shift into release/1.3.x #4198

Merged
merged 5 commits into from
Jul 23, 2024
Merged

Backport of Net 10114 consul is under resourced when deploying to crc local version of open shift into release/1.3.x #4198

merged 5 commits into from
Jul 23, 2024

Conversation

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

Backport

This PR is auto-generated from #4184 to be assessed for backporting due to the inclusion of the label backport/1.3.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:
@sarahalsmiller
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.

Changes proposed in this PR

  • Make resources in webhookCertManager configurable to resolve OOM error when installing consul on CRC

How I've tested this PR

  • Local install to crc from local helm chart

How I expect reviewers to test this PR

Checklist

Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/NET-10114-Consul-is-under-resourced-when-deploying-to-CRC-local-version-of-OpenShift/vastly-pure-husky branch from 55daa35 to f19d792 Compare July 22, 2024 16:13
@sarahalsmiller
Net 10114 consul is under resourced when deploying to crc local versi…
e03dd5a 
…on of open shift (#4184)

* cert managerkubectl get pods

* make resources for webhook cert manager configurable

* changelog entry

* Update charts/consul/values.yaml

* make gateway resources configurable

* update changelog
@sarahalsmiller sarahalsmiller marked this pull request as ready for review July 22, 2024 19:29
@sarahalsmiller sarahalsmiller enabled auto-merge (squash) July 22, 2024 19:37
@sarahalsmiller sarahalsmiller merged commit 6a55305 into release/1.3.x Jul 23, 2024
47 checks passed
@sarahalsmiller sarahalsmiller deleted the backport/NET-10114-Consul-is-under-resourced-when-deploying-to-CRC-local-version-of-OpenShift/vastly-pure-husky branch July 23, 2024 16:02
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