chore: resolve sync concerns

[rexagod]

• defer to the later go version when merging back to main (and not the
  older version introduced in the release branch).
• resolve merge conflicts.

Signed-off-by: Pranshu Srivastava [email protected]

---

To resolve #2203 (comment) (force-pushes are disable for release-*).

/cc @dgrisonnet

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rexagod

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

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

[dgrisonnet]

I don't think we should do that since the Kubernetes 1.27 deps are based on go 1.20.z.

I would prefer having the release-2.10 diverge away from master and stick to go 1.20.z whilst master is on 1.21.z

[rexagod]

Makes sense, but wouldn't release-2.10 conflict with main? My plan was to resolve this on release-2.10 itself and create a release from the last commit before this one, so merging back into main wouldn't be an issue.

[dashpole]

/assign @dgrisonnet
/triage accepted

[dgrisonnet]

Normally you should never have to rebase a release branch on main since it is meant to diverge away. I am not sure why the release process is like that here, but I don't think it will work well going forward if we have to continue keeping go version up-to-date on release branch.

[rexagod]

/close

Since the superseding PR was closed as well, refer: #2203 (comment).

[k8s-ci-robot]

@rexagod: Closed this PR.

In response to this:

/close

Since the superseding PR was closed as well.

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/test-infra repository.