blob: e95258562eb4080114d6a36c3389fc81d770fa48 [file] [log] [blame]
Lorenz Brund13c1c62022-03-30 19:58:58 +02001From 355d38f38cf241b91a862795892bcb87c5729d2e Mon Sep 17 00:00:00 2001
2From: 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 -------
10 plugin/kubernetes/setup.go | 3 ---
11 4 files changed, 24 deletions(-)
Lorenz Brunb29e0b02020-07-28 17:26:12 +020012
13diff --git a/core/dnsserver/zdirectives.go b/core/dnsserver/zdirectives.go
Lorenz Brund13c1c62022-03-30 19:58:58 +020014index bca21718..678c02c6 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 Brunb29e0b02020-07-28 17:26:12 +020024 "reload",
Lorenz Brund13c1c62022-03-30 19:58:58 +020025@@ -20,14 +19,12 @@ var Directives = []string{
26 "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 Brund13c1c62022-03-30 19:58:58 +020040@@ -43,15 +40,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 Brund13c1c62022-03-30 19:58:58 +020057index a9167eea..2a5d0b13 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 Brund13c1c62022-03-30 19:58:58 +020084@@ -45,12 +40,10 @@ 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 Brund13c1c62022-03-30 19:58:58 +020092 _ "github.com/coredns/coredns/plugin/tls"
Lorenz Brunb29e0b02020-07-28 17:26:12 +020093- _ "github.com/coredns/coredns/plugin/trace"
Lorenz Brund13c1c62022-03-30 19:58:58 +020094 _ "github.com/coredns/coredns/plugin/transfer"
Lorenz Brunb29e0b02020-07-28 17:26:12 +020095 _ "github.com/coredns/coredns/plugin/whoami"
96 )
97diff --git a/plugin.cfg b/plugin.cfg
Lorenz Brund13c1c62022-03-30 19:58:58 +020098index 628e7141..d4ce1c89 100644
Lorenz Brunb29e0b02020-07-28 17:26:12 +020099--- a/plugin.cfg
100+++ b/plugin.cfg
Lorenz Brund13c1c62022-03-30 19:58:58 +0200101@@ -20,7 +20,6 @@
Lorenz Brunb29e0b02020-07-28 17:26:12 +0200102 # log:log
Lorenz Brund13c1c62022-03-30 19:58:58 +0200103
Lorenz Brunb29e0b02020-07-28 17:26:12 +0200104 metadata:metadata
Lorenz Brund13c1c62022-03-30 19:58:58 +0200105-geoip:geoip
106 cancel:cancel
107 tls:tls
Lorenz Brunb29e0b02020-07-28 17:26:12 +0200108 reload:reload
Lorenz Brund13c1c62022-03-30 19:58:58 +0200109@@ -29,14 +28,12 @@ bufsize:bufsize
110 root:root
Lorenz Brunb29e0b02020-07-28 17:26:12 +0200111 bind:bind
112 debug:debug
113-trace:trace
Lorenz Brund13c1c62022-03-30 19:58:58 +0200114 ready:ready
Lorenz Brunb29e0b02020-07-28 17:26:12 +0200115 health:health
Lorenz Brund13c1c62022-03-30 19:58:58 +0200116 pprof:pprof
117 prometheus:metrics
Lorenz Brunb29e0b02020-07-28 17:26:12 +0200118 errors:errors
119 log:log
120-dnstap:dnstap
Lorenz Brund13c1c62022-03-30 19:58:58 +0200121 local:local
Lorenz Brunb29e0b02020-07-28 17:26:12 +0200122 dns64:dns64
123 acl:acl
Lorenz Brund13c1c62022-03-30 19:58:58 +0200124@@ -52,15 +49,11 @@ minimal:minimal
Lorenz Brunb29e0b02020-07-28 17:26:12 +0200125 template:template
Lorenz Brund13c1c62022-03-30 19:58:58 +0200126 transfer:transfer
Lorenz Brunfa5c2fc2020-09-28 13:32:12 +0200127 hosts:hosts
Lorenz Brunb29e0b02020-07-28 17:26:12 +0200128-route53:route53
129-azure:azure
130-clouddns:clouddns
Lorenz Brund13c1c62022-03-30 19:58:58 +0200131 k8s_external:k8s_external
Lorenz Brunb29e0b02020-07-28 17:26:12 +0200132 kubernetes:kubernetes
Lorenz Brund13c1c62022-03-30 19:58:58 +0200133 file:file
134 auto:auto
135 secondary:secondary
Lorenz Brunb29e0b02020-07-28 17:26:12 +0200136-etcd:etcd
Lorenz Brund13c1c62022-03-30 19:58:58 +0200137 loop:loop
Lorenz Brunb29e0b02020-07-28 17:26:12 +0200138 forward:forward
Lorenz Brund13c1c62022-03-30 19:58:58 +0200139 grpc:grpc
Lorenz Brunb29e0b02020-07-28 17:26:12 +0200140diff --git a/plugin/kubernetes/setup.go b/plugin/kubernetes/setup.go
Lorenz Brund13c1c62022-03-30 19:58:58 +0200141index 5f5ab058..ae1a7cf8 100644
Lorenz Brunb29e0b02020-07-28 17:26:12 +0200142--- a/plugin/kubernetes/setup.go
143+++ b/plugin/kubernetes/setup.go
Lorenz Brund13c1c62022-03-30 19:58:58 +0200144@@ -17,9 +17,6 @@ import (
145
Lorenz Brunb29e0b02020-07-28 17:26:12 +0200146 "github.com/miekg/dns"
147 meta "k8s.io/apimachinery/pkg/apis/meta/v1"
148- _ "k8s.io/client-go/plugin/pkg/client/auth/gcp" // pull this in here, because we want it excluded if plugin.cfg doesn't have k8s
149- _ "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
150- _ "k8s.io/client-go/plugin/pkg/client/auth/openstack" // pull this in here, because we want it excluded if plugin.cfg doesn't have k8s
151 "k8s.io/client-go/tools/clientcmd"
Lorenz Brund13c1c62022-03-30 19:58:58 +0200152 "k8s.io/klog/v2"
Lorenz Brunb29e0b02020-07-28 17:26:12 +0200153 )
Lorenz Brund13c1c62022-03-30 19:58:58 +0200154--
Lorenz Brunb29e0b02020-07-28 17:26:12 +02001552.25.1
Lorenz Brund13c1c62022-03-30 19:58:58 +0200156