diff --git a/go.mod b/go.mod index c067a4ab4e7818f8219d9fded3e9ca6545efda79..dd5c24c9c38a5b1f2a41d3aaf065916f58015650 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module git.fsmpi.rwth-aachen.de/thomas/cert-manager-webhook-rwth go 1.18 require ( - git.fsmpi.rwth-aachen.de/thomas/go-rwthdns v0.1.2 + git.fsmpi.rwth-aachen.de/thomas/go-rwthdns v0.2.0 github.com/cert-manager/cert-manager v1.8.1 k8s.io/apiextensions-apiserver v0.23.4 k8s.io/apimachinery v0.23.4 @@ -25,7 +25,7 @@ require ( github.com/evanphx/json-patch v4.12.0+incompatible // indirect github.com/felixge/httpsnoop v1.0.1 // indirect github.com/fsnotify/fsnotify v1.5.1 // indirect - github.com/go-logr/logr v1.2.0 // indirect + github.com/go-logr/logr v1.2.3 // indirect github.com/go-openapi/jsonpointer v0.19.5 // indirect github.com/go-openapi/jsonreference v0.19.5 // indirect github.com/go-openapi/swag v0.19.14 // indirect diff --git a/go.sum b/go.sum index 1f67a407e49fd61dd4d90a835a674b7fc7eff9a7..0c954751b6b5620fe973cd868781b857346035c3 100644 --- a/go.sum +++ b/go.sum @@ -48,8 +48,8 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -git.fsmpi.rwth-aachen.de/thomas/go-rwthdns v0.1.2 h1:dIjHIUCSSEc42ciAyDYN9DuximE1vmFtEWLuQJOMtIw= -git.fsmpi.rwth-aachen.de/thomas/go-rwthdns v0.1.2/go.mod h1:16Yi5qD1j3dHtjdUpbJbdM6tnpaqyqRYjJu8AZxWSQ4= +git.fsmpi.rwth-aachen.de/thomas/go-rwthdns v0.2.0 h1:vlIin0abs8+5eEwznCoQ/jkit027USMaZmORKzXXLGw= +git.fsmpi.rwth-aachen.de/thomas/go-rwthdns v0.2.0/go.mod h1:N2sse11luR9EO6YKphifs6DuU3HFdWMVRKTSKpIt4OY= github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= github.com/Azure/go-ansiterm v0.0.0-20210608223527-2377c96fe795/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= @@ -205,8 +205,9 @@ github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= github.com/go-logr/logr v0.4.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= -github.com/go-logr/logr v1.2.0 h1:QK40JKJyMdUDz+h+xvCsru/bJhvG0UxvePV0ufL/AcE= github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= +github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/zapr v0.4.0/go.mod h1:tabnROwaDl0UNxkVeFRbY8bwB37GwRv0P8lg6aAiEnk= github.com/go-logr/zapr v1.2.0/go.mod h1:Qa4Bsj2Vb+FAVeAKsLD8RLQ+YRJB8YDmOAKxaBQf7Ro= github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg= diff --git a/main.go b/main.go index 183744e866bd5a765f93f79c468798ad93771934..ae97728b6480e6292ba708b21a32826ab8ef4edf 100644 --- a/main.go +++ b/main.go @@ -20,6 +20,7 @@ import ( extapi "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" "k8s.io/klog/v2" + "k8s.io/klog/v2/klogr" ) type solver struct { @@ -135,7 +136,8 @@ func (s *solver) newClientFromChallenge(ch *whapi.ChallengeRequest) (*rwthdns.Cl return nil, fmt.Errorf("getting credentials: %w", err) } - client := rwthdns.Client{ApiToken: apikey, Client: http.DefaultClient} + logger := klogr.New() + client := rwthdns.Client{ApiToken: apikey, Client: http.DefaultClient, Log: &logger} return &client, nil } @@ -157,5 +159,6 @@ func loadConfig(cfgJSON *extapi.JSON) (config, error) { } func main() { + klog.InitFlags(nil) cmd.RunWebhookServer("cert-manager-webhook-rwth.thomas.fsmpi.eu", &solver{}) }