Skip to content

Commit

Permalink
Merge branch 'master' into enh/configure_cloudprovider_vue3
Browse files Browse the repository at this point in the history
# Conflicts:
#	backend/test/acceptance/__snapshots__/api.cloudprofiles.spec.js.snap
#	charts/gardener-dashboard/charts/runtime/templates/dashboard/deployment.yaml
#	docs/README.md
#	frontend/src/components/GCloudProfile.vue
#	frontend/src/components/NewShoot/GNewShootInfrastructureDetails.vue
#	frontend/src/components/NewShoot/GNewShootSelectInfrastructure.vue
#	frontend/src/components/Secrets/GSecretDialogAlicloud.vue
#	frontend/src/components/Secrets/GSecretDialogAws.vue
#	frontend/src/components/Secrets/GSecretDialogAzure.vue
#	frontend/src/components/Secrets/GSecretDialogCloudflare.vue
#	frontend/src/components/Secrets/GSecretDialogGeneric.vue
#	frontend/src/components/Secrets/GSecretDialogHCloud.vue
#	frontend/src/components/Secrets/GSecretDialogInfoblox.vue
#	frontend/src/components/Secrets/GSecretDialogMetal.vue
#	frontend/src/components/Secrets/GSecretDialogNetlify.vue
#	frontend/src/components/Secrets/GSecretDialogVSphere.vue
#	frontend/src/components/ShootWorkers/GManageWorkers.vue
#	frontend/src/components/ShootWorkers/GWorkerConfiguration.vue
#	frontend/src/store/cloudProfile/index.js
#	frontend/src/store/config.js
#	frontend/src/utils/shoot.js
#	frontend/src/views/GNewShoot.vue
  • Loading branch information
grolu committed Jul 23, 2024
2 parents b65d099 + f85457c commit 1203a2c
Show file tree
Hide file tree
Showing 622 changed files with 26,414 additions and 20,846 deletions.
43 changes: 0 additions & 43 deletions .ci/check-docforge

This file was deleted.

8 changes: 3 additions & 5 deletions .ci/pipeline_definitions
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ dashboard:
- linux/amd64
- linux/arm64
dockerimages:
dashboard:
gardener-dashboard:
inputs:
repos:
source: ~ # default
Expand All @@ -46,9 +46,7 @@ dashboard:
pull-request: ~
steps:
check:
image: 'node:20-alpine3.18'
check-docforge:
image: 'golang:1.22.1'
image: 'node:20-alpine3.20'
release:
traits:
version:
Expand All @@ -66,7 +64,7 @@ dashboard:
slack_cfg_name: 'scp_workspace'
publish:
dockerimages:
dashboard:
gardener-dashboard:
image: europe-docker.pkg.dev/gardener-project/releases/gardener/dashboard
tag_as_latest: true
extra_push_targets: # may be dropped after all users updated to new registry
Expand Down
39 changes: 0 additions & 39 deletions .docforge/manifest.yaml

This file was deleted.

18 changes: 17 additions & 1 deletion .github/renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@
"regexManagers:githubActionsVersions",
"group:monorepos"
],
labels: ["kind/enhancement"],
labels: [
"kind/enhancement",
"renovate"
],
ignorePaths: [
"**/node_modules/**",
"**/.yarn/**",
Expand All @@ -25,13 +28,17 @@
// Ignore major updates for these dependencies until we support ES modules
matchDatasources: ["npm"],
matchPackageNames: [
"@octokit/auth-app",
"@octokit/core",
"@octokit/plugin-paginate-graphql",
"@octokit/plugin-paginate-rest",
"@octokit/plugin-request-log",
"@octokit/plugin-rest-endpoint-methods",
"chalk",
"codemirror",
"eslint",
"eslint-plugin-vitest",
"eslint-plugin-vue",
"eslint-plugin-jest",
"eslint-plugin-n",
"jest",
Expand All @@ -43,6 +50,15 @@
matchUpdateTypes: ["major"],
enabled: false
},
{
// Ignore minor updates for these dependencies until we support flat config: https://github.com/veritem/eslint-plugin-vitest/releases/tag/v0.5.0
matchDatasources: ["npm"],
matchPackageNames: [
"eslint-plugin-vitest"
],
matchUpdateTypes: ["minor"],
enabled: false
},
{
// Group github-actions in one PR.
groupName: "github-actions",
Expand Down
4 changes: 2 additions & 2 deletions .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@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
- name: REUSE Compliance Check
uses: fsfe/reuse-action@a46482ca367aef4454a87620aa37c2be4b2f8106 # v3.0.0
uses: fsfe/reuse-action@3ae3c6bdf1257ab19397fab11fd3312144692083 # v4.0.0
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ scripts/bin
node_modules/
bin/
dist/
ssl/
tmp/
coverage/
my*
Expand Down
Loading

0 comments on commit 1203a2c

Please sign in to comment.