Skip to content

Commit 2d9af2f

Browse files
chore: support v1 and v1beta1
1 parent a27db53 commit 2d9af2f

File tree

9 files changed

+247
-198
lines changed

9 files changed

+247
-198
lines changed

cmd/tektoncontroller/main.go

+6-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,12 @@ func main() {
7575
logrus.WithError(err).Fatal("Unable to start manager")
7676
}
7777

78-
lhJobReconciler := tektonengine.NewLighthouseJobReconciler(mgr.GetClient(), mgr.GetAPIReader(), mgr.GetScheme(), o.dashboardURL, o.dashboardTemplate, o.namespace)
78+
tektonclient, _, _, _, err := clients.GetAPIClients()
79+
if err != nil {
80+
logrus.WithError(err).Fatal(err, "failed to get api clients")
81+
}
82+
83+
lhJobReconciler := tektonengine.NewLighthouseJobReconciler(mgr.GetClient(), mgr.GetAPIReader(), mgr.GetScheme(), tektonclient, o.dashboardURL, o.dashboardTemplate, o.namespace)
7984
if err = lhJobReconciler.SetupWithManager(mgr); err != nil {
8085
logrus.WithError(err).Fatal("Unable to create controller")
8186
}

go.mod

+34-31
Original file line numberDiff line numberDiff line change
@@ -12,29 +12,30 @@ require (
1212
github.com/gorilla/sessions v1.2.1
1313
github.com/h2non/gock v1.0.9
1414
github.com/hashicorp/go-multierror v1.1.1
15-
github.com/hashicorp/golang-lru v0.5.4
15+
github.com/hashicorp/golang-lru v1.0.2
1616
github.com/jenkins-x/go-scm v1.14.56
1717
github.com/mattn/go-zglob v0.0.1
1818
github.com/onsi/ginkgo v1.16.5
19-
github.com/onsi/gomega v1.33.1
19+
github.com/onsi/gomega v1.36.1
2020
github.com/pkg/errors v0.9.1
2121
github.com/prometheus/client_golang v1.19.1
2222
github.com/shurcooL/githubv4 v0.0.0-20191102174205-af46314aec7b
2323
github.com/sirupsen/logrus v1.9.3
2424
github.com/stretchr/testify v1.9.0
2525
github.com/tektoncd/pipeline v0.65.3
26-
golang.org/x/oauth2 v0.22.0
26+
golang.org/x/oauth2 v0.23.0
2727
gopkg.in/robfig/cron.v2 v2.0.0-20150107220207-be2e0b0deed5
28-
k8s.io/api v0.31.3
29-
k8s.io/apimachinery v0.31.3
30-
k8s.io/client-go v0.31.3
31-
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
28+
k8s.io/api v0.32.1
29+
k8s.io/apimachinery v0.32.3
30+
k8s.io/client-go v0.32.1
31+
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
3232
knative.dev/pkg v0.0.0-20240416145024-0f34a8815650
33-
sigs.k8s.io/controller-runtime v0.19.3
33+
sigs.k8s.io/controller-runtime v0.20.3
3434
sigs.k8s.io/yaml v1.4.0
3535
)
3636

