Configure extension DNS settings in the spec.extensions section

frontend/__tests__/composables/useShootDns.spec.js

@@ -37,7 +37,7 @@ describe('composables', () => {
       shootDns = reactive(composable)
     })
 
-    it('should add extension dns providers', async () => {
+    it('should add extension dns providers', () => {
       shootDns.addDnsServiceExtensionProvider()
       shootDns.dnsDomain = 'example.org'
 
@@ -46,7 +46,7 @@ describe('composables', () => {
       expect(manifest.spec).toMatchSnapshot()
     })
 
-    it('should delete extension dns providers', async () => {
+    it('should delete extension dns providers', () => {
       shootDns.addDnsServiceExtensionProvider()
       shootDns.addDnsServiceExtensionProvider()
 
@@ -61,15 +61,15 @@ describe('composables', () => {
       expect(manifest.spec).toMatchSnapshot('last provider deleted')
     })
 
-    it('should add primary dns provider', async () => {
+    it('should add primary dns provider', () => {
       shootDns.dnsDomain = 'example.org'
       shootDns.dnsPrimaryProviderType = 'foo'
       shootDns.dnsPrimaryProviderSecretName = 'bar'
 
       expect(manifest.spec).toMatchSnapshot()
     })
 
-    it('should add extension custom domain dns provider', async () => {
+    it('should add extension custom domain dns provider', () => {
       shootDns.dnsDomain = 'example.org'
       shootDns.dnsPrimaryProviderType = 'foo'
       shootDns.dnsPrimaryProviderSecretName = 'bar'

frontend/src/components/Secrets/GSecretDialogWrapper.vue

@@ -24,7 +24,7 @@ import VsphereDialog from '@/components/Secrets/GSecretDialogVSphere'
 import CloudflareDialog from '@/components/Secrets/GSecretDialogCloudflare'
 import InfobloxDialog from '@/components/Secrets/GSecretDialogInfoblox'
 import NetlifyDialog from '@/components/Secrets/GSecretDialogNetlify'
-import DDnsDialog from '@/components/Secrets/GSecretDialogDDNS'
+import GSecretDialogDDNS from '@/components/Secrets/GSecretDialogDDNS'
 import DeleteDialog from '@/components/Secrets/GSecretDialogDelete'
 import HcloudDialog from '@/components/Secrets/GSecretDialogHCloud'
 import GenericDialog from '@/components/Secrets/GSecretDialogGeneric'
@@ -46,7 +46,7 @@ const components = {
   CloudflareDialog,
   InfobloxDialog,
   NetlifyDialog,
-  DDnsDialog,
+  GSecretDialogDDNS,
   HcloudDialog,
   GenericDialog,
   DeleteDialog,
@@ -78,7 +78,7 @@ export default {
         case 'google-clouddns':
           return 'GcpDialog'
         case 'rfc2136':
-          return 'DDnsDialog'
+          return 'GSecretDialogDDNS'
         default: {
           const name = upperFirst(head(split(this.visibleDialog, '-')))
           const componentName = `${name}Dialog`

frontend/src/components/Secrets/GSelectSecret.vue

@@ -120,7 +120,7 @@ export default {
     registerVuelidateAs: {
       type: String,
     },
-    filterSecretNames: {
+    allowedSecretNames: {
       type: Array,
       default: () => [],
     },
@@ -198,7 +198,7 @@ export default {
         secrets = this.dnsSecretsByProviderKind(this.dnsProviderKind)
       }
       return secrets
-        ?.filter(secret => !this.filterSecretNames.includes(secret.metadata.name))
+        ?.filter(secret => !this.allowedSecretNames.includes(secret.metadata.name))
     },
     infrastructureKind () {
       if (this.dnsProviderKind) {

frontend/src/components/ShootDetails/GShootInfrastructureCard.vue

@@ -171,11 +171,11 @@ SPDX-License-Identifier: Apache-2.0
         <template #prepend />
         <g-list-item-content label="DNS Providers">
           <div
-            v-if="shootExtensionDnsProviders && shootExtensionDnsProviders.length"
+            v-if="shootDnsServiceExtensionProviders && shootDnsServiceExtensionProviders.length"
             class="d-flex"
           >
             <g-dns-provider
-              v-for="({ secretName, type, domains, zones }) in shootExtensionDnsProviders"
+              v-for="({ secretName, type, domains, zones }) in shootDnsServiceExtensionProviders"
               :key="secretName"
               class="mr-2"
               :secret-name="secretNameFromShootResources(secretName)"
@@ -313,7 +313,7 @@ export default {
       nodesCidr,
       podsCidr,
       shootTechnicalId,
-      shootExtensionDnsProviders,
+      shootDnsServiceExtensionProviders,
       shootDnsPrimaryProvider,
       shootResources,
     } = useShootItem()
@@ -336,7 +336,7 @@ export default {
       nodesCidr,
       podsCidr,
       shootTechnicalId,
-      shootExtensionDnsProviders,
+      shootDnsServiceExtensionProviders,
       shootDnsPrimaryProvider,
       shootResources,
     }

frontend/src/components/ShootDns/GDnsConfiguration.vue

@@ -15,7 +15,7 @@ SPDX-License-Identifier: Apache-2.0
   >
     <template #content>
       <v-card-text>
-        <g-manage-shoot-dns :key="componentKey" />
+        <g-manage-dns :key="componentKey" />
       </v-card-text>
     </template>
   </g-action-button-dialog>
@@ -26,7 +26,7 @@ import { ref } from 'vue'
 import { useVuelidate } from '@vuelidate/core'
 
 import GActionButtonDialog from '@/components/dialogs/GActionButtonDialog'
-import GManageShootDns from '@/components/ShootDns/GManageDns'
+import GManageDns from '@/components/ShootDns/GManageDns'
 
 import { useShootContext } from '@/composables/useShootContext'
 import { useShootItem } from '@/composables/useShootItem'
@@ -37,7 +37,7 @@ import { v4 as uuidv4 } from '@/utils/uuid'
 export default {
   components: {
     GActionButtonDialog,
-    GManageShootDns,
+    GManageDns,
   },
   inject: ['api', 'logger'],
   setup () {
@@ -50,7 +50,7 @@ export default {
     const {
       shootManifest,
       setShootManifest,
-      forceMigrateSyncDNSProvidersToFalse,
+      forceMigrateSyncDnsProvidersToFalse,
     } = useShootContext()
 
     const componentKey = ref(uuidv4())
@@ -63,7 +63,7 @@ export default {
       shootManifest,
       setShootManifest,
       componentKey,
-      forceMigrateSyncDNSProvidersToFalse,
+      forceMigrateSyncDnsProvidersToFalse,
     }
   },
   methods: {
@@ -77,7 +77,7 @@ export default {
     async updateConfiguration () {
       try {
         // Remove migration logic when all dns configurations have been migrated by Gardener
-        this.forceMigrateSyncDNSProvidersToFalse()
+        this.forceMigrateSyncDnsProvidersToFalse()
 
         const { dns, extensions, resources } = this.shootManifest.spec
 

frontend/src/components/ShootDns/GDnsProviderRow.vue

@@ -9,14 +9,12 @@ SPDX-License-Identifier: Apache-2.0
     <div class="d-flex flex-wrap">
       <div class="regular-input">
         <v-select
-          v-model="dnsProviderType"
+          v-model="v$.dnsProviderType.$model"
           color="primary"
           :items="dnsProviderTypes"
           :error-messages="getErrorMessages(v$.dnsProviderType)"
           label="Dns Provider Type"
           variant="underlined"
-          @change="v$.dnsProviderType.$touch()"
-          @blur="v$.dnsProviderType.$touch()"
         >
           <template #item="{ props }">
             <v-list-item v-bind="props">
@@ -38,11 +36,11 @@ SPDX-License-Identifier: Apache-2.0
       </div>
       <div class="regular-input">
         <g-select-secret
-          v-if="extensionDnsProviderSecret || !dnsProvider.secretName"
-          v-model="extensionDnsProviderSecret"
+          v-if="dnsServiceExtensionProviderSecret || !dnsProvider.secretName"
+          v-model="dnsServiceExtensionProviderSecret"
           :dns-provider-kind="dnsProviderType"
-          :filter-secret-names="filterSecretNames"
-          register-vuelidate-as="extensionDnsProviderSecret"
+          :allowed-secret-names="allowedSecretNames"
+          register-vuelidate-as="dnsServiceExtensionProviderSecret"
         />
         <v-text-field
           v-else
@@ -179,10 +177,10 @@ export default {
         this.dnsProvider.type = value
         const dnsSecrets = this.dnsSecretsByProviderKind(value)
         const defaultDnsSecret = head(dnsSecrets)
-        this.extensionDnsProviderSecret = defaultDnsSecret
+        this.dnsServiceExtensionProviderSecret = defaultDnsSecret
       },
     },
-    extensionDnsProviderSecret: {
+    dnsServiceExtensionProviderSecret: {
       get () {
         const resourceName = this.dnsProvider.secretName
         const secretName = this.getResourceRefName(resourceName)
@@ -235,10 +233,10 @@ export default {
         set(this.dnsProvider, 'zones.include', value)
       },
     },
-    filterSecretNames () {
+    allowedSecretNames () {
       return this.dnsServiceExtensionProviders.map(provider => {
         const secretName = this.getResourceRefName(provider.secretName) // provider.secretName is the resource name
-        if (secretName !== this.extensionDnsProviderSecret?.metadata.name) {
+        if (secretName !== this.dnsServiceExtensionProviderSecret?.metadata.name) {
           return secretName
         }
         return undefined

frontend/src/components/ShootDns/GManageDns.vue

@@ -84,8 +84,7 @@ SPDX-License-Identifier: Apache-2.0
           max-width="50%"
         >
           <div>
-            The cluster domain is used for the API server of this cluster.
-            To expose workload services with your cluster domain, add a DNS provider for the <code>shoot-dns-service</code> extension.
+            To manage DNS entries for your cluster domain, add a DNS provider for the <code>shoot-dns-service</code> extension.<br>
             Click the <span class="font-weight-bold">Apply</span> button below to configure a provider for the <code>shoot-dns-service</code> extension using your cluster domain as the included domain.
           </div>
           <v-btn
@@ -104,7 +103,7 @@ SPDX-License-Identifier: Apache-2.0
         DNS Providers for the shoot-dns-service Extension
       </div>
       <div class="text-caption">
-        Configure DNS providers for the shoot-dns-service-extension to expose cluster workloads using domains managed by the configured providers
+        Configure DNS providers for the shoot-dns-service extension to automatically manage and synchronize DNS entries for cluster resources like services and ingresses
       </div>
       <div class="alternate-row-background">
         <v-expand-transition group>
@@ -155,6 +154,7 @@ import {
   mapState,
   mapActions,
 } from 'pinia'
+import { ref } from 'vue'
 
 import { useGardenerExtensionStore } from '@/store/gardenerExtension'
 import { useSecretStore } from '@/store/secret'
@@ -188,7 +188,6 @@ export default {
       dnsPrimaryProviderType,
       dnsPrimaryProviderSecretName,
       isNewCluster,
-      dnsProvidersWithPrimarySupport,
       dnsServiceExtensionProviders,
       hasDnsServiceExtensionProviderForCustomDomain,
       addDnsServiceExtensionProvider,
@@ -197,19 +196,21 @@ export default {
       deleteDnsServiceExtensionProvider,
     } = useShootContext()
 
+    const customDomain = ref(!!dnsDomain.value && !!dnsPrimaryProviderType.value)
+
     return {
       v$: useVuelidate(),
       dnsDomain,
       dnsPrimaryProviderType,
       dnsPrimaryProviderSecretName,
       isNewCluster,
-      dnsProvidersWithPrimarySupport,
       dnsServiceExtensionProviders,
       hasDnsServiceExtensionProviderForCustomDomain,
       addDnsServiceExtensionProvider,
       addDnsServiceExtensionProviderForCustomDomain,
       resetDnsPrimaryProvider,
       deleteDnsServiceExtensionProvider,
+      customDomain,
     }
   },
   validations () {
@@ -225,11 +226,6 @@ export default {
       }),
     }
   },
-  data () {
-    return {
-      customDomain: false,
-    }
-  },
   computed: {
     ...mapState(useGardenerExtensionStore, [
       'dnsProviderTypesWithPrimarySupport',
@@ -254,8 +250,7 @@ export default {
     },
     customDomainEnabled: {
       get () {
-        return this.customDomain ||
-          (!!this.dnsDomain && !!this.dnsPrimaryProviderType)
+        return this.customDomain
       },
       set (value) {
         this.customDomain = value
@@ -304,11 +299,6 @@ export default {
       }
     },
   },
-  mounted () {
-    if (this.customDomainEnabled) {
-      this.customDomain = true
-    }
-  },
   methods: {
     ...mapActions(useSecretStore, [
       'dnsSecretsByProviderKind',

frontend/src/composables/useShootContext.js

@@ -849,7 +849,7 @@ export function createShootContextComposable (options = {}) {
     deleteDnsServiceExtensionProvider,
     getDnsServiceExtensionResourceName,
     resetDnsPrimaryProvider,
-    forceMigrateSyncDNSProvidersToFalse,
+    forceMigrateSyncDnsProvidersToFalse,
     addExtensionDnsProviderResourceRef,
     setResource,
     deleteResource,
@@ -1005,7 +1005,7 @@ export function createShootContextComposable (options = {}) {
     deleteDnsServiceExtensionProvider,
     getDnsServiceExtensionResourceName,
     resetDnsPrimaryProvider,
-    forceMigrateSyncDNSProvidersToFalse,
+    forceMigrateSyncDnsProvidersToFalse,
     addExtensionDnsProviderResourceRef,
     setResource,
     deleteResource,

frontend/src/composables/useShootDns.js

@@ -264,7 +264,7 @@ export const useShootDns = (manifest, options) => {
     }
   }
 
-  function forceMigrateSyncDNSProvidersToFalse () {
+  function forceMigrateSyncDnsProvidersToFalse () {
     if (get(dnsServiceExtension.value, 'providerConfig.syncProvidersFromShootSpecDNS') === true) {
       // Migrate from old DNS configuration to new DNS configuration
       set(dnsServiceExtension.value, 'providerConfig.syncProvidersFromShootSpecDNS', false)
@@ -278,7 +278,7 @@ export const useShootDns = (manifest, options) => {
     dnsPrimaryProviderType,
     dnsPrimaryProviderSecretName,
     resetDnsPrimaryProvider,
-    forceMigrateSyncDNSProvidersToFalse,
+    forceMigrateSyncDnsProvidersToFalse,
     dnsServiceExtensionProviders,
     addDnsServiceExtensionProvider,
     deleteDnsServiceExtensionProvider,

frontend/src/composables/useShootItem.js

@@ -99,7 +99,7 @@ export function createShootItemComposable (shootItem, options = {}) {
     shootDomain,
     isCustomShootDomain,
     shootDnsPrimaryProvider,
-    shootExtensionDnsProviders,
+    shootDnsServiceExtensionProviders,
     shootDnsProviders,
     shootHibernationSchedules,
     shootMaintenance,
@@ -218,7 +218,7 @@ export function createShootItemComposable (shootItem, options = {}) {
     shootDomain,
     isCustomShootDomain,
     shootDnsPrimaryProvider,
-    shootExtensionDnsProviders,
+    shootDnsServiceExtensionProviders,
     shootDnsProviders,
     shootHibernationSchedules,
     shootMaintenance,

frontend/src/composables/useShootSpec.js

@@ -122,10 +122,10 @@ export function useShootSpec (shootItem, options = {}) {
   })
 
   const shootDnsPrimaryProvider = computed(() => {
-    return find(shootSpec.value.dns?.providers, { primary: true })
+    return find(shootSpec.value.dns?.providers, 'primary')
   })
 
-  const shootExtensionDnsProviders = computed(() => {
+  const shootDnsServiceExtensionProviders = computed(() => {
     const extensionDns = find(shootSpec.value.extensions, ['type', 'shoot-dns-service'])
     return get(extensionDns, 'providerConfig.providers')
   })
@@ -180,7 +180,7 @@ export function useShootSpec (shootItem, options = {}) {
     shootDomain,
     isCustomShootDomain,
     shootDnsPrimaryProvider,
-    shootExtensionDnsProviders,
+    shootDnsServiceExtensionProviders,
     shootHibernationSchedules,
     shootMaintenance,
     shootControlPlaneHighAvailabilityFailureTolerance,