DevFW-CICD/ingress-nginx-helm
14
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Migrate to klog v2

Browse source
This commit is contained in:
Manuel Alejandro de Brito Fontes 2020-08-08 19:31:02 -04:00
parent c500bd4b3f
commit cb86c5698c
38 changed files with 47 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmd/nginx/flags.go
View file

@ -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"

2
cmd/nginx/main.go
View file

@ -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"

2
cmd/waitshutdown/main.go
View file

@ -22,7 +22,7 @@ import (
"time"
"k8s.io/ingress-nginx/internal/nginx"
"k8s.io/klog"
"k8s.io/klog/v2"
)
func main() {

2
go.mod
View file

@ -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

4
go.sum
View file

@ -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=

2
internal/admission/controller/main.go
View file

@ -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"
)

2
internal/admission/controller/server.go
View file

@ -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 (

2
internal/file/file.go
View file

@ -21,7 +21,7 @@ import (
"encoding/hex"
"io/ioutil"
"k8s.io/klog"
"k8s.io/klog/v2"
)
// SHA1 returns the SHA1 of a file.

2
internal/ingress/annotations/annotations.go
View file

@ -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"

2
internal/ingress/annotations/authreq/main.go
View file

@ -21,7 +21,7 @@ import (
"regexp"
"strings"
"k8s.io/klog"
"k8s.io/klog/v2"
networking "k8s.io/api/networking/v1beta1"

2
internal/ingress/annotations/backendprotocol/main.go
View file

@ -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"

2
internal/ingress/annotations/rewrite/main.go
View file

@ -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"

2
internal/ingress/annotations/secureupstream/main.go
View file

@ -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"

2
internal/ingress/annotations/sessionaffinity/main.go
View file

@ -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"

4
internal/ingress/controller/config/config.go
View file

@ -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"
}

2
internal/ingress/controller/controller.go
View file

@ -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 (

2
internal/ingress/controller/endpoints.go
View file

@ -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"

4
internal/ingress/controller/nginx.go
View file

@ -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")

2
internal/ingress/controller/process/nginx.go
View file

@ -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

2
internal/ingress/controller/status.go
View file

@ -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"

2
internal/ingress/controller/store/backend_ssl.go
View file

@ -20,7 +20,7 @@ import (
"fmt"
"strings"
"k8s.io/klog"
"k8s.io/klog/v2"
"github.com/pkg/errors"
apiv1 "k8s.io/api/core/v1"

2
internal/ingress/controller/store/store.go
View file

@ -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"

2
internal/ingress/controller/tcp.go
View file

@ -21,7 +21,7 @@ import (
"io"
"net"
"k8s.io/klog"
"k8s.io/klog/v2"
"pault.ag/go/sniff/parser"
)

2
internal/ingress/controller/template/configmap.go
View file

@ -23,7 +23,7 @@ import (
"strings"
"time"
"k8s.io/klog"
"k8s.io/klog/v2"
"github.com/mitchellh/hashstructure"
"github.com/mitchellh/mapstructure"

4
internal/ingress/controller/template/template.go
View file

@ -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)

2
internal/ingress/controller/util.go
View file

@ -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"
)

2
internal/ingress/metric/collectors/controller.go
View file

@ -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 (

2
internal/ingress/metric/collectors/nginx_status.go
View file

@ -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 (

2
internal/ingress/metric/collectors/process.go
View file

@ -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"

2
internal/ingress/metric/collectors/socket.go
View file

@ -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 {

2
internal/ingress/metric/main.go
View file

@ -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"

2
internal/ingress/status/status.go
View file

@ -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"

2
internal/k8s/main.go
View file

@ -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"

2
internal/net/dns/dns.go
View file

@ -21,7 +21,7 @@ import (
"net"
"strings"
"k8s.io/klog"
"k8s.io/klog/v2"
)
var defResolvConf = "/etc/resolv.conf"

2
internal/net/ssl/ssl.go
View file

@ -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

4
internal/nginx/main.go
View file

@ -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"
}

2
internal/task/queue.go
View file

@ -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"

6
test/e2e/framework/framework.go
View file

@ -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)
}