Skip to content

Commit 53959bf

Browse files
committed
switching dependencies to use sigs.k8s.io/prow so that k8s dependencies can be updated
Signed-off-by: Adam D. Cornett <adc@redhat.com>
1 parent e66fc92 commit 53959bf

9 files changed

Lines changed: 222 additions & 258 deletions

File tree

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ARG release_tag=0.0.0
33
ARG ARCH=amd64
44
ARG OS=linux
55

6-
FROM docker.io/golang:1.21 AS builder
6+
FROM docker.io/golang:1.22 AS builder
77
ARG quay_expiration
88
ARG release_tag
99
ARG ARCH

cmd/artifacts.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
"strings"
1616

1717
"github.com/spf13/cobra"
18-
pjapi "k8s.io/test-infra/prow/apis/prowjobs/v1"
18+
pjapi "sigs.k8s.io/prow/pkg/apis/prowjobs/v1"
1919
)
2020

2121
// artifactsCmd represents the artifacts command

cmd/job.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,11 @@ import (
1313
"github.com/redhat-openshift-ecosystem/preflight-trigger/internal"
1414

1515
"github.com/ghodss/yaml"
16-
"github.com/openshift/ci-tools/pkg/util"
1716
"github.com/spf13/cobra"
1817
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1918
"k8s.io/apimachinery/pkg/fields"
20-
pjapi "k8s.io/test-infra/prow/apis/prowjobs/v1"
21-
pjclient "k8s.io/test-infra/prow/client/clientset/versioned"
19+
pjapi "sigs.k8s.io/prow/pkg/apis/prowjobs/v1"
20+
pjclient "sigs.k8s.io/prow/pkg/client/clientset/versioned"
2221
)
2322

2423
// jobCmd represents the job command
@@ -152,7 +151,7 @@ func jobRun(cmd *cobra.Command, args []string) {
152151
os.Exit(0)
153152
}
154153

155-
clusterconfig, err := util.LoadClusterConfig()
154+
clusterconfig, err := internal.LoadClusterConfig()
156155
if err != nil {
157156
log.Fatalf("Error loading clusterconfig: %v", err)
158157
}

cmd/root.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"reflect"
1010

1111
"github.com/spf13/cobra"
12-
configflagutil "k8s.io/test-infra/prow/flagutil/config"
12+
configflagutil "sigs.k8s.io/prow/pkg/flagutil/config"
1313
)
1414

