chore: update prow

kubernetes-sigs · Jun 24, 2024 · db838f1 · db838f1
1 parent 59dbd6c
commit db838f1
Show file tree

Hide file tree

Showing 15 changed files with 194 additions and 192 deletions.
diff --git a/Makefile b/Makefile
@@ -40,7 +40,7 @@ CONTROLLER_GEN := $(TOOLS_BIN_DIR)/$(CONTROLLER_GEN_BIN)-$(CONTROLLER_GEN_VER)
 
 CMDS = $(notdir $(shell find ./cmd/ -maxdepth 1 -type d | sort))
 
-export GO_VERSION=1.19.12
+export GO_VERSION=1.22.3
 export GO111MODULE=on
 export DOCKER_REPO
 export DOCKER_TAG

diff --git a/client/client.go b/client/client.go
@@ -38,9 +38,9 @@ import (
 	"github.com/sirupsen/logrus"
 	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 
-	"k8s.io/test-infra/prow/config/secret"
 	"sigs.k8s.io/boskos/common"
 	"sigs.k8s.io/boskos/storage"
+	"sigs.k8s.io/prow/pkg/config/secret"
 )
 
 var (

diff --git a/cmd/aws-janitor-boskos/main.go b/cmd/aws-janitor-boskos/main.go
@@ -28,11 +28,10 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/sirupsen/logrus"
 
-	"k8s.io/test-infra/pkg/flagutil"
-	"k8s.io/test-infra/prow/config"
-	prowflagutil "k8s.io/test-infra/prow/flagutil"
-	"k8s.io/test-infra/prow/logrusutil"
-	prowmetrics "k8s.io/test-infra/prow/metrics"
+	"sigs.k8s.io/prow/pkg/config"
+	prowflagutil "sigs.k8s.io/prow/pkg/flagutil"
+	"sigs.k8s.io/prow/pkg/logrusutil"
+	prowmetrics "sigs.k8s.io/prow/pkg/metrics"
 
 	"sigs.k8s.io/boskos/aws-janitor/account"
 	"sigs.k8s.io/boskos/aws-janitor/regions"
@@ -100,7 +99,7 @@ func init() {
 
 func main() {
 	logrusutil.ComponentInit()
-	for _, o := range []flagutil.OptionGroup{&instrumentationOptions} {
+	for _, o := range []prowflagutil.OptionGroup{&instrumentationOptions} {
 		o.AddFlags(flag.CommandLine)
 	}
 	flag.Parse()
@@ -111,7 +110,7 @@ func main() {
 	}
 	logrus.SetLevel(level)
 
-	for _, o := range []flagutil.OptionGroup{&instrumentationOptions} {
+	for _, o := range []prowflagutil.OptionGroup{&instrumentationOptions} {
 		if err := o.Validate(false); err != nil {
 			logrus.Fatalf("Invalid options: %v", err)
 		}

diff --git a/cmd/aws-janitor/main.go b/cmd/aws-janitor/main.go
@@ -30,7 +30,7 @@ import (
 	"github.com/prometheus/client_golang/prometheus/push"
 	"github.com/sirupsen/logrus"
 
-	"k8s.io/test-infra/prow/logrusutil"
+	"sigs.k8s.io/prow/pkg/logrusutil"
 
 	"sigs.k8s.io/boskos/aws-janitor/account"
 	"sigs.k8s.io/boskos/aws-janitor/regions"

diff --git a/cmd/boskos/boskos.go b/cmd/boskos/boskos.go
@@ -39,14 +39,13 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 	"sigs.k8s.io/controller-runtime/pkg/source"
 
-	"k8s.io/test-infra/pkg/flagutil"
-	"k8s.io/test-infra/prow/config"
-	prowflagutil "k8s.io/test-infra/prow/flagutil"
-	"k8s.io/test-infra/prow/interrupts"
-	"k8s.io/test-infra/prow/logrusutil"
-	prowmetrics "k8s.io/test-infra/prow/metrics"
-	"k8s.io/test-infra/prow/pjutil"
-	"k8s.io/test-infra/prow/pjutil/pprof"
+	"sigs.k8s.io/prow/pkg/config"
+	prowflagutil "sigs.k8s.io/prow/pkg/flagutil"
+	"sigs.k8s.io/prow/pkg/interrupts"
+	"sigs.k8s.io/prow/pkg/logrusutil"
+	prowmetrics "sigs.k8s.io/prow/pkg/metrics"
+	"sigs.k8s.io/prow/pkg/pjutil"
+	"sigs.k8s.io/prow/pkg/pjutil/pprof"
 
 	"sigs.k8s.io/boskos/common"
 	"sigs.k8s.io/boskos/crds"
@@ -90,7 +89,7 @@ func init() {
 
 func main() {
 	logrusutil.ComponentInit()
-	for _, o := range []flagutil.OptionGroup{&kubeClientOptions, &instrumentationOptions} {
+	for _, o := range []prowflagutil.OptionGroup{&kubeClientOptions, &instrumentationOptions} {
 		o.AddFlags(flag.CommandLine)
 	}
 	flag.Parse()
@@ -100,7 +99,7 @@ func main() {
 		logrus.WithError(err).Fatal("invalid log level specified")
 	}
 	logrus.SetLevel(level)
-	for _, o := range []flagutil.OptionGroup{&kubeClientOptions, &instrumentationOptions} {
+	for _, o := range []prowflagutil.OptionGroup{&kubeClientOptions, &instrumentationOptions} {
 		if err := o.Validate(false); err != nil {
 			logrus.Fatalf("Invalid options: %v", err)
 		}
@@ -239,9 +238,9 @@ func constHandler() handler.EventHandler {
 
 // resourceUpdatePredicate prevents the config reconciler from reacting to resource update events
 // except if:
-// * The new status is tombstone, because then we have to delete is
-// * The new owner is empty, because then we have to delete it if it got deleted from the config but
-//   was not deleted from the api to let the current owner finish its work.
+//   - The new status is tombstone, because then we have to delete is
+//   - The new owner is empty, because then we have to delete it if it got deleted from the config but
+//     was not deleted from the api to let the current owner finish its work.
 func resourceUpdatePredicate() predicate.Predicate {
 	return predicate.Funcs{
 		CreateFunc: func(_ event.CreateEvent) bool { return true },

diff --git a/cmd/cleaner/main.go b/cmd/cleaner/main.go
@@ -27,20 +27,21 @@ import (
 
 	"github.com/sirupsen/logrus"
 	corev1 "k8s.io/api/core/v1"
+	"sigs.k8s.io/controller-runtime/pkg/cache"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
+	"sigs.k8s.io/controller-runtime/pkg/metrics/server"
 
-	"k8s.io/test-infra/pkg/flagutil"
-	"k8s.io/test-infra/prow/config"
-	prowflagutil "k8s.io/test-infra/prow/flagutil"
-	"k8s.io/test-infra/prow/interrupts"
-	"k8s.io/test-infra/prow/logrusutil"
-	prowmetrics "k8s.io/test-infra/prow/metrics"
-	"k8s.io/test-infra/prow/pjutil/pprof"
 	"sigs.k8s.io/boskos/cleaner"
 	cleanerv2 "sigs.k8s.io/boskos/cleaner/v2"
 	"sigs.k8s.io/boskos/client"
 	"sigs.k8s.io/boskos/crds"
 	"sigs.k8s.io/boskos/ranch"
+	"sigs.k8s.io/prow/pkg/config"
+	prowflagutil "sigs.k8s.io/prow/pkg/flagutil"
+	"sigs.k8s.io/prow/pkg/interrupts"
+	"sigs.k8s.io/prow/pkg/logrusutil"
+	prowmetrics "sigs.k8s.io/prow/pkg/metrics"
+	"sigs.k8s.io/prow/pkg/pjutil/pprof"
 )
 
 const (
@@ -74,7 +75,7 @@ func init() {
 
 func main() {
 	logrusutil.ComponentInit()
-	for _, o := range []flagutil.OptionGroup{&kubeClientOptions, &instrumentationOptions} {
+	for _, o := range []prowflagutil.OptionGroup{&kubeClientOptions, &instrumentationOptions} {
 		o.AddFlags(flag.CommandLine)
 	}
 	flag.Parse()
@@ -84,7 +85,7 @@ func main() {
 		logrus.WithError(err).Fatal("invalid log level specified")
 	}
 	logrus.SetLevel(level)
-	for _, o := range []flagutil.OptionGroup{&kubeClientOptions, &instrumentationOptions} {
+	for _, o := range []prowflagutil.OptionGroup{&kubeClientOptions, &instrumentationOptions} {
 		if err := o.Validate(false); err != nil {
 			logrus.Fatalf("Invalid options: %v", err)
 		}
@@ -133,8 +134,8 @@ func v2Main(client *client.Client) {
 		LeaderElection:          true,
 		LeaderElectionNamespace: namespace,
 		LeaderElectionID:        "boskos-cleaner-leaderlock",
-		Namespace:               namespace,
-		MetricsBindAddress:      "0",
+		Cache:                   cache.Options{DefaultNamespaces: map[string]cache.Config{namespace: {}}},
+		Metrics:                 server.Options{BindAddress: "0"},
 	})
 	if err != nil {
 		logrus.WithError(err).Fatal("failed to construct manager.")

diff --git a/cmd/fake-mason/main.go b/cmd/fake-mason/main.go
@@ -26,7 +26,7 @@ import (
 
 	"github.com/sirupsen/logrus"
 	corev1 "k8s.io/api/core/v1"
-	"k8s.io/test-infra/prow/logrusutil"
+	"sigs.k8s.io/prow/pkg/logrusutil"
 
 	"sigs.k8s.io/boskos/client"
 	"sigs.k8s.io/boskos/common"

diff --git a/cmd/ibmcloud-janitor-boskos/main.go b/cmd/ibmcloud-janitor-boskos/main.go
@@ -24,7 +24,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 
-	"k8s.io/test-infra/prow/logrusutil"
+	"sigs.k8s.io/prow/pkg/logrusutil"
 
 	boskosClient "sigs.k8s.io/boskos/client"
 	"sigs.k8s.io/boskos/common"

diff --git a/cmd/janitor/janitor.go b/cmd/janitor/janitor.go
@@ -24,7 +24,7 @@ import (
 
 	"github.com/sirupsen/logrus"
 	flag "github.com/spf13/pflag"
-	"k8s.io/test-infra/prow/logrusutil"
+	"sigs.k8s.io/prow/pkg/logrusutil"
 
 	"sigs.k8s.io/boskos/client"
 	"sigs.k8s.io/boskos/common"

diff --git a/cmd/metrics/metrics.go b/cmd/metrics/metrics.go
@@ -26,13 +26,13 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/sirupsen/logrus"
 
-	"k8s.io/test-infra/prow/config"
-	"k8s.io/test-infra/prow/flagutil"
-	"k8s.io/test-infra/prow/logrusutil"
-	prowmetrics "k8s.io/test-infra/prow/metrics"
 	"sigs.k8s.io/boskos/client"
 	"sigs.k8s.io/boskos/common"
 	"sigs.k8s.io/boskos/metrics"
+	"sigs.k8s.io/prow/pkg/config"
+	"sigs.k8s.io/prow/pkg/flagutil"
+	"sigs.k8s.io/prow/pkg/logrusutil"
+	prowmetrics "sigs.k8s.io/prow/pkg/metrics"
 )
 
 var (
@@ -108,8 +108,8 @@ func updateResourcesMetric(boskos *client.Client) error {
 	return nil
 }
 
-//  handleMetric: Handler for /
-//  Method: GET
+// handleMetric: Handler for /
+// Method: GET
 func handleMetric(boskos *client.Client) http.HandlerFunc {
 	return func(res http.ResponseWriter, req *http.Request) {
 		log := logrus.WithField("handler", "handleMetric")

diff --git a/cmd/reaper/reaper.go b/cmd/reaper/reaper.go
@@ -22,9 +22,9 @@ import (
 
 	"github.com/sirupsen/logrus"
 
-	"k8s.io/test-infra/prow/logrusutil"
 	"sigs.k8s.io/boskos/client"
 	"sigs.k8s.io/boskos/common"
+	"sigs.k8s.io/prow/pkg/logrusutil"
 )
 
 var (

diff --git a/crds/client.go b/crds/client.go
@@ -37,12 +37,13 @@ import (
 	ctrlruntimeclient "sigs.k8s.io/controller-runtime/pkg/client"
 	fakectrlruntimeclient "sigs.k8s.io/controller-runtime/pkg/client/fake"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
+	"sigs.k8s.io/controller-runtime/pkg/metrics/server"
 
-	"k8s.io/test-infra/prow/interrupts"
+	"sigs.k8s.io/prow/pkg/interrupts"
 )
 
 // KubernetesClientOptions are flag options used to create a kube client.
-// It implements the k8s.io/test-infra/pkg/flagutil.OptionGroup interface.
+// It implements the sigs.k8s.io/prow/pkg/flagutil.OptionGroup interface.
 type KubernetesClientOptions struct {
 	inMemory           bool
 	kubeConfig         string
@@ -86,9 +87,9 @@ func (o *KubernetesClientOptions) Client() (ctrlruntimeclient.Client, error) {
 func (o *KubernetesClientOptions) Manager(namespace string, enableLeaderElection bool, startCacheFor ...ctrlruntimeclient.Object) (manager.Manager, error) {
 	if o.inMemory {
 		return manager.New(&rest.Config{}, manager.Options{
-			LeaderElection:     false,
-			MapperProvider:     func(_ *rest.Config, _ *http.Client) (meta.RESTMapper, error) { return &fakeRESTMapper{}, nil },
-			MetricsBindAddress: "0",
+			LeaderElection: false,
+			MapperProvider: func(_ *rest.Config, _ *http.Client) (meta.RESTMapper, error) { return &fakeRESTMapper{}, nil },
+			Metrics:        server.Options{BindAddress: "0"},
 			NewCache: func(_ *rest.Config, _ cache.Options) (cache.Cache, error) {
 				return &informertest.FakeInformers{}, nil
 			},
@@ -111,8 +112,8 @@ func (o *KubernetesClientOptions) Manager(namespace string, enableLeaderElection
 		LeaderElectionReleaseOnCancel: true,
 		LeaderElectionResourceLock:    "leases",
 		LeaderElectionID:              "boskos-server",
-		Namespace:                     namespace,
-		MetricsBindAddress:            "0",
+		Cache:                         cache.Options{DefaultNamespaces: map[string]cache.Config{namespace: {}}},
+		Metrics:                       server.Options{BindAddress: "0"},
 	})
 	if err != nil {
 		return nil, fmt.Errorf("failed to construct manager: %v", err)