[release-4.15] HOSTEDCP-1518: Preserve container resource requests and limits

[lucaspalm]

This is a manual cherry-pick of the changes from #3864.

[openshift-ci-robot]

@lucaspalm: This pull request references HOSTEDCP-1518 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the bug to target the "4.15.z" version, but no target version was set.

In response to this:

This is a manual cherry-pick of the changes from #3864.

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.

[stevekuznetsov]

/lgtm

[stevekuznetsov]

@lucaspalm use UPDATE=1 go test ./... to update fixtures:

 --- FAIL: TestReconcileDeployment (0.04s)
    --- FAIL: TestReconcileDeployment/No_private_apiserver_connectivity,_proxy_apiserver_address_is_set (0.02s)
        clusternetworkoperator_test.go:90: got diff between expected and actual result:
            file: /go/src/github.com/openshift/hypershift/control-plane-operator/controllers/hostedcontrolplane/cno/testdata/zz_fixture_TestReconcileDeployment_No_private_apiserver_connectivity__proxy_apiserver_address_is_set.yaml
            diff:
              (
              	"""
              	... // 39 identical lines
              	          value: "true"
              	        - name: HOSTED_CLUSTER_NAME
            - 	        - name: CA_CONFIG_MAP
            - 	        - name: CA_CONFIG_MAP_KEY
              	        - name: TOKEN_AUDIENCE
              	        - name: RELEASE_VERSION
              	... // 60 identical lines
              	        - /usr/bin/control-plane-operator
              	        - konnectivity-socks5-proxy
            - 	        - --disable-resolver
            + 	        - --resolve-from-guest-cluster-dns=true
              	        env:
              	        - name: KUBECONFIG
              	... // 91 identical lines
              	"""
              ) 

[rtheis]

/lgtm

[rtheis]

/retest-required

[csrwng]

/approve

[openshift-ci-robot]

/retest-required

Remaining retests: 0 against base HEAD c825e42 and 2 for PR HEAD e0965bb in total

[rtheis]

/retest-required

[openshift-ci-robot]

/retest-required

Remaining retests: 0 against base HEAD 70ec14d and 1 for PR HEAD e0965bb in total

[rtheis]

/retest-required

[lucaspalm]

/retest

[rtheis]

/retest-required

[rtheis]

/retest-required

[rtheis]

/test e2e-aws

[rtheis]

/test e2e-aws

[lucaspalm]

/retest

[rtheis]

/test e2e-aws

[rtheis]

/test e2e-aws

[rtheis]

/test e2e-aws

[rtheis]

/retest-required

[rtheis]

/test e2e-aws

[lucaspalm]

rebased to hopefully fix the konflux test

[bryan-cox]

/lgtm

[rtheis]

/lgtm

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: csrwng, lucaspalm, rtheis

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 [csrwng]

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

[openshift-ci]

@lucaspalm: 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-bot]

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-hypershift-container-v4.15.0-202405201941.p0.g4cc91fe.assembly.stream.el9 for distgit hypershift.
All builds following this will include this PR.