Lorenz Brun | b29e0b0 | 2020-07-28 17:26:12 +0200 | [diff] [blame] | 1 | Copyright 2020 The Monogon Project Authors. |
| 2 | |
| 3 | Licensed under the Apache License, Version 2.0 (the "License"); |
| 4 | you may not use this file except in compliance with the License. |
| 5 | You may obtain a copy of the License at |
| 6 | |
| 7 | http://www.apache.org/licenses/LICENSE-2.0 |
| 8 | |
| 9 | Unless required by applicable law or agreed to in writing, software |
| 10 | distributed under the License is distributed on an "AS IS" BASIS, |
| 11 | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| 12 | See the License for the specific language governing permissions and |
| 13 | limitations under the License. |
| 14 | |
| 15 | |
| 16 | From b8a216a10775163dac6267127c35c9230ccbc5f7 Mon Sep 17 00:00:00 2001 |
| 17 | From: Lorenz Brun <lorenz@nexantic.com> |
| 18 | Date: Mon, 27 Jul 2020 14:25:03 +0200 |
| 19 | Subject: [PATCH] Removed unused plugins |
| 20 | |
| 21 | --- |
Lorenz Brun | fa5c2fc | 2020-09-28 13:32:12 +0200 | [diff] [blame^] | 22 | core/dnsserver/zdirectives.go | 26 -------------------------- |
| 23 | core/plugin/zplugin.go | 26 -------------------------- |
| 24 | plugin.cfg | 26 -------------------------- |
Lorenz Brun | b29e0b0 | 2020-07-28 17:26:12 +0200 | [diff] [blame] | 25 | plugin/kubernetes/setup.go | 3 --- |
Lorenz Brun | fa5c2fc | 2020-09-28 13:32:12 +0200 | [diff] [blame^] | 26 | 4 files changed, 81 deletions(-) |
Lorenz Brun | b29e0b0 | 2020-07-28 17:26:12 +0200 | [diff] [blame] | 27 | |
| 28 | diff --git a/core/dnsserver/zdirectives.go b/core/dnsserver/zdirectives.go |
Lorenz Brun | fa5c2fc | 2020-09-28 13:32:12 +0200 | [diff] [blame^] | 29 | index 1bf449cb..c3619160 100644 |
Lorenz Brun | b29e0b0 | 2020-07-28 17:26:12 +0200 | [diff] [blame] | 30 | --- a/core/dnsserver/zdirectives.go |
| 31 | +++ b/core/dnsserver/zdirectives.go |
Lorenz Brun | fa5c2fc | 2020-09-28 13:32:12 +0200 | [diff] [blame^] | 32 | @@ -11,48 +11,22 @@ package dnsserver |
Lorenz Brun | b29e0b0 | 2020-07-28 17:26:12 +0200 | [diff] [blame] | 33 | // care what plugin above them are doing. |
| 34 | var Directives = []string{ |
| 35 | "metadata", |
| 36 | - "cancel", |
| 37 | - "tls", |
| 38 | "reload", |
| 39 | "nsid", |
| 40 | "bufsize", |
| 41 | - "root", |
| 42 | "bind", |
| 43 | "debug", |
| 44 | - "trace", |
| 45 | - "ready", |
| 46 | "health", |
| 47 | - "pprof", |
| 48 | - "prometheus", |
| 49 | "errors", |
| 50 | "log", |
| 51 | - "dnstap", |
| 52 | "dns64", |
| 53 | "acl", |
| 54 | "any", |
| 55 | - "chaos", |
| 56 | "loadbalance", |
| 57 | "cache", |
| 58 | - "rewrite", |
| 59 | - "dnssec", |
| 60 | - "autopath", |
| 61 | "template", |
| 62 | - "transfer", |
Lorenz Brun | fa5c2fc | 2020-09-28 13:32:12 +0200 | [diff] [blame^] | 63 | "hosts", |
Lorenz Brun | b29e0b0 | 2020-07-28 17:26:12 +0200 | [diff] [blame] | 64 | - "route53", |
| 65 | - "azure", |
| 66 | - "clouddns", |
| 67 | - "k8s_external", |
| 68 | "kubernetes", |
| 69 | - "file", |
| 70 | - "auto", |
| 71 | - "secondary", |
| 72 | - "etcd", |
| 73 | - "loop", |
| 74 | "forward", |
| 75 | - "grpc", |
| 76 | - "erratic", |
| 77 | "whoami", |
| 78 | - "on", |
| 79 | - "sign", |
| 80 | } |
| 81 | diff --git a/core/plugin/zplugin.go b/core/plugin/zplugin.go |
Lorenz Brun | fa5c2fc | 2020-09-28 13:32:12 +0200 | [diff] [blame^] | 82 | index cf83be70..de026516 100644 |
Lorenz Brun | b29e0b0 | 2020-07-28 17:26:12 +0200 | [diff] [blame] | 83 | --- a/core/plugin/zplugin.go |
| 84 | +++ b/core/plugin/zplugin.go |
Lorenz Brun | fa5c2fc | 2020-09-28 13:32:12 +0200 | [diff] [blame^] | 85 | @@ -4,49 +4,23 @@ package plugin |
| 86 | |
Lorenz Brun | b29e0b0 | 2020-07-28 17:26:12 +0200 | [diff] [blame] | 87 | import ( |
| 88 | // Include all plugins. |
| 89 | - _ "github.com/caddyserver/caddy/onevent" |
| 90 | _ "github.com/coredns/coredns/plugin/acl" |
| 91 | _ "github.com/coredns/coredns/plugin/any" |
| 92 | - _ "github.com/coredns/coredns/plugin/auto" |
| 93 | - _ "github.com/coredns/coredns/plugin/autopath" |
| 94 | - _ "github.com/coredns/coredns/plugin/azure" |
| 95 | _ "github.com/coredns/coredns/plugin/bind" |
| 96 | _ "github.com/coredns/coredns/plugin/bufsize" |
| 97 | _ "github.com/coredns/coredns/plugin/cache" |
| 98 | - _ "github.com/coredns/coredns/plugin/cancel" |
| 99 | - _ "github.com/coredns/coredns/plugin/chaos" |
| 100 | - _ "github.com/coredns/coredns/plugin/clouddns" |
| 101 | _ "github.com/coredns/coredns/plugin/debug" |
| 102 | _ "github.com/coredns/coredns/plugin/dns64" |
| 103 | - _ "github.com/coredns/coredns/plugin/dnssec" |
| 104 | - _ "github.com/coredns/coredns/plugin/dnstap" |
| 105 | - _ "github.com/coredns/coredns/plugin/erratic" |
| 106 | _ "github.com/coredns/coredns/plugin/errors" |
| 107 | - _ "github.com/coredns/coredns/plugin/etcd" |
| 108 | - _ "github.com/coredns/coredns/plugin/file" |
| 109 | _ "github.com/coredns/coredns/plugin/forward" |
| 110 | - _ "github.com/coredns/coredns/plugin/grpc" |
| 111 | _ "github.com/coredns/coredns/plugin/health" |
Lorenz Brun | fa5c2fc | 2020-09-28 13:32:12 +0200 | [diff] [blame^] | 112 | _ "github.com/coredns/coredns/plugin/hosts" |
Lorenz Brun | b29e0b0 | 2020-07-28 17:26:12 +0200 | [diff] [blame] | 113 | - _ "github.com/coredns/coredns/plugin/k8s_external" |
| 114 | _ "github.com/coredns/coredns/plugin/kubernetes" |
| 115 | _ "github.com/coredns/coredns/plugin/loadbalance" |
| 116 | _ "github.com/coredns/coredns/plugin/log" |
| 117 | - _ "github.com/coredns/coredns/plugin/loop" |
| 118 | _ "github.com/coredns/coredns/plugin/metadata" |
| 119 | - _ "github.com/coredns/coredns/plugin/metrics" |
| 120 | _ "github.com/coredns/coredns/plugin/nsid" |
| 121 | - _ "github.com/coredns/coredns/plugin/pprof" |
| 122 | - _ "github.com/coredns/coredns/plugin/ready" |
| 123 | _ "github.com/coredns/coredns/plugin/reload" |
| 124 | - _ "github.com/coredns/coredns/plugin/rewrite" |
| 125 | - _ "github.com/coredns/coredns/plugin/root" |
| 126 | - _ "github.com/coredns/coredns/plugin/route53" |
| 127 | - _ "github.com/coredns/coredns/plugin/secondary" |
| 128 | - _ "github.com/coredns/coredns/plugin/sign" |
| 129 | _ "github.com/coredns/coredns/plugin/template" |
| 130 | - _ "github.com/coredns/coredns/plugin/tls" |
| 131 | - _ "github.com/coredns/coredns/plugin/trace" |
| 132 | - _ "github.com/coredns/coredns/plugin/transfer" |
| 133 | _ "github.com/coredns/coredns/plugin/whoami" |
| 134 | ) |
| 135 | diff --git a/plugin.cfg b/plugin.cfg |
Lorenz Brun | fa5c2fc | 2020-09-28 13:32:12 +0200 | [diff] [blame^] | 136 | index c389d74e..80a8bc51 100644 |
Lorenz Brun | b29e0b0 | 2020-07-28 17:26:12 +0200 | [diff] [blame] | 137 | --- a/plugin.cfg |
| 138 | +++ b/plugin.cfg |
Lorenz Brun | fa5c2fc | 2020-09-28 13:32:12 +0200 | [diff] [blame^] | 139 | @@ -20,47 +20,21 @@ |
Lorenz Brun | b29e0b0 | 2020-07-28 17:26:12 +0200 | [diff] [blame] | 140 | # log:log |
Lorenz Brun | fa5c2fc | 2020-09-28 13:32:12 +0200 | [diff] [blame^] | 141 | |
Lorenz Brun | b29e0b0 | 2020-07-28 17:26:12 +0200 | [diff] [blame] | 142 | metadata:metadata |
| 143 | -cancel:cancel |
| 144 | -tls:tls |
| 145 | reload:reload |
| 146 | nsid:nsid |
| 147 | bufsize:bufsize |
| 148 | -root:root |
| 149 | bind:bind |
| 150 | debug:debug |
| 151 | -trace:trace |
| 152 | -ready:ready |
| 153 | health:health |
| 154 | -pprof:pprof |
| 155 | -prometheus:metrics |
| 156 | errors:errors |
| 157 | log:log |
| 158 | -dnstap:dnstap |
| 159 | dns64:dns64 |
| 160 | acl:acl |
| 161 | any:any |
| 162 | -chaos:chaos |
| 163 | loadbalance:loadbalance |
| 164 | cache:cache |
| 165 | -rewrite:rewrite |
| 166 | -dnssec:dnssec |
| 167 | -autopath:autopath |
| 168 | template:template |
| 169 | -transfer:transfer |
Lorenz Brun | fa5c2fc | 2020-09-28 13:32:12 +0200 | [diff] [blame^] | 170 | hosts:hosts |
Lorenz Brun | b29e0b0 | 2020-07-28 17:26:12 +0200 | [diff] [blame] | 171 | -route53:route53 |
| 172 | -azure:azure |
| 173 | -clouddns:clouddns |
| 174 | -k8s_external:k8s_external |
| 175 | kubernetes:kubernetes |
| 176 | -file:file |
| 177 | -auto:auto |
| 178 | -secondary:secondary |
| 179 | -etcd:etcd |
| 180 | -loop:loop |
| 181 | forward:forward |
| 182 | -grpc:grpc |
| 183 | -erratic:erratic |
| 184 | whoami:whoami |
| 185 | -on:github.com/caddyserver/caddy/onevent |
| 186 | -sign:sign |
| 187 | diff --git a/plugin/kubernetes/setup.go b/plugin/kubernetes/setup.go |
| 188 | index 0c46a3ab..827fc141 100644 |
| 189 | --- a/plugin/kubernetes/setup.go |
| 190 | +++ b/plugin/kubernetes/setup.go |
| 191 | @@ -20,9 +20,6 @@ import ( |
| 192 | "github.com/caddyserver/caddy" |
| 193 | "github.com/miekg/dns" |
| 194 | meta "k8s.io/apimachinery/pkg/apis/meta/v1" |
| 195 | - _ "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 |
| 196 | - _ "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 |
| 197 | - _ "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 |
| 198 | "k8s.io/client-go/tools/clientcmd" |
| 199 | "k8s.io/klog" |
| 200 | ) |
Lorenz Brun | fa5c2fc | 2020-09-28 13:32:12 +0200 | [diff] [blame^] | 201 | -- |
Lorenz Brun | b29e0b0 | 2020-07-28 17:26:12 +0200 | [diff] [blame] | 202 | 2.25.1 |