OCPBUGS-54225: Bump socks5 proxy, konnectivity proxy, http proxy, token minter memory requests #5897

Evan-Reilly · 2025-03-25T18:06:28Z

What this PR does / why we need it:

The steady-state memory utilization of socks5 proxy, konnectivity proxy, http proxy, and token minter containers is approximately ~30Mi. This PR bumps apiserver-token-minter, init-client-token-minter, client-token-minter, cloud-token-minter, token-minter, konnectivity-proxy, konnectivity-proxy-socks5, konnectivity-proxy-https, socks5-proxy, http-proxy container requests to 30Mi to reflect this usage. The total persistent (non-init container) memory increase per HCP is ~200Mi.

Which issue(s) this PR fixes (optional, use fixes #<issue_number>(, fixes #<issue_number>, ...) format, where issue_number might be a GitHub issue, or a Jira story:
Fixes #

https://issues.redhat.com/browse/OCPBUGS-54225

Checklist

Subject and description added to both, commit and PR.
Relevant issues have been referenced.
This change includes docs.
This change includes unit tests.

openshift-ci · 2025-03-25T18:07:03Z

Hi @Evan-Reilly. Thanks for your PR.

I'm waiting for a openshift member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

openshift-ci-robot · 2025-03-25T18:23:33Z

@Evan-Reilly: This pull request references Jira Issue OCPBUGS-54225, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.19.0) matches configured target version for branch (4.19.0)
bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

What this PR does / why we need it:

The steady-state memory utilization of socks5-proxy, konnectivity-proxy, http-proxy, and client-token-minter containers is approximately ~30Mi. Bump memory requests to reflect Given this usage.

Which issue(s) this PR fixes (optional, use fixes #<issue_number>(, fixes #<issue_number>, ...) format, where issue_number might be a GitHub issue, or a Jira story:
Fixes #

Checklist

Subject and description added to both, commit and PR.

Relevant issues have been referenced.

This change includes docs.

This change includes unit tests.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

openshift-ci-robot · 2025-03-25T18:23:58Z

@Evan-Reilly: This pull request references Jira Issue OCPBUGS-54225, which is valid.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.19.0) matches configured target version for branch (4.19.0)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

In response to this:

What this PR does / why we need it:

The steady-state memory utilization of socks5-proxy, konnectivity-proxy, http-proxy, and client-token-minter containers is approximately ~30Mi. Bump memory requests to reflect this usage.

