Skip to content

Conversation

rayandas
Copy link

@rayandas rayandas requested review from kinarashah and a team April 12, 2023 11:20
Copy link
Member

@kinarashah kinarashah left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. We used v1.24-custom branch for v1.24.10 where we needed one tag from v1.24 downloading kubelet from kubernetes/kubernetes and another from v1.24-custom downloading kubelet from rancher/kubernetes. We'll be only releasing one version now onwards, so let's forward port the change from https://github.com/rancher/hyperkube/pull/305/files to v1.24 and use that as the target branch. cc @snasovich lemme know if my assumption is wrong.

  2. The build is failing because you'd first need to create PR under https://github.com/rancher/kubernetes/pull/ to generate a new tag for v1.24.13.

@snasovich
Copy link
Collaborator

  1. We used v1.24-custom branch for v1.24.10 where we needed one tag from v1.24 downloading kubelet from kubernetes/kubernetes and another from v1.24-custom downloading kubelet from rancher/kubernetes. We'll be only releasing one version now onwards, so let's forward port the change from #305 (files) to v1.24 and use that as the target branch. cc @snasovich lemme know if my assumption is wrong.

@kinarashah , your assumption is totally correct - we're only maintaining versions pulling from rancher/kubernetes going forward. That first time we've released both so we have "plan B" in case we find something is terribly wrong with our fork.

@kinarashah kinarashah changed the base branch from v1.24-custom to v1.24 April 14, 2023 05:51
@kinarashah
Copy link
Member

@rayandas I changed the destination branch to v1.24 but when I restart build, it still runs for v1.24-custom. Could you force push and see if that works?

@rayandas
Copy link
Author

@kinarashah yeah force pushing works.

@mitulshah-suse mitulshah-suse merged commit cb0d353 into rancher:v1.24 Apr 14, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants