Skaffold master -> main #6263

briandealwis · 2021-07-21T16:48:29Z

Update references to master to now point to main.

Rewrite the few existing uses of `skaffold/(blob|tree)/HEAD` to use main as GitHub's file viewer uses a commit rather than a branch. Rewrite the buildpacks to use main since they already switched.

tejal29 · 2021-07-21T16:58:05Z

Verification notes

hub pr checkout 6263

rm -rf docs/static/swaggerr

git grep master

Binary file hack/release-notes matches

tejal29

Can you verify if hack/release_notes binary needs to be rebuilt.
See #6263 (comment)

briandealwis · 2021-07-21T17:00:46Z

hack/release-notes is a binary executable and shouldn't have been committed! 😱

tejal29 · 2021-07-21T17:03:44Z

hack/release-notes is a binary executable and shouldn't be committed! 😱

Maybe it was mistake during v1.9.0?
https://github.com/GoogleContainerTools/skaffold/blob/main/hack/release-notes

briandealwis · 2021-07-21T17:05:37Z

I don't find any references to master in hack/tools/vendor/github.com/corneliusweig/release-notes.

codecov · 2021-07-21T17:23:27Z

Codecov Report

Merging #6263 (a1086fd) into main (8c34f1e) will increase coverage by 0.01%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##             main    #6263      +/-   ##
==========================================
+ Coverage   70.86%   70.88%   +0.01%     
==========================================
  Files         490      490              
  Lines       22162    22162              
==========================================
+ Hits        15706    15709       +3     
+ Misses       5440     5439       -1     
+ Partials     1016     1014       -2

Impacted Files	Coverage Δ
pkg/skaffold/build/docker/docker.go	`89.28% <ø> (ø)`
pkg/skaffold/docker/image.go	`69.93% <0.00%> (+1.04%)`	⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 8c34f1e...a1086fd. Read the comment docs.

tejal29

Please change examples/remote-multi-config-microservices to include branch: main

- git:
    repo: https://github.com/GoogleContainerTools/skaffold
    path: examples/multi-config-microservices/leeroy-app
    sync: false
- git:
    repo: https://github.com/GoogleContainerTools/skaffold
    path: examples/multi-config-microservices/leeroy-web
    sync: false
``

briandealwis · 2021-07-21T17:59:22Z

We don't need to do that @tejal29: the git repo code already uses main if master is not found.

skaffold/pkg/skaffold/git/gitutil.go

Lines 41 to 43 in 8c34f1e

    
           // defaultRef returns the default ref as "master" if master branch exists in 
        
           // remote repository, falls back to "main" if master branch doesn't exist 
        
           func defaultRef(repo string) (string, error) {

Well at least theoretically that's supposed to work :-) (#6264)

--- FAIL: TestRun (326.07s)
/integration/TestRun/remote-multi-config-microservices
time="2021-07-21T17:12:58Z" level=info msg="Namespace: skaffold6b8pk"
time="2021-07-21T17:12:58Z" level=info msg="Running [skaffold run --namespace skaffold6b8pk --default-repo gcr.io/k8s-skaffold --cache-artifacts=false] in examples/remote-multi-config-microservices"
    helper.go:239: skaffold run: exit status 128, 
    panic.go:613: parsing skaffold config: error parsing skaffold configuration file: caching remote dependency https://github.com/GoogleContainerTools/skaffold: failed to clone repo: running [/usr/bin/git clone https://github.com/GoogleContainerTools/skaffold euw2xNJipHV7cZ9CraIE8t5SYEhMAt9x --branch master --depth 1]
         - stdout: ""
         - stderr: "Cloning into 'euw2xNJipHV7cZ9CraIE8t5SYEhMAt9x'...\nwarning: Could not find remote branch master to clone.\nfatal: Remote branch master not found in upstream origin\n"
         - cause: exit status 128
    --- FAIL: TestRun/remote-multi-config-microservices (0.71s)

aaron-prindle

Do we have any build/release webhooks (eg: cloudbuild, etc) which target master that need to be changed on GCP (code/infra not directly in this repo)? I don't believe so, just wanted to put this here in case something was there that watched master

briandealwis · 2021-07-21T19:57:37Z

@aaron-prindle I updated the GCB triggers already to support master|main
https://console.cloud.google.com/cloud-build/triggers?project=k8s-skaffold

briandealwis · 2021-07-21T20:32:13Z

Kokoro is being temperamental. Committing since everything is green.

- Rewrite the few existing uses of `skaffold/(blob|tree)/HEAD` to use `main` as GitHub's file viewer uses a commit rather than a branch. - Rewrite the buildpacks references to use `main` since they already switched. - Explicitly specify `main` for remote repositories due to GoogleContainerTools#6264

* [v2] Customize hydration-dir and render-output path. 1. Remove unused flag v2 2. Enable hydration-dir as a configurable flag. 3. Convert structured (hydrated) manifests to a flattened format and stored in a give path (--render-output/--output flag) 4. Prompt user interactive message to acknowledge users that the manifest hydration may override the hydration-dir 5. sort SkaffoldOptions to fix maligned linter error. * Skaffold master -> main (#6263) - Rewrite the few existing uses of `skaffold/(blob|tree)/HEAD` to use `main` as GitHub's file viewer uses a commit rather than a branch. - Rewrite the buildpacks references to use `main` since they already switched. - Explicitly specify `main` for remote repositories due to #6264 * bump v1 versions to v2beta20 * improve user experience on the prompting message Co-authored-by: Brian de Alwis <[email protected]>

- Rewrite the few existing uses of `skaffold/(blob|tree)/HEAD` to use `main` as GitHub's file viewer uses a commit rather than a branch. - Rewrite the buildpacks references to use `main` since they already switched. - Explicitly specify `main` for remote repositories due to GoogleContainerTools#6264

Skaffold master -> main

91f60ff

Rewrite the few existing uses of `skaffold/(blob|tree)/HEAD` to use main as GitHub's file viewer uses a commit rather than a branch. Rewrite the buildpacks to use main since they already switched.

briandealwis requested a review from a team as a code owner July 21, 2021 16:48

briandealwis requested a review from tejal29 July 21, 2021 16:48

google-cla bot added the cla: yes label Jul 21, 2021

briandealwis enabled auto-merge (squash) July 21, 2021 16:58

tejal29 reviewed Jul 21, 2021

View reviewed changes

remove hack/release-notes

e5dd97f

tejal29 suggested changes Jul 21, 2021

View reviewed changes

explicitly specify main for remote repositories

a1086fd

aaron-prindle reviewed Jul 21, 2021

View reviewed changes

tejal29 approved these changes Jul 21, 2021

View reviewed changes

aaron-prindle approved these changes Jul 21, 2021

View reviewed changes

briandealwis added the kokoro:run runs the kokoro jobs on a PR label Jul 21, 2021

briandealwis disabled auto-merge July 21, 2021 20:27

briandealwis added the kokoro:force-run forces a kokoro re-run on a PR label Jul 21, 2021

briandealwis merged commit 01a8336 into GoogleContainerTools:main Jul 21, 2021

briandealwis deleted the master2main branch July 21, 2021 20:35

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Skaffold master -> main #6263

Skaffold master -> main #6263

briandealwis commented Jul 21, 2021

tejal29 commented Jul 21, 2021

tejal29 left a comment

briandealwis commented Jul 21, 2021 •

edited

Loading

tejal29 commented Jul 21, 2021

briandealwis commented Jul 21, 2021

codecov bot commented Jul 21, 2021 •

edited

Loading

tejal29 left a comment

briandealwis commented Jul 21, 2021 •

edited

Loading

aaron-prindle left a comment •

edited

Loading

briandealwis commented Jul 21, 2021

briandealwis commented Jul 21, 2021

Skaffold master -> main #6263

Skaffold master -> main #6263

Conversation

briandealwis commented Jul 21, 2021

tejal29 commented Jul 21, 2021

tejal29 left a comment

Choose a reason for hiding this comment

briandealwis commented Jul 21, 2021 • edited Loading

tejal29 commented Jul 21, 2021

briandealwis commented Jul 21, 2021

codecov bot commented Jul 21, 2021 • edited Loading

Codecov Report

tejal29 left a comment

Choose a reason for hiding this comment

briandealwis commented Jul 21, 2021 • edited Loading

aaron-prindle left a comment • edited Loading

Choose a reason for hiding this comment

briandealwis commented Jul 21, 2021

briandealwis commented Jul 21, 2021

briandealwis commented Jul 21, 2021 •

edited

Loading

codecov bot commented Jul 21, 2021 •

edited

Loading

briandealwis commented Jul 21, 2021 •

edited

Loading

aaron-prindle left a comment •

edited

Loading