Skip to content

Commit 51a3250

Browse files
acornett21bcrochet
authored andcommitted
updating go dependencies and tools to support k8s 1.31
Signed-off-by: Adam D. Cornett <adc@redhat.com>
1 parent f38593b commit 51a3250

4 files changed

Lines changed: 138 additions & 166 deletions

File tree

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ endif
5858
# Image URL to use all building/pushing image targets
5959
IMG ?= $(IMAGE_TAG_BASE):$(RELEASE_TAG)
6060
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
61-
ENVTEST_K8S_VERSION = 1.30.0
61+
ENVTEST_K8S_VERSION = 1.31.0
6262

6363
# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
6464
ifeq (,$(shell go env GOBIN))
@@ -191,9 +191,9 @@ ENVTEST ?= $(LOCALBIN)/setup-envtest
191191
OPERATOR_SDK ?= $(LOCALBIN)/operator-sdk
192192

193193
## Tool Versions
194-
KUSTOMIZE_VERSION ?= v5.3.0
195-
CONTROLLER_TOOLS_VERSION ?= v0.15.0
196-
ENVTEST_VERSION ?= release-0.18
194+
KUSTOMIZE_VERSION ?= v5.4.3
195+
CONTROLLER_TOOLS_VERSION ?= v0.16.1
196+
ENVTEST_VERSION ?= release-0.19
197197
OPERATOR_SDK_VERSION ?= "v1.36.0"
198198
KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
199199
.PHONY: kustomize

