Stop publishing synthetic Godeps.json files

From https://github.com/kubernetes/enhancements/blob/master/keps/sig-architecture/917-go-modules/README.md#publish-staging-component-modules-to-individual-repositories:
> Generate synthetic Godeps.json files containing the SHA or git tag of
> module dependencies, for consumption by downstream consumers using
> dependency management tools like glide. Continue publishing these at
> least until our minimum supported version of go defaults to enabling
> module support (currently targeted for go 1.13, which is approximately
> Kubernetes 1.16-1.17 timeframe).

Now that Go 1.16 is in module-aware mode by default, it should be safe
to remove support for publishing synthetic `Godeps.json` files.

Author: nikhita

Diff for: Dockerfile

@@ -36,7 +36,6 @@ ADD _output/collapsed-kube-commit-mapper /collapsed-kube-commit-mapper
 ADD _output/sync-tags /sync-tags
 ADD _output/init-repo /init-repo
 
-ADD _output/godeps-gen /godeps-gen
 ADD _output/gomod-zip /gomod-zip
 ADD artifacts/scripts/ /publish_scripts
 

Diff for: Makefile

@@ -40,7 +40,6 @@ build:
 	$(call build_cmd,publishing-bot)
 	$(call build_cmd,sync-tags)
 	$(call build_cmd,init-repo)
-	$(call build_cmd,godeps-gen)
 	$(call build_cmd,gomod-zip)
 .PHONY: build
 

Diff for: README.md

@@ -10,7 +10,7 @@ The publishing bot publishes the code in `k8s.io/kubernetes/staging` to their ow
 
 It pulls the latest k8s.io/kubernetes changes and runs `git filter-branch` to distill the commits that affect a staging repo. Then it cherry-picks merged PRs with their feature branch commits to the target repo. It records the SHA1 of the last cherrypicked commits in `Kubernetes-sha: <sha>` lines in the commit messages.
 
-The robot is also responsible to update the `go-mod` and the `vendor/` directory for the target repos, and to create a fake (sparse and repo level based) `Godeps/Godeps.json`.
+The robot is also responsible to update the `go-mod` and the `vendor/` directory for the target repos.
 
 ## Playbook
 

Diff for: artifacts/scripts/construct.sh

@@ -149,7 +149,6 @@ if [ -z "${SKIP_TAGS}" ]; then
                --push-script ${PUSH_SCRIPT} \
                --dependencies "${DEPS}" \
                --mapping-output-file "../tag-${REPO}-{{.Tag}}-mapping" \
-               --generate-godeps=${PUBLISHER_BOT_GENERATE_GODEPS:-false} \
                --publish-v0-semver \
                -alsologtostderr \
                "${EXTRA_ARGS[@]-}"

Diff for: artifacts/scripts/util.sh

