From b68ffdfebeaa0a563a7f4c34de933c39f4b62af8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Huss?= Date: Sun, 6 Aug 2023 07:46:38 +0200 Subject: [PATCH] fix --- .../apps_v1_Deployment_coredns-coredns.yaml | 4 +- share/dns/config.tf | 17 ++--- share/dns/index.yaml | 64 +++++++++---------- ...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, 46 insertions(+), 49 deletions(-) diff --git a/share/dns/apps_v1_Deployment_coredns-coredns.yaml b/share/dns/apps_v1_Deployment_coredns-coredns.yaml index 629a0a1..81e68dc 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.2" + helm.sh/chart: "coredns-1.24.3" 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: 5354efa9373f373cf926e61e409439f70f9ae856ea1d1a5760c4f43634df3bb7 + checksum/config: c20a82007ff774eb9626cdbe5e2e69f55a04e108bd3840e94017b5d2ed1fae37 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 04e09a1..bb4531d 100644 --- a/share/dns/config.tf +++ b/share/dns/config.tf @@ -48,14 +48,11 @@ locals { }]...) } -resource "kubectl_manifest" "coredns-config" { - yaml_body = <<-EOF - apiVersion: v1 - kind: ConfigMap - metadata: - name: "${var.component}-${var.instance}" - namespace: "${var.namespace}" - labels: ${jsonencode(local.common-labels)} - data: ${jsonencode(local.files)} - EOF +resource "kubernetes_config_map_v1" "coredns-config" { + metadata { + name = "${var.component}-${var.instance}" + namespace = "${var.namespace}" + labels = local.common-labels + } + data = local.files } diff --git a/share/dns/index.yaml b/share/dns/index.yaml index a01f5a6..1847e73 100644 --- a/share/dns/index.yaml +++ b/share/dns/index.yaml @@ -11,11 +11,30 @@ options: examples: - your-company type: string - domain-name: - default: your_company.com - examples: - - your_company.com - 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 @@ -45,39 +64,20 @@ 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 - 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 - sub-domain: - default: dns + domain-name: + default: your_company.com examples: - - dns + - your_company.com type: string dependencies: [] providers: 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 35165a8..5cff258 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.2" + helm.sh/chart: "coredns-1.24.3" 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 e0a6204..38d2edb 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.2" + helm.sh/chart: "coredns-1.24.3" 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 595217a..c029ded 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.2" + helm.sh/chart: "coredns-1.24.3" 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 b0bc2d6..f03816e 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.2" + helm.sh/chart: "coredns-1.24.3" 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 017fa71..71559f0 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.2" + helm.sh/chart: "coredns-1.24.3" k8s-app: coredns kubernetes.io/cluster-service: "true" kubernetes.io/name: "CoreDNS"