Skip to content

Rebase to 1.21.0#298

Merged
k8s-ci-robot merged 3 commits intokubernetes-csi:masterfrom
jsafrane:bump-1.21-rc0
Apr 16, 2021
Merged

Rebase to 1.21.0#298
k8s-ci-robot merged 3 commits intokubernetes-csi:masterfrom
jsafrane:bump-1.21-rc0

Conversation

@jsafrane
Copy link
Copy Markdown
Contributor

@jsafrane jsafrane commented Apr 7, 2021

/kind cleanup
What this PR does / why we need it:
Update to the latest release-tools and rebase all Kubernetes libs to v1.21.0

NONE

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. labels Apr 7, 2021
@k8s-ci-robot k8s-ci-robot requested review from lpabon and saad-ali April 7, 2021 06:46
@k8s-ci-robot
Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jsafrane

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details 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 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. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Apr 7, 2021
@jsafrane jsafrane force-pushed the bump-1.21-rc0 branch 2 times, most recently from 816a2a4 to 79d27bf Compare April 13, 2021 12:03
@jsafrane jsafrane changed the title Rebase to 1.21-rc.0 Rebase to 1.21.0 Apr 13, 2021
Comment thread go.mod Outdated
)

replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.20.0
replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.21.0
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

same question as resize PR. I think we don't need these replace statements if we're not importing k8s.io/kubernetes

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I have less faith in that. But we can try without them and then we'll see whether the default version selection for indirect dependencies will do a good enough job of selecting a consistent set of module versions.

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

I tried it out on my local workspace and it seems fine?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Fixed with the new release-tools.

bc0504ad Merge pull request kubernetes-csi#140 from jsafrane/remove-unused-k8s-libs
5b1de1ad go-get-kubernetes.sh: remove unused k8s libs
49b42693 Merge pull request kubernetes-csi#120 from pohly/add-kubernetes-release
f7e7ee49 docs: steps for adding testing against new Kubernetes release

git-subtree-dir: release-tools
git-subtree-split: bc0504ad76ac6e20d0d7c60d46f62c7ff7591f8c
Comment thread go.mod
)

replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.20.0
replace k8s.io/component-base => k8s.io/component-base v0.21.0
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Even then I think all of these replace statements can be removed.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Then go get -u ./... no longer works. For example, it updates to k8s.io/client-go v1.5.2.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

+1 to Patrick, go mod is very confused when you remove those replaces.

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

thanks. one day I will understand how vendoring works :-)

@msau42
Copy link
Copy Markdown
Collaborator

msau42 commented Apr 16, 2021

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 16, 2021
@k8s-ci-robot k8s-ci-robot merged commit 1f11e40 into kubernetes-csi:master Apr 16, 2021
andyzhangx added a commit to andyzhangx/external-attacher that referenced this pull request Apr 17, 2026
90925279 Merge pull request kubernetes-csi#298 from torredil/trivy-schedule-trigger
2c9aed3e Merge pull request kubernetes-csi#299 from andyzhangx/patch-12
507ea1e9 chore: fix broken gcb-docker-gcloud image
ab1da0e9 Run Trivy scan on schedule instead of pull requests
de06a09a Merge pull request kubernetes-csi#297 from andyzhangx/patch-11
fc719f31 fix: Update Go version from 1.25.8 to 1.25.9
c24a730e Merge pull request kubernetes-csi#296 from jsafrane/pin-github-actions-sha
59b456b8 fix: pin github action to exact SHA
061f6eed Merge pull request kubernetes-csi#295 from kubernetes-csi/security/update-trivy-action-v0.35.0
6c16f30b security: Update trivy-action to v0.35.0
119a53c3 Merge pull request kubernetes-csi#294 from andyzhangx/patch-10
7c9aa9ba fix: upgrade to go1.25.7 to fix CVE-2026-25679

git-subtree-dir: release-tools
git-subtree-split: 909252797a11793b90f81c1aff9d181b4eebd363
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. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants