*: Move to klog v2

wking · wking · commit 24a0f5bb1cf9 · 2020-09-29T16:25:57.000-07:00
When we moved to 0.19 Kube tooling in ef236c3 (vendor: Bump client-go and library-go to current 4.6 tips 2020-07-24, #420), the tooling moved to klog v2. Port our local klog consumers so we don't have to worry about configuring multiple klogs [1]. Generated with: $ sed -i 's|^go 1.13|go 1.15|' go.mod $ sed -i 's|k8s.io/klog v1.0.0|k8s.io/klog/v2 v2.3.0|' go.mod $ sed -i 's|"k8s.io/klog"|"k8s.io/klog/v2"|' $(git grep -l k8s.io/klog cmd lib pkg) $ sed -i 's|klog.V($[0-9]$) |klog.V(\1).Enabled() |' $(git grep -l klog.V cmd lib pkg) $ go mod tidy $ go mod vendor $ git add -A go.* vendor using: $ go version go version go1.15.2 linux/amd64 The change to Go 1.15 catches us up with 1d9a319 (Dockerfile.rhel: Bump to Go 1.15, 2020-09-16, #457). [1]: https://bugzilla.redhat.com/show_bug.cgi?id=1883705
diff --git a/cmd/image.go b/cmd/image.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"github.com/spf13/cobra"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	"github.com/openshift/cluster-version-operator/pkg/payload"
 )
diff --git a/cmd/main.go b/cmd/main.go
@@ -4,7 +4,7 @@ import (
 	"flag"
 
 	"github.com/spf13/cobra"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )
 
 var (
diff --git a/cmd/render.go b/cmd/render.go
@@ -4,7 +4,7 @@ import (
 	"flag"
 
 	"github.com/spf13/cobra"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	"github.com/openshift/cluster-version-operator/pkg/payload"
 )
diff --git a/cmd/start.go b/cmd/start.go
@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"github.com/spf13/cobra"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	"github.com/openshift/cluster-version-operator/pkg/start"
 	"github.com/openshift/cluster-version-operator/pkg/version"
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/openshift/cluster-version-operator
 
-go 1.13
+go 1.15
 
 require (
 	github.com/blang/semver/v4 v4.0.0
@@ -24,7 +24,7 @@ require (
 	k8s.io/apiextensions-apiserver v0.19.0-rc.2
 	k8s.io/apimachinery v0.19.0-rc.2
 	k8s.io/client-go v0.19.0-rc.2
-	k8s.io/klog v1.0.0
+	k8s.io/klog/v2 v2.3.0
 	k8s.io/kube-aggregator v0.19.0-rc.2
 	k8s.io/utils v0.0.0-20200720150651-0bdb4ca86cbc
 )
diff --git a/lib/manifest_test.go b/lib/manifest_test.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/davecgh/go-spew/spew"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )
 
 func init() {
diff --git a/lib/resourceapply/apiext.go b/lib/resourceapply/apiext.go
@@ -10,7 +10,7 @@ import (
 	apiextclientv1beta1 "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 	"k8s.io/utils/pointer"
 )
 
diff --git a/lib/resourcebuilder/apps.go b/lib/resourcebuilder/apps.go
@@ -11,7 +11,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	"github.com/openshift/cluster-version-operator/pkg/payload"
 )
diff --git a/lib/resourcebuilder/batch.go b/lib/resourcebuilder/batch.go
@@ -8,7 +8,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/wait"
 	batchclientv1 "k8s.io/client-go/kubernetes/typed/batch/v1"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )
 
 // WaitForJobCompletion waits for job to complete.
diff --git a/lib/resourcemerge/meta_test.go b/lib/resourcemerge/meta_test.go
@@ -8,7 +8,7 @@ import (
 	"k8s.io/apimachinery/pkg/api/equality"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 	"k8s.io/utils/pointer"
 )
 
diff --git a/pkg/autoupdate/autoupdate.go b/pkg/autoupdate/autoupdate.go
@@ -23,7 +23,7 @@ import (
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/client-go/tools/record"
 	"k8s.io/client-go/util/workqueue"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )
 
 const (
diff --git a/pkg/cincinnati/cincinnati_test.go b/pkg/cincinnati/cincinnati_test.go
@@ -13,7 +13,7 @@ import (
 
 	"github.com/blang/semver/v4"
 	"github.com/google/uuid"
-	_ "k8s.io/klog" // integration tests set glog flags.
+	_ "k8s.io/klog/v2" // integration tests set glog flags.
 )
 
 func TestGetUpdates(t *testing.T) {
diff --git a/pkg/cvo/availableupdates.go b/pkg/cvo/availableupdates.go
@@ -14,7 +14,7 @@ import (
 	"github.com/google/uuid"
 	"k8s.io/apimachinery/pkg/api/equality"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	configv1 "github.com/openshift/api/config/v1"
 	"github.com/openshift/cluster-version-operator/lib/resourcemerge"
diff --git a/pkg/cvo/cvo.go b/pkg/cvo/cvo.go
@@ -26,7 +26,7 @@ import (
 	"k8s.io/client-go/tools/record"
 	"k8s.io/client-go/transport"
 	"k8s.io/client-go/util/workqueue"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	configv1 "github.com/openshift/api/config/v1"
 	clientset "github.com/openshift/client-go/config/clientset/versioned"
diff --git a/pkg/cvo/cvo_test.go b/pkg/cvo/cvo_test.go
@@ -33,7 +33,7 @@ import (
 	ktesting "k8s.io/client-go/testing"
 	"k8s.io/client-go/tools/record"
 	"k8s.io/client-go/util/workqueue"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	configv1 "github.com/openshift/api/config/v1"
 	clientset "github.com/openshift/client-go/config/clientset/versioned"
diff --git a/pkg/cvo/metrics.go b/pkg/cvo/metrics.go
@@ -15,7 +15,7 @@ import (
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/client-go/tools/cache"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	configv1 "github.com/openshift/api/config/v1"
 	"github.com/openshift/cluster-version-operator/lib/resourcemerge"
diff --git a/pkg/cvo/status.go b/pkg/cvo/status.go
@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"time"
 
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	"k8s.io/apimachinery/pkg/api/equality"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -113,7 +113,7 @@ func mergeOperatorHistory(config *configv1.ClusterVersion, desired configv1.Rele
 	}
 
 	// leave this here in case we find other future history bugs and need to debug it
-	if klog.V(5) && len(config.Status.History) > 1 {
+	if klog.V(5).Enabled() && len(config.Status.History) > 1 {
 		if config.Status.History[0].Image == config.Status.History[1].Image && config.Status.History[0].Version == config.Status.History[1].Version {
 			data, _ := json.MarshalIndent(config.Status.History, "", "  ")
 			panic(fmt.Errorf("tried to update cluster version history to contain duplicate image entries: %s", string(data)))
@@ -334,7 +334,7 @@ func (optr *Operator) syncStatus(ctx context.Context, original, config *configv1
 		})
 	}
 
-	if klog.V(6) {
+	if klog.V(6).Enabled() {
 		klog.Infof("Apply config: %s", diff.ObjectReflectDiff(original, config))
 	}
 	updated, err := applyClusterVersionStatus(ctx, optr.client.ConfigV1(), config, original)
diff --git a/pkg/cvo/sync_worker.go b/pkg/cvo/sync_worker.go
@@ -19,7 +19,7 @@ import (
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/tools/record"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	configv1 "github.com/openshift/api/config/v1"
 
@@ -460,7 +460,7 @@ func (w *SyncWorker) updateStatus(update SyncWorkerStatus) {
 	select {
 	case w.report <- update:
 	default:
-		if klog.V(5) {
+		if klog.V(5).Enabled() {
 			klog.Infof("Status report channel was full %#v", update)
 		}
 	}
@@ -862,7 +862,7 @@ func summarizeTaskGraphErrors(errs []error) error {
 	}
 
 	// log the errors to assist in debugging future summarization
-	if klog.V(4) {
+	if klog.V(4).Enabled() {
 		klog.Infof("Summarizing %d errors", len(errs))
 		for _, err := range errs {
 			if uErr, ok := err.(*payload.UpdateError); ok {
diff --git a/pkg/cvo/updatepayload.go b/pkg/cvo/updatepayload.go
@@ -19,7 +19,7 @@ import (
 	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 	randutil "k8s.io/apimachinery/pkg/util/rand"
 	"k8s.io/client-go/kubernetes"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 	"k8s.io/utils/pointer"
 
 	configv1 "github.com/openshift/api/config/v1"
diff --git a/pkg/cvo/upgradeable.go b/pkg/cvo/upgradeable.go
@@ -14,7 +14,7 @@ import (
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	"github.com/openshift/cluster-version-operator/lib/resourcemerge"
 )
diff --git a/pkg/payload/payload.go b/pkg/payload/payload.go
@@ -14,7 +14,7 @@ import (
 	"strings"
 	"time"
 
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 	"k8s.io/apimachinery/pkg/util/sets"
diff --git a/pkg/payload/precondition/clusterversion/upgradeable.go b/pkg/payload/precondition/clusterversion/upgradeable.go
@@ -8,7 +8,7 @@ import (
 	configv1listers "github.com/openshift/client-go/config/listers/config/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/meta"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	"github.com/openshift/cluster-version-operator/lib/resourcemerge"
 	precondition "github.com/openshift/cluster-version-operator/pkg/payload/precondition"
diff --git a/pkg/payload/precondition/precondition.go b/pkg/payload/precondition/precondition.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 
 	configv1 "github.com/openshift/api/config/v1"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	"github.com/openshift/cluster-version-operator/pkg/payload"
 )
diff --git a/pkg/payload/task_graph.go b/pkg/payload/task_graph.go
@@ -10,7 +10,7 @@ import (
 
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )
 
 // SplitOnJobs enforces the rule that any Job in the payload prevents reordering or parallelism (either before or after)
diff --git a/pkg/start/start.go b/pkg/start/start.go
@@ -27,7 +27,7 @@ import (
 	"k8s.io/client-go/tools/leaderelection/resourcelock"
 	"k8s.io/client-go/tools/record"
 	"k8s.io/client-go/util/flowcontrol"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	clientset "github.com/openshift/client-go/config/clientset/versioned"
 	externalversions "github.com/openshift/client-go/config/informers/externalversions"
diff --git a/pkg/start/start_integration_test.go b/pkg/start/start_integration_test.go
@@ -29,7 +29,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/tools/record"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	configv1 "github.com/openshift/api/config/v1"
 	clientset "github.com/openshift/client-go/config/clientset/versioned"
diff --git a/pkg/verify/configmap.go b/pkg/verify/configmap.go
@@ -11,7 +11,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	"github.com/openshift/cluster-version-operator/lib"
 	"github.com/openshift/cluster-version-operator/pkg/verify/store"
diff --git a/pkg/verify/persist.go b/pkg/verify/persist.go
@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"k8s.io/apimachinery/pkg/util/wait"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )
 
 // SignatureSource provides a set of signatures by digest to save.
diff --git a/pkg/verify/store/configmap/configmap.go b/pkg/verify/store/configmap/configmap.go
@@ -15,7 +15,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	corev1client "k8s.io/client-go/kubernetes/typed/core/v1"
 	"k8s.io/client-go/util/retry"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	"github.com/openshift/cluster-version-operator/pkg/verify/store"
 	"github.com/openshift/cluster-version-operator/pkg/verify/util"
diff --git a/pkg/verify/store/sigstore/sigstore.go b/pkg/verify/store/sigstore/sigstore.go
@@ -22,7 +22,7 @@ import (
 	"path"
 	"strconv"
 
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	"github.com/openshift/cluster-version-operator/pkg/verify/store"
 	"github.com/openshift/cluster-version-operator/pkg/verify/util"
diff --git a/pkg/verify/verify.go b/pkg/verify/verify.go
@@ -17,7 +17,7 @@ import (
 	"time"
 
 	"golang.org/x/crypto/openpgp"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	"github.com/openshift/cluster-version-operator/pkg/verify/store"
 	"github.com/openshift/cluster-version-operator/pkg/verify/util"
@@ -175,7 +175,7 @@ func (v *ReleaseVerifier) Verify(ctx context.Context, releaseDigest string) erro
 	}
 
 	if len(remaining) > 0 {
-		if klog.V(4) {
+		if klog.V(4).Enabled() {
 			for k := range remaining {
 				klog.Infof("Unable to verify %s against keyring %s", releaseDigest, k)
 			}
diff --git a/vendor/k8s.io/klog/.travis.yml b/vendor/k8s.io/klog/.travis.yml
diff --git a/vendor/k8s.io/klog/CONTRIBUTING.md b/vendor/k8s.io/klog/CONTRIBUTING.md
diff --git a/vendor/k8s.io/klog/LICENSE b/vendor/k8s.io/klog/LICENSE
diff --git a/vendor/k8s.io/klog/OWNERS b/vendor/k8s.io/klog/OWNERS
diff --git a/vendor/k8s.io/klog/README.md b/vendor/k8s.io/klog/README.md
diff --git a/vendor/k8s.io/klog/RELEASE.md b/vendor/k8s.io/klog/RELEASE.md
diff --git a/vendor/k8s.io/klog/SECURITY_CONTACTS b/vendor/k8s.io/klog/SECURITY_CONTACTS
diff --git a/vendor/k8s.io/klog/code-of-conduct.md b/vendor/k8s.io/klog/code-of-conduct.md
diff --git a/vendor/k8s.io/klog/go.mod b/vendor/k8s.io/klog/go.mod
diff --git a/vendor/k8s.io/klog/go.sum b/vendor/k8s.io/klog/go.sum
diff --git a/vendor/k8s.io/klog/klog.go b/vendor/k8s.io/klog/klog.go
diff --git a/vendor/k8s.io/klog/klog_file.go b/vendor/k8s.io/klog/klog_file.go
diff --git a/vendor/modules.txt b/vendor/modules.txt

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"fmt"`
`5`	`5`
`6`	`6`	`"github.com/spf13/cobra"`
`7`		`- "k8s.io/klog"`
	`7`	`+ "k8s.io/klog/v2"`
`8`	`8`
`9`	`9`	`"github.com/openshift/cluster-version-operator/pkg/payload"`
`10`	`10`	`)`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"flag"`
`5`	`5`
`6`	`6`	`"github.com/spf13/cobra"`
`7`		`- "k8s.io/klog"`
	`7`	`+ "k8s.io/klog/v2"`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`var (`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ import (`
`11`	`11`
`12`	`12`	`"github.com/davecgh/go-spew/spew"`
`13`	`13`	`"k8s.io/apimachinery/pkg/runtime/schema"`
`14`		`- "k8s.io/klog"`
	`14`	`+ "k8s.io/klog/v2"`
`15`	`15`	`)`
`16`	`16`
`17`	`17`	`func init() {`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import (`
`10`	`10`	`apiextclientv1beta1 "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1"`
`11`	`11`	`apierrors "k8s.io/apimachinery/pkg/api/errors"`
`12`	`12`	`metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"`
`13`		`- "k8s.io/klog"`
	`13`	`+ "k8s.io/klog/v2"`
`14`	`14`	`"k8s.io/utils/pointer"`
`15`	`15`	`)`
`16`	`16`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`	`metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"`
`9`	`9`	`"k8s.io/apimachinery/pkg/util/wait"`
`10`	`10`	`batchclientv1 "k8s.io/client-go/kubernetes/typed/batch/v1"`
`11`		`- "k8s.io/klog"`
	`11`	`+ "k8s.io/klog/v2"`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`// WaitForJobCompletion waits for job to complete.`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`	`"k8s.io/apimachinery/pkg/api/equality"`
`9`	`9`	`metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"`
`10`	`10`	`"k8s.io/apimachinery/pkg/types"`
`11`		`- "k8s.io/klog"`
	`11`	`+ "k8s.io/klog/v2"`
`12`	`12`	`"k8s.io/utils/pointer"`
`13`	`13`	`)`
`14`	`14`