Skip to content

v1.115.0 cherry-picks#140

Merged
ske-prow[bot] merged 7 commits intoske-v1.115from
v1.115-cherry-pick
Mar 26, 2025
Merged

v1.115.0 cherry-picks#140
ske-prow[bot] merged 7 commits intoske-v1.115from
v1.115-cherry-pick

Conversation

@Wieneo
Copy link
Copy Markdown

@Wieneo Wieneo commented Mar 26, 2025

How to categorize this PR?

/area open-source
/kind enhancement

What this PR does / why we need it:
This PR applies our fork changes to the Gardener 1.115 release.

Niclas Schad and others added 3 commits March 26, 2025 08:04
Signed-off-by: Niclas Schad <niclas.schad@stackit.de>
The changes are similar to those made by pkg/provider-local/webhook/nodeagentosc/mutator.go
@ske-prow ske-prow Bot added the kind/enhancement Enhancement, improvement, extension label Mar 26, 2025
@ske-prow
Copy link
Copy Markdown

ske-prow Bot commented Mar 26, 2025

@Wieneo: The label(s) area/open-source cannot be applied, because the repository doesn't have them.

Details

In response to this:

How to categorize this PR?

/area open-source
/kind enhancement

What this PR does / why we need it:
This PR applies our fork changes to the Gardener 1.115 release.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@Wieneo Wieneo changed the title V1.115 cherry pick v1.115.0 cherry-picks Mar 26, 2025
@ske-prow ske-prow Bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Mar 26, 2025
@Wieneo
Copy link
Copy Markdown
Author

Wieneo commented Mar 26, 2025

/hold needs local testing

@ske-prow ske-prow Bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 26, 2025
timebertt and others added 2 commits March 26, 2025 08:39
Since Prometheus Targets are all down due to gardener#9716 in Gardener v1.96, we need to set insecure_skip_verify to true on cadvisor & kubelet scrape config.

Since this is a hotfix, it can be dropped whenever we have a long term
solution.
@Wieneo Wieneo force-pushed the v1.115-cherry-pick branch from b9eb6b6 to 8fb8392 Compare March 26, 2025 07:39
@Wieneo
Copy link
Copy Markdown
Author

Wieneo commented Mar 26, 2025

/unhold

@ske-prow ske-prow Bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 26, 2025
Comment thread pkg/utils/gardener/garden.go
Copy link
Copy Markdown

@Duciwuci Duciwuci left a comment

Choose a reason for hiding this comment

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

According to Umbrella-Issue, there is missing the rebase label

@Duciwuci
Copy link
Copy Markdown

Otherwise, LGTM

Duciwuci and others added 2 commits March 26, 2025 13:32
With Gardener v1.114+ the operator extensions are a required resource for the upgrade.
In our use case, we need to deactivate this validation since this is a breaking change.
We need to do a backup-s3 migration.

Drop this commit, after the migration of the extension was performed.
@Wieneo Wieneo force-pushed the v1.115-cherry-pick branch from 56ac854 to 5b26a6a Compare March 26, 2025 12:32
@Wieneo Wieneo added the tide/merge-method-rebase Denotes a PR that should be rebased by tide when it merges. label Mar 26, 2025
@Wieneo
Copy link
Copy Markdown
Author

Wieneo commented Mar 26, 2025

@Duciwuci Fixed up commit and added label :)

@Wieneo
Copy link
Copy Markdown
Author

Wieneo commented Mar 26, 2025

/retest

@Duciwuci
Copy link
Copy Markdown

/lgtm

@ske-prow ske-prow Bot added the lgtm Indicates that a PR is ready to be merged. label Mar 26, 2025
@ske-prow
Copy link
Copy Markdown

ske-prow Bot commented Mar 26, 2025

LGTM label has been added.

DetailsGit tree hash: 414661fc0bfed381bc2eff34b553fd00f3fda47f

@Duciwuci
Copy link
Copy Markdown

/hold wait for tests

@ske-prow ske-prow Bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 26, 2025
@ske-prow
Copy link
Copy Markdown

ske-prow Bot commented Mar 26, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Duciwuci

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

@ske-prow ske-prow Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 26, 2025
@Duciwuci
Copy link
Copy Markdown

/hold cancel

@ske-prow ske-prow Bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 26, 2025
@ske-prow ske-prow Bot merged commit d2e0afd into ske-v1.115 Mar 26, 2025
4 checks passed
@ske-prow ske-prow Bot deleted the v1.115-cherry-pick branch March 26, 2025 12: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. kind/enhancement Enhancement, improvement, extension lgtm Indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. tide/merge-method-rebase Denotes a PR that should be rebased by tide when it merges.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants