Oc 4.7 kubernetes 1.20.0 beta.2 #467
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
openshift-ci-robot
added
the
do-not-merge/work-in-progress
openshift-ci-robot
added
the
area/dependency
ingvagabund
force-pushed
the
oc-4.7-kubernetes-1.20.0-beta.2
branch
from
2088028
to
188f5d1
Compare
ingvagabund
changed the title
openshift-ci-robot
removed
the
do-not-merge/work-in-progress
|
/hold |
openshift-ci-robot
added
the
do-not-merge/hold
ingvagabund
force-pushed
the
oc-4.7-kubernetes-1.20.0-beta.2
branch
from
188f5d1
to
3b0947c
Compare
|
/hold cancel |
openshift-ci-robot
removed
the
do-not-merge/hold
ingvagabund
force-pushed
the
oc-4.7-kubernetes-1.20.0-beta.2
branch
2 times, most recently
from
c5fb61c
to
04e2077
Compare
|
/retest |
Had to patch hack/update-vendor.sh to get rid of:
$ ./hack/update-vendor.sh
+++ [1119 14:23:06] logfile at /tmp/update-vendor.USbV/update-vendor.log
+++ [1119 14:23:06] go.mod: update staging references
+++ [1119 14:23:14] go.mod: propagate to staging modules
+++ [1119 14:23:15] go.mod: sorting staging modules
+++ [1119 14:23:32] go.mod: tidying
tsort: /tmp/update-vendor.USbV/tidy_deps.txt: input contains a loop:
tsort: k8s.io/api
tsort: k8s.io/code-generator
tsort: k8s.io/client-go
tsort: k8s.io/apimachinery
tsort: /tmp/update-vendor.USbV/tidy_deps.txt: input contains a loop:
tsort: k8s.io/api
tsort: k8s.io/code-generator
tsort: k8s.io/client-go
tsort: /tmp/update-vendor.USbV/tidy_deps.txt: input contains a loop:
tsort: k8s.io/api
tsort: k8s.io/code-generator
tsort: /tmp/update-vendor.USbV/tidy_deps.txt: input contains a loop:
tsort: k8s.io/code-generator
tsort: k8s.io/client-go
tsort: k8s.io/apimachinery
tsort: /tmp/update-vendor.USbV/tidy_deps.txt: input contains a loop:
tsort: k8s.io/code-generator
tsort: k8s.io/client-go
tsort: /tmp/update-vendor.USbV/tidy_deps.txt: input contains a loop:
tsort: k8s.io/client-go
tsort: k8s.io/apimachinery
github.com/openshift/* repos are adding unnecessary deps to staging repos.
Patch:
diff --git a/hack/update-vendor.sh b/hack/update-vendor.sh
index 35b1ef22c49..9afa63a2124 100755
--- a/hack/update-vendor.sh
+++ b/hack/update-vendor.sh
@@ -191,7 +191,7 @@ for repo in $(kube::util::list_staging_repos); do
pushd "staging/src/k8s.io/${repo}" >/dev/null 2>&1
echo "=== propagating to ${repo}" >> "${LOG_FILE}"
# copy root go.mod, changing module name
- sed "s#module k8s.io/kubernetes#module k8s.io/${repo}#" < "${KUBE_ROOT}/go.mod" > "${KUBE_ROOT}/staging/src/k8s.io/${repo}/go.mod"
+ cat "${KUBE_ROOT}/go.mod" | grep -v "github.com/openshift/" | sed "s#module k8s.io/kubernetes#module k8s.io/${repo}#" > "${KUBE_ROOT}/staging/src/k8s.io/${repo}/go.mod"
# remove `require` directives for staging components (will get re-added as needed by `go list`)
kube::util::list_staging_repos | xargs -n 1 -I {} echo "-droprequire k8s.io/{}" | xargs -L 100 go mod edit
# rewrite `replace` directives for staging components to point to peer directories
ingvagabund
force-pushed
the
oc-4.7-kubernetes-1.20.0-beta.2
branch
from
04e2077
to
4144759
Compare
soltysh
added
the
approved
|
[APPROVALNOTIFIER] This PR is APPROVED Approval requirements bypassed by manually added approval. This pull-request has been approved by: ingvagabund, soltysh 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:
Approvers can indicate their approval by writing |
openshift-merge-robot
merged commit 99ac8bc
into
openshift:oc-4.7-kubernetes-1.20.0-beta.2
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
see 1.20 pick spreadsheet
Following https://github.com/openshift/enhancements/blob/master/enhancements/oc/upgrade_kubernetes.md
/assign soltysh