Rename default branch for kubernetes/k8s.io #1597

spiffxp · 2021-01-29T17:01:24Z

Part of umbrella issue kubernetes/org#2222

Issue to spec out and then run through renaming the default branch for this repository

update pre/postsubmits to trigger on old branch name and new branch name
determine whether periodics use default branch or have name hardcoded in git commands
- if hardcoded, does attempting to checkout old name break?
determine whether branch name is part of any job names
determine if any docs need to be updated
send notice
rename branch (ref: https://github.com/github/renaming#renaming-existing-branches)
if necessary, update periodics to refer to new branch name
if necessary, rename jobs
update branch protection config
update jobs to only trigger on new branch name
make sure things still work
- keep an eye on ci and prs for a bit
- trial the local development experience with pre-rename clone
send notice

/sig contributor-experience
/area github-management
trialing a repo for this subproject
/wg k8s-infra
owns this repo
/sig testing
to discover any prow issues
/milestone v1.21
/priority important-soon
/assign @spiffxp
I plan on speccing this out, whether/when to execute depends on how kubernetes/org goes

k8s-ci-robot · 2021-01-29T17:01:27Z

@spiffxp: The label(s) area/github-management cannot be applied, because the repository doesn't have them

In response to this:

Issue to spec out and then run through renaming the default branch for this repository

update pre/postsubmits to trigger on old branch name and new branch name

determine whether periodics use default branch or have name hardcoded in git commands

if hardcoded, does attempting to checkout old name break?

determine whether branch name is part of any job names

determine if any docs need to be updated

send notice

rename branch (ref: https://github.com/github/renaming#renaming-existing-branches)

if necessary, update periodics to refer to new branch name

if necessary, rename jobs

update branch protection config

update jobs to only trigger on new branch name

make sure things still work

keep an eye on ci and prs for a bit

trial the local development experience with pre-rename clone

send notice

/sig contributor-experience
/area github-management
trialing a repo for this subproject
/wg k8s-infra
owns this repo
/sig testing
to discover any prow issues
/milestone v1.21
/priority important-soon
/assign @spiffxp
I plan on speccing this out, whether/when to execute depends on how kubernetes/org goes

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.

spiffxp · 2021-01-29T23:02:39Z

PR up for job config changes + prow config changes: kubernetes/test-infra#20675 (holding merge until next week, and completion of the below review)

Still need to:

review the code in k8s.io to confirm whether it explicitly references the master branch...
review docs to see whether master is explicitly references (beyond uris that github will redirect for us)

spiffxp · 2021-02-09T00:34:58Z

Merged kubernetes/test-infra#20675

spiffxp · 2021-02-09T00:35:41Z

Renamed the branch

spiffxp · 2021-02-09T00:42:04Z

Will leave as-is and cleanup tomorrow

Confirmed:

pr merged after rename was properly auto-milestoned: Setup gcb-builder-releng-test SA for k8s-infra-prow-build #1626 (comment)
postsubmit correctly fired on merge after rename: https://prow.k8s.io/view/gs/kubernetes-jenkins/logs/post-k8sio-deploy-prow-build-resources/1358938678449147904

Known issues:

go.k8s.io/redirects 404's for me (but visiting https://github.com/kubernetes/k8s.io/tree/master/k8s.io#redirections is properly redirected to main by github)

k8s.io/k8s.io/configmap-nginx.yaml

Line 242 in a8e0b65

rewrite ^/redirects$ https://github.com/kubernetes/k8s.io/tree/master/k8s.io#redirections redirect;

spiffxp · 2021-02-09T15:20:42Z

spiffxp · 2021-02-18T00:24:48Z

https://kubernetes.slack.com/archives/C1TU9EB9S/p1613578896224800 - @xmudrii noticed cs.k8s.io wasn't able to search this repo anymore, @dims enabled detect-ref and we're searchable again

spiffxp · 2021-02-18T00:28:49Z

I'm going to assume the jobs that have no recent runs are fine given everything else worked

spiffxp · 2021-02-18T00:58:52Z

Looking for references to master within this repo:

I think we have cip-auditor in cloud run hardcoded to look at master, see

k8s.io/infra/gcp/cip-auditor/deploy.sh

Line 49 in 4cf9780

    
           --update-env-vars="CIP_AUDIT_MANIFEST_REPO_URL=https://github.com/kubernetes/k8s.io,CIP_AUDIT_MANIFEST_REPO_BRANCH=master,CIP_AUDIT_MANIFEST_REPO_MANIFEST_DIR=k8s.gcr.io,CIP_AUDIT_GCP_PROJECT_ID=k8s-artifacts-prod" \

but also, looking at logs for it, I see a lot of 500's, I think something else is broken with it
manually deployed a new revision with the new branch name

dns/octodns-docker/cloudbuild.yaml has 'master' as a default
there are some links to k8s.io.*master (github would redirect those anyway, but we can clean them up)

spiffxp · 2021-03-04T17:57:16Z

Still need to cleanup references to master in this repo

Blocking

cip-auditor: this is on me, is now blocked behind audit followup: restore k8s-infra-gcr-auditor service account #1730 otherwise I would ask releng
~~go.k8s.io/redirects - Can be PR'ed by anyone. Approval should be restricted to someone who can deploy the k8s.io app. I don't have experience there, would prefer someone else can unblock.¹~~ (done: Replace master branch references with main #1764)

Nice to have

~~dns/octodns-docker/cloudbuild.yaml: Can be PR'ed by anyone. Should auto-deploy on merge.~~ (done: Replace master branch references with main #1764)
clean up links to k8s.io/(blob|tree)/master: Can be PR'ed by anyone, approved by relevant subproject owners or approvers.
~~(I missed this originally) remove job references to master~~ config: remove master branch references for k/k8s.io test-infra#21212

¹ I would like to learn how to deploy k8s.io, but it may be a while before I can get there.

spiffxp · 2021-03-17T04:46:46Z

@nikhita and @dims have helped land some of the necessary changes, edited above comment into checklist and crossed out what's been done

ameukam · 2021-04-15T22:51:48Z

/milestone v1.22

spiffxp · 2021-06-30T23:43:35Z

k8s-ci-robot · 2021-06-30T23:43:36Z

@spiffxp:
This request has been marked as needing help from a contributor.

Please ensure the request meets the requirements listed here.

If this request no longer meets these requirements, the label can be removed
by commenting with the /remove-help command.

In response to this:

/help

We could use some help closing out "clean up links to k8s.io/(blob|tree)/master" above. A PR per repo would be fine

List generated via:
curl -s -X POST \
 -F "q=/k8s.io/(tree|blob)/master/" \
 -F "repos=*" \
 "https://cs.k8s.io/api/v1/search" \
| jq -r '.Results | keys | .[]' \
| sort \
| sed -e 's/^/- [ ] /g'
kubernetes-csi/csi-driver-host-path

kubernetes-csi/csi-driver-iscsi

kubernetes-csi/csi-driver-nfs

kubernetes-csi/csi-lib-utils

kubernetes-csi/csi-proxy

kubernetes-csi/csi-release-tools

kubernetes-csi/csi-test

kubernetes-csi/external-attacher

kubernetes-csi/external-health-monitor

kubernetes-csi/external-provisioner

kubernetes-csi/external-resizer

kubernetes-csi/external-snapshotter

kubernetes-csi/livenessprobe

kubernetes-csi/node-driver-registrar

kubernetes-csi/volume-data-source-validator

kubernetes-sigs/cluster-api-bootstrap-provider-kubeadm

kubernetes-sigs/cluster-api-provider-aws

kubernetes-sigs/cluster-api-provider-digitalocean

kubernetes-sigs/cluster-api-provider-openstack

kubernetes-sigs/descheduler

kubernetes-sigs/gcp-compute-persistent-disk-csi-driver

kubernetes-sigs/gcp-filestore-csi-driver

kubernetes-sigs/k8s-container-image-promoter

kubernetes-sigs/metrics-server

kubernetes-sigs/nfs-ganesha-server-and-external-provisioner

kubernetes-sigs/nfs-subdir-external-provisioner

kubernetes-sigs/scheduler-plugins

kubernetes-sigs/secrets-store-csi-driver

kubernetes/community

kubernetes/dns

kubernetes/ingress-nginx

kubernetes/k8s.io

kubernetes/kubernetes

kubernetes/perf-tests

kubernetes/publishing-bot

kubernetes/sig-release

kubernetes/test-infra

kubernetes/website

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.

praveenghuge · 2021-07-01T04:20:15Z

/assign

anubha-v-ardhan · 2021-07-01T10:24:24Z

Closed all my PRs except kubernetes-csi/csi-release-tools#164
as stated in this comment kubernetes-csi/csi-release-tools#164 (comment)

Seems like we have a way to mass update all the repos

spiffxp · 2021-07-02T23:33:49Z

/assign @anubha-v-ardhan @praveenghuge @RinkiyaKeDad
Thank you for taking this on! I've updated #1597 (comment) based on latest results

Sounds like @pohly will help out with the remainder of the kubernetes-csi repos

RinkiyaKeDad · 2021-07-05T10:56:16Z

All the PRs for kubernetes/ have now been merged @spiffxp. Please let us know if there is something else we could help with :D

spiffxp · 2021-07-27T04:26:56Z

I refreshed #1597 (comment) and poked the open PRs I could find. There are still some outstanding repos I couldn't find a linked repo for.

Leaving this in v1.22 because it may be basically done if we can figure out how many repos are blocked by the "csi tools will be copied" reasoning

pohly · 2021-08-02T10:15:08Z

As I mentioned in kubernetes-sigs/nfs-ganesha-server-and-external-provisioner#55 (comment), repo owner are not blocked and can update their copy of csi-release-tools.

spiffxp · 2021-08-02T20:51:28Z

/milestone v1.23

RinkiyaKeDad · 2021-09-01T09:28:16Z

Unassinging myself for the moment, but please let me know if there's something that needs help :)

/unassign

spiffxp · 2021-09-15T22:37:42Z

Two more repos have crept up since this issue was created. So I opened:

And poked for an update on:

spiffxp · 2021-09-20T22:04:03Z

Hopefully the last bit needed:

opened Update release-tools to 5489de6 kubernetes-sigs/nfs-subdir-external-provisioner#144 (based off of Update release tools to 5489de6 kubernetes-sigs/nfs-ganesha-server-and-external-provisioner#70)

spiffxp · 2021-09-24T14:39:44Z

/close
And we're done!

Thanks for the help @RinkiyaKeDad @anubha-v-ardhan @pohly @wongma7 @ikarldasan @praveenghuge

k8s-ci-robot · 2021-09-24T14:39:59Z

@spiffxp: Closing this issue.

In response to this:

/close
And we're done!

Thanks for the help @RinkiyaKeDad @anubha-v-ardhan @pohly @wongma7 @ikarldasan @praveenghuge

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.

k8s-ci-robot assigned spiffxp Jan 29, 2021

k8s-ci-robot added sig/contributor-experience Categorizes an issue or PR as relevant to SIG Contributor Experience. wg/k8s-infra labels Jan 29, 2021

k8s-ci-robot added this to the v1.21 milestone Jan 29, 2021

k8s-ci-robot added sig/testing Categorizes an issue or PR as relevant to SIG Testing. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. labels Jan 29, 2021

This was referenced Jan 29, 2021

Changing default branch names to main kubernetes/org#2222

Open

Prep kubernetes/k8s.io for default branch rename kubernetes/test-infra#20675

Merged

This was referenced Mar 7, 2021

config: remove master branch references for k/k8s.io kubernetes/test-infra#21212

Merged

Replace master branch references with main #1764

Merged

k8s-ci-robot modified the milestones: v1.21, v1.22 Apr 15, 2021

k8s-ci-robot added the help wanted Denotes an issue that needs help from a contributor. Must meet "help wanted" guidelines. label Jun 30, 2021

This was referenced Jul 1, 2021

Rename master to main kubernetes-sigs/nfs-ganesha-server-and-external-provisioner#55

Closed

Rename master to main kubernetes-sigs/nfs-subdir-external-provisioner#117

Closed

Rename master to main kubernetes-sigs/gcp-compute-persistent-disk-csi-driver#796

Merged

tam7t mentioned this issue Jul 2, 2021

Rename default branch to main kubernetes-sigs/secrets-store-csi-driver#617

Closed

19 tasks

RinkiyaKeDad mentioned this issue Jul 13, 2021

REQUEST: New membership for RinkiyaKeDad kubernetes/org#2823

Closed

6 tasks

This was referenced Aug 2, 2021

Update github links referencing master to reference HEAD kubernetes-sigs/nfs-ganesha-server-and-external-provisioner#58

Merged

docs: make github links reference HEAD instead of master kubernetes-csi/csi-release-tools#165

Merged

k8s-ci-robot modified the milestones: v1.22, v1.23 Aug 2, 2021

anubha-v-ardhan mentioned this issue Aug 17, 2021

REQUEST: New membership for anubha-v-ardhan kubernetes/org#2895

Closed

7 tasks

k8s-ci-robot unassigned RinkiyaKeDad Sep 1, 2021

This was referenced Sep 15, 2021

docs: follow kubernetes/k8s.io branch rename: kubernetes-sigs/prometheus-adapter#454

Merged

docs: follow kubernetes/k8s.io branch rename: kubernetes-sigs/lwkd#117

Merged

spiffxp mentioned this issue Sep 20, 2021

Update release-tools to 5489de6 kubernetes-sigs/nfs-subdir-external-provisioner#144

Merged

k8s-ci-robot closed this as completed Sep 24, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rename default branch for kubernetes/k8s.io #1597

Rename default branch for kubernetes/k8s.io #1597

spiffxp commented Jan 29, 2021 •

edited

Loading

k8s-ci-robot commented Jan 29, 2021

spiffxp commented Jan 29, 2021

spiffxp commented Feb 9, 2021

spiffxp commented Feb 9, 2021

spiffxp commented Feb 9, 2021 •

edited

Loading

spiffxp commented Feb 9, 2021 •

edited

Loading

spiffxp commented Feb 18, 2021

spiffxp commented Feb 18, 2021

spiffxp commented Feb 18, 2021

spiffxp commented Mar 4, 2021 •

edited

Loading

spiffxp commented Mar 17, 2021

ameukam commented Apr 15, 2021

spiffxp commented Jun 30, 2021 •

edited

Loading

k8s-ci-robot commented Jun 30, 2021

praveenghuge commented Jul 1, 2021

anubha-v-ardhan commented Jul 1, 2021 •

edited

Loading

spiffxp commented Jul 2, 2021

RinkiyaKeDad commented Jul 5, 2021

spiffxp commented Jul 27, 2021

pohly commented Aug 2, 2021

spiffxp commented Aug 2, 2021

RinkiyaKeDad commented Sep 1, 2021

spiffxp commented Sep 15, 2021

spiffxp commented Sep 20, 2021

spiffxp commented Sep 24, 2021

k8s-ci-robot commented Sep 24, 2021

Rename default branch for kubernetes/k8s.io #1597

Rename default branch for kubernetes/k8s.io #1597

Comments

spiffxp commented Jan 29, 2021 • edited Loading

k8s-ci-robot commented Jan 29, 2021

spiffxp commented Jan 29, 2021

spiffxp commented Feb 9, 2021

spiffxp commented Feb 9, 2021

spiffxp commented Feb 9, 2021 • edited Loading

spiffxp commented Feb 9, 2021 • edited Loading

spiffxp commented Feb 18, 2021

spiffxp commented Feb 18, 2021

spiffxp commented Feb 18, 2021

spiffxp commented Mar 4, 2021 • edited Loading

spiffxp commented Mar 17, 2021

ameukam commented Apr 15, 2021

spiffxp commented Jun 30, 2021 • edited Loading

k8s-ci-robot commented Jun 30, 2021

praveenghuge commented Jul 1, 2021

anubha-v-ardhan commented Jul 1, 2021 • edited Loading

spiffxp commented Jul 2, 2021

RinkiyaKeDad commented Jul 5, 2021

spiffxp commented Jul 27, 2021

pohly commented Aug 2, 2021

spiffxp commented Aug 2, 2021

RinkiyaKeDad commented Sep 1, 2021

spiffxp commented Sep 15, 2021

spiffxp commented Sep 20, 2021

spiffxp commented Sep 24, 2021

k8s-ci-robot commented Sep 24, 2021

spiffxp commented Jan 29, 2021 •

edited

Loading

spiffxp commented Feb 9, 2021 •

edited

Loading

spiffxp commented Feb 9, 2021 •

edited

Loading

spiffxp commented Mar 4, 2021 •

edited

Loading

spiffxp commented Jun 30, 2021 •

edited

Loading

anubha-v-ardhan commented Jul 1, 2021 •

edited

Loading