Skip to content

Update k8s.io deps to 1.31.0#46307

Merged
tigrato merged 1 commit intomasterfrom
tigrato/bump-sigs.k8s.io/controller-runtime2
Sep 6, 2024
Merged

Update k8s.io deps to 1.31.0#46307
tigrato merged 1 commit intomasterfrom
tigrato/bump-sigs.k8s.io/controller-runtime2

Conversation

@tigrato
Copy link
Copy Markdown
Contributor

@tigrato tigrato commented Sep 5, 2024

Depends on #46299

@tigrato tigrato added the no-changelog Indicates that a PR does not require a changelog entry label Sep 5, 2024
Copy link
Copy Markdown
Contributor

@codingllama codingllama left a comment

Choose a reason for hiding this comment

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

Thanks, Tiago!

teleport.machineid.v1.SPIFFEFederation SPIFFEFederation = 62;
// StaticHostUser is a resource for static host users.
teleport.userprovisioning.v1.StaticHostUser StaticHostUser = 63;
// AutoUpdateConfig is a resource for autoupdate config.
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.

Why are the proto changes necessary? Are they part of the fix for k8s.io v1.31.x?

Copy link
Copy Markdown
Contributor

@hugoShaka hugoShaka Sep 5, 2024

Choose a reason for hiding this comment

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

Tiago re-syced the test snapshots fopr the CRD generation. We use a copy of the proto definitions rather than the real ones in the snapshot tests. It's dumb and not useful, but I never got time to clean this up, so we need to sync the test inputs from time to time.

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.

This is fine, but I want to understand what is part of the k8s v1.31.x fix and what is just tagging along.

Copy link
Copy Markdown
Contributor Author

@tigrato tigrato Sep 6, 2024

Choose a reason for hiding this comment

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

The protobuf updates are unrelated but since I generated the new CRD stubs, I also updated the protos. I can revert them as they have no interference in the output

Base automatically changed from codingllama/go1.23.1 to master September 5, 2024 19:36
@tigrato tigrato force-pushed the tigrato/bump-sigs.k8s.io/controller-runtime2 branch from f420605 to 80182c1 Compare September 6, 2024 08:18
@tigrato tigrato enabled auto-merge September 6, 2024 10:38
@tigrato tigrato changed the title Update k8s.io deps to 1.31 Update k8s.io deps to 1.31.0 Sep 6, 2024
@codingllama
Copy link
Copy Markdown
Contributor

(Sorry for the delay, I thought had approved this already.)

@tigrato tigrato added this pull request to the merge queue Sep 6, 2024
Merged via the queue into master with commit c0df3dc Sep 6, 2024
@tigrato tigrato deleted the tigrato/bump-sigs.k8s.io/controller-runtime2 branch September 6, 2024 13:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

helm no-changelog Indicates that a PR does not require a changelog entry size/sm

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants