blob: c05b9a95926a49b009bf3beddccfc94b1f0f4c68 [file] [log] [blame]
Lorenz Brun6211e4d2023-11-14 19:09:40 +01001From e2134787f676554c0eee7d48d405a5e680ceed8b Mon Sep 17 00:00:00 2001
Lorenz Brund13c1c62022-03-30 19:58:58 +02002From: Lorenz Brun <lorenz@monogon.tech>
3Date: Wed, 16 Mar 2022 13:39:39 +0100
4Subject: [PATCH] Remove unused plugins
Lorenz Brunb29e0b02020-07-28 17:26:12 +02005
6---
Lorenz Brund13c1c62022-03-30 19:58:58 +02007 core/dnsserver/zdirectives.go | 7 -------
8 core/plugin/zplugin.go | 7 -------
9 plugin.cfg | 7 -------
Lorenz Brun6211e4d2023-11-14 19:09:40 +010010 plugin/kubernetes/setup.go | 2 +-
11 4 files changed, 1 insertion(+), 22 deletions(-)
Lorenz Brunb29e0b02020-07-28 17:26:12 +020012
13diff --git a/core/dnsserver/zdirectives.go b/core/dnsserver/zdirectives.go
Lorenz Brun6211e4d2023-11-14 19:09:40 +010014index 6d713758..8d46a0a2 100644
Lorenz Brunb29e0b02020-07-28 17:26:12 +020015--- a/core/dnsserver/zdirectives.go
16+++ b/core/dnsserver/zdirectives.go
Lorenz Brund13c1c62022-03-30 19:58:58 +020017@@ -11,7 +11,6 @@ package dnsserver
Lorenz Brunb29e0b02020-07-28 17:26:12 +020018 // care what plugin above them are doing.
19 var Directives = []string{
20 "metadata",
Lorenz Brund13c1c62022-03-30 19:58:58 +020021- "geoip",
22 "cancel",
23 "tls",
Lorenz Brun6211e4d2023-11-14 19:09:40 +010024 "timeouts",
25@@ -21,14 +20,12 @@ var Directives = []string{
Lorenz Brund13c1c62022-03-30 19:58:58 +020026 "root",
Lorenz Brunb29e0b02020-07-28 17:26:12 +020027 "bind",
28 "debug",
29- "trace",
Lorenz Brund13c1c62022-03-30 19:58:58 +020030 "ready",
Lorenz Brunb29e0b02020-07-28 17:26:12 +020031 "health",
Lorenz Brund13c1c62022-03-30 19:58:58 +020032 "pprof",
33 "prometheus",
Lorenz Brunb29e0b02020-07-28 17:26:12 +020034 "errors",
35 "log",
36- "dnstap",
Lorenz Brund13c1c62022-03-30 19:58:58 +020037 "local",
Lorenz Brunb29e0b02020-07-28 17:26:12 +020038 "dns64",
39 "acl",
Lorenz Brun6211e4d2023-11-14 19:09:40 +010040@@ -45,15 +42,11 @@ var Directives = []string{
Lorenz Brunb29e0b02020-07-28 17:26:12 +020041 "template",
Lorenz Brund13c1c62022-03-30 19:58:58 +020042 "transfer",
Lorenz Brunfa5c2fc2020-09-28 13:32:12 +020043 "hosts",
Lorenz Brunb29e0b02020-07-28 17:26:12 +020044- "route53",
45- "azure",
46- "clouddns",
Lorenz Brund13c1c62022-03-30 19:58:58 +020047 "k8s_external",
Lorenz Brunb29e0b02020-07-28 17:26:12 +020048 "kubernetes",
Lorenz Brund13c1c62022-03-30 19:58:58 +020049 "file",
50 "auto",
51 "secondary",
Lorenz Brunb29e0b02020-07-28 17:26:12 +020052- "etcd",
Lorenz Brund13c1c62022-03-30 19:58:58 +020053 "loop",
Lorenz Brunb29e0b02020-07-28 17:26:12 +020054 "forward",
Lorenz Brund13c1c62022-03-30 19:58:58 +020055 "grpc",
Lorenz Brunb29e0b02020-07-28 17:26:12 +020056diff --git a/core/plugin/zplugin.go b/core/plugin/zplugin.go
Lorenz Brun6211e4d2023-11-14 19:09:40 +010057index b97cd85c..67c7ecbc 100644
Lorenz Brunb29e0b02020-07-28 17:26:12 +020058--- a/core/plugin/zplugin.go
59+++ b/core/plugin/zplugin.go
Lorenz Brund13c1c62022-03-30 19:58:58 +020060@@ -9,23 +9,18 @@ import (
Lorenz Brunb29e0b02020-07-28 17:26:12 +020061 _ "github.com/coredns/coredns/plugin/any"
Lorenz Brund13c1c62022-03-30 19:58:58 +020062 _ "github.com/coredns/coredns/plugin/auto"
63 _ "github.com/coredns/coredns/plugin/autopath"
Lorenz Brunb29e0b02020-07-28 17:26:12 +020064- _ "github.com/coredns/coredns/plugin/azure"
65 _ "github.com/coredns/coredns/plugin/bind"
66 _ "github.com/coredns/coredns/plugin/bufsize"
67 _ "github.com/coredns/coredns/plugin/cache"
Lorenz Brund13c1c62022-03-30 19:58:58 +020068 _ "github.com/coredns/coredns/plugin/cancel"
69 _ "github.com/coredns/coredns/plugin/chaos"
Lorenz Brunb29e0b02020-07-28 17:26:12 +020070- _ "github.com/coredns/coredns/plugin/clouddns"
71 _ "github.com/coredns/coredns/plugin/debug"
72 _ "github.com/coredns/coredns/plugin/dns64"
Lorenz Brund13c1c62022-03-30 19:58:58 +020073 _ "github.com/coredns/coredns/plugin/dnssec"
Lorenz Brunb29e0b02020-07-28 17:26:12 +020074- _ "github.com/coredns/coredns/plugin/dnstap"
Lorenz Brund13c1c62022-03-30 19:58:58 +020075 _ "github.com/coredns/coredns/plugin/erratic"
Lorenz Brunb29e0b02020-07-28 17:26:12 +020076 _ "github.com/coredns/coredns/plugin/errors"
77- _ "github.com/coredns/coredns/plugin/etcd"
Lorenz Brund13c1c62022-03-30 19:58:58 +020078 _ "github.com/coredns/coredns/plugin/file"
Lorenz Brunb29e0b02020-07-28 17:26:12 +020079 _ "github.com/coredns/coredns/plugin/forward"
Lorenz Brund13c1c62022-03-30 19:58:58 +020080- _ "github.com/coredns/coredns/plugin/geoip"
81 _ "github.com/coredns/coredns/plugin/grpc"
82 _ "github.com/coredns/coredns/plugin/header"
Lorenz Brunb29e0b02020-07-28 17:26:12 +020083 _ "github.com/coredns/coredns/plugin/health"
Lorenz Brun6211e4d2023-11-14 19:09:40 +010084@@ -45,13 +40,11 @@ import (
Lorenz Brunb29e0b02020-07-28 17:26:12 +020085 _ "github.com/coredns/coredns/plugin/reload"
Lorenz Brund13c1c62022-03-30 19:58:58 +020086 _ "github.com/coredns/coredns/plugin/rewrite"
87 _ "github.com/coredns/coredns/plugin/root"
Lorenz Brunb29e0b02020-07-28 17:26:12 +020088- _ "github.com/coredns/coredns/plugin/route53"
Lorenz Brund13c1c62022-03-30 19:58:58 +020089 _ "github.com/coredns/coredns/plugin/secondary"
90 _ "github.com/coredns/coredns/plugin/sign"
Lorenz Brunb29e0b02020-07-28 17:26:12 +020091 _ "github.com/coredns/coredns/plugin/template"
Lorenz Brun6211e4d2023-11-14 19:09:40 +010092 _ "github.com/coredns/coredns/plugin/timeouts"
Lorenz Brund13c1c62022-03-30 19:58:58 +020093 _ "github.com/coredns/coredns/plugin/tls"
Lorenz Brunb29e0b02020-07-28 17:26:12 +020094- _ "github.com/coredns/coredns/plugin/trace"
Lorenz Brund13c1c62022-03-30 19:58:58 +020095 _ "github.com/coredns/coredns/plugin/transfer"
Lorenz Brun6211e4d2023-11-14 19:09:40 +010096 _ "github.com/coredns/coredns/plugin/tsig"
97 _ "github.com/coredns/coredns/plugin/view"
Lorenz Brunb29e0b02020-07-28 17:26:12 +020098diff --git a/plugin.cfg b/plugin.cfg
Lorenz Brun6211e4d2023-11-14 19:09:40 +010099index 407a668e..0429f5ee 100644
Lorenz Brunb29e0b02020-07-28 17:26:12 +0200100--- a/plugin.cfg
101+++ b/plugin.cfg
Lorenz Brund13c1c62022-03-30 19:58:58 +0200102@@ -20,7 +20,6 @@
Lorenz Brunb29e0b02020-07-28 17:26:12 +0200103 # log:log
Lorenz Brun6211e4d2023-11-14 19:09:40 +0100104
Lorenz Brunb29e0b02020-07-28 17:26:12 +0200105 metadata:metadata
Lorenz Brund13c1c62022-03-30 19:58:58 +0200106-geoip:geoip
107 cancel:cancel
108 tls:tls
Lorenz Brun6211e4d2023-11-14 19:09:40 +0100109 timeouts:timeouts
110@@ -30,14 +29,12 @@ bufsize:bufsize
Lorenz Brund13c1c62022-03-30 19:58:58 +0200111 root:root
Lorenz Brunb29e0b02020-07-28 17:26:12 +0200112 bind:bind
113 debug:debug
114-trace:trace
Lorenz Brund13c1c62022-03-30 19:58:58 +0200115 ready:ready
Lorenz Brunb29e0b02020-07-28 17:26:12 +0200116 health:health
Lorenz Brund13c1c62022-03-30 19:58:58 +0200117 pprof:pprof
118 prometheus:metrics
Lorenz Brunb29e0b02020-07-28 17:26:12 +0200119 errors:errors
120 log:log
121-dnstap:dnstap
Lorenz Brund13c1c62022-03-30 19:58:58 +0200122 local:local
Lorenz Brunb29e0b02020-07-28 17:26:12 +0200123 dns64:dns64
124 acl:acl
Lorenz Brun6211e4d2023-11-14 19:09:40 +0100125@@ -54,15 +51,11 @@ minimal:minimal
Lorenz Brunb29e0b02020-07-28 17:26:12 +0200126 template:template
Lorenz Brund13c1c62022-03-30 19:58:58 +0200127 transfer:transfer
Lorenz Brunfa5c2fc2020-09-28 13:32:12 +0200128 hosts:hosts
Lorenz Brunb29e0b02020-07-28 17:26:12 +0200129-route53:route53
130-azure:azure
131-clouddns:clouddns
Lorenz Brund13c1c62022-03-30 19:58:58 +0200132 k8s_external:k8s_external
Lorenz Brunb29e0b02020-07-28 17:26:12 +0200133 kubernetes:kubernetes
Lorenz Brund13c1c62022-03-30 19:58:58 +0200134 file:file
135 auto:auto
136 secondary:secondary
Lorenz Brunb29e0b02020-07-28 17:26:12 +0200137-etcd:etcd
Lorenz Brund13c1c62022-03-30 19:58:58 +0200138 loop:loop
Lorenz Brunb29e0b02020-07-28 17:26:12 +0200139 forward:forward
Lorenz Brund13c1c62022-03-30 19:58:58 +0200140 grpc:grpc
Lorenz Brunb29e0b02020-07-28 17:26:12 +0200141diff --git a/plugin/kubernetes/setup.go b/plugin/kubernetes/setup.go
Lorenz Brun6211e4d2023-11-14 19:09:40 +0100142index 0b988a9a..a07a1194 100644
Lorenz Brunb29e0b02020-07-28 17:26:12 +0200143--- a/plugin/kubernetes/setup.go
144+++ b/plugin/kubernetes/setup.go
Lorenz Brun6211e4d2023-11-14 19:09:40 +0100145@@ -8,6 +8,7 @@ import (
146 "strings"
147
148 "github.com/coredns/caddy"
149+
150 "github.com/coredns/coredns/core/dnsserver"
151 "github.com/coredns/coredns/plugin"
152 "github.com/coredns/coredns/plugin/pkg/dnsutil"
153@@ -17,7 +18,6 @@ import (
154 "github.com/go-logr/logr"
Lorenz Brunb29e0b02020-07-28 17:26:12 +0200155 "github.com/miekg/dns"
156 meta "k8s.io/apimachinery/pkg/apis/meta/v1"
Lorenz Brun6211e4d2023-11-14 19:09:40 +0100157- _ "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
Lorenz Brunb29e0b02020-07-28 17:26:12 +0200158 "k8s.io/client-go/tools/clientcmd"
Lorenz Brund13c1c62022-03-30 19:58:58 +0200159 "k8s.io/klog/v2"
Lorenz Brunb29e0b02020-07-28 17:26:12 +0200160 )
Lorenz Brun6211e4d2023-11-14 19:09:40 +0100161--
1622.41.0
Lorenz Brund13c1c62022-03-30 19:58:58 +0200163