Skip to content

Commit

Permalink
Merge branch 'master' into openmfp
Browse files Browse the repository at this point in the history
* master: (140 commits)
  Update dependency @codemirror/autocomplete to v6.18.3 (#2175)
  Update dependency uuid to v11.0.3 (#2173)
  Drop usage of deprecated credential.secretRef (#2169)
  Move GShootListRowActions from GShootListRow to GShootList component (#2148)
  Adapt to new shoot access restriction configurations in `CloudProfile`, `Seed`, and `Shoot` APIs (#2163)
  Upgrade to eslint v9 and move to neostandard (#2137)
  Update dependency vuetify to v3.7.4 (#2168)
  Update dependency @octokit/auth-app to v6.1.3 (#2167)
  Update Monthly Dev Dependencies (#2160)
  Update vueuse monorepo to v11.2.0 (#2158)
  Remove fallback to read cluster ca Secret (#2164)
  Update dependency @codemirror/view to v6.34.2 (#2165)
  Update dependency pinia to v2.2.6 (#2162)
  Update dependency @codemirror/search to v6.5.7 (#2161)
  Update dependency compression to v1.7.5 (#2159)
  Update dependency @codemirror/autocomplete to v6.18.2 (#2157)
  Update dependency universal-cookie to v7.2.2 (#2156)
  Update dependency pinia to v2.2.5 (#2154)
  Update dependency uuid to v11 (#2151)
  Update dependency @kyvg/vue3-notification to v3.4.1 (#2153)
  ...

# Conflicts:
#	.pnp.cjs
#	backend/lib/app.js
#	backend/lib/config/gardener.js
#	backend/lib/security/index.js
#	backend/lib/services/projects.js
#	backend/lib/services/shoots.js
#	backend/package.json
#	frontend/package.json
#	frontend/src/components/dialogs/GProjectDialog.vue
#	frontend/src/composables/useProjectContext.js
#	frontend/src/store/app.js
#	frontend/src/views/GAdministration.vue
#	frontend/src/views/GShootList.vue
#	yarn.lock
  • Loading branch information
holgerkoser committed Nov 13, 2024
2 parents 7576772 + 0559483 commit 884ed92
Show file tree
Hide file tree
Showing 686 changed files with 12,566 additions and 9,198 deletions.
2 changes: 1 addition & 1 deletion .ci/pipeline_definitions
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ dashboard:
pull-request: ~
steps:
check:
image: 'node:20-alpine3.20'
image: 'node:22-alpine3.20'
release:
traits:
version:
Expand Down
11 changes: 10 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

# include workspace packages/logger
!packages/logger/package.json
!packages/logger/eslint.config.js
!packages/logger/jest.setup.js
!packages/logger/lib
!packages/logger/__tests__
Expand All @@ -24,6 +25,7 @@

# include workspace packages/request
!packages/request/package.json
!packages/request/eslint.config.js
!packages/request/jest.setup.js
!packages/request/lib
!packages/request/__tests__
Expand All @@ -32,6 +34,7 @@

# include workspace packages/kube-config
!packages/kube-config/package.json
!packages/kube-config/eslint.config.js
!packages/kube-config/jest.setup.js
!packages/kube-config/lib
!packages/kube-config/__tests__
Expand All @@ -40,6 +43,7 @@

# include workspace packages/kube-client
!packages/kube-client/package.json
!packages/kube-client/eslint.config.js
!packages/kube-client/jest.setup.js
!packages/kube-client/lib
!packages/kube-client/__tests__
Expand All @@ -48,6 +52,7 @@

# include workspace packages/monitor
!packages/monitor/package.json
!packages/monitor/eslint.config.js
!packages/monitor/jest.setup.js
!packages/monitor/lib
!packages/monitor/__tests__
Expand All @@ -56,6 +61,7 @@

# include workspace backend
!backend/package.json
!backend/eslint.config.js
!backend/jest.setup.js
!backend/server.js
!backend/lib
Expand All @@ -67,8 +73,9 @@
# include workspace frontend
!frontend/.browserslistrc
!frontend/.env*
!frontend/.eslintrc.cjs
!frontend/.gitignore
!frontend/eslint.config.cjs
!frontend/eslint-import-resolver-local.cjs
!frontend/jsconfig.json
!frontend/package.json
!frontend/vite.config.js
Expand All @@ -82,6 +89,7 @@

# include workspace charts
!charts/package.json
!charts/eslint.config.js
!charts/jest.setup.js
!charts/_versions.tpl
!charts/gardener-dashboard
Expand All @@ -92,6 +100,7 @@

# include workspace packages/test-utils
!packages/test-utils/package.json
!packages/test-utils/eslint.config.js
!packages/test-utils/lib

# include metadata files
Expand Down
15 changes: 13 additions & 2 deletions .github/renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
],
ignorePaths: [
"**/node_modules/**",
"**/.yarn/**",
"**/.yarn/**"
],
customManagers: [
{
Expand All @@ -21,9 +21,18 @@
fileMatch: ["^\.ci\/pipeline_definitions$"],
matchStrings: ["image: ['\"]?(?<depName>.*?):(?<currentValue>.*?)['\"]?\\s"],
datasourceTemplate: "docker"
},
}
],
packageRules: [
{
matchDepTypes: ["devDependencies"],
groupName: "Monthly Dev Dependencies",
schedule: ["on the first day of the month"]
},
{
matchUpdateTypes: ["patch"],
automerge: true
},
{
// Ignore major updates for these dependencies until we support ES modules
matchDatasources: ["npm"],
Expand All @@ -41,7 +50,9 @@
"eslint-plugin-vue",
"eslint-plugin-jest",
"eslint-plugin-n",
"eslint-plugin-promise", // latest version not yet supported by eslint-config-standard
"jest",
"openid-client",
"p-event",
"p-limit",
"p-retry",
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reuse-tool-lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ jobs:
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: REUSE Compliance Check
uses: fsfe/reuse-action@3ae3c6bdf1257ab19397fab11fd3312144692083 # v4.0.0
Loading

0 comments on commit 884ed92

Please sign in to comment.