Skip to content

Commit

Permalink
Merge branch 'master' into enh/eslint-plugin-security
Browse files Browse the repository at this point in the history
# By Gardener Prow Robot (50) and others
# Via GitHub
* master: (62 commits)
  Update dependency codemirror to v5.65.18 (#2101)
  Update dependency vite to v5.4.6 [SECURITY] (#2096)
  Fix issues with hibernation schedule dialog (#2076)
  Hide SSH keypair rotation when SSH access disabled (#2077)
  remove unnecessary model-value binding (#2080)
  Fix vite warning (#2090)
  Update dependency vuetify to v3.7.2 (#2095)
  Update vueuse monorepo to v11.1.0 (#2094)
  Update dependency @vueuse/core to v11.1.0 (#2091)
  Update dependency chokidar to v4 (#2081)
  Update dependency @fontsource/roboto to v5.1.0 (#2078)
  Update dependency jose to v5.9.2 (#2087)
  Update dependency express to v4.20.0 [SECURITY] (#2084)
  Update dependency vue to v3.5.6 (#2089)
  Update Yarn to v4.5.0 (#2088)
  Update dependency vue to v3.5.5 (#2086)
  Update dependency vue-router to v4.4.5 (#2083)
  Update dependency express-static-gzip to v2.1.8 (#2082)
  Update dependency vue-router to v4.4.4 (#2075)
  Update dependency openid-client to v5.7.0 (#2069)
  ...

# Conflicts:
#	.pnp.cjs
#	backend/package.json
#	frontend/package.json
#	frontend/src/components/ShootAddons/GManageAddons.vue
#	packages/kube-client/package.json
#	packages/kube-config/package.json
#	packages/logger/package.json
#	packages/monitor/package.json
#	packages/request/package.json
#	yarn.lock
  • Loading branch information
holgerkoser committed Sep 20, 2024
2 parents d15c944 + 8b37a03 commit a337100
Show file tree
Hide file tree
Showing 117 changed files with 2,385 additions and 1,989 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
13 changes: 11 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 Down
1,403 changes: 778 additions & 625 deletions .pnp.cjs

Large diffs are not rendered by default.

54 changes: 32 additions & 22 deletions .pnp.loader.mjs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
894 changes: 0 additions & 894 deletions .yarn/releases/yarn-4.3.1.cjs

This file was deleted.

925 changes: 925 additions & 0 deletions .yarn/releases/yarn-4.5.0.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,4 @@ supportedArchitectures:
- linux
- darwin

yarnPath: .yarn/releases/yarn-4.3.1.cjs
yarnPath: .yarn/releases/yarn-4.5.0.cjs
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# SPDX-License-Identifier: Apache-2.0

############# builder #############
FROM node:20-alpine3.20 AS builder
FROM node:22-alpine3.20 AS builder

WORKDIR /volume

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.77.0-dev
1.78.0-dev
10 changes: 5 additions & 5 deletions backend/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@gardener-dashboard/backend",
"version": "1.76.0",
"version": "1.77.0",
"description": "Gardener Dashboard Server",
"license": "Apache-2.0",
"author": "Koser, Holger <[email protected]>",
Expand Down Expand Up @@ -81,12 +81,12 @@
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-jest": "^26.9.0",
"eslint-plugin-n": "^15.7.0",
"eslint-plugin-promise": "^6.4.0",
"eslint-plugin-promise": "^6.6.0",
"eslint-plugin-security": "^3.0.1",
"fast-json-patch": "^3.1.1",
"jest": "^29.7.0",
"p-event": "^4.2.0",
"path-to-regexp": "^7.0.0",
"path-to-regexp": "^8.0.0",
"set-cookie-parser": "^2.6.0",
"socket.io-client": "^4.7.5",
"supertest": "^7.0.0"
Expand Down Expand Up @@ -169,8 +169,8 @@
"<rootDir>/jest.setup.js"
]
},
"packageManager": "yarn@4.3.1",
"packageManager": "yarn@4.5.0",
"engines": {
"node": "^20.9.0"
"node": "^22.7.0"
}
}
9 changes: 3 additions & 6 deletions backend/test/docker.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,11 @@ const { DockerfileParser } = require('dockerfile-ast')

/* Nodejs release schedule (see https://nodejs.org/en/about/releases/) */
const activeNodeReleases = {
18: {
endOfLife: new Date('2025-04-30T23:59:59Z')
},
19: {
endOfLife: new Date('2023-06-01T23:59:59Z')
},
20: {
endOfLife: new Date('2026-04-30T23:59:59Z')
},
22: {
endOfLife: new Date('2027-04-30T23:59:59Z')
}
}

Expand Down
2 changes: 1 addition & 1 deletion charts/identity/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ replicaCount: 1

image:
repository: ghcr.io/dexidp/dex
tag: v2.41.0-distroless
tag: v2.41.1-distroless
pullPolicy: IfNotPresent

containerPort: 5556
Expand Down
6 changes: 3 additions & 3 deletions charts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-jest": "^26.9.0",
"eslint-plugin-n": "^15.7.0",
"eslint-plugin-promise": "^6.4.0",
"eslint-plugin-promise": "^6.6.0",
"jest": "^29.7.0",
"js-yaml": "^4.1.0",
"lodash": "^4.17.21"
Expand Down Expand Up @@ -62,8 +62,8 @@
"<rootDir>/jest.setup.js"
]
},
"packageManager": "yarn@4.3.1",
"packageManager": "yarn@4.5.0",
"engines": {
"node": "^20.9.0"
"node": "^22.7.0"
}
}
25 changes: 25 additions & 0 deletions frontend/__tests__/components/GShootCredentialRotation.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,11 @@ describe('components', () => {
workers: [
{},
],
workerSettings: {
sshAccess: {
enabled: true,
},
},
},
},
status: {
Expand Down Expand Up @@ -127,6 +132,26 @@ describe('components', () => {
})

describe('Credential tiles', () => {
it('should not include SSH key rotation when SSH access is disabled', () => {
shootItem.spec.provider.workerSettings.sshAccess.enabled = false
const wrapper = mountShootCredentialRotationCard(shootItem)
const credentialWrappers = wrapper.findAllComponents(GCredentialTile)

// Ensure SSH key tile is not present
const sshKeyWrapper = credentialWrappers.find(wrapper => wrapper.vm.type === 'sshKeypair')
expect(sshKeyWrapper).toBe(undefined)
})

it('should include SSH key rotation when SSH access is enabled', () => {
shootItem.spec.provider.workerSettings.sshAccess.enabled = true
const wrapper = mountShootCredentialRotationCard(shootItem)
const credentialWrappers = wrapper.findAllComponents(GCredentialTile)

// Ensure SSH key tile is present
const sshKeyWrapper = credentialWrappers.find(wrapper => wrapper.vm.type === 'sshKeypair')
expect(sshKeyWrapper).toBeDefined()
})

it('should compute phases', () => {
const wrapper = mountShootCredentialRotationCard(shootItem)
const [
Expand Down
10 changes: 5 additions & 5 deletions frontend/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@gardener-dashboard/frontend",
"version": "1.76.0",
"version": "1.77.0",
"description": "Gardener Dashboard Client",
"license": "Apache-2.0",
"author": "Koser, Holger <[email protected]>",
Expand Down Expand Up @@ -86,11 +86,11 @@
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-import-newlines": "^1.4.0",
"eslint-plugin-n": "^15.7.0",
"eslint-plugin-promise": "^6.4.0",
"eslint-plugin-promise": "^6.6.0",
"eslint-plugin-security": "^3.0.1",
"eslint-plugin-vitest": "^0.4.0",
"eslint-plugin-vue": "^9.23.0",
"jsdom": "^24.0.0",
"jsdom": "^25.0.0",
"rollup-plugin-visualizer": "^5.12.0",
"sass": "~1.74.1",
"unplugin-fonts": "^1.1.1",
Expand All @@ -100,8 +100,8 @@
"vitest": "^2.0.0",
"vitest-fetch-mock": "^0.3.0"
},
"packageManager": "yarn@4.3.1",
"packageManager": "yarn@4.5.0",
"engines": {
"node": "^20.9.0"
"node": "^22.7.0"
}
}
2 changes: 1 addition & 1 deletion frontend/src/components/GPurpose.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ SPDX-License-Identifier: Apache-2.0
<template>
<v-select
v-model="v$.internalValue.$model"
hint="Indicate the importance of the cluster"
hint="Indicate the importance of the cluster. Available purposes may be limited by the selected secret. If any add-on is enabled, only purpose evaluation can be selected."
color="primary"
item-color="primary"
label="Purpose"
Expand Down
3 changes: 2 additions & 1 deletion frontend/src/components/GShootActionRotateCredentials.vue
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ export default {
shootEnableStaticTokenKubeconfig,
isShootStatusHibernated,
hasShootWorkerGroups,
sshAccessEnabled,
} = useShootItem()
const {
Expand Down Expand Up @@ -396,7 +397,7 @@ export default {
: [],
...allComponentTexts['rotate-ca-start'].actions,
...allComponentTexts['rotate-observability-credentials'].actions,
...hasShootWorkerGroups.value
...hasShootWorkerGroups.value && sshAccessEnabled.value
? allComponentTexts['rotate-ssh-keypair'].actions
: [],
...allComponentTexts['rotate-etcd-encryption-key-start'].actions,
Expand Down
Loading

0 comments on commit a337100

Please sign in to comment.