1515
type FlagsData struct {

go.mod

Lines changed: 58 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,81 +1,84 @@
11
module github.com/redhat-openshift-ecosystem/preflight-trigger
22

3-
go 1.21
3+
go 1.22.0
4+
5+
toolchain go1.22.1
46

57
require (
6-
github.com/ProtonMail/gopenpgp/v2 v2.7.3
8+
github.com/ProtonMail/gopenpgp/v2 v2.7.5
79
github.com/ghodss/yaml v1.0.0
810
github.com/gobuffalo/envy v1.10.2
911
github.com/google/go-github/v56 v56.0.0
10-
github.com/openshift/api v0.0.1
11-
github.com/openshift/ci-tools v0.0.0-20231017183824-2a52e3bfc083
12-
github.com/spf13/afero v1.10.0
13-
github.com/spf13/cobra v1.7.0
14-
k8s.io/api v0.27.2
15-
k8s.io/apimachinery v0.27.3
16-
k8s.io/client-go v0.27.2
17-
k8s.io/test-infra v0.0.0-20230928115035-61f80eaf9972
18-
sigs.k8s.io/controller-runtime v0.15.2
12+
github.com/openshift/api v0.0.0-20240518060631-280767ad03ed
13+
github.com/spf13/afero v1.11.0
14+
github.com/spf13/cobra v1.8.0
15+
k8s.io/api v0.30.0
16+
k8s.io/apimachinery v0.30.0
17+
k8s.io/client-go v0.30.0
18+
sigs.k8s.io/controller-runtime v0.18.2
19+
sigs.k8s.io/prow v0.0.0-20240517154251-ea10bd8144c3
1920
)
2021

2122
require (
22-
cloud.google.com/go v0.110.6 // indirect
23-
cloud.google.com/go/compute v1.23.0 // indirect
23+
cloud.google.com/go v0.110.10 // indirect
24+
cloud.google.com/go/compute v1.23.3 // indirect
2425
cloud.google.com/go/compute/metadata v0.2.3 // indirect
25-
cloud.google.com/go/iam v1.1.1 // indirect
26-
cloud.google.com/go/storage v1.30.1 // indirect
26+
cloud.google.com/go/iam v1.1.5 // indirect
27+
cloud.google.com/go/storage v1.35.1 // indirect
2728
contrib.go.opencensus.io/exporter/ocagent v0.7.1-0.20200907061046-05415f1de66d // indirect
2829
contrib.go.opencensus.io/exporter/prometheus v0.4.0 // indirect
30+
github.com/Azure/azure-pipeline-go v0.2.2 // indirect
2931
github.com/GoogleCloudPlatform/testgrid v0.0.123 // indirect
3032
github.com/ProtonMail/go-crypto v0.0.0-20230717121422-5aa5874ade95 // indirect
3133
github.com/ProtonMail/go-mime v0.0.0-20230322103455-7d82a3887f2f // indirect
3234
github.com/andygrunwald/go-jira v1.14.0 // indirect
3335
github.com/aws/aws-sdk-go v1.44.116 // indirect
3436
github.com/beorn7/perks v1.0.1 // indirect
3537
github.com/blendle/zapdriver v1.3.1 // indirect
38+
github.com/bombsimon/logrusr/v4 v4.1.0 // indirect
3639
github.com/bwmarrin/snowflake v0.0.0 // indirect
3740
github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
3841
github.com/cespare/xxhash/v2 v2.2.0 // indirect
3942
github.com/cjwagner/httpcache v0.0.0-20230907212505-d4841bbad466 // indirect
4043
github.com/clarketm/json v1.13.4 // indirect
4144
github.com/cloudflare/circl v1.3.3 // indirect
42-
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
45+
github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
4346
github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964 // indirect
44-
github.com/davecgh/go-spew v1.1.1 // indirect
47+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
4548
github.com/denormal/go-gitignore v0.0.0-20180930084346-ae8ad1d07817 // indirect
4649
github.com/dgrijalva/jwt-go/v4 v4.0.0-preview1 // indirect
47-
github.com/emicklei/go-restful/v3 v3.10.2 // indirect
48-
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
49-
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
50+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
51+
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
52+
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
5053
github.com/fatih/structs v1.1.0 // indirect
5154
github.com/felixge/fgprof v0.9.1 // indirect
52-
github.com/fsnotify/fsnotify v1.6.0 // indirect
55+
github.com/fsnotify/fsnotify v1.7.0 // indirect
5356
github.com/fvbommel/sortorder v1.0.1 // indirect
5457
github.com/go-kit/log v0.2.1 // indirect
5558
github.com/go-logfmt/logfmt v0.5.1 // indirect
56-
github.com/go-logr/logr v1.2.4 // indirect
59+
github.com/go-logr/logr v1.4.1 // indirect
5760
github.com/go-openapi/jsonpointer v0.19.6 // indirect
5861
github.com/go-openapi/jsonreference v0.20.2 // indirect
5962
github.com/go-openapi/swag v0.22.3 // indirect
6063
github.com/gogo/protobuf v1.3.2 // indirect
6164
github.com/golang-jwt/jwt v3.2.1+incompatible // indirect
6265
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
63-
github.com/golang/protobuf v1.5.3 // indirect
66+
github.com/golang/protobuf v1.5.4 // indirect
6467
github.com/gomodule/redigo v1.8.5 // indirect
6568
github.com/google/btree v1.0.1 // indirect
66-
github.com/google/gnostic v0.6.9 // indirect
67-
github.com/google/go-cmp v0.5.9 // indirect
69+
github.com/google/gnostic-models v0.6.8 // indirect
70+
github.com/google/go-cmp v0.6.0 // indirect
6871
github.com/google/go-containerregistry v0.16.1 // indirect
6972
github.com/google/go-querystring v1.1.0 // indirect
7073
github.com/google/gofuzz v1.2.1-0.20210504230335-f78f29fc09ea // indirect
7174
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
72-
github.com/google/s2a-go v0.1.5 // indirect
73-
github.com/google/uuid v1.3.0 // indirect
75+
github.com/google/s2a-go v0.1.7 // indirect
76+
github.com/google/uuid v1.6.0 // indirect
7477
github.com/google/wire v0.4.0 // indirect
75-
github.com/googleapis/enterprise-certificate-proxy v0.2.5 // indirect
78+
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
7679
github.com/googleapis/gax-go v2.0.2+incompatible // indirect
7780
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
78-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3 // indirect
81+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
7982
github.com/hashicorp/errwrap v1.1.0 // indirect
8083
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
8184
github.com/hashicorp/go-multierror v1.1.1 // indirect
@@ -88,19 +91,19 @@ require (
8891
github.com/josharian/intern v1.0.0 // indirect
8992
github.com/json-iterator/go v1.1.12 // indirect
9093
github.com/mailru/easyjson v0.7.7 // indirect
94+
github.com/mattn/go-ieproxy v0.0.1 // indirect
9195
github.com/mattn/go-zglob v0.0.2 // indirect
9296
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
93-
github.com/moby/spdystream v0.2.0 // indirect
9497
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
9598
github.com/modern-go/reflect2 v1.0.2 // indirect
9699
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
97100
github.com/opencontainers/go-digest v1.0.0 // indirect
98101
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
99102
github.com/pkg/errors v0.9.1 // indirect
100-
github.com/prometheus/client_golang v1.15.1 // indirect
103+
github.com/prometheus/client_golang v1.16.0 // indirect
101104
github.com/prometheus/client_model v0.4.0 // indirect
102105
github.com/prometheus/common v0.44.0 // indirect
103-
github.com/prometheus/procfs v0.10.1 // indirect
106+
github.com/prometheus/procfs v0.12.0 // indirect
104107
github.com/prometheus/statsd_exporter v0.21.0 // indirect
105108
github.com/rogpeppe/go-internal v1.10.0 // indirect
106109
github.com/russross/blackfriday/v2 v2.1.0 // indirect
@@ -112,41 +115,40 @@ require (
112115
github.com/trivago/tgo v1.0.7 // indirect
113116
go.opencensus.io v0.24.0 // indirect
114117
go.uber.org/atomic v1.10.0 // indirect
115-
go.uber.org/multierr v1.10.0 // indirect
116-
go.uber.org/zap v1.25.0 // indirect
118+
go.uber.org/multierr v1.11.0 // indirect
119+
go.uber.org/zap v1.26.0 // indirect
117120
go4.org v0.0.0-20201209231011-d4a079459e60 // indirect
118121
gocloud.dev v0.19.0 // indirect
119-
golang.org/x/crypto v0.14.0 // indirect
122+
golang.org/x/crypto v0.21.0 // indirect
120123
golang.org/x/exp v0.0.0-20230307190834-24139beb5833 // indirect
121-
golang.org/x/net v0.17.0 // indirect
122-
golang.org/x/oauth2 v0.11.0 // indirect
123-
golang.org/x/sync v0.3.0 // indirect
124-
golang.org/x/sys v0.13.0 // indirect
125-
golang.org/x/term v0.13.0 // indirect
126-
golang.org/x/text v0.13.0 // indirect
127-
golang.org/x/time v0.3.0 // indirect
124+
golang.org/x/net v0.23.0 // indirect
125+
golang.org/x/oauth2 v0.18.0 // indirect
126+
golang.org/x/sync v0.6.0 // indirect
127+
golang.org/x/sys v0.18.0 // indirect
128+
golang.org/x/term v0.18.0 // indirect
129+
golang.org/x/text v0.14.0 // indirect
130+
golang.org/x/time v0.5.0 // indirect
128131
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
129-
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
130-
google.golang.org/api v0.138.0 // indirect
131-
google.golang.org/appengine v1.6.7 // indirect
132-
google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect
133-
google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5 // indirect
134-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230807174057-1744710a1577 // indirect
135-
google.golang.org/grpc v1.58.1 // indirect
136-
google.golang.org/protobuf v1.31.0 // indirect
132+
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
133+
google.golang.org/api v0.152.0 // indirect
134+
google.golang.org/appengine v1.6.8 // indirect
135+
google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 // indirect
136+
google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect
137+
google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect
138+
google.golang.org/grpc v1.60.1 // indirect
139+
google.golang.org/protobuf v1.33.0 // indirect
137140
gopkg.in/fsnotify.v1 v1.4.7 // indirect
138141
gopkg.in/inf.v0 v0.9.1 // indirect
139142
gopkg.in/ini.v1 v1.63.2 // indirect
140143
gopkg.in/robfig/cron.v2 v2.0.0-20150107220207-be2e0b0deed5 // indirect
141144
gopkg.in/yaml.v2 v2.4.0 // indirect
142145
gopkg.in/yaml.v3 v3.0.1 // indirect
143-
k8s.io/apiextensions-apiserver v0.27.2 // indirect
144-
k8s.io/component-base v0.27.2 // indirect
145-
k8s.io/klog/v2 v2.100.1 // indirect
146-
k8s.io/kube-openapi v0.0.0-20230525220651-2546d827e515 // indirect
147-
k8s.io/utils v0.0.0-20230505201702-9f6742963106 // indirect
146+
k8s.io/apiextensions-apiserver v0.30.0 // indirect
147+
k8s.io/klog/v2 v2.120.1 // indirect
148+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
149+
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
148150
knative.dev/pkg v0.0.0-20230718152110-aef227e72ead // indirect
149151
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
150-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
152+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
151153
sigs.k8s.io/yaml v1.3.0 // indirect
152154
)

0 commit comments

Comments
 (0)