Bump k8s to v1.30 release train #9335
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
marvin-tigera
added
release-note-required
hjiawei
force-pushed
the
k8s-1.30
branch
6 times, most recently
from
46277a2 to
e7f5bec
Compare
|
🚂 |
|
Requires calico/go-build k8s utilities bump in projectcalico/go-build#597. |
hjiawei
commented
Oct 23, 2024
hjiawei
commented
Oct 23, 2024
hjiawei
commented
Oct 23, 2024
hjiawei
commented
Oct 23, 2024
| @@ -57,17 +57,17 @@ gen-files .generate_files: lint-cache-dir clean-generated | |||
| sh -c '$(GIT_CONFIG_SSH) defaulter-gen \ | |||
| --v 1 --logtostderr \ | |||
| --go-header-file "/go/src/$(PACKAGE_NAME)/hack/boilerplate/boilerplate.go.txt" \ | |||
| --input-dirs "$(PACKAGE_NAME)/pkg/apis/projectcalico/v3" \ | |||
There was a problem hiding this comment.
--input-dirs flag is removed in kubernetes/code-generator@4d6b3bd.
hjiawei
commented
Oct 23, 2024
| --extra-peer-dirs "$(PACKAGE_NAME)/pkg/apis/projectcalico/v3" \ | ||
| --output-file-base "zz_generated.defaults"' |
There was a problem hiding this comment.
--output-file-base is renamed in kubernetes/code-generator@1441417.
hjiawei
commented
Oct 23, 2024
| @@ -78,8 +78,16 @@ gen-files .generate_files: lint-cache-dir clean-generated | |||
| sh -c '$(GIT_CONFIG_SSH) openapi-gen \ | |||
| --v 1 --logtostderr \ | |||
| --go-header-file "/go/src/$(PACKAGE_NAME)/hack/boilerplate/boilerplate.go.txt" \ | |||
| --input-dirs "$(PACKAGE_NAME)/pkg/apis/projectcalico/v3,k8s.io/api/core/v1,k8s.io/api/networking/v1,k8s.io/apimachinery/pkg/apis/meta/v1,k8s.io/apimachinery/pkg/version,k8s.io/apimachinery/pkg/runtime,k8s.io/apimachinery/pkg/util/intstr,$(PACKAGE_NAME)/pkg/lib/numorstring" \ | |||
| --output-package "$(PACKAGE_NAME)/pkg/openapi"' | |||
| --output-dir "/go/src/$(PACKAGE_NAME)/pkg/openapi" \ | |||
There was a problem hiding this comment.
--output-dir flag is enforced in kubernetes/code-generator@0723f18.
hjiawei
commented
Oct 23, 2024
tomastigera
reviewed
Oct 23, 2024
This changeset upgrades k8s dependencies to v1.30 release train.
hjiawei
commented
Oct 23, 2024
Comment on lines
+1457
to
+1459
| a.ExternallyAccessible() == b.ExternallyAccessible() && | ||
| a.UsesClusterEndpoints() == b.UsesClusterEndpoints() && | ||
| a.UsesLocalEndpoints() == b.UsesLocalEndpoints() |
There was a problem hiding this comment.
These fields exist in k8s ServicePort interface but not as part of the comparison. They are probably added after we implement ServicePortEqual function. @tomastigera PTAL this and the new cidrEqual function (replaces stringsEqual).
5 tasks
coutinhop
reviewed
Oct 29, 2024
Comment on lines
+407
to
+409
| type IPOrIPNet interface { | ||
| net.IP | *net.IPNet | ||
| } |
coutinhop
approved these changes
Oct 29, 2024
3 tasks
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.
Description
This changeset upgrades k8s dependencies to v1.30 release train.
Related issues/PRs
Todos
Release Note
Reminder for the reviewer
Make sure that this PR has the correct labels and milestone set.
Every PR needs one
docs-*label.docs-pr-required: This change requires a change to the documentation that has not been completed yet.docs-completed: This change has all necessary documentation completed.docs-not-required: This change has no user-facing impact and requires no docs.Every PR needs one
release-note-*label.release-note-required: This PR has user-facing changes. Most PRs should have this label.release-note-not-required: This PR has no user-facing changes.Other optional labels:
cherry-pick-candidate: This PR should be cherry-picked to an earlier release. For bug fixes only.needs-operator-pr: This PR is related to install and requires a corresponding change to the operator.