diff --git a/cmd/nginx/flags.go b/cmd/nginx/flags.go index 88d5b9397..1b9a5d5f0 100644 --- a/cmd/nginx/flags.go +++ b/cmd/nginx/flags.go @@ -25,7 +25,7 @@ import ( "github.com/spf13/pflag" apiv1 "k8s.io/api/core/v1" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/ingress-nginx/internal/ingress/annotations/class" "k8s.io/ingress-nginx/internal/ingress/annotations/parser" diff --git a/cmd/nginx/main.go b/cmd/nginx/main.go index ee4d4dcfb..4b309d66d 100644 --- a/cmd/nginx/main.go +++ b/cmd/nginx/main.go @@ -40,7 +40,7 @@ import ( "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" certutil "k8s.io/client-go/util/cert" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/ingress-nginx/internal/file" "k8s.io/ingress-nginx/internal/ingress/annotations/class" diff --git a/cmd/waitshutdown/main.go b/cmd/waitshutdown/main.go index 69ec011c8..b54915833 100644 --- a/cmd/waitshutdown/main.go +++ b/cmd/waitshutdown/main.go @@ -22,7 +22,7 @@ import ( "time" "k8s.io/ingress-nginx/internal/nginx" - "k8s.io/klog" + "k8s.io/klog/v2" ) func main() { diff --git a/go.mod b/go.mod index 6bef99d3b..a856131a7 100644 --- a/go.mod +++ b/go.mod @@ -41,7 +41,7 @@ require ( k8s.io/client-go v0.18.5 k8s.io/code-generator v0.18.5 k8s.io/component-base v0.18.5 - k8s.io/klog v1.0.0 + k8s.io/klog/v2 v2.3.0 k8s.io/kubernetes v1.18.5 pault.ag/go/sniff v0.0.0-20200207005214-cf7e4d167732 sigs.k8s.io/controller-runtime v0.6.0 diff --git a/go.sum b/go.sum index dd8d4beff..1fddb32c5 100644 --- a/go.sum +++ b/go.sum @@ -187,6 +187,8 @@ github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logr/logr v0.1.0 h1:M1Tv3VzNlEHg6uyACnRdtrploV2P7wZqH8BoQMtz0cg= github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= +github.com/go-logr/logr v0.2.0 h1:QvGt2nLcHH0WK9orKa+ppBPAxREcH364nPUedEpK0TY= +github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= github.com/go-logr/zapr v0.1.0 h1:h+WVe9j6HAA01niTJPA/kKH0i7e0rLZBCwauQFcRE54= github.com/go-logr/zapr v0.1.0/go.mod h1:tabnROwaDl0UNxkVeFRbY8bwB37GwRv0P8lg6aAiEnk= github.com/go-ole/go-ole v1.2.1/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8= @@ -948,6 +950,8 @@ k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUc k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8= k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= +k8s.io/klog/v2 v2.3.0 h1:WmkrnW7fdrm0/DMClc+HIxtftvxVIPAhlVwMQo5yLco= +k8s.io/klog/v2 v2.3.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/kube-aggregator v0.18.5/go.mod h1:5M4HZr+fs3MSFYRL/UBoieXn7BjA5Bvs3yF8Nct6KkA= k8s.io/kube-controller-manager v0.18.5/go.mod h1:RwvyGSS7eMEiCgfeehPaOBOhpOMR2IsQYpXeFrgO7/c= k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6 h1:Oh3Mzx5pJ+yIumsAD0MOECPVeXsVot0UkiaCGVyfGQY= diff --git a/internal/admission/controller/main.go b/internal/admission/controller/main.go index 4e303c538..512c185f0 100644 --- a/internal/admission/controller/main.go +++ b/internal/admission/controller/main.go @@ -23,7 +23,7 @@ import ( extensions "k8s.io/api/extensions/v1beta1" networking "k8s.io/api/networking/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/ingress-nginx/internal/ingress/annotations/parser" ) diff --git a/internal/admission/controller/server.go b/internal/admission/controller/server.go index cecfc9432..c13643757 100644 --- a/internal/admission/controller/server.go +++ b/internal/admission/controller/server.go @@ -25,7 +25,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/apimachinery/pkg/util/json" - "k8s.io/klog" + "k8s.io/klog/v2" ) var ( diff --git a/internal/file/file.go b/internal/file/file.go index 0a8d5270e..75126e89c 100644 --- a/internal/file/file.go +++ b/internal/file/file.go @@ -21,7 +21,7 @@ import ( "encoding/hex" "io/ioutil" - "k8s.io/klog" + "k8s.io/klog/v2" ) // SHA1 returns the SHA1 of a file. diff --git a/internal/ingress/annotations/annotations.go b/internal/ingress/annotations/annotations.go index 7fe64efd8..f04f1ea5e 100644 --- a/internal/ingress/annotations/annotations.go +++ b/internal/ingress/annotations/annotations.go @@ -22,7 +22,7 @@ import ( "k8s.io/ingress-nginx/internal/ingress/annotations/modsecurity" "k8s.io/ingress-nginx/internal/ingress/annotations/proxyssl" "k8s.io/ingress-nginx/internal/ingress/annotations/sslcipher" - "k8s.io/klog" + "k8s.io/klog/v2" apiv1 "k8s.io/api/core/v1" networking "k8s.io/api/networking/v1beta1" diff --git a/internal/ingress/annotations/authreq/main.go b/internal/ingress/annotations/authreq/main.go index 48f3a81e9..a4558cff1 100644 --- a/internal/ingress/annotations/authreq/main.go +++ b/internal/ingress/annotations/authreq/main.go @@ -21,7 +21,7 @@ import ( "regexp" "strings" - "k8s.io/klog" + "k8s.io/klog/v2" networking "k8s.io/api/networking/v1beta1" diff --git a/internal/ingress/annotations/backendprotocol/main.go b/internal/ingress/annotations/backendprotocol/main.go index 514f824a7..d6e7beb4c 100644 --- a/internal/ingress/annotations/backendprotocol/main.go +++ b/internal/ingress/annotations/backendprotocol/main.go @@ -21,7 +21,7 @@ import ( "strings" networking "k8s.io/api/networking/v1beta1" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/ingress-nginx/internal/ingress/annotations/parser" "k8s.io/ingress-nginx/internal/ingress/resolver" diff --git a/internal/ingress/annotations/rewrite/main.go b/internal/ingress/annotations/rewrite/main.go index 9ac5c0b7e..67d0e42bf 100644 --- a/internal/ingress/annotations/rewrite/main.go +++ b/internal/ingress/annotations/rewrite/main.go @@ -20,7 +20,7 @@ import ( "net/url" networking "k8s.io/api/networking/v1beta1" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/ingress-nginx/internal/ingress/annotations/parser" "k8s.io/ingress-nginx/internal/ingress/errors" diff --git a/internal/ingress/annotations/secureupstream/main.go b/internal/ingress/annotations/secureupstream/main.go index 6f0204752..272fe77e0 100644 --- a/internal/ingress/annotations/secureupstream/main.go +++ b/internal/ingress/annotations/secureupstream/main.go @@ -18,7 +18,7 @@ package secureupstream import ( networking "k8s.io/api/networking/v1beta1" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/ingress-nginx/internal/ingress/annotations/parser" "k8s.io/ingress-nginx/internal/ingress/resolver" diff --git a/internal/ingress/annotations/sessionaffinity/main.go b/internal/ingress/annotations/sessionaffinity/main.go index 0324d8d90..795d9896a 100644 --- a/internal/ingress/annotations/sessionaffinity/main.go +++ b/internal/ingress/annotations/sessionaffinity/main.go @@ -20,7 +20,7 @@ import ( "regexp" networking "k8s.io/api/networking/v1beta1" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/ingress-nginx/internal/ingress/annotations/parser" "k8s.io/ingress-nginx/internal/ingress/resolver" diff --git a/internal/ingress/controller/config/config.go b/internal/ingress/controller/config/config.go index 8055fd9d7..c2cea9a43 100644 --- a/internal/ingress/controller/config/config.go +++ b/internal/ingress/controller/config/config.go @@ -20,7 +20,7 @@ import ( "strconv" "time" - "k8s.io/klog" + "k8s.io/klog/v2" apiv1 "k8s.io/api/core/v1" @@ -833,7 +833,7 @@ func NewDefault() Configuration { DefaultType: "text/html", } - if klog.V(5) { + if klog.V(5).Enabled() { cfg.ErrorLogLevel = "debug" } diff --git a/internal/ingress/controller/controller.go b/internal/ingress/controller/controller.go index d8784c898..44a1bca83 100644 --- a/internal/ingress/controller/controller.go +++ b/internal/ingress/controller/controller.go @@ -39,7 +39,7 @@ import ( ngx_config "k8s.io/ingress-nginx/internal/ingress/controller/config" "k8s.io/ingress-nginx/internal/k8s" "k8s.io/ingress-nginx/internal/nginx" - "k8s.io/klog" + "k8s.io/klog/v2" ) const ( diff --git a/internal/ingress/controller/endpoints.go b/internal/ingress/controller/endpoints.go index 01af48888..6796b0ca9 100644 --- a/internal/ingress/controller/endpoints.go +++ b/internal/ingress/controller/endpoints.go @@ -23,7 +23,7 @@ import ( "strconv" "k8s.io/apimachinery/pkg/util/validation" - "k8s.io/klog" + "k8s.io/klog/v2" corev1 "k8s.io/api/core/v1" diff --git a/internal/ingress/controller/nginx.go b/internal/ingress/controller/nginx.go index ea237219b..89a2853de 100644 --- a/internal/ingress/controller/nginx.go +++ b/internal/ingress/controller/nginx.go @@ -44,7 +44,7 @@ import ( v1core "k8s.io/client-go/kubernetes/typed/core/v1" "k8s.io/client-go/tools/record" "k8s.io/client-go/util/flowcontrol" - "k8s.io/klog" + "k8s.io/klog/v2" adm_controller "k8s.io/ingress-nginx/internal/admission/controller" "k8s.io/ingress-nginx/internal/file" @@ -673,7 +673,7 @@ func (n *NGINXController) OnUpdate(ingressCfg ingress.Configuration) error { return err } - if klog.V(2) { + if klog.V(2).Enabled() { src, _ := ioutil.ReadFile(cfgPath) if !bytes.Equal(src, content) { tmpfile, err := ioutil.TempFile("", "new-nginx-cfg") diff --git a/internal/ingress/controller/process/nginx.go b/internal/ingress/controller/process/nginx.go index 69314441f..702f60da8 100644 --- a/internal/ingress/controller/process/nginx.go +++ b/internal/ingress/controller/process/nginx.go @@ -20,7 +20,7 @@ import ( "os/exec" "syscall" - "k8s.io/klog" + "k8s.io/klog/v2" ) // IsRespawnIfRequired checks if error type is exec.ExitError or not diff --git a/internal/ingress/controller/status.go b/internal/ingress/controller/status.go index f6f562b91..0baeb4b00 100644 --- a/internal/ingress/controller/status.go +++ b/internal/ingress/controller/status.go @@ -21,7 +21,7 @@ import ( "os" "time" - "k8s.io/klog" + "k8s.io/klog/v2" apiv1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/internal/ingress/controller/store/backend_ssl.go b/internal/ingress/controller/store/backend_ssl.go index 4a2f347a3..5c96fbb1f 100644 --- a/internal/ingress/controller/store/backend_ssl.go +++ b/internal/ingress/controller/store/backend_ssl.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/pkg/errors" apiv1 "k8s.io/api/core/v1" diff --git a/internal/ingress/controller/store/store.go b/internal/ingress/controller/store/store.go index bacf507f8..44ab18c55 100644 --- a/internal/ingress/controller/store/store.go +++ b/internal/ingress/controller/store/store.go @@ -42,7 +42,7 @@ import ( clientcorev1 "k8s.io/client-go/kubernetes/typed/core/v1" "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/ingress-nginx/internal/file" "k8s.io/ingress-nginx/internal/ingress" diff --git a/internal/ingress/controller/tcp.go b/internal/ingress/controller/tcp.go index db0ee776a..da257dda7 100644 --- a/internal/ingress/controller/tcp.go +++ b/internal/ingress/controller/tcp.go @@ -21,7 +21,7 @@ import ( "io" "net" - "k8s.io/klog" + "k8s.io/klog/v2" "pault.ag/go/sniff/parser" ) diff --git a/internal/ingress/controller/template/configmap.go b/internal/ingress/controller/template/configmap.go index a96f8037e..ab659fa4f 100644 --- a/internal/ingress/controller/template/configmap.go +++ b/internal/ingress/controller/template/configmap.go @@ -23,7 +23,7 @@ import ( "strings" "time" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/mitchellh/hashstructure" "github.com/mitchellh/mapstructure" diff --git a/internal/ingress/controller/template/template.go b/internal/ingress/controller/template/template.go index d9dc6aec7..696447442 100644 --- a/internal/ingress/controller/template/template.go +++ b/internal/ingress/controller/template/template.go @@ -41,7 +41,7 @@ import ( networkingv1beta1 "k8s.io/api/networking/v1beta1" "k8s.io/apimachinery/pkg/util/sets" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/ingress-nginx/internal/ingress" "k8s.io/ingress-nginx/internal/ingress/annotations/influxdb" @@ -96,7 +96,7 @@ func (t *Template) Write(conf config.TemplateConfig) ([]byte, error) { outCmdBuf := t.bp.Get() defer t.bp.Put(outCmdBuf) - if klog.V(3) { + if klog.V(3).Enabled() { b, err := json.Marshal(conf) if err != nil { klog.Errorf("unexpected error: %v", err) diff --git a/internal/ingress/controller/util.go b/internal/ingress/controller/util.go index 56273f639..9a4964b35 100644 --- a/internal/ingress/controller/util.go +++ b/internal/ingress/controller/util.go @@ -24,7 +24,7 @@ import ( api "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/ingress-nginx/internal/ingress" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kubernetes/pkg/util/sysctl" ) diff --git a/internal/ingress/metric/collectors/controller.go b/internal/ingress/metric/collectors/controller.go index ab7cbe552..2c3a87b17 100644 --- a/internal/ingress/metric/collectors/controller.go +++ b/internal/ingress/metric/collectors/controller.go @@ -23,7 +23,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/ingress-nginx/internal/ingress" - "k8s.io/klog" + "k8s.io/klog/v2" ) var ( diff --git a/internal/ingress/metric/collectors/nginx_status.go b/internal/ingress/metric/collectors/nginx_status.go index 97c731d4f..4032eb863 100644 --- a/internal/ingress/metric/collectors/nginx_status.go +++ b/internal/ingress/metric/collectors/nginx_status.go @@ -23,7 +23,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "k8s.io/ingress-nginx/internal/nginx" - "k8s.io/klog" + "k8s.io/klog/v2" ) var ( diff --git a/internal/ingress/metric/collectors/process.go b/internal/ingress/metric/collectors/process.go index 1385f2d3a..3a29f289a 100644 --- a/internal/ingress/metric/collectors/process.go +++ b/internal/ingress/metric/collectors/process.go @@ -20,7 +20,7 @@ import ( "fmt" "path/filepath" - "k8s.io/klog" + "k8s.io/klog/v2" common "github.com/ncabatoff/process-exporter" "github.com/ncabatoff/process-exporter/proc" diff --git a/internal/ingress/metric/collectors/socket.go b/internal/ingress/metric/collectors/socket.go index 084eaf0e4..816016f30 100644 --- a/internal/ingress/metric/collectors/socket.go +++ b/internal/ingress/metric/collectors/socket.go @@ -27,7 +27,7 @@ import ( jsoniter "github.com/json-iterator/go" "github.com/prometheus/client_golang/prometheus" "k8s.io/apimachinery/pkg/util/sets" - "k8s.io/klog" + "k8s.io/klog/v2" ) type upstream struct { diff --git a/internal/ingress/metric/main.go b/internal/ingress/metric/main.go index ecc59c5b8..22ee83c42 100644 --- a/internal/ingress/metric/main.go +++ b/internal/ingress/metric/main.go @@ -22,7 +22,7 @@ import ( "time" "github.com/prometheus/client_golang/prometheus" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/ingress-nginx/internal/ingress" diff --git a/internal/ingress/status/status.go b/internal/ingress/status/status.go index 69b1b6e1d..815674c0e 100644 --- a/internal/ingress/status/status.go +++ b/internal/ingress/status/status.go @@ -25,7 +25,7 @@ import ( "time" "github.com/pkg/errors" - "k8s.io/klog" + "k8s.io/klog/v2" pool "gopkg.in/go-playground/pool.v3" apiv1 "k8s.io/api/core/v1" diff --git a/internal/k8s/main.go b/internal/k8s/main.go index 3e37f8982..49a234a6d 100644 --- a/internal/k8s/main.go +++ b/internal/k8s/main.go @@ -22,7 +22,7 @@ import ( "os" "strings" - "k8s.io/klog" + "k8s.io/klog/v2" apiv1 "k8s.io/api/core/v1" networkingv1beta1 "k8s.io/api/networking/v1beta1" diff --git a/internal/net/dns/dns.go b/internal/net/dns/dns.go index 1edd64cf9..7d721ce3b 100644 --- a/internal/net/dns/dns.go +++ b/internal/net/dns/dns.go @@ -21,7 +21,7 @@ import ( "net" "strings" - "k8s.io/klog" + "k8s.io/klog/v2" ) var defResolvConf = "/etc/resolv.conf" diff --git a/internal/net/ssl/ssl.go b/internal/net/ssl/ssl.go index 723bbbc5d..fe7865b12 100644 --- a/internal/net/ssl/ssl.go +++ b/internal/net/ssl/ssl.go @@ -44,7 +44,7 @@ import ( "k8s.io/ingress-nginx/internal/ingress" ngx_config "k8s.io/ingress-nginx/internal/ingress/controller/config" "k8s.io/ingress-nginx/internal/watch" - "k8s.io/klog" + "k8s.io/klog/v2" ) // FakeSSLCertificateUID defines the default UID to use for the fake SSL diff --git a/internal/nginx/main.go b/internal/nginx/main.go index ead833ef4..c7e5fb529 100644 --- a/internal/nginx/main.go +++ b/internal/nginx/main.go @@ -28,7 +28,7 @@ import ( "time" ps "github.com/mitchellh/go-ps" - "k8s.io/klog" + "k8s.io/klog/v2" ) // TODO: Check https://github.com/kubernetes/kubernetes/blob/master/pkg/master/ports/ports.go for ports already being used @@ -144,7 +144,7 @@ func readFileToString(path string) (string, error) { func Version() string { flag := "-v" - if klog.V(2) { + if klog.V(2).Enabled() { flag = "-V" } diff --git a/internal/task/queue.go b/internal/task/queue.go index 872b37cdb..2722e4a9d 100644 --- a/internal/task/queue.go +++ b/internal/task/queue.go @@ -20,7 +20,7 @@ import ( "fmt" "time" - "k8s.io/klog" + "k8s.io/klog/v2" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" diff --git a/test/e2e/framework/framework.go b/test/e2e/framework/framework.go index e9519ee62..27312ec98 100644 --- a/test/e2e/framework/framework.go +++ b/test/e2e/framework/framework.go @@ -41,7 +41,7 @@ import ( "k8s.io/client-go/kubernetes" restclient "k8s.io/client-go/rest" "k8s.io/ingress-nginx/internal/k8s" - "k8s.io/klog" + "k8s.io/klog/v2" kubeframework "k8s.io/kubernetes/test/e2e/framework" ) @@ -258,7 +258,7 @@ func (f *Framework) matchNginxConditions(name string, matcher func(cfg string) b return false, nil } - if klog.V(10) && len(o) > 0 { + if klog.V(10).Enabled() && len(o) > 0 { klog.Infof("nginx.conf:\n%v", o) } @@ -285,7 +285,7 @@ func (f *Framework) matchNginxCustomConditions(from string, to string, matcher f return false, nil } - if klog.V(10) && len(o) > 0 { + if klog.V(10).Enabled() && len(o) > 0 { klog.Infof("nginx.conf:\n%v", o) }