blob: c05b9a95926a49b009bf3beddccfc94b1f0f4c68 [file] [log] [blame]
From e2134787f676554c0eee7d48d405a5e680ceed8b Mon Sep 17 00:00:00 2001
From: Lorenz Brun <lorenz@monogon.tech>
Date: Wed, 16 Mar 2022 13:39:39 +0100
Subject: [PATCH] Remove unused plugins
---
core/dnsserver/zdirectives.go | 7 -------
core/plugin/zplugin.go | 7 -------
plugin.cfg | 7 -------
plugin/kubernetes/setup.go | 2 +-
4 files changed, 1 insertion(+), 22 deletions(-)
diff --git a/core/dnsserver/zdirectives.go b/core/dnsserver/zdirectives.go
index 6d713758..8d46a0a2 100644
--- a/core/dnsserver/zdirectives.go
+++ b/core/dnsserver/zdirectives.go
@@ -11,7 +11,6 @@ package dnsserver
// care what plugin above them are doing.
var Directives = []string{
"metadata",
- "geoip",
"cancel",
"tls",
"timeouts",
@@ -21,14 +20,12 @@ var Directives = []string{
"root",
"bind",
"debug",
- "trace",
"ready",
"health",
"pprof",
"prometheus",
"errors",
"log",
- "dnstap",
"local",
"dns64",
"acl",
@@ -45,15 +42,11 @@ var Directives = []string{
"template",
"transfer",
"hosts",
- "route53",
- "azure",
- "clouddns",
"k8s_external",
"kubernetes",
"file",
"auto",
"secondary",
- "etcd",
"loop",
"forward",
"grpc",
diff --git a/core/plugin/zplugin.go b/core/plugin/zplugin.go
index b97cd85c..67c7ecbc 100644
--- a/core/plugin/zplugin.go
+++ b/core/plugin/zplugin.go
@@ -9,23 +9,18 @@ import (
_ "github.com/coredns/coredns/plugin/any"
_ "github.com/coredns/coredns/plugin/auto"
_ "github.com/coredns/coredns/plugin/autopath"
- _ "github.com/coredns/coredns/plugin/azure"
_ "github.com/coredns/coredns/plugin/bind"
_ "github.com/coredns/coredns/plugin/bufsize"
_ "github.com/coredns/coredns/plugin/cache"
_ "github.com/coredns/coredns/plugin/cancel"
_ "github.com/coredns/coredns/plugin/chaos"
- _ "github.com/coredns/coredns/plugin/clouddns"
_ "github.com/coredns/coredns/plugin/debug"
_ "github.com/coredns/coredns/plugin/dns64"
_ "github.com/coredns/coredns/plugin/dnssec"
- _ "github.com/coredns/coredns/plugin/dnstap"
_ "github.com/coredns/coredns/plugin/erratic"
_ "github.com/coredns/coredns/plugin/errors"
- _ "github.com/coredns/coredns/plugin/etcd"
_ "github.com/coredns/coredns/plugin/file"
_ "github.com/coredns/coredns/plugin/forward"
- _ "github.com/coredns/coredns/plugin/geoip"
_ "github.com/coredns/coredns/plugin/grpc"
_ "github.com/coredns/coredns/plugin/header"
_ "github.com/coredns/coredns/plugin/health"
@@ -45,13 +40,11 @@ import (
_ "github.com/coredns/coredns/plugin/reload"
_ "github.com/coredns/coredns/plugin/rewrite"
_ "github.com/coredns/coredns/plugin/root"
- _ "github.com/coredns/coredns/plugin/route53"
_ "github.com/coredns/coredns/plugin/secondary"
_ "github.com/coredns/coredns/plugin/sign"
_ "github.com/coredns/coredns/plugin/template"
_ "github.com/coredns/coredns/plugin/timeouts"
_ "github.com/coredns/coredns/plugin/tls"
- _ "github.com/coredns/coredns/plugin/trace"
_ "github.com/coredns/coredns/plugin/transfer"
_ "github.com/coredns/coredns/plugin/tsig"
_ "github.com/coredns/coredns/plugin/view"
diff --git a/plugin.cfg b/plugin.cfg
index 407a668e..0429f5ee 100644
--- a/plugin.cfg
+++ b/plugin.cfg
@@ -20,7 +20,6 @@
# log:log
metadata:metadata
-geoip:geoip
cancel:cancel
tls:tls
timeouts:timeouts
@@ -30,14 +29,12 @@ bufsize:bufsize
root:root
bind:bind
debug:debug
-trace:trace
ready:ready
health:health
pprof:pprof
prometheus:metrics
errors:errors
log:log
-dnstap:dnstap
local:local
dns64:dns64
acl:acl
@@ -54,15 +51,11 @@ minimal:minimal
template:template
transfer:transfer
hosts:hosts
-route53:route53
-azure:azure
-clouddns:clouddns
k8s_external:k8s_external
kubernetes:kubernetes
file:file
auto:auto
secondary:secondary
-etcd:etcd
loop:loop
forward:forward
grpc:grpc
diff --git a/plugin/kubernetes/setup.go b/plugin/kubernetes/setup.go
index 0b988a9a..a07a1194 100644
--- a/plugin/kubernetes/setup.go
+++ b/plugin/kubernetes/setup.go
@@ -8,6 +8,7 @@ import (
"strings"
"github.com/coredns/caddy"
+
"github.com/coredns/coredns/core/dnsserver"
"github.com/coredns/coredns/plugin"
"github.com/coredns/coredns/plugin/pkg/dnsutil"
@@ -17,7 +18,6 @@ import (
"github.com/go-logr/logr"
"github.com/miekg/dns"
meta "k8s.io/apimachinery/pkg/apis/meta/v1"
- _ "k8s.io/client-go/plugin/pkg/client/auth/oidc" // pull this in here, because we want it excluded if plugin.cfg doesn't have k8s
"k8s.io/client-go/tools/clientcmd"
"k8s.io/klog/v2"
)
--
2.41.0