Skip to content
Open
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,31 @@ data:
maxRequestBodySize: {{ .Values.global.dashboard.maxRequestBodySize | default "100kb" }}
readinessProbe:
periodSeconds: {{ .Values.global.dashboard.readinessProbe.periodSeconds }}

{{- if .Values.global.dashboard.show }}
show:
{{- if .Values.global.dashboard.show.DNSConfiguration }}
DNSConfiguration: {{ .Values.global.dashboard.show.DNSConfiguration }}
{{- end }}
{{- if .Values.global.dashboard.show.addons }}
addons: {{ .Values.global.dashboard.show.addons }}
{{- end }}
{{- if .Values.global.dashboard.show.autoUpdate }}
autoUpdate: {{ .Values.global.dashboard.show.autoUpdate }}
{{- end }}
{{- if .Values.global.dashboard.show.controlPlaneHighAvailability }}
controlPlaneHighAvailability: {{ .Values.global.dashboard.show.controlPlaneHighAvailability }}
{{- end }}
{{- if .Values.global.dashboard.show.hibernation }}
hibernation: {{ .Values.global.dashboard.show.hibernation }}
{{- end }}
{{- if .Values.global.dashboard.show.infrastructure }}
infrastructure: {{ .Values.global.dashboard.show.infrastructure }}
{{- end }}
{{- if .Values.global.dashboard.show.workerlessOption }}
workerlessOption: {{ .Values.global.dashboard.show.workerlessOption }}
{{- end }}
{{- end }}
{{- if .Values.global.dashboard.gitHub }}
gitHub:
apiUrl: {{ .Values.global.dashboard.gitHub.apiUrl }}
Expand Down
8 changes: 8 additions & 0 deletions charts/gardener-dashboard/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,14 @@ global:
- title: Issues
icon: mdi-bug
url: https://github.com/gardener/gardener/issues
# show: # hides new shoot creation items
Comment thread
benedikt-haug marked this conversation as resolved.
Outdated
# DNSConfiguration: true
# addons: true
# autoUpdate: true
# controlPlaneHighAvailability: true
# hibernation: true
# infrastructure: true
# workerlessOption: true
# # supported grantTypes of the garden cluster oidc issuer. See https://github.com/int128/kubelogin/blob/master/docs/usage.md for possible values.
# grantTypes:
# - auto
Expand Down
3 changes: 2 additions & 1 deletion frontend/src/components/NewShoot/GNewShootDetails.vue
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ SPDX-License-Identifier: Apache-2.0
/>
</v-col>
</v-row>
<v-row>
<v-row v-if="showWorkerlessOption">
<v-col cols="12">
<v-checkbox
v-model="workerless"
Expand Down Expand Up @@ -175,6 +175,7 @@ export default {
computed: {
...mapState(useConfigStore, [
'sla',
'showWorkerlessOption',
]),
unexpiredKubernetesVersions () {
return filter(this.sortedKubernetesVersions, ({ isExpired }) => !isExpired)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,13 @@ SPDX-License-Identifier: Apache-2.0

<template>
<div class="ml-3">
<div class="text-subtitle-1 pt-4">
<div
v-if="configStore.showAutoUpdate"
class="text-subtitle-1 pt-4"
>
{{ title }}
</div>
<template v-if="!workerless">
<template v-if="!workerless && configStore.showAutoUpdate">
<div
v-if="!readonly || osUpdates"
class="d-flex mt-4"
Expand Down Expand Up @@ -39,7 +42,7 @@ SPDX-License-Identifier: Apache-2.0
</div>
</template>
<div
v-if="!readonly || k8sUpdates"
v-if="(!readonly || k8sUpdates) && configStore.showAutoUpdate"
class="d-flex mt-4"
>
<div class="d-flex align-center justify-center action-select">
Expand Down Expand Up @@ -101,6 +104,10 @@ import {
toRefs,
} from 'vue'

import { useConfigStore } from '@/store/config'

const configStore = useConfigStore()

const props = defineProps({
title: {
type: String,
Expand Down
35 changes: 35 additions & 0 deletions frontend/src/store/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,34 @@ export const useConfigStore = defineStore('config', () => {
return state.value?.knownConditions
})

const showWorkerlessOption = computed(() => {
return state.value?.show?.workerlessOption ?? true
})

const showAutoUpdate = computed(() => {
return state.value?.show?.autoUpdate ?? true
})

const showInfrastructure = computed(() => {
return state.value?.show?.infrastructure ?? true
})

const showControlPlaneHighAvailability = computed(() => {
return state.value?.show?.controlPlaneHighAvailability ?? true
})

const showDNSConfiguration = computed(() => {
return state.value?.show?.DNSConfiguration ?? true
})

const showAddons = computed(() => {
return state.value?.show?.addons ?? true
})

const showHibernation = computed(() => {
return state.value?.show?.hibernation ?? true
})

const allKnownConditions = computed(() => {
return {
...wellKnownConditions,
Expand Down Expand Up @@ -403,6 +431,13 @@ export const useConfigStore = defineStore('config', () => {
vendorHints,
helpMenuItems,
externalTools,
showAddons,
showAutoUpdate,
showControlPlaneHighAvailability,
showDNSConfiguration,
showHibernation,
showInfrastructure,
showWorkerlessOption,
defaultNodesCIDR,
shootAdminKubeconfig,
apiServerUrl,
Expand Down
23 changes: 19 additions & 4 deletions frontend/src/views/GNewShoot.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ SPDX-License-Identifier: Apache-2.0
class="overflow-auto"
fluid
>
<v-card>
<v-card v-if="showInfrastructure">
<g-toolbar title="Infrastructure" />
<v-card-text class="py-1">
<g-new-shoot-select-infrastructure />
Expand All @@ -33,13 +33,19 @@ SPDX-License-Identifier: Apache-2.0
<g-new-shoot-infrastructure-details />
</v-card-text>
</v-card>
<v-card class="mt-4">
<v-card
v-if="showControlPlaneHighAvailability"
class="mt-4"
>
<g-toolbar title="Control Plane High Availability" />
<v-card-text class="pt-2">
<g-manage-control-plane-high-availability />
</v-card-text>
</v-card>
<v-card class="mt-4">
<v-card
v-if="showDNSConfiguration"
class="mt-4"
>
<g-toolbar title="DNS Configuration" />
<v-card-text class="py-1">
<g-manage-dns />
Expand Down Expand Up @@ -67,6 +73,7 @@ SPDX-License-Identifier: Apache-2.0
</v-card>
<v-card
v-show="!workerless"
v-if="showAddons"
class="mt-4"
>
<g-toolbar
Expand All @@ -87,7 +94,10 @@ SPDX-License-Identifier: Apache-2.0
/>
</v-card-text>
</v-card>
<v-card class="mt-4">
<v-card
v-if="showHibernation"
class="mt-4"
>
<g-toolbar title="Hibernation" />
<v-card-text>
<g-manage-hibernation-schedule />
Expand Down Expand Up @@ -231,6 +241,11 @@ export default {
computed: {
...mapState(useConfigStore, [
'accessRestriction',
'showInfrastructure',
'showControlPlaneHighAvailability',
'showDNSConfiguration',
'showAddons',
'showHibernation',
]),
...mapState(useCloudProfileStore, [
'sortedProviderTypeList',
Expand Down