Skip to content

Commit

Permalink
Merge branch 'master' into enh/collapse_columns
Browse files Browse the repository at this point in the history
  • Loading branch information
grolu authored Sep 17, 2024
2 parents 368408f + c97171c commit 772f237
Show file tree
Hide file tree
Showing 119 changed files with 2,546 additions and 1,904 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,465 changes: 882 additions & 583 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.
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
2 changes: 1 addition & 1 deletion backend/lib/services/projects.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ exports.create = async function ({ user, body }) {
const client = user.client

const name = _.get(body, 'metadata.name')
_.set(body, 'metadata.namespace', `garden-${name}`)
_.set(body, 'spec.namespace', `garden-${name}`)
let project = await client['core.gardener.cloud'].projects.create(body)

const isProjectReady = ({ type, object: project }) => {
Expand Down
12 changes: 6 additions & 6 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,11 +81,11 @@
"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",
"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 @@ -144,7 +144,7 @@
"coverageThreshold": {
"global": {
"branches": 68,
"functions": 95,
"functions": 94,
"lines": 90,
"statements": 90
}
Expand All @@ -153,8 +153,8 @@
"<rootDir>/jest.setup.js"
]
},
"packageManager": "yarn@4.3.1",
"packageManager": "yarn@4.5.0",
"engines": {
"node": "^20.9.0"
"node": "^22.7.0"
}
}
2 changes: 2 additions & 0 deletions backend/test/__snapshots__/services.projects.spec.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ exports[`services/projects #create should create a project and return it when re
{
"metadata": {
"name": "foo",
},
"spec": {
"namespace": "garden-foo",
},
"status": {
Expand Down
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
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

exports[`gardener-dashboard vpa should render the template with default values 1`] = `
{
"apiVersion": "autoscaling.k8s.io/v1beta2",
"apiVersion": "autoscaling.k8s.io/v1",
"kind": "VerticalPodAutoscaler",
"metadata": {
"labels": {
Expand Down Expand Up @@ -50,7 +50,7 @@ exports[`gardener-dashboard vpa should render the template with default values 1

exports[`gardener-dashboard vpa should render the template with overwritten values 1`] = `
{
"apiVersion": "autoscaling.k8s.io/v1beta2",
"apiVersion": "autoscaling.k8s.io/v1",
"kind": "VerticalPodAutoscaler",
"metadata": {
"labels": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{{- if .Values.global.dashboard.enabled }}
{{- if .Values.global.dashboard.vpa }}
apiVersion: autoscaling.k8s.io/v1beta2
apiVersion: autoscaling.k8s.io/v1
kind: VerticalPodAutoscaler
metadata:
name: gardener-dashboard-vpa
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.40.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"
}
}
12 changes: 6 additions & 6 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,21 +86,21 @@
"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-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.72.0",
"sass": "~1.74.1",
"unplugin-fonts": "^1.1.1",
"vite": "^5.1.6",
"vite-plugin-compression": "^0.5.1",
"vite-plugin-vuetify": "^2.0.3",
"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
Loading

0 comments on commit 772f237

Please sign in to comment.