config/crd/bases/certification.redhat.com_operatorpipelines.yaml

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.15.0
6+
controller-gen.kubebuilder.io/version: v0.16.1
77
name: operatorpipelines.certification.redhat.com
88
spec:
99
group: certification.redhat.com
@@ -88,16 +88,8 @@ spec:
8888
conditions describes the state of the operator's reconciliation functionality.
8989
Conditions is a list of conditions related to operator reconciliation
9090
items:
91-
description: "Condition contains details for one aspect of the current
92-
state of this API Resource.\n---\nThis struct is intended for
93-
direct use as an array at the field path .status.conditions. For
94-
example,\n\n\n\ttype FooStatus struct{\n\t // Represents the
95-
observations of a foo's current state.\n\t // Known .status.conditions.type
96-
are: \"Available\", \"Progressing\", and \"Degraded\"\n\t //
97-
+patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t
98-
\ // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\"
99-
patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t
100-
\ // other fields\n\t}"
91+
description: Condition contains details for one aspect of the current
92+
state of this API Resource.
10193
properties:
10294
lastTransitionTime:
10395
description: |-
@@ -138,12 +130,7 @@ spec:
138130
- Unknown
139131
type: string
140132
type:
141-
description: |-
142-
type of condition in CamelCase or in foo.example.com/CamelCase.
143-
---
144-
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
145-
useful (see .node.status.conditions), the ability to deconflict is important.
146-
The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
133+
description: type of condition in CamelCase or in foo.example.com/CamelCase.
147134
maxLength: 316
148135
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
149136
type: string

go.mod

Lines changed: 37 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -3,42 +3,44 @@ module github.com/redhat-openshift-ecosystem/operator-certification-operator
33
go 1.23.4
44

55
require (
6-
github.com/go-git/go-git/v5 v5.12.0
6+
github.com/go-git/go-git/v5 v5.13.1
77
github.com/go-logr/logr v1.4.2
88
github.com/onsi/ginkgo v1.16.5
9-
github.com/onsi/gomega v1.34.1
10-
github.com/openshift/api v0.0.0-20240802200810-346347bccbc8
11-
github.com/operator-framework/api v0.26.0
9+
github.com/onsi/gomega v1.36.2
10+
github.com/openshift/api v0.0.0-20250110183840-c1a063b1614a
11+
github.com/operator-framework/api v0.28.0
1212
github.com/shurcooL/graphql v0.0.0-20230722043721-ed46e5a46466
13-
github.com/tektoncd/pipeline v0.62.0
14-
k8s.io/api v0.30.3
15-
k8s.io/apimachinery v0.30.3
16-
k8s.io/client-go v0.30.3
17-
sigs.k8s.io/controller-runtime v0.18.4
13+
github.com/tektoncd/pipeline v0.66.0
14+
k8s.io/api v0.31.4
15+
k8s.io/apimachinery v0.31.4
16+
k8s.io/client-go v0.31.4
17+
sigs.k8s.io/controller-runtime v0.19.4
1818
sigs.k8s.io/yaml v1.4.0
1919
)
2020

2121
require (
22+
cel.dev/expr v0.18.0 // indirect
2223
contrib.go.opencensus.io/exporter/ocagent v0.7.1-0.20200907061046-05415f1de66d // indirect
2324
contrib.go.opencensus.io/exporter/prometheus v0.4.2 // indirect
2425
dario.cat/mergo v1.0.0 // indirect
2526
github.com/Microsoft/go-winio v0.6.2 // indirect
26-
github.com/ProtonMail/go-crypto v1.0.0 // indirect
27+
github.com/ProtonMail/go-crypto v1.1.3 // indirect
2728
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
2829
github.com/beorn7/perks v1.0.1 // indirect
2930
github.com/blang/semver/v4 v4.0.0 // indirect
3031
github.com/blendle/zapdriver v1.3.1 // indirect
3132
github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
32-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
33+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3334
github.com/cloudflare/circl v1.3.7 // indirect
34-
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
35-
github.com/davecgh/go-spew v1.1.1 // indirect
35+
github.com/cyphar/filepath-securejoin v0.3.6 // indirect
36+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
3637
github.com/emicklei/go-restful/v3 v3.11.2 // indirect
3738
github.com/emirpasic/gods v1.18.1 // indirect
3839
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
3940
github.com/fsnotify/fsnotify v1.7.0 // indirect
41+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
4042
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
41-
github.com/go-git/go-billy/v5 v5.5.0 // indirect
43+
github.com/go-git/go-billy/v5 v5.6.1 // indirect
4244
github.com/go-kit/log v0.2.1 // indirect
4345
github.com/go-logfmt/logfmt v0.5.1 // indirect
4446
github.com/go-logr/zapr v1.3.0 // indirect
@@ -48,7 +50,7 @@ require (
4850
github.com/gogo/protobuf v1.3.2 // indirect
4951
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
5052
github.com/golang/protobuf v1.5.4 // indirect
51-
github.com/google/cel-go v0.20.1 // indirect
53+
github.com/google/cel-go v0.22.1 // indirect
5254
github.com/google/gnostic-models v0.6.8 // indirect
5355
github.com/google/go-cmp v0.6.0 // indirect
5456
github.com/google/gofuzz v1.2.0 // indirect
@@ -66,44 +68,45 @@ require (
6668
github.com/nxadm/tail v1.4.8 // indirect
6769
github.com/pjbgf/sha1cd v0.3.0 // indirect
6870
github.com/pkg/errors v0.9.1 // indirect
69-
github.com/prometheus/client_golang v1.19.0 // indirect
70-
github.com/prometheus/client_model v0.6.0 // indirect
71-
github.com/prometheus/common v0.52.3 // indirect
72-
github.com/prometheus/procfs v0.12.0 // indirect
71+
github.com/prometheus/client_golang v1.19.1 // indirect
72+
github.com/prometheus/client_model v0.6.1 // indirect
73+
github.com/prometheus/common v0.55.0 // indirect
74+
github.com/prometheus/procfs v0.15.1 // indirect
7375
github.com/prometheus/statsd_exporter v0.22.7 // indirect
7476
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
7577
github.com/sirupsen/logrus v1.9.3 // indirect
76-
github.com/skeema/knownhosts v1.2.2 // indirect
78+
github.com/skeema/knownhosts v1.3.0 // indirect
7779
github.com/spf13/pflag v1.0.5 // indirect
7880
github.com/stoewer/go-strcase v1.3.0 // indirect
81+
github.com/x448/float16 v0.8.4 // indirect
7982
github.com/xanzy/ssh-agent v0.3.3 // indirect
8083
go.opencensus.io v0.24.0 // indirect
8184
go.uber.org/multierr v1.11.0 // indirect
8285
go.uber.org/zap v1.27.0 // indirect
83-
golang.org/x/crypto v0.25.0 // indirect
86+
golang.org/x/crypto v0.32.0 // indirect
8487
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
85-
golang.org/x/net v0.27.0 // indirect
86-
golang.org/x/oauth2 v0.20.0 // indirect
87-
golang.org/x/sync v0.7.0 // indirect
88-
golang.org/x/sys v0.22.0 // indirect
89-
golang.org/x/term v0.22.0 // indirect
90-
golang.org/x/text v0.16.0 // indirect
88+
golang.org/x/net v0.34.0 // indirect
89+
golang.org/x/oauth2 v0.22.0 // indirect
90+
golang.org/x/sync v0.10.0 // indirect
91+
golang.org/x/sys v0.29.0 // indirect
92+
golang.org/x/term v0.28.0 // indirect
93+
golang.org/x/text v0.21.0 // indirect
9194
golang.org/x/time v0.5.0 // indirect
9295
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
9396
google.golang.org/api v0.181.0 // indirect
94-
google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5 // indirect
95-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240515191416-fc5f0ca64291 // indirect
96-
google.golang.org/grpc v1.64.1 // indirect
97-
google.golang.org/protobuf v1.34.2 // indirect
97+
google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7 // indirect
98+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 // indirect
99+
google.golang.org/grpc v1.67.0 // indirect
100+
google.golang.org/protobuf v1.36.1 // indirect
98101
gopkg.in/inf.v0 v0.9.1 // indirect
99102
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
100103
gopkg.in/warnings.v0 v0.1.2 // indirect
101104
gopkg.in/yaml.v2 v2.4.0 // indirect
102105
gopkg.in/yaml.v3 v3.0.1 // indirect
103-
k8s.io/apiextensions-apiserver v0.30.1 // indirect
104-
k8s.io/klog/v2 v2.120.1 // indirect
106+
k8s.io/apiextensions-apiserver v0.31.3 // indirect
107+
k8s.io/klog/v2 v2.130.1 // indirect
105108
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
106-
k8s.io/utils v0.0.0-20240102154912-e7106e64919e // indirect
109+
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
107110
knative.dev/pkg v0.0.0-20240416145024-0f34a8815650 // indirect
108111
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
109112
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect

0 commit comments

Comments
 (0)