Updated to use klog library instead of log/slog; Updated the library-…

…go changes in the vendor file Signed-off-by: jubittajohn <[email protected]>
openshift · Jun 21, 2024 · 50bae80 · 50bae80
1 parent dece9c1
commit 50bae80
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 22 deletions.
diff --git a/go.mod b/go.mod
@@ -137,6 +137,6 @@ require (
 
 replace (
 	github.com/gogo/protobuf => github.com/gogo/protobuf v1.3.2
-	github.com/openshift/library-go => github.com/jubittajohn/library-go v0.0.0-20240614184430-a251d5e997f6
+	github.com/openshift/library-go => github.com/jubittajohn/library-go v0.0.0-20240621140645-d1afb2e3039d
 	vbom.ml/util => github.com/fvbommel/util v0.0.0-20180919145318-efcd4e0f9787
 )
diff --git a/go.sum b/go.sum
@@ -251,8 +251,8 @@ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnr
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
-github.com/jubittajohn/library-go v0.0.0-20240614184430-a251d5e997f6 h1:vex3FWDN5mXBg4kxokJKKHA8gBhmuaT9tp9WVArEhcQ=
-github.com/jubittajohn/library-go v0.0.0-20240614184430-a251d5e997f6/go.mod h1:PdASVamWinll2BPxiUpXajTwZxV8A1pQbWEsCN1od7I=
+github.com/jubittajohn/library-go v0.0.0-20240621140645-d1afb2e3039d h1:+pjdApmdTUrRpUtiYQ/blLaU0cEJXBIO8a/cOCLFn4c=
+github.com/jubittajohn/library-go v0.0.0-20240621140645-d1afb2e3039d/go.mod h1:PdASVamWinll2BPxiUpXajTwZxV8A1pQbWEsCN1od7I=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
 github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
@@ -311,8 +311,6 @@ github.com/openshift/build-machinery-go v0.0.0-20240419090851-af9c868bcf52 h1:bq
 github.com/openshift/build-machinery-go v0.0.0-20240419090851-af9c868bcf52/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE=
 github.com/openshift/client-go v0.0.0-20240528061634-b054aa794d87 h1:JtLhaGpSEconE+1IKmIgCOof/Len5ceG6H1pk43yv5U=
 github.com/openshift/client-go v0.0.0-20240528061634-b054aa794d87/go.mod h1:3IPD4U0qyovZS4EFady2kqY32m8lGcbs/Wx+yprg9z8=
-github.com/openshift/library-go v0.0.0-20240619140217-e20ca28ddfe7 h1:kgkHtO+fI1OdanQHZYTQgImqzTzS4naBw8SMQbB18DI=
-github.com/openshift/library-go v0.0.0-20240619140217-e20ca28ddfe7/go.mod h1:PdASVamWinll2BPxiUpXajTwZxV8A1pQbWEsCN1od7I=
 github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=

diff --git a/pkg/operator/starter.go b/pkg/operator/starter.go
@@ -3,7 +3,6 @@ package operator
 import (
 	"context"
 	"fmt"
-	"log/slog"
 	"os"
 	"regexp"
 	"time"
@@ -304,7 +303,7 @@ func RunOperator(ctx context.Context, controllerContext *controllercmd.Controlle
 
 	// checks if quorum is valid
 	quorumSafe := func() (bool, error) {
-		slog.Info("Hitting quorum valid check")
+		klog.Info("Hitting quorum valid check")
 		safe, err := quorumChecker.IsSafeToUpdateRevision()
 		if !safe {
 			err = fmt.Errorf("quorum is not safe")

diff --git a/.../openshift/library-go/pkg/operator/staticpod/controller/installer/installer_controller.go b/.../openshift/library-go/pkg/operator/staticpod/controller/installer/installer_controller.go
diff --git a/vendor/github.com/openshift/library-go/pkg/operator/staticpod/controllers.go b/vendor/github.com/openshift/library-go/pkg/operator/staticpod/controllers.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -325,7 +325,7 @@ github.com/openshift/client-go/operator/informers/externalversions/operator/v1
 github.com/openshift/client-go/operator/informers/externalversions/operator/v1alpha1
 github.com/openshift/client-go/operator/listers/operator/v1
 github.com/openshift/client-go/operator/listers/operator/v1alpha1
-# github.com/openshift/library-go v0.0.0-20240619140217-e20ca28ddfe7
+# github.com/openshift/library-go v0.0.0-20240619140217-e20ca28ddfe7 => github.com/jubittajohn/library-go v0.0.0-20240621140645-d1afb2e3039d
 ## explicit; go 1.22.0
 github.com/openshift/library-go/pkg/assets
 github.com/openshift/library-go/pkg/authorization/hardcodedauthorizer
@@ -1542,5 +1542,5 @@ sigs.k8s.io/structured-merge-diff/v4/value
 ## explicit; go 1.12
 sigs.k8s.io/yaml
 # github.com/gogo/protobuf => github.com/gogo/protobuf v1.3.2
-# github.com/openshift/library-go => github.com/jubittajohn/library-go v0.0.0-20240614184430-a251d5e997f6
+# github.com/openshift/library-go => github.com/jubittajohn/library-go v0.0.0-20240621140645-d1afb2e3039d
 # vbom.ml/util => github.com/fvbommel/util v0.0.0-20180919145318-efcd4e0f9787