Which issue(s) this PR fixes (optional, use fixes #<issue_number>(, fixes #<issue_number>, ...) format, where issue_number might be a GitHub issue, or a Jira story:
Fixes #

Checklist

Subject and description added to both, commit and PR.

Relevant issues have been referenced.

This change includes docs.

This change includes unit tests.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

rtheis

@Evan-Reilly please rebase to pick up #5876 since there is another container to update.

rtheis · 2025-03-26T12:38:00Z

/ok-to-test

rtheis · 2025-03-26T13:02:06Z

@Evan-Reilly please investigate the test failures.

Evan-Reilly · 2025-03-26T19:27:11Z

Each of these seems to fail with the following.

ERRO[2025-03-26T12:48:55Z] Some steps failed:                           
ERRO[2025-03-26T12:48:55Z] 
  * could not run steps: step hypershift-operator failed: error occurred handling build hypershift-operator-amd64: the build hypershift-operator-amd64 failed after 2m29s with reason DockerBuildFailed: Dockerfile build strategy has failed.

However, I attempted a make docker-build locally and it built successfully, so I'm not quite sure yet what I'm missing here.

rtheis · 2025-03-27T14:15:23Z

/retest

rtheis · 2025-03-27T16:47:19Z

/retest

rtheis · 2025-03-28T12:03:21Z

/retest

rtheis

@Evan-Reilly there appears to be a lot more changes needed functionally and to test data. The v2 code path also needs to be updated. Please search for 10Mi and change everything applicable to these containers.

rtheis · 2025-04-01T01:11:14Z

/retest-required

rtheis · 2025-04-03T11:56:08Z

/ok-to-test

rtheis · 2025-04-11T10:21:04Z

/ok-to-test

openshift-ci-robot · 2025-04-11T12:08:00Z

/retest-required

Remaining retests: 0 against base HEAD 6efaf27 and 2 for PR HEAD ba89ff5 in total

rtheis · 2025-04-11T17:58:04Z

/retest

rtheis · 2025-04-11T21:18:57Z

/retest

rtheis · 2025-04-12T00:41:40Z

/retest-required

rtheis · 2025-04-12T11:17:36Z

/retest

rtheis · 2025-04-13T11:40:18Z

/retest

Evan-Reilly · 2025-04-14T15:27:33Z

/retest

bryan-cox · 2025-04-14T15:31:33Z

/override "Red Hat Konflux / hypershift-operator-main-on-pull-request"

bryan-cox · 2025-04-14T15:31:44Z

/override "Red Hat Konflux / hypershift-operator-main-enterprise-contract / hypershift-operator-main"

openshift-ci · 2025-04-14T15:38:13Z

@bryan-cox: Overrode contexts on behalf of bryan-cox: Red Hat Konflux / hypershift-operator-main-on-pull-request

In response to this:

/override "Red Hat Konflux / hypershift-operator-main-on-pull-request"

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

openshift-ci · 2025-04-14T15:38:24Z

@bryan-cox: Overrode contexts on behalf of bryan-cox: Red Hat Konflux / hypershift-operator-main-enterprise-contract / hypershift-operator-main

In response to this:

/override "Red Hat Konflux / hypershift-operator-main-enterprise-contract / hypershift-operator-main"

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

openshift-ci-robot · 2025-04-14T18:04:14Z

/retest-required

Remaining retests: 0 against base HEAD 6c62eaa and 2 for PR HEAD ba89ff5 in total

bryan-cox · 2025-04-14T18:20:12Z

/retest

openshift-ci-robot · 2025-04-14T21:04:16Z

/retest-required

Remaining retests: 0 against base HEAD c99fd69 and 1 for PR HEAD ba89ff5 in total

rtheis · 2025-04-15T14:53:59Z

/retest-required

openshift-ci-robot · 2025-04-15T16:06:37Z

/retest-required

Remaining retests: 0 against base HEAD e513976 and 2 for PR HEAD ba89ff5 in total

rtheis · 2025-04-15T19:05:14Z

/retest

rtheis · 2025-04-16T00:48:33Z

/retest

rtheis

/lgtm

openshift-ci · 2025-04-16T02:29:19Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Evan-Reilly, rtheis, sjenning

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [sjenning]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

openshift-ci-robot · 2025-04-16T03:54:50Z

/retest-required

Remaining retests: 0 against base HEAD e513976 and 2 for PR HEAD ba89ff5 in total

openshift-ci · 2025-04-16T05:34:16Z

@Evan-Reilly: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

openshift-ci-robot · 2025-04-16T05:38:55Z

@Evan-Reilly: Jira Issue OCPBUGS-54225: All pull requests linked via external trackers have merged:

openshift/hypershift#5897

Jira Issue OCPBUGS-54225 has been moved to the MODIFIED state.

In response to this:

What this PR does / why we need it:

The steady-state memory utilization of socks5 proxy, konnectivity proxy, http proxy, and token minter containers is approximately ~30Mi. This PR bumps apiserver-token-minter, init-client-token-minter, client-token-minter, cloud-token-minter, token-minter, konnectivity-proxy, konnectivity-proxy-socks5, konnectivity-proxy-https, socks5-proxy, http-proxy container requests to 30Mi to reflect this usage. The total persistent (non-init container) memory increase per HCP is ~200Mi.

Which issue(s) this PR fixes (optional, use fixes #<issue_number>(, fixes #<issue_number>, ...) format, where issue_number might be a GitHub issue, or a Jira story:
Fixes #

https://issues.redhat.com/browse/OCPBUGS-54225

Checklist

Subject and description added to both, commit and PR.

Relevant issues have been referenced.

This change includes docs.

This change includes unit tests.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

openshift-cherrypick-robot · 2025-04-16T05:39:44Z

@openshift-ci-robot: #5897 failed to apply on top of branch "release-4.18":

Applying: Bump socks5 proxy, konnectivity proxy, http proxy, token minter memory requests
Using index info to reconstruct a base tree...
M	control-plane-operator/controllers/hostedcontrolplane/cno/clusternetworkoperator.go
M	control-plane-operator/controllers/hostedcontrolplane/ingressoperator/ingressoperator.go
M	control-plane-operator/controllers/hostedcontrolplane/kas/kms/aws.go
M	control-plane-operator/controllers/hostedcontrolplane/oapi/deployment.go
M	control-plane-operator/controllers/hostedcontrolplane/oapi/oauth_deployment.go
M	control-plane-operator/controllers/hostedcontrolplane/oauth/params.go
M	control-plane-operator/controllers/hostedcontrolplane/olm/operator.go
M	control-plane-operator/controllers/hostedcontrolplane/olm/packageserver.go
M	control-plane-operator/controllers/hostedcontrolplane/registryoperator/reconcile.go
A	control-plane-operator/controllers/hostedcontrolplane/v2/assets/cluster-network-operator/deployment.yaml
M	control-plane-operator/controllers/hostedcontrolplane/v2/kas/kms/aws.go
M	hypershift-operator/controllers/hostedcluster/hostedcluster_controller.go
M	hypershift-operator/controllers/hostedcluster/internal/platform/aws/aws.go
A	karpenter-operator/controllers/karpenter/manifests.go
A	karpenter-operator/manifests/operator.go
M	support/controlplane-component/konnectivity-container.go
A	support/controlplane-component/token-minter-container.go
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): support/controlplane-component/token-minter-container.go deleted in HEAD and modified in Bump socks5 proxy, konnectivity proxy, http proxy, token minter memory requests. Version Bump socks5 proxy, konnectivity proxy, http proxy, token minter memory requests of support/controlplane-component/token-minter-container.go left in tree.
Auto-merging support/controlplane-component/konnectivity-container.go
CONFLICT (modify/delete): karpenter-operator/manifests/operator.go deleted in HEAD and modified in Bump socks5 proxy, konnectivity proxy, http proxy, token minter memory requests. Version Bump socks5 proxy, konnectivity proxy, http proxy, token minter memory requests of karpenter-operator/manifests/operator.go left in tree.
CONFLICT (modify/delete): karpenter-operator/controllers/karpenter/manifests.go deleted in HEAD and modified in Bump socks5 proxy, konnectivity proxy, http proxy, token minter memory requests. Version Bump socks5 proxy, konnectivity proxy, http proxy, token minter memory requests of karpenter-operator/controllers/karpenter/manifests.go left in tree.
Auto-merging hypershift-operator/controllers/hostedcluster/internal/platform/aws/aws.go
Auto-merging hypershift-operator/controllers/hostedcluster/hostedcluster_controller.go
Auto-merging control-plane-operator/controllers/hostedcontrolplane/v2/kas/kms/aws.go
Auto-merging control-plane-operator/controllers/hostedcontrolplane/registryoperator/reconcile.go
Auto-merging control-plane-operator/controllers/hostedcontrolplane/olm/packageserver.go
Auto-merging control-plane-operator/controllers/hostedcontrolplane/olm/operator.go
Auto-merging control-plane-operator/controllers/hostedcontrolplane/oauth/params.go
Auto-merging control-plane-operator/controllers/hostedcontrolplane/oapi/oauth_deployment.go
Auto-merging control-plane-operator/controllers/hostedcontrolplane/oapi/deployment.go
Auto-merging control-plane-operator/controllers/hostedcontrolplane/kas/kms/aws.go
Auto-merging control-plane-operator/controllers/hostedcontrolplane/ingressoperator/ingressoperator.go
Auto-merging control-plane-operator/controllers/hostedcontrolplane/cno/testdata/zz_fixture_TestReconcileDeployment_Private_apiserver_connectivity__proxy_apiserver_address_is_unset.yaml
Auto-merging control-plane-operator/controllers/hostedcontrolplane/cno/clusternetworkoperator.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Bump socks5 proxy, konnectivity proxy, http proxy, token minter memory requests

In response to this:

@bryan-cox: The following backport issues have been created:

OCPBUGS-54737 for branch release-4.18

Queuing cherrypicks to the requested branches to be created after this PR merges:
/cherrypick release-4.18

In response to this:

/jira backport release-4.18

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

openshift-bot · 2025-04-16T07:33:16Z

[ART PR BUILD NOTIFIER]

Distgit: hypershift
This PR has been included in build ose-hypershift-container-v4.19.0-202504160650.p0.gcddcc2f.assembly.stream.el9.
All builds following this will include this PR.

rtheis · 2025-04-16T09:26:09Z

@Evan-Reilly please manually cherry-pick your fix to 4.18.

Evan-Reilly · 2025-04-17T19:54:32Z

Manual cherry-pick PR created here: #6052

openshift-ci bot added the do-not-merge/needs-area label Mar 25, 2025

openshift-ci bot requested review from csrwng and enxebre March 25, 2025 18:06

openshift-ci bot added area/control-plane-operator area/hypershift-operator needs-ok-to-test and removed do-not-merge/needs-area labels Mar 25, 2025

Evan-Reilly changed the title ~~Bump socks5-proxy, konnectivity-proxy, http-proxy, client-token-minter memory requests~~ OCPBUGS-54225: Bump socks5-proxy, konnectivity-proxy, http-proxy, client-token-minter memory requests Mar 25, 2025

openshift-ci-robot added jira/severity-moderate jira/valid-reference jira/valid-bug labels Mar 25, 2025

Evan-Reilly force-pushed the bump-container-memory branch from f8c821c to 6410ee0 Compare March 25, 2025 18:27

rtheis suggested changes Mar 25, 2025

View reviewed changes

openshift-ci bot assigned rtheis Mar 25, 2025

Evan-Reilly force-pushed the bump-container-memory branch from 6410ee0 to 50d9b1f Compare March 25, 2025 20:57

openshift-ci bot added ok-to-test and removed needs-ok-to-test labels Mar 26, 2025

rtheis suggested changes Mar 28, 2025

View reviewed changes

Evan-Reilly force-pushed the bump-container-memory branch from f6f556c to b6b8ae6 Compare April 7, 2025 13:51

rtheis approved these changes Apr 16, 2025

View reviewed changes

openshift-merge-bot bot merged commit cddcc2f into openshift:main Apr 16, 2025
16 of 18 checks passed

Evan-Reilly mentioned this pull request Apr 17, 2025

[release-4.18] OCPBUGS-54737: Bump socks5 proxy, konnectivity proxy, http proxy, token minter memory requests #6052

Open

4 tasks

OCPBUGS-54225: Bump socks5 proxy, konnectivity proxy, http proxy, token minter memory requests #5897

OCPBUGS-54225: Bump socks5 proxy, konnectivity proxy, http proxy, token minter memory requests #5897

Conversation

Evan-Reilly commented Mar 25, 2025 • edited Loading

openshift-ci bot commented Mar 25, 2025

openshift-ci-robot commented Mar 25, 2025

openshift-ci-robot commented Mar 25, 2025

rtheis left a comment

Choose a reason for hiding this comment

rtheis commented Mar 26, 2025

rtheis commented Mar 26, 2025

Evan-Reilly commented Mar 26, 2025

rtheis commented Mar 27, 2025

rtheis commented Mar 27, 2025

rtheis commented Mar 28, 2025

rtheis left a comment

Choose a reason for hiding this comment

rtheis commented Apr 1, 2025

rtheis commented Apr 3, 2025

rtheis commented Apr 11, 2025

openshift-ci-robot commented Apr 11, 2025

rtheis commented Apr 11, 2025

rtheis commented Apr 11, 2025

rtheis commented Apr 12, 2025

rtheis commented Apr 12, 2025

rtheis commented Apr 13, 2025

Evan-Reilly commented Apr 14, 2025

bryan-cox commented Apr 14, 2025

bryan-cox commented Apr 14, 2025

openshift-ci bot commented Apr 14, 2025

openshift-ci bot commented Apr 14, 2025

openshift-ci-robot commented Apr 14, 2025

bryan-cox commented Apr 14, 2025

openshift-ci-robot commented Apr 14, 2025

rtheis commented Apr 15, 2025

openshift-ci-robot commented Apr 15, 2025

rtheis commented Apr 15, 2025

rtheis commented Apr 16, 2025

rtheis left a comment

Choose a reason for hiding this comment

openshift-ci bot commented Apr 16, 2025

openshift-ci-robot commented Apr 16, 2025

openshift-ci bot commented Apr 16, 2025

openshift-ci-robot commented Apr 16, 2025

openshift-cherrypick-robot commented Apr 16, 2025

openshift-bot commented Apr 16, 2025

rtheis commented Apr 16, 2025

Evan-Reilly commented Apr 17, 2025

Evan-Reilly commented Mar 25, 2025 •

edited

Loading