Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci/dependabot updates #3561

Merged
merged 2 commits into from May 14, 2024
Merged

ci/dependabot updates #3561

merged 2 commits into from May 14, 2024

Conversation

cpanato
Copy link
Member

@cpanato cpanato commented Mar 30, 2024

  • make sure CI install the correct go
  • group dependabot updates

/assign @aojea @BenTheElder

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Mar 30, 2024
@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Mar 30, 2024
@BenTheElder
Copy link
Member

/hold

we can't just upgrade to 1.22 because of the toolchain changes

there's a pending PR in #3335 that resolves those

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 1, 2024
.go-version Outdated
@@ -1 +1 @@
1.20.13
1.22.1
Copy link
Member

Choose a reason for hiding this comment

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

this will actually cause us to use go 1.16 because of toolchains :-)

@k8s-ci-robot k8s-ci-robot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Apr 2, 2024
@BenTheElder
Copy link
Member

can you rebase this to remove the merge commit? it will make bisecting less confusing.

we could do squash merging, except this PR has multiple unrelated changes

@cpanato
Copy link
Member Author

cpanato commented Apr 2, 2024

can you rebase this to remove the merge commit? it will make bisecting less confusing.

we could do squash merging, except this PR has multiple unrelated changes

that was weird, i swear i did a rebase this morning, but i can be wrong, missing coffee lol

but rebase is done now :)

@cpanato cpanato requested a review from BenTheElder April 2, 2024 16:29
@BenTheElder
Copy link
Member

thanks.

Seems we shouldn't switch to 1.22 yet: https://github.com/opencontainers/runc/pull/4240/files https://kubernetes.slack.com/archives/CHGFYJVAN/p1712086885304549

@cpanato
Copy link
Member Author

cpanato commented Apr 3, 2024

we can hold or close this pr

@BenTheElder
Copy link
Member

sigh: #3335 (comment)

maybe we can merge the rest without the go bump?

we may have to roll back go temporarily even for 1.21

@cpanato
Copy link
Member Author

cpanato commented Apr 3, 2024

ok will remove the go bump

Signed-off-by: cpanato <ctadeu@gmail.com>
Signed-off-by: cpanato <ctadeu@gmail.com>
@cpanato cpanato changed the title Upgrade go to 1.22.x and ci/dependabot updates ci/dependabot updates Apr 3, 2024
@cpanato
Copy link
Member Author

cpanato commented Apr 4, 2024

@BenTheElder PTAL

@BenTheElder
Copy link
Member

cc @aojea
sorry, I'm out of time / closing tabs on my way to vacation, got distracted by broken build, security patching, etc...

@aojea
Copy link
Contributor

aojea commented Apr 7, 2024

we already setup go from the makefile

kind/Makefile

Line 37 in 915b13a

PATH:=$(shell . hack/build/setup-go.sh && echo "$${PATH}")

# read go-version file unless GO_VERSION is set
# override GOTOOLCHAIN unless set as well
. ./hack/build/gotoolchain.sh
# we don't actually care where the .env files are
# however, GIMME_SILENT_ENV doesn't trigger re-generating a .env if it
# already exists and isn't "silent" (no `go version` command in it)
# so we fix that by changing where the .env is written, ensuring ours
# is generated from this repo and silent.
export GIMME_ENV_PREFIX=./bin/.gimme/
export GIMME_SILENT_ENV=y
# only setup go if we haven't set FORCE_HOST_GO, or `go version` doesn't match
# go version output looks like:
# go version go1.14.5 darwin/amd64
if ! ([ -n "${FORCE_HOST_GO:-}" ] || \
(command -v go >/dev/null && [ "$(go version | cut -d' ' -f3)" = "go${GO_VERSION}" ])); then
# eval because the output of this is shell to set PATH etc.
eval "$(hack/third_party/gimme/gimme "${GO_VERSION}")"
fi
# force go modules

I assume this does not harm and saves some time

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 7, 2024
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: aojea, cpanato

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 7, 2024
@BenTheElder BenTheElder added this to the v0.24.0 milestone May 14, 2024
@BenTheElder
Copy link
Member

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 14, 2024
@k8s-ci-robot k8s-ci-robot merged commit edd3e26 into kubernetes-sigs:main May 14, 2024
20 of 21 checks passed
@cpanato cpanato deleted the updates branch May 14, 2024 17:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants