From 7b84e7cd957de78cc8e9af045e265e0f1f7c360c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Huss?= Date: Tue, 1 Aug 2023 08:50:32 +0200 Subject: [PATCH] fix --- .../apps_v1_Deployment_coredns-coredns.yaml | 4 +-- share/dns/config.tf | 2 +- share/dns/index.yaml | 26 +++++++++---------- ...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, 21 insertions(+), 21 deletions(-) diff --git a/share/dns/apps_v1_Deployment_coredns-coredns.yaml b/share/dns/apps_v1_Deployment_coredns-coredns.yaml index 5abf09d..629a0a1 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.1" + helm.sh/chart: "coredns-1.24.2" 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: 2c80ea26dcf7cd4d57c4ccbe0561210d06f8e048704a7edb5c495e4e2d60999d + checksum/config: 5354efa9373f373cf926e61e409439f70f9ae856ea1d1a5760c4f43634df3bb7 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 30a0ac7..04e09a1 100644 --- a/share/dns/config.tf +++ b/share/dns/config.tf @@ -43,7 +43,7 @@ locals { [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)], z.wildcard!=""?[format("*.%s. IN A %s", z.name, z.wildcard)]:[], - z.wildcard6!=""?[format("*.%s. IN AAAA %s", z.namz, z.wildcard6)]:[], + z.wildcard6!=""?[format("*.%s. IN AAAA %s", z.name, z.wildcard6)]:[], )) }]...) } diff --git a/share/dns/index.yaml b/share/dns/index.yaml index 8bf04a2..a01f5a6 100644 --- a/share/dns/index.yaml +++ b/share/dns/index.yaml @@ -6,25 +6,15 @@ metadata: name: dns description: null options: - domain-name: - default: your_company.com - examples: - - your_company.com - type: string - sub-domain: - default: dns - examples: - - dns - type: string domain: default: your-company examples: - your-company type: string - forward: - default: 192.168.1.254 + domain-name: + default: your_company.com examples: - - 192.168.1.254 + - your_company.com type: string image: default: @@ -55,6 +45,11 @@ options: default: 1.10.1 type: string type: object + forward: + default: 192.168.1.254 + examples: + - 192.168.1.254 + type: string zones: default: [] items: @@ -79,6 +74,11 @@ options: type: string type: object type: array + sub-domain: + default: dns + examples: + - dns + 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 ebfd79b..35165a8 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.1" + helm.sh/chart: "coredns-1.24.2" 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 3f69800..e0a6204 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.1" + helm.sh/chart: "coredns-1.24.2" 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 cd90a96..595217a 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.1" + helm.sh/chart: "coredns-1.24.2" 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 cf82ffd..b0bc2d6 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.1" + helm.sh/chart: "coredns-1.24.2" 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 cefc843..017fa71 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.1" + helm.sh/chart: "coredns-1.24.2" k8s-app: coredns kubernetes.io/cluster-service: "true" kubernetes.io/name: "CoreDNS"