From 77b671091e22cf4254ed8c17694a9151bb86ec45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Huss?= Date: Sat, 12 Aug 2023 14:57:21 +0200 Subject: [PATCH] fix --- .../apps_v1_Deployment_coredns-coredns.yaml | 4 +- share/dns/config.tf | 4 + share/dns/index.yaml | 98 ++++++++++++------- ...v1_ClusterRoleBinding_coredns-coredns.yaml | 2 +- ...k8s.io_v1_ClusterRole_coredns-coredns.yaml | 2 +- .../v1_ServiceAccount_coredns-coredns.yaml | 2 +- .../v1_Service_coredns-coredns-metrics.yaml | 2 +- share/dns/v1_Service_coredns-coredns.yaml | 2 +- 8 files changed, 72 insertions(+), 44 deletions(-) diff --git a/share/dns/apps_v1_Deployment_coredns-coredns.yaml b/share/dns/apps_v1_Deployment_coredns-coredns.yaml index 81e68dc..a65f3ac 100644 --- a/share/dns/apps_v1_Deployment_coredns-coredns.yaml +++ b/share/dns/apps_v1_Deployment_coredns-coredns.yaml @@ -6,7 +6,7 @@ metadata: labels: app.kubernetes.io/managed-by: "Helm" app.kubernetes.io/instance: "coredns" - helm.sh/chart: "coredns-1.24.3" + helm.sh/chart: "coredns-1.24.5" k8s-app: coredns kubernetes.io/cluster-service: "true" kubernetes.io/name: "CoreDNS" @@ -31,7 +31,7 @@ spec: app.kubernetes.io/name: coredns app.kubernetes.io/instance: "coredns" annotations: - checksum/config: c20a82007ff774eb9626cdbe5e2e69f55a04e108bd3840e94017b5d2ed1fae37 + checksum/config: 2785d160acee47f10ca0e9488b70f640042ade25a25f2ac1bb593844c3b6e8df scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]' spec: terminationGracePeriodSeconds: 30 diff --git a/share/dns/config.tf b/share/dns/config.tf index bb4531d..917938a 100644 --- a/share/dns/config.tf +++ b/share/dns/config.tf @@ -39,9 +39,13 @@ locals { "$ORIGIN ${z.name}.", local.soa-ns ], + z.domain!=""?[format("%s. IN A %s", z.name, z.domain)]:[], + z.domain6!=""?[format("%s. IN AAAA %s", z.name, z.domain6)]:[], + [for k,v in z.TXT: format("%s IN TXT %s", k, v)], [for k,v in z.hosts: format("%s IN A %s", k, v)], [for k,v in z.hosts6: format("%s IN AAAA %s", k, v)], [for k,v in z.alias: format("%s IN CNAME %s", k, v)], + [for mx in z.mx: format("%s IN MX %d %s", mx.name, mx.priority, mx.value)], z.wildcard!=""?[format("*.%s. IN A %s", z.name, z.wildcard)]:[], z.wildcard6!=""?[format("*.%s. IN AAAA %s", z.name, z.wildcard6)]:[], )) diff --git a/share/dns/index.yaml b/share/dns/index.yaml index 1847e73..70301ed 100644 --- a/share/dns/index.yaml +++ b/share/dns/index.yaml @@ -6,35 +6,16 @@ metadata: name: dns description: null options: - domain: - default: your-company + forward: + default: 192.168.1.254 examples: - - your-company + - 192.168.1.254 + type: string + sub-domain: + default: dns + examples: + - dns type: string - zones: - default: [] - items: - properties: - alias: - default: {} - type: object - hosts: - default: {} - type: object - hosts6: - default: {} - type: object - name: - default: local.domain - type: string - wildcard: - default: '' - type: string - wildcard6: - default: '' - type: string - type: object - type: array image: default: pullPolicy: IfNotPresent @@ -64,21 +45,64 @@ options: default: 1.10.1 type: string type: object - sub-domain: - default: dns - examples: - - dns - type: string - forward: - default: 192.168.1.254 - examples: - - 192.168.1.254 - type: string + zones: + default: [] + items: + properties: + alias: + default: {} + type: object + domain: + default: '' + type: string + domain6: + default: '' + type: string + hosts: + default: {} + type: object + hosts6: + default: {} + type: object + mx: + default: [] + items: + properties: + name: + default: vynil.solidite.fr. + type: string + priority: + default: 10 + type: number + value: + default: mail.solidite.fr. + type: string + type: object + type: array + name: + default: local.domain + type: string + txt: + default: {} + type: object + wildcard: + default: '' + type: string + wildcard6: + default: '' + type: string + type: object + type: array domain-name: default: your_company.com examples: - your_company.com type: string + domain: + default: your-company + examples: + - your-company + type: string dependencies: [] providers: kubernetes: true diff --git a/share/dns/rbac.authorization.k8s.io_v1_ClusterRoleBinding_coredns-coredns.yaml b/share/dns/rbac.authorization.k8s.io_v1_ClusterRoleBinding_coredns-coredns.yaml index 5cff258..6daf246 100644 --- a/share/dns/rbac.authorization.k8s.io_v1_ClusterRoleBinding_coredns-coredns.yaml +++ b/share/dns/rbac.authorization.k8s.io_v1_ClusterRoleBinding_coredns-coredns.yaml @@ -6,7 +6,7 @@ metadata: labels: app.kubernetes.io/managed-by: "Helm" app.kubernetes.io/instance: "coredns" - helm.sh/chart: "coredns-1.24.3" + helm.sh/chart: "coredns-1.24.5" k8s-app: coredns kubernetes.io/cluster-service: "true" kubernetes.io/name: "CoreDNS" diff --git a/share/dns/rbac.authorization.k8s.io_v1_ClusterRole_coredns-coredns.yaml b/share/dns/rbac.authorization.k8s.io_v1_ClusterRole_coredns-coredns.yaml index 38d2edb..b36f729 100644 --- a/share/dns/rbac.authorization.k8s.io_v1_ClusterRole_coredns-coredns.yaml +++ b/share/dns/rbac.authorization.k8s.io_v1_ClusterRole_coredns-coredns.yaml @@ -6,7 +6,7 @@ metadata: labels: app.kubernetes.io/managed-by: "Helm" app.kubernetes.io/instance: "coredns" - helm.sh/chart: "coredns-1.24.3" + helm.sh/chart: "coredns-1.24.5" k8s-app: coredns kubernetes.io/cluster-service: "true" kubernetes.io/name: "CoreDNS" diff --git a/share/dns/v1_ServiceAccount_coredns-coredns.yaml b/share/dns/v1_ServiceAccount_coredns-coredns.yaml index c029ded..29b2be3 100644 --- a/share/dns/v1_ServiceAccount_coredns-coredns.yaml +++ b/share/dns/v1_ServiceAccount_coredns-coredns.yaml @@ -7,7 +7,7 @@ metadata: labels: app.kubernetes.io/managed-by: "Helm" app.kubernetes.io/instance: "coredns" - helm.sh/chart: "coredns-1.24.3" + helm.sh/chart: "coredns-1.24.5" k8s-app: coredns kubernetes.io/cluster-service: "true" kubernetes.io/name: "CoreDNS" diff --git a/share/dns/v1_Service_coredns-coredns-metrics.yaml b/share/dns/v1_Service_coredns-coredns-metrics.yaml index f03816e..3f7a7f2 100644 --- a/share/dns/v1_Service_coredns-coredns-metrics.yaml +++ b/share/dns/v1_Service_coredns-coredns-metrics.yaml @@ -6,7 +6,7 @@ metadata: labels: app.kubernetes.io/managed-by: "Helm" app.kubernetes.io/instance: "coredns" - helm.sh/chart: "coredns-1.24.3" + helm.sh/chart: "coredns-1.24.5" k8s-app: coredns kubernetes.io/cluster-service: "true" kubernetes.io/name: "CoreDNS" diff --git a/share/dns/v1_Service_coredns-coredns.yaml b/share/dns/v1_Service_coredns-coredns.yaml index 71559f0..1dbf618 100644 --- a/share/dns/v1_Service_coredns-coredns.yaml +++ b/share/dns/v1_Service_coredns-coredns.yaml @@ -6,7 +6,7 @@ metadata: labels: app.kubernetes.io/managed-by: "Helm" app.kubernetes.io/instance: "coredns" - helm.sh/chart: "coredns-1.24.3" + helm.sh/chart: "coredns-1.24.5" k8s-app: coredns kubernetes.io/cluster-service: "true" kubernetes.io/name: "CoreDNS"