@@ -334,7 +334,7 @@ sync_repo() {
             fi
             local date=$(commit-date ${k_pending_merge_commit}) # author and committer date is equal for PR merges
             local dst_new_merge=$(GIT_COMMITTER_DATE="${date}" GIT_AUTHOR_DATE="${date}" git commit-tree -p ${dst_merge_point_commit} -p ${dst_parent2} -m "$(commit-message ${k_pending_merge_commit}; echo; echo "${commit_msg_tag}: ${k_pending_merge_commit}")" HEAD^{tree})
-            # no amend-godeps needed here: because the merge-commit was dropped, both parents had the same tree, i.e. go.mod did not change.
+            # no amend-gomod needed here: because the merge-commit was dropped, both parents had the same tree, i.e. go.mod did not change.
             git reset -q --hard ${dst_new_merge}
             if ! skip-gomod-update ${k_pending_merge_commit}; then
                 fix-gomod "${deps}" "${required_packages}" "${base_package}" "${is_library}" ${dst_needs_gomod_update} true "${commit_msg_tag}" "${recursive_delete_pattern}"
@@ -370,11 +370,6 @@ sync_repo() {
                 squash_commits=$[${squash_commits} + 1] # squash the cherry-pick into the go.mod reset commit below
                 dst_needs_gomod_update=true
             fi
-            if godeps-changes ${f_mainline_commit}; then
-                reset-godeps ${f_mainline_commit}^
-                squash_commits=$[${squash_commits} + 1]
-                dst_needs_gomod_update=true
-            fi
 
             # finally cherry-pick
             if ! GIT_COMMITTER_DATE="$(commit-date ${f_mainline_commit})" git cherry-pick --keep-redundant-commits ${pick_args} ${f_mainline_commit} >/dev/null; then
@@ -433,11 +428,6 @@ sync_repo() {
                     squash_commits=$[${squash_commits} + 1] # squash the cherry-pick into the go.mod reset commit below
                     dst_needs_gomod_update=true
                 fi
-                if godeps-changes ${f_latest_branch_point_commit} ${f_latest_merge_commit}; then
-                    reset-godeps ${f_latest_branch_point_commit}
-                    squash_commits=$[${squash_commits} + 1]
-                    dst_needs_gomod_update=true
-                fi
 
                 if ! git diff --quiet --exit-code ${f_latest_branch_point_commit} ${f_latest_merge_commit}; then
                     if ! git diff ${f_latest_branch_point_commit} ${f_latest_merge_commit}  | git apply --index; then
@@ -463,11 +453,6 @@ sync_repo() {
                     squash_commits=$[${squash_commits} + 1] # squash the cherry-pick into the go.mod reset commit below
                     dst_needs_gomod_update=true
                 fi
-                if godeps-changes ${f_commit}; then
-                    reset-godeps $(state-before-commit ${f_commit})
-                    squash_commits=$[${squash_commits} + 1]
-                    dst_needs_gomod_update=true
-                fi
 
                 echo "Cherry-picking k8s.io/kubernetes branch-commit $(kube-commit ${commit_msg_tag} ${f_commit}): $(commit-subject ${f_commit})."
                 if ! GIT_COMMITTER_DATE="$(commit-date ${f_commit})" git cherry-pick --keep-redundant-commits ${f_commit} >/dev/null; then
@@ -636,14 +621,6 @@ function gomod-changes() {
     fi
 }
 
-function godeps-changes() {
-    if [ -n "${2:-}" ]; then
-        ! git diff --exit-code --quiet ${1} ${2} -- Godeps/Godeps.json
-    else
-        ! git diff --exit-code --quiet $(state-before-commit ${1}) ${1} -- Godeps/Godeps.json
-    fi
-}
-
 function state-before-commit() {
     if git rev-parse --verify ${1}^1 &>/dev/null; then
         echo ${1}^
@@ -728,37 +705,6 @@ function fix-gomod() {
     if [ -f go.mod ]; then
         checkout-deps-to-kube-commit "${commit_msg_tag}" "${deps}" "${base_package}"
         update-deps-in-gomod "${deps}" "${base_package}"
-
-        # generate Godeps/Godeps.json from go.mod
-        if [ "${PUBLISHER_BOT_GENERATE_GODEPS:-}" == true ]; then
-            mkdir -p Godeps
-            echo "Resolving dependencies for Godeps.json generation"
-            GOPROXY="file://${GOPATH}/pkg/mod/cache/download" GO111MODULE=on go list -m -json all > /tmp/go-list
-            /godeps-gen /tmp/go-list Godeps/Godeps.json
-            git add Godeps go.mod go.sum # go.mod is surprisingly written: EOF newline
-            if ! git-index-clean; then
-                git commit -q -m "sync: update Godeps/Godeps.json"
-            fi
-        fi
-    fi
-
-    # remove Godeps/Godeps.json
-    if [ ! -f go.mod ] || [ "${PUBLISHER_BOT_GENERATE_GODEPS:-}" != true ]; then
-        if [ -d Godeps ]; then
-            git rm -q -rf Godeps
-            if ! git-index-clean; then
-                git commit -q -m "sync: remove Godeps/"
-            fi
-        fi
-    fi
-
-    # remove vendor/ when switching from Godeps to go.mod
-    if [ -d vendor/ ]; then
-        echo "Removing vendor/ from Godeps era"
-        git rm -q -rf vendor/
-        if ! git-index-clean; then
-            git commit -q -m "sync: remove vendor/"
-        fi
     fi
 
     # squash go.mod commits, either into ${dst_old_commit} or into _one_ new commit
@@ -797,24 +743,6 @@ function reset-gomod() {
     git commit -q -m "sync: reset go.mod" --allow-empty
 }
 
-# Reset Godeps/Godeps.json to what it looked like in the given commit $1. Always create a
-# commit, even an empty one.
-function reset-godeps() {
-    local f_clean_commit=${1}
-
-    # checkout or delete go.mod
-    if [ -n "$(git ls-tree ${f_clean_commit}^{tree} Godeps/Godeps.json)" ]; then
-        git checkout ${f_clean_commit} Godeps/Godeps.json
-        git add Godeps/Godeps.json
-    elif [ -d Godeps ]; then
-        rm -f Godeps/Godeps.json
-        git rm -f Godeps/Godeps.json
-    fi
-
-    # commit go.mod unconditionally
-    git commit -q -m "sync: reset Godeps/Godeps.json" --allow-empty
-}
-
 # Squash the last $1 commits into one, with the commit message of the last.
 function squash() {
     local head=$(git rev-parse HEAD)
@@ -961,6 +889,3 @@ checkout-deps-to-kube-commit() {
     done
 }
 
-indent-godeps() {
-     unexpand --first-only --tabs=2
-}

Diff for: cmd/godeps-gen/main.go

@@ -38,7 +38,7 @@ var (
 
 func Usage() {
 	fmt.Fprintf(os.Stderr, `
-Usage: %s [-config <config-yaml-file>] [-source-repo <repo>] [-source-org <org>] [-rules-file <file> ] [-skip-godep|skip-dep] [-target-org <org>]
+Usage: %s [-config <config-yaml-file>] [-source-repo <repo>] [-source-org <org>] [-rules-file <file> ] [-target-org <org>]
 
 Command line flags override config values.
 `, os.Args[0])

Diff for: cmd/init-repo/main.go

@@ -70,7 +70,6 @@ type RepositoryRule struct {
 
 type RepositoryRules struct {
 	SkippedSourceBranches []string         `yaml:"skip-source-branches"`
-	SkipGodeps            bool             `yaml:"skip-godeps"`
 	SkipGomod             bool             `yaml:"skip-gomod"`
 	SkipTags              bool             `yaml:"skip-tags"`
 	Rules                 []RepositoryRule `yaml:"rules"`

Diff for: cmd/publishing-bot/config/rules.go

@@ -304,9 +304,6 @@ func (p *PublisherMunger) construct() error {
 				lastPublishedUpstreamHash,
 			)
 			cmd.Env = append([]string(nil), branchEnv...) // make mutable
-			if !p.reposRules.SkipGodeps {
-				cmd.Env = append(cmd.Env, "PUBLISHER_BOT_GENERATE_GODEPS=true")
-			}
 			if p.reposRules.SkipGomod {
 				cmd.Env = append(cmd.Env, "PUBLISHER_BOT_SKIP_GOMOD=true")
 			}