Skip to content

Conversation

@holgerkoser
Copy link
Member

What this PR does / why we need it:
TODO

Which issue(s) this PR fixes:
Fixes #

Special notes for your reviewer:

Release note:


* master: (169 commits)
  revert #1933 (#1937)
  Migrate GProjectDialog to script setup (#1934)
  Update connect-kubectl.md
  cancel on esc (#1933)
  fix project menu after vuetify update (#1929)
  Update dependency vuetify to v3.6.10 (#1927)
  Bump braces from 3.0.2 to 3.0.3 (#1922)
  Update dependency vite to v5.3.1 (#1920)
  Update dependency @braintree/sanitize-url to v7.0.3 (#1925)
  Update dependency vue to v3.4.29 (#1921)
  Update dependency jose to v5.4.1 (#1924)
  Update dependency sass to v1.77.6 (#1917)
  Update dependency vuetify to v3.6.9 (#1916)
  Update dependency @vueuse/router to v10.11.0 (#1914)
  Update dependency @vueuse/integrations to v10.11.0 (#1913)
  Update actions/checkout action to v4.1.7 (#1918)
  Update dependency @vueuse/core to v10.11.0 (#1912)
  Adapt the debug and test scripts for `vscode-jest-runner` to be compatible with Vitest. (#1923)
  Update dependency vue-router to v4.3.3 (#1907)
  Update Yarn to v4.3.0 (#1910)
  ...

# Conflicts:
#	.pnp.cjs
#	backend/lib/app.js
#	backend/lib/config/gardener.js
#	backend/lib/security/index.js
#	backend/lib/services/shoots.js
#	frontend/package.json
#	frontend/vite.config.js
#	yarn.lock
* master:
  Update dependency vite to v5.3.3 (#1954)
  Update dependency eslint-plugin-vue to v9.27.0 (#1948)
  Update dependency eslint-plugin-promise to v6.4.0 (#1945)
  Update dependency jose to v5.6.2 (#1941)
  Update dependency vite to v5.3.2 (#1942)
  including the iss parameter in server code exchange (#1939)
  Update dependency vue to v3.4.31 (#1944)
  Fix issue when no costObject is defined (#1943)
  Update dependency path-to-regexp to v7 (#1930)
  Update Yarn to v4.3.1 (#1931)
  Update dependency prom-client to v15.1.3 (#1940)
  Update dependency vue to v3.4.30 (#1935)
  Update dependency jose to v5.5.0 (#1938)
  Update dependency vue-router to v4.4.0 (#1932)
  Add Custom Field Configuration Editor for Shoot Clusters (#1926)

# Conflicts:
#	.pnp.cjs
#	.yarn/cache/@vue-compiler-core-npm-3.4.29-29bc9e7853-9d68fd1a0c.zip
#	.yarn/cache/@vue-compiler-core-npm-3.4.30-f4933d9063-f0109b472d.zip
#	.yarn/cache/@vue-compiler-core-npm-3.4.31-f79d05324a-17833fa55a.zip
#	.yarn/cache/@vue-compiler-dom-npm-3.4.29-a117217369-c98620b718.zip
#	.yarn/cache/@vue-compiler-dom-npm-3.4.30-7742f540f5-b975fcb1a6.zip
#	.yarn/cache/@vue-compiler-dom-npm-3.4.31-6d2d250445-136b220868.zip
#	.yarn/cache/@vue-compiler-sfc-npm-3.4.29-25de7bdaef-4db562793d.zip
#	.yarn/cache/@vue-compiler-sfc-npm-3.4.30-7854a51719-63b09e7d9d.zip
#	.yarn/cache/@vue-compiler-sfc-npm-3.4.31-25353c4cc2-b8983a52dd.zip
#	.yarn/cache/@vue-compiler-ssr-npm-3.4.29-acc329a1f4-a12cc3ecc0.zip
#	.yarn/cache/@vue-compiler-ssr-npm-3.4.30-bf06ebff88-f7ba4bde96.zip
#	.yarn/cache/@vue-compiler-ssr-npm-3.4.31-9533893acb-8083959c21.zip
#	.yarn/cache/@vue-reactivity-npm-3.4.29-60fd993ecd-cc465ba167.zip
#	.yarn/cache/@vue-reactivity-npm-3.4.30-241edc7af3-b6ca8281f4.zip
#	.yarn/cache/@vue-reactivity-npm-3.4.31-6fb2cecc5c-974ce9c9f2.zip
#	.yarn/cache/@vue-runtime-core-npm-3.4.29-2bd370acac-1580ac9dae.zip
#	.yarn/cache/@vue-runtime-core-npm-3.4.30-a2886d20a5-f496a9bd99.zip
#	.yarn/cache/@vue-runtime-core-npm-3.4.31-fb7fdb78b9-446711364e.zip
#	.yarn/cache/@vue-runtime-dom-npm-3.4.29-dff1aa2f2a-b307e9a166.zip
#	.yarn/cache/@vue-runtime-dom-npm-3.4.30-6ed8273a18-69fa19e5a7.zip
#	.yarn/cache/@vue-runtime-dom-npm-3.4.31-18c8027dfb-4c0b20f16a.zip
#	.yarn/cache/@vue-server-renderer-npm-3.4.29-b7dad78c9d-c414447049.zip
#	.yarn/cache/@vue-server-renderer-npm-3.4.30-98a18cf281-6313e7f71c.zip
#	.yarn/cache/@vue-server-renderer-npm-3.4.31-a7fc49ff3c-1e01142c2f.zip
#	.yarn/cache/@vue-shared-npm-3.4.29-f059414627-7569bb841f.zip
#	.yarn/cache/@vue-shared-npm-3.4.30-8d6e063bf4-39e128f9b2.zip
#	.yarn/cache/@vue-shared-npm-3.4.31-07b999feaf-45643c0c7a.zip
#	.yarn/cache/jose-npm-5.4.1-82d453ef52-51234a7383.zip
#	.yarn/cache/jose-npm-5.5.0-f42a134c93-e240caa9f7.zip
#	.yarn/cache/jose-npm-5.6.2-6dd6e106fc-86df192545.zip
#	.yarn/cache/vue-npm-3.4.29-5618bba5e0-1a84802f74.zip
#	.yarn/cache/vue-npm-3.4.30-52ebe7d44e-0d0f5d8841.zip
#	.yarn/cache/vue-npm-3.4.31-375a256262-d9d7ac45f2.zip
#	backend/lib/security/index.js
#	frontend/src/views/GAdministration.vue
#	yarn.lock
@gardener-robot gardener-robot added the needs/review Needs review label Jul 4, 2024
@ghost ghost added the reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) label Jul 4, 2024
@gardener-robot gardener-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. needs/second-opinion Needs second review by someone else labels Jul 4, 2024
# Conflicts:
#	backend/lib/app.js
@gardener-ci-robot
Copy link
Contributor

The Gardener project currently lacks enough active contributors to adequately respond to all PRs.
This bot triages PRs according to the following rules:

  • After 15d of inactivity, lifecycle/stale is applied
  • After 15d of inactivity since lifecycle/stale was applied, lifecycle/rotten is applied
  • After 7d of inactivity since lifecycle/rotten was applied, the PR is closed

You can:

  • Mark this PR as fresh with /remove-lifecycle stale
  • Mark this PR as rotten with /lifecycle rotten
  • Close this PR with /close

/lifecycle stale

@gardener-robot gardener-robot added the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Dec 19, 2025
@gardener-ci-robot
Copy link
Contributor

The Gardener project currently lacks enough active contributors to adequately respond to all PRs.
This bot triages PRs according to the following rules:

  • After 15d of inactivity, lifecycle/stale is applied
  • After 15d of inactivity since lifecycle/stale was applied, lifecycle/rotten is applied
  • After 7d of inactivity since lifecycle/rotten was applied, the PR is closed

You can:

  • Mark this PR as fresh with /remove-lifecycle rotten
  • Close this PR with /close

/lifecycle rotten

@gardener-robot gardener-robot added lifecycle/rotten Denotes an issue or PR that has aged beyond stale and will be auto-closed. and removed lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. labels Jan 3, 2026
@gardener-ci-robot
Copy link
Contributor

The Gardener project currently lacks enough active contributors to adequately respond to all PRs.
This bot triages PRs according to the following rules:

  • After 15d of inactivity, lifecycle/stale is applied
  • After 15d of inactivity since lifecycle/stale was applied, lifecycle/rotten is applied
  • After 7d of inactivity since lifecycle/rotten was applied, the PR is closed

You can:

  • Reopen this PR with /reopen
  • Mark this PR as fresh with /remove-lifecycle rotten

/close

@gardener-robot gardener-robot deleted the openmfp branch January 10, 2026 19:46
@gardener-robot
Copy link

@gardener-ci-robot Branch openmfp has been deleted.

@gardener-robot gardener-robot added the status/closed Issue is closed (either delivered or triaged) label Jan 10, 2026
@grolu grolu added lifecycle/active Indicates that an issue or PR is actively being worked on by a contributor. and removed lifecycle/rotten Denotes an issue or PR that has aged beyond stale and will be auto-closed. labels Jan 13, 2026
@grolu
Copy link
Contributor

grolu commented Jan 13, 2026

/reopen

@gardener-prow
Copy link

gardener-prow bot commented Jan 13, 2026

@grolu: Failed to re-open PR: state cannot be changed. The openmfp branch has been deleted.

Details

In response to this:

/reopen

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.

@grolu grolu restored the openmfp branch January 13, 2026 10:19
@grolu
Copy link
Contributor

grolu commented Jan 13, 2026

/reopen

@gardener-prow gardener-prow bot reopened this Jan 13, 2026
@gardener-prow
Copy link

gardener-prow bot commented Jan 13, 2026

@grolu: Reopened this PR.

Details

In response to this:

/reopen

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.

@gardener-prow gardener-prow bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 13, 2026
@gardener-prow
Copy link

gardener-prow bot commented Jan 13, 2026

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: holgerkoser

The full list of commands accepted by this bot can be found 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

@gardener-prow gardener-prow bot added the do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. label Jan 13, 2026
@gardener-prow
Copy link

gardener-prow bot commented Jan 13, 2026

Keywords which can automatically close issues and at(@) or hashtag(#) mentions are not allowed in commit messages.

The list of commits with invalid commit messages:

  • 32096ea Merge branch 'master' into enh/mfp-hackaton
  • c4f9304 Merge branch 'master' into enh/mfp-hackaton
  • 5c2cc4d Merge branch 'master' into openmfp
  • a3a9071 Merge branch 'master' into openmfp
  • 884ed92 Merge branch 'master' into openmfp
  • a55826d Merge branch 'master' into openmfp
Details

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. I understand the commands that are listed here.

@gardener-prow gardener-prow bot added the do-not-merge/contains-merge-commits Indicates a PR which contains merge commits. label Jan 13, 2026
@gardener-prow
Copy link

gardener-prow bot commented Jan 13, 2026

Adding label do-not-merge/contains-merge-commits because PR contains merge commits, which are not allowed in this repository.
Use git rebase to reapply your commits on top of the target branch. Detailed instructions for doing so can be found here.

Details

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.

@gardener-prow gardener-prow bot added do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Jan 13, 2026
@gardener-prow
Copy link

gardener-prow bot commented Jan 13, 2026

PR needs rebase.

Details

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.

@gardener-prow gardener-prow bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Jan 13, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/ipcei IPCEI (Important Project of Common European Interest) do-not-merge/contains-merge-commits Indicates a PR which contains merge commits. do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. lifecycle/active Indicates that an issue or PR is actively being worked on by a contributor. needs/ok-to-test Needs approval for testing (check PR in detail before setting this label because PR is run on CI/CD) needs/rebase Needs git rebase needs/review Needs review needs/second-opinion Needs second review by someone else needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. status/closed Issue is closed (either delivered or triaged)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants