Unverified Commit 82272021 authored by Niklas Hambüchen's avatar Niklas Hambüchen Committed by GitHub
Browse files

Merge pull request #128886 from scvalex/coredns-configurable-corefile

kubernetes.addons.dns: make corefile configurable
parents 4bdce59e ed62c1c6
Loading
Loading
Loading
Loading
+40 −14
Original line number Diff line number Diff line
@@ -60,6 +60,45 @@ in {
        sha256 = "02r440xcdsgi137k5lmmvp0z5w5fmk8g9mysq5pnysq1wl8sj6mw";
      };
    };

    corefile = mkOption {
      description = ''
        Custom coredns corefile configuration.

        See: <link xlink:href="https://coredns.io/manual/toc/#configuration"/>.
      '';
      type = types.str;
      default = ''
        .:${toString ports.dns} {
          errors
          health :${toString ports.health}
          kubernetes ${cfg.clusterDomain} in-addr.arpa ip6.arpa {
            pods insecure
            fallthrough in-addr.arpa ip6.arpa
          }
          prometheus :${toString ports.metrics}
          forward . /etc/resolv.conf
          cache 30
          loop
          reload
          loadbalance
        }'';
      defaultText = ''
        .:${toString ports.dns} {
          errors
          health :${toString ports.health}
          kubernetes ''${config.services.kubernetes.addons.dns.clusterDomain} in-addr.arpa ip6.arpa {
            pods insecure
            fallthrough in-addr.arpa ip6.arpa
          }
          prometheus :${toString ports.metrics}
          forward . /etc/resolv.conf
          cache 30
          loop
          reload
          loadbalance
        }'';
    };
  };

  config = mkIf cfg.enable {
@@ -151,20 +190,7 @@ in {
          namespace = "kube-system";
        };
        data = {
          Corefile = ".:${toString ports.dns} {
            errors
            health :${toString ports.health}
            kubernetes ${cfg.clusterDomain} in-addr.arpa ip6.arpa {
              pods insecure
              fallthrough in-addr.arpa ip6.arpa
            }
            prometheus :${toString ports.metrics}
            forward . /etc/resolv.conf
            cache 30
            loop
            reload
            loadbalance
          }";
          Corefile = cfg.corefile;
        };
      };