Lorenz Brun | d13c1c6 | 2022-03-30 19:58:58 +0200 | [diff] [blame^] | 1 | From 355d38f38cf241b91a862795892bcb87c5729d2e Mon Sep 17 00:00:00 2001 |
| 2 | From: Lorenz Brun <lorenz@monogon.tech> |
| 3 | Date: Wed, 16 Mar 2022 13:39:39 +0100 |
| 4 | Subject: [PATCH] Remove unused plugins |
Lorenz Brun | b29e0b0 | 2020-07-28 17:26:12 +0200 | [diff] [blame] | 5 | |
| 6 | --- |
Lorenz Brun | d13c1c6 | 2022-03-30 19:58:58 +0200 | [diff] [blame^] | 7 | 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 Brun | b29e0b0 | 2020-07-28 17:26:12 +0200 | [diff] [blame] | 12 | |
| 13 | diff --git a/core/dnsserver/zdirectives.go b/core/dnsserver/zdirectives.go |
Lorenz Brun | d13c1c6 | 2022-03-30 19:58:58 +0200 | [diff] [blame^] | 14 | index bca21718..678c02c6 100644 |
Lorenz Brun | b29e0b0 | 2020-07-28 17:26:12 +0200 | [diff] [blame] | 15 | --- a/core/dnsserver/zdirectives.go |
| 16 | +++ b/core/dnsserver/zdirectives.go |
Lorenz Brun | d13c1c6 | 2022-03-30 19:58:58 +0200 | [diff] [blame^] | 17 | @@ -11,7 +11,6 @@ package dnsserver |
Lorenz Brun | b29e0b0 | 2020-07-28 17:26:12 +0200 | [diff] [blame] | 18 | // care what plugin above them are doing. |
| 19 | var Directives = []string{ |
| 20 | "metadata", |
Lorenz Brun | d13c1c6 | 2022-03-30 19:58:58 +0200 | [diff] [blame^] | 21 | - "geoip", |
| 22 | "cancel", |
| 23 | "tls", |
Lorenz Brun | b29e0b0 | 2020-07-28 17:26:12 +0200 | [diff] [blame] | 24 | "reload", |
Lorenz Brun | d13c1c6 | 2022-03-30 19:58:58 +0200 | [diff] [blame^] | 25 | @@ -20,14 +19,12 @@ var Directives = []string{ |
| 26 | "root", |
Lorenz Brun | b29e0b0 | 2020-07-28 17:26:12 +0200 | [diff] [blame] | 27 | "bind", |
| 28 | "debug", |
| 29 | - "trace", |
Lorenz Brun | d13c1c6 | 2022-03-30 19:58:58 +0200 | [diff] [blame^] | 30 | "ready", |
Lorenz Brun | b29e0b0 | 2020-07-28 17:26:12 +0200 | [diff] [blame] | 31 | "health", |
Lorenz Brun | d13c1c6 | 2022-03-30 19:58:58 +0200 | [diff] [blame^] | 32 | "pprof", |
| 33 | "prometheus", |
Lorenz Brun | b29e0b0 | 2020-07-28 17:26:12 +0200 | [diff] [blame] | 34 | "errors", |
| 35 | "log", |
| 36 | - "dnstap", |
Lorenz Brun | d13c1c6 | 2022-03-30 19:58:58 +0200 | [diff] [blame^] | 37 | "local", |
Lorenz Brun | b29e0b0 | 2020-07-28 17:26:12 +0200 | [diff] [blame] | 38 | "dns64", |
| 39 | "acl", |
Lorenz Brun | d13c1c6 | 2022-03-30 19:58:58 +0200 | [diff] [blame^] | 40 | @@ -43,15 +40,11 @@ var Directives = []string{ |
Lorenz Brun | b29e0b0 | 2020-07-28 17:26:12 +0200 | [diff] [blame] | 41 | "template", |
Lorenz Brun | d13c1c6 | 2022-03-30 19:58:58 +0200 | [diff] [blame^] | 42 | "transfer", |
Lorenz Brun | fa5c2fc | 2020-09-28 13:32:12 +0200 | [diff] [blame] | 43 | "hosts", |
Lorenz Brun | b29e0b0 | 2020-07-28 17:26:12 +0200 | [diff] [blame] | 44 | - "route53", |
| 45 | - "azure", |
| 46 | - "clouddns", |
Lorenz Brun | d13c1c6 | 2022-03-30 19:58:58 +0200 | [diff] [blame^] | 47 | "k8s_external", |
Lorenz Brun | b29e0b0 | 2020-07-28 17:26:12 +0200 | [diff] [blame] | 48 | "kubernetes", |
Lorenz Brun | d13c1c6 | 2022-03-30 19:58:58 +0200 | [diff] [blame^] | 49 | "file", |
| 50 | "auto", |
| 51 | "secondary", |
Lorenz Brun | b29e0b0 | 2020-07-28 17:26:12 +0200 | [diff] [blame] | 52 | - "etcd", |
Lorenz Brun | d13c1c6 | 2022-03-30 19:58:58 +0200 | [diff] [blame^] | 53 | "loop", |
Lorenz Brun | b29e0b0 | 2020-07-28 17:26:12 +0200 | [diff] [blame] | 54 | "forward", |
Lorenz Brun | d13c1c6 | 2022-03-30 19:58:58 +0200 | [diff] [blame^] | 55 | "grpc", |
Lorenz Brun | b29e0b0 | 2020-07-28 17:26:12 +0200 | [diff] [blame] | 56 | diff --git a/core/plugin/zplugin.go b/core/plugin/zplugin.go |
Lorenz Brun | d13c1c6 | 2022-03-30 19:58:58 +0200 | [diff] [blame^] | 57 | index a9167eea..2a5d0b13 100644 |
Lorenz Brun | b29e0b0 | 2020-07-28 17:26:12 +0200 | [diff] [blame] | 58 | --- a/core/plugin/zplugin.go |
| 59 | +++ b/core/plugin/zplugin.go |
Lorenz Brun | d13c1c6 | 2022-03-30 19:58:58 +0200 | [diff] [blame^] | 60 | @@ -9,23 +9,18 @@ import ( |
Lorenz Brun | b29e0b0 | 2020-07-28 17:26:12 +0200 | [diff] [blame] | 61 | _ "github.com/coredns/coredns/plugin/any" |
Lorenz Brun | d13c1c6 | 2022-03-30 19:58:58 +0200 | [diff] [blame^] | 62 | _ "github.com/coredns/coredns/plugin/auto" |
| 63 | _ "github.com/coredns/coredns/plugin/autopath" |
Lorenz Brun | b29e0b0 | 2020-07-28 17:26:12 +0200 | [diff] [blame] | 64 | - _ "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 Brun | d13c1c6 | 2022-03-30 19:58:58 +0200 | [diff] [blame^] | 68 | _ "github.com/coredns/coredns/plugin/cancel" |
| 69 | _ "github.com/coredns/coredns/plugin/chaos" |
Lorenz Brun | b29e0b0 | 2020-07-28 17:26:12 +0200 | [diff] [blame] | 70 | - _ "github.com/coredns/coredns/plugin/clouddns" |
| 71 | _ "github.com/coredns/coredns/plugin/debug" |
| 72 | _ "github.com/coredns/coredns/plugin/dns64" |
Lorenz Brun | d13c1c6 | 2022-03-30 19:58:58 +0200 | [diff] [blame^] | 73 | _ "github.com/coredns/coredns/plugin/dnssec" |
Lorenz Brun | b29e0b0 | 2020-07-28 17:26:12 +0200 | [diff] [blame] | 74 | - _ "github.com/coredns/coredns/plugin/dnstap" |
Lorenz Brun | d13c1c6 | 2022-03-30 19:58:58 +0200 | [diff] [blame^] | 75 | _ "github.com/coredns/coredns/plugin/erratic" |
Lorenz Brun | b29e0b0 | 2020-07-28 17:26:12 +0200 | [diff] [blame] | 76 | _ "github.com/coredns/coredns/plugin/errors" |
| 77 | - _ "github.com/coredns/coredns/plugin/etcd" |
Lorenz Brun | d13c1c6 | 2022-03-30 19:58:58 +0200 | [diff] [blame^] | 78 | _ "github.com/coredns/coredns/plugin/file" |
Lorenz Brun | b29e0b0 | 2020-07-28 17:26:12 +0200 | [diff] [blame] | 79 | _ "github.com/coredns/coredns/plugin/forward" |
Lorenz Brun | d13c1c6 | 2022-03-30 19:58:58 +0200 | [diff] [blame^] | 80 | - _ "github.com/coredns/coredns/plugin/geoip" |
| 81 | _ "github.com/coredns/coredns/plugin/grpc" |
| 82 | _ "github.com/coredns/coredns/plugin/header" |
Lorenz Brun | b29e0b0 | 2020-07-28 17:26:12 +0200 | [diff] [blame] | 83 | _ "github.com/coredns/coredns/plugin/health" |
Lorenz Brun | d13c1c6 | 2022-03-30 19:58:58 +0200 | [diff] [blame^] | 84 | @@ -45,12 +40,10 @@ import ( |
Lorenz Brun | b29e0b0 | 2020-07-28 17:26:12 +0200 | [diff] [blame] | 85 | _ "github.com/coredns/coredns/plugin/reload" |
Lorenz Brun | d13c1c6 | 2022-03-30 19:58:58 +0200 | [diff] [blame^] | 86 | _ "github.com/coredns/coredns/plugin/rewrite" |
| 87 | _ "github.com/coredns/coredns/plugin/root" |
Lorenz Brun | b29e0b0 | 2020-07-28 17:26:12 +0200 | [diff] [blame] | 88 | - _ "github.com/coredns/coredns/plugin/route53" |
Lorenz Brun | d13c1c6 | 2022-03-30 19:58:58 +0200 | [diff] [blame^] | 89 | _ "github.com/coredns/coredns/plugin/secondary" |
| 90 | _ "github.com/coredns/coredns/plugin/sign" |
Lorenz Brun | b29e0b0 | 2020-07-28 17:26:12 +0200 | [diff] [blame] | 91 | _ "github.com/coredns/coredns/plugin/template" |
Lorenz Brun | d13c1c6 | 2022-03-30 19:58:58 +0200 | [diff] [blame^] | 92 | _ "github.com/coredns/coredns/plugin/tls" |
Lorenz Brun | b29e0b0 | 2020-07-28 17:26:12 +0200 | [diff] [blame] | 93 | - _ "github.com/coredns/coredns/plugin/trace" |
Lorenz Brun | d13c1c6 | 2022-03-30 19:58:58 +0200 | [diff] [blame^] | 94 | _ "github.com/coredns/coredns/plugin/transfer" |
Lorenz Brun | b29e0b0 | 2020-07-28 17:26:12 +0200 | [diff] [blame] | 95 | _ "github.com/coredns/coredns/plugin/whoami" |
| 96 | ) |
| 97 | diff --git a/plugin.cfg b/plugin.cfg |
Lorenz Brun | d13c1c6 | 2022-03-30 19:58:58 +0200 | [diff] [blame^] | 98 | index 628e7141..d4ce1c89 100644 |
Lorenz Brun | b29e0b0 | 2020-07-28 17:26:12 +0200 | [diff] [blame] | 99 | --- a/plugin.cfg |
| 100 | +++ b/plugin.cfg |
Lorenz Brun | d13c1c6 | 2022-03-30 19:58:58 +0200 | [diff] [blame^] | 101 | @@ -20,7 +20,6 @@ |
Lorenz Brun | b29e0b0 | 2020-07-28 17:26:12 +0200 | [diff] [blame] | 102 | # log:log |
Lorenz Brun | d13c1c6 | 2022-03-30 19:58:58 +0200 | [diff] [blame^] | 103 | |
Lorenz Brun | b29e0b0 | 2020-07-28 17:26:12 +0200 | [diff] [blame] | 104 | metadata:metadata |
Lorenz Brun | d13c1c6 | 2022-03-30 19:58:58 +0200 | [diff] [blame^] | 105 | -geoip:geoip |
| 106 | cancel:cancel |
| 107 | tls:tls |
Lorenz Brun | b29e0b0 | 2020-07-28 17:26:12 +0200 | [diff] [blame] | 108 | reload:reload |
Lorenz Brun | d13c1c6 | 2022-03-30 19:58:58 +0200 | [diff] [blame^] | 109 | @@ -29,14 +28,12 @@ bufsize:bufsize |
| 110 | root:root |
Lorenz Brun | b29e0b0 | 2020-07-28 17:26:12 +0200 | [diff] [blame] | 111 | bind:bind |
| 112 | debug:debug |
| 113 | -trace:trace |
Lorenz Brun | d13c1c6 | 2022-03-30 19:58:58 +0200 | [diff] [blame^] | 114 | ready:ready |
Lorenz Brun | b29e0b0 | 2020-07-28 17:26:12 +0200 | [diff] [blame] | 115 | health:health |
Lorenz Brun | d13c1c6 | 2022-03-30 19:58:58 +0200 | [diff] [blame^] | 116 | pprof:pprof |
| 117 | prometheus:metrics |
Lorenz Brun | b29e0b0 | 2020-07-28 17:26:12 +0200 | [diff] [blame] | 118 | errors:errors |
| 119 | log:log |
| 120 | -dnstap:dnstap |
Lorenz Brun | d13c1c6 | 2022-03-30 19:58:58 +0200 | [diff] [blame^] | 121 | local:local |
Lorenz Brun | b29e0b0 | 2020-07-28 17:26:12 +0200 | [diff] [blame] | 122 | dns64:dns64 |
| 123 | acl:acl |
Lorenz Brun | d13c1c6 | 2022-03-30 19:58:58 +0200 | [diff] [blame^] | 124 | @@ -52,15 +49,11 @@ minimal:minimal |
Lorenz Brun | b29e0b0 | 2020-07-28 17:26:12 +0200 | [diff] [blame] | 125 | template:template |
Lorenz Brun | d13c1c6 | 2022-03-30 19:58:58 +0200 | [diff] [blame^] | 126 | transfer:transfer |
Lorenz Brun | fa5c2fc | 2020-09-28 13:32:12 +0200 | [diff] [blame] | 127 | hosts:hosts |
Lorenz Brun | b29e0b0 | 2020-07-28 17:26:12 +0200 | [diff] [blame] | 128 | -route53:route53 |
| 129 | -azure:azure |
| 130 | -clouddns:clouddns |
Lorenz Brun | d13c1c6 | 2022-03-30 19:58:58 +0200 | [diff] [blame^] | 131 | k8s_external:k8s_external |
Lorenz Brun | b29e0b0 | 2020-07-28 17:26:12 +0200 | [diff] [blame] | 132 | kubernetes:kubernetes |
Lorenz Brun | d13c1c6 | 2022-03-30 19:58:58 +0200 | [diff] [blame^] | 133 | file:file |
| 134 | auto:auto |
| 135 | secondary:secondary |
Lorenz Brun | b29e0b0 | 2020-07-28 17:26:12 +0200 | [diff] [blame] | 136 | -etcd:etcd |
Lorenz Brun | d13c1c6 | 2022-03-30 19:58:58 +0200 | [diff] [blame^] | 137 | loop:loop |
Lorenz Brun | b29e0b0 | 2020-07-28 17:26:12 +0200 | [diff] [blame] | 138 | forward:forward |
Lorenz Brun | d13c1c6 | 2022-03-30 19:58:58 +0200 | [diff] [blame^] | 139 | grpc:grpc |
Lorenz Brun | b29e0b0 | 2020-07-28 17:26:12 +0200 | [diff] [blame] | 140 | diff --git a/plugin/kubernetes/setup.go b/plugin/kubernetes/setup.go |
Lorenz Brun | d13c1c6 | 2022-03-30 19:58:58 +0200 | [diff] [blame^] | 141 | index 5f5ab058..ae1a7cf8 100644 |
Lorenz Brun | b29e0b0 | 2020-07-28 17:26:12 +0200 | [diff] [blame] | 142 | --- a/plugin/kubernetes/setup.go |
| 143 | +++ b/plugin/kubernetes/setup.go |
Lorenz Brun | d13c1c6 | 2022-03-30 19:58:58 +0200 | [diff] [blame^] | 144 | @@ -17,9 +17,6 @@ import ( |
| 145 | |
Lorenz Brun | b29e0b0 | 2020-07-28 17:26:12 +0200 | [diff] [blame] | 146 | "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 Brun | d13c1c6 | 2022-03-30 19:58:58 +0200 | [diff] [blame^] | 152 | "k8s.io/klog/v2" |
Lorenz Brun | b29e0b0 | 2020-07-28 17:26:12 +0200 | [diff] [blame] | 153 | ) |
Lorenz Brun | d13c1c6 | 2022-03-30 19:58:58 +0200 | [diff] [blame^] | 154 | -- |
Lorenz Brun | b29e0b0 | 2020-07-28 17:26:12 +0200 | [diff] [blame] | 155 | 2.25.1 |
Lorenz Brun | d13c1c6 | 2022-03-30 19:58:58 +0200 | [diff] [blame^] | 156 | |