3737
require (
38+
cel.dev/expr v0.18.0 // indirect
3839
code.gitea.io/sdk/gitea v0.18.0 // indirect
3940
contrib.go.opencensus.io/exporter/ocagent v0.7.1-0.20200907061046-05415f1de66d // indirect
4041
contrib.go.opencensus.io/exporter/prometheus v0.4.2 // indirect
@@ -48,27 +49,27 @@ require (
4849
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
4950
github.com/davidmz/go-pageant v1.0.2 // indirect
5051
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
51-
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
52+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
5253
github.com/fsnotify/fsnotify v1.7.0 // indirect
5354
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
5455
github.com/go-fed/httpsig v1.1.0 // indirect
5556
github.com/go-kit/log v0.2.1 // indirect
5657
github.com/go-logfmt/logfmt v0.5.1 // indirect
5758
github.com/go-logr/logr v1.4.2 // indirect
58-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
59+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
5960
github.com/go-openapi/jsonreference v0.20.2 // indirect
60-
github.com/go-openapi/swag v0.22.4 // indirect
61+
github.com/go-openapi/swag v0.23.0 // indirect
6162
github.com/gogo/protobuf v1.3.2 // indirect
6263
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
6364
github.com/golang/protobuf v1.5.4 // indirect
64-
github.com/google/cel-go v0.20.1 // indirect
65+
github.com/google/btree v1.1.3 // indirect
66+
github.com/google/cel-go v0.22.0 // indirect
6567
github.com/google/gnostic-models v0.6.8 // indirect
6668
github.com/google/gofuzz v1.2.0 // indirect
6769
github.com/gorilla/securecookie v1.1.1 // indirect
6870
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
6971
github.com/hashicorp/errwrap v1.1.0 // indirect
7072
github.com/hashicorp/go-version v1.7.0 // indirect
71-
github.com/imdario/mergo v0.3.15 // indirect
7273
github.com/josharian/intern v1.0.0 // indirect
7374
github.com/json-iterator/go v1.1.12 // indirect
7475
github.com/mailru/easyjson v0.7.7 // indirect
@@ -86,35 +87,35 @@ require (
8687
github.com/prometheus/statsd_exporter v0.22.7 // indirect
8788
github.com/shurcooL/graphql v0.0.0-20181231061246-d48a9a75455f // indirect
8889
github.com/spf13/pflag v1.0.5 // indirect
89-
github.com/stoewer/go-strcase v1.2.0 // indirect
90+
github.com/stoewer/go-strcase v1.3.0 // indirect
9091
github.com/x448/float16 v0.8.4 // indirect
9192
go.opencensus.io v0.24.0 // indirect
9293
go.uber.org/multierr v1.11.0 // indirect
9394
go.uber.org/zap v1.27.0 // indirect
94-
golang.org/x/crypto v0.26.0 // indirect
95-
golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc // indirect
96-
golang.org/x/net v0.28.0 // indirect
95+
golang.org/x/crypto v0.28.0 // indirect
96+
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
97+
golang.org/x/net v0.30.0 // indirect
9798
golang.org/x/sync v0.8.0 // indirect
98-
golang.org/x/sys v0.24.0 // indirect
99-
golang.org/x/term v0.23.0 // indirect
100-
golang.org/x/text v0.17.0 // indirect
101-
golang.org/x/time v0.5.0 // indirect
99+
golang.org/x/sys v0.26.0 // indirect
100+
golang.org/x/term v0.25.0 // indirect
101+
golang.org/x/text v0.19.0 // indirect
102+
golang.org/x/time v0.7.0 // indirect
102103
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
103104
google.golang.org/api v0.181.0 // indirect
104-
google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 // indirect
105-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect
105+
google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7 // indirect
106+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 // indirect
106107
google.golang.org/grpc v1.67.0 // indirect
107-
google.golang.org/protobuf v1.34.2 // indirect
108+
google.golang.org/protobuf v1.35.1 // indirect
108109
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
109110
gopkg.in/inf.v0 v0.9.1 // indirect
110111
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
111112
gopkg.in/yaml.v2 v2.4.0 // indirect
112113
gopkg.in/yaml.v3 v3.0.1 // indirect
113-
k8s.io/apiextensions-apiserver v0.31.0 // indirect
114+
k8s.io/apiextensions-apiserver v0.32.1 // indirect
114115
k8s.io/klog/v2 v2.130.1 // indirect
115-
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
116-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
117-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
116+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
117+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
118+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
118119
)
119120

120121
replace (
@@ -127,8 +128,10 @@ replace (
127128

128129
// gomodules.xyz breaks in Athens proxying
129130
gomodules.xyz/jsonpatch/v2 => github.com/gomodules/jsonpatch/v2 v2.2.0
130-
k8s.io/api => k8s.io/api v0.31.3
131-
k8s.io/apimachinery => k8s.io/apimachinery v0.31.3
131+
k8s.io/api => k8s.io/api v0.32.3
132+
k8s.io/apimachinery => k8s.io/apimachinery v0.32.3
132133
)
133134

134-
go 1.22.3
135+
go 1.23.0
136+
137+
toolchain go1.23.2

0 commit comments

Comments
 (0)