MGMT-17871: Include proxy when computing openshift-apiserver spec-hash

[mresvanis]

This PR includes the proxy env vars to the openshift-apiserver deployment JSON spec when computing its spec-hash annotation, in order to skip an openshift-apiserver rollout after a recert run when the cluster-wide OCP Proxy is defined.

[openshift-ci-robot]

@mresvanis: This pull request references MGMT-16777 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 task to target the "4.16.0" version, but no target version was set.

In response to this:

This PR includes the proxy env vars to the openshift-apiserver deployment spec when computing its spec-hash, in order to skip an openshift-apiserver after recert when the cluster-wide OCP Proxy is defined.

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]

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

[openshift-ci-robot]

@mresvanis: This pull request references MGMT-17871 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 task to target the "4.17.0" version, but no target version was set.

In response to this:

This PR includes the proxy env vars to the openshift-apiserver deployment spec when computing its spec-hash, in order to skip an openshift-apiserver after recert when the cluster-wide OCP Proxy is defined.

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]

@mresvanis: This pull request references MGMT-17871 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 task to target the "4.17.0" version, but no target version was set.

In response to this:

This PR includes the proxy env vars to the openshift-apiserver deployment JSON spec when computing its spec-hash, in order to skip an openshift-apiserver rollout after a recert run when the cluster-wide OCP Proxy is defined.

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.

[mresvanis]

/test e2e-aws-ovn-single-node-recert-serial

[openshift-ci-robot]

@mresvanis: This pull request references MGMT-17871 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 task to target the "4.17.0" version, but no target version was set.

In response to this:

This PR includes the proxy env vars to the openshift-apiserver deployment JSON spec when computing its spec-hash annotation, in order to skip an openshift-apiserver rollout after a recert run when the cluster-wide OCP Proxy is defined.

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]

@mresvanis: This pull request references MGMT-17871 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 task to target the "4.17.0" version, but no target version was set.

In response to this:

This PR includes the proxy env vars to the openshift-apiserver deployment JSON spec when computing its spec-hash annotation, in order to skip an openshift-apiserver rollout after a recert run when the cluster-wide OCP Proxy is defined.

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.

[mresvanis]

/test e2e-aws-ovn-single-node-recert-serial

[omertuc]

Does this interact correctly with our Proxy rename feature? e.g. things like should it happen before or after the proxy rename. Maybe it already does, did not give a thorough review

[mresvanis]

Does this interact correctly with our Proxy rename feature? e.g. things like should it happen before or after the proxy rename. Maybe it already does, did not give a thorough review

Yes, both the openshift-apiserver and the oauth-apiserver spec-hash annotation adjustments are triggered after all the other customizations.

[mresvanis]

@omertuc FYI, because our CI currently doesn't support recert's proxy rename feature (it already checks though that after recert the SNO is healthy and no control-plane rollouts are issued), I have manually tested e2e this change by:

• creating a seed with cluster-wide proxy
• creating a seed image
• creating a target with its own cluster-wide-proxy
• running a full IBU flow
• verifying that
  1. the SNO is healthy and no control-plane rollouts are issued
  2. that no new openshift-apiserver generation was issued

[omertuc]

/lgtm

[omertuc]

/approve

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mresvanis, omertuc

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 [mresvanis,omertuc]

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

[omertuc]

/retest

[eranco74]

@mresvanis do we need to cherry-pick this to the release branches?

git show-branch origin/main origin/release-4.16 origin/release-4.15 
! [origin/main] Merge pull request #156 from omertuc/timefix
 ! [origin/release-4.16] Merge pull request #155 from mresvanis/update-oauth-apiserver-deployment-spec
  ! [origin/release-4.15] Merge pull request #155 from mresvanis/update-oauth-apiserver-deployment-spec
---
-   [origin/main] Merge pull request #156 from omertuc/timefix
+   [origin/main^2] Fix type inference regression in indirect dependency
+   [origin/main^^2] Include proxy when computing openshift-apiserver spec-hash
--- [origin/release-4.16] Merge pull request #155 from mresvanis/update-oauth-apiserver-deployment-spec