Skip to content

Commit 38f4870

Browse files
acornett21tmshort
authored andcommitted
k8s 1.28 version update and go 1.20 (openshift#292)
Signed-off-by: Adam D. Cornett <[email protected]> Upstream-repository: api Upstream-commit: 9ffba44ad7ed20160e3ab8fd36d5317067cb603c
1 parent fad5376 commit 38f4870

File tree

9 files changed

+468
-154
lines changed

9 files changed

+468
-154
lines changed

staging/api/.github/workflows/go.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ jobs:
1212
name: Build
1313
runs-on: ubuntu-latest
1414
steps:
15+
- name: Check out code into the Go module directory
16+
uses: actions/checkout@v3
1517
- name: Set up Go
16-
uses: actions/setup-go@v3
18+
uses: actions/setup-go@v4
1719
with:
18-
go-version: 1.19
20+
go-version-file: go.mod
1921
id: go
20-
- name: Check out code into the Go module directory
21-
uses: actions/checkout@v2
2222
- name: Cache dependencies
2323
uses: actions/cache@v2
2424
with:
@@ -40,16 +40,16 @@ jobs:
4040
if: github.event_name == 'pull_request'
4141
runs-on: ubuntu-latest
4242
steps:
43+
- name: Check out code into the Go module directory
44+
uses: actions/checkout@v3
45+
with:
46+
fetch-depth: 0
4347
- name: Set up Go
44-
uses: actions/setup-go@v3
48+
uses: actions/setup-go@v4
4549
with:
46-
go-version: 1.19
50+
go-version-file: go.mod
4751
id: go
4852
- name: Print out Go env
4953
run: go env
50-
- name: Check out code into the Go module directory
51-
uses: actions/checkout@v2
52-
with:
53-
fetch-depth: 0
5454
- name: Run go-apidiff
5555
uses: joelanford/go-apidiff@main

staging/api/.github/workflows/verify.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ jobs:
1111
verify:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v2
15-
- uses: actions/setup-go@v3
14+
- uses: actions/checkout@v3
15+
- uses: actions/setup-go@v4
1616
with:
17-
go-version: '~1.19'
17+
go-version-file: go.mod
1818
- name: Run the verify target
1919
run: |
2020
export GOPATH=$(go env GOPATH)

staging/api/crds/operators.coreos.com_clusterserviceversions.yaml

Lines changed: 18 additions & 9 deletions
Large diffs are not rendered by default.

staging/api/crds/zz_defs.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

staging/api/go.mod

Lines changed: 39 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
module github.com/operator-framework/api
22

3-
go 1.19
3+
go 1.20
44

55
require (
66
github.com/blang/semver/v4 v4.0.0
77
github.com/go-bindata/go-bindata/v3 v3.1.3
8-
github.com/google/cel-go v0.15.3
8+
github.com/google/cel-go v0.16.1
99
github.com/sirupsen/logrus v1.9.2
1010
github.com/spf13/cobra v1.7.0
1111
github.com/stretchr/testify v1.8.4
12-
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d
13-
k8s.io/api v0.27.7
14-
k8s.io/apiextensions-apiserver v0.27.7
15-
k8s.io/apimachinery v0.27.7
16-
k8s.io/client-go v0.27.7
17-
sigs.k8s.io/controller-runtime v0.15.0
12+
google.golang.org/genproto/googleapis/api v0.0.0-20231120223509-83a465c0220f
13+
k8s.io/api v0.28.4
14+
k8s.io/apiextensions-apiserver v0.28.4
15+
k8s.io/apimachinery v0.28.4
16+
k8s.io/client-go v0.28.4
17+
sigs.k8s.io/controller-runtime v0.16.3
1818
sigs.k8s.io/yaml v1.3.0
1919
)
2020

@@ -25,69 +25,71 @@ require (
2525
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
2626
github.com/cespare/xxhash/v2 v2.2.0 // indirect
2727
github.com/davecgh/go-spew v1.1.1 // indirect
28-
github.com/emicklei/go-restful/v3 v3.10.2 // indirect
28+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
2929
github.com/felixge/httpsnoop v1.0.3 // indirect
30-
github.com/go-logr/logr v1.3.0 // indirect
30+
github.com/go-logr/logr v1.2.4 // indirect
3131
github.com/go-logr/stdr v1.2.2 // indirect
3232
github.com/go-openapi/jsonpointer v0.19.6 // indirect
33-
github.com/go-openapi/jsonreference v0.20.1 // indirect
33+
github.com/go-openapi/jsonreference v0.20.2 // indirect
3434
github.com/go-openapi/swag v0.22.3 // indirect
3535
github.com/gogo/protobuf v1.3.2 // indirect
3636
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
3737
github.com/golang/protobuf v1.5.3 // indirect
38-
github.com/google/gnostic v0.5.7-v3refs // indirect
39-
github.com/google/go-cmp v0.6.0 // indirect
40-
github.com/google/gofuzz v1.1.0 // indirect
38+
github.com/google/gnostic-models v0.6.8 // indirect
39+
github.com/google/go-cmp v0.5.9 // indirect
40+
github.com/google/gofuzz v1.2.0 // indirect
4141
github.com/google/uuid v1.3.1 // indirect
42-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
43-
github.com/imdario/mergo v0.3.12 // indirect
42+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
43+
github.com/imdario/mergo v0.3.6 // indirect
4444
github.com/inconshreveable/mousetrap v1.1.0 // indirect
4545
github.com/josharian/intern v1.0.0 // indirect
4646
github.com/json-iterator/go v1.1.12 // indirect
4747
github.com/kisielk/errcheck v1.5.0 // indirect
4848
github.com/mailru/easyjson v0.7.7 // indirect
4949
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
50-
github.com/mitchellh/mapstructure v1.4.1 // indirect
5150
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5251
github.com/modern-go/reflect2 v1.0.2 // indirect
5352
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
5453
github.com/pmezard/go-difflib v1.0.0 // indirect
55-
github.com/prometheus/client_golang v1.15.1 // indirect
54+
github.com/prometheus/client_golang v1.16.0 // indirect
5655
github.com/prometheus/client_model v0.4.0 // indirect
57-
github.com/prometheus/common v0.42.0 // indirect
58-
github.com/prometheus/procfs v0.9.0 // indirect
56+
github.com/prometheus/common v0.44.0 // indirect
57+
github.com/prometheus/procfs v0.10.1 // indirect
5958
github.com/spf13/pflag v1.0.5 // indirect
6059
github.com/stoewer/go-strcase v1.2.0 // indirect
61-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 // indirect
62-
go.opentelemetry.io/otel v1.20.0 // indirect
63-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.20.0 // indirect
64-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.20.0 // indirect
65-
go.opentelemetry.io/otel/metric v1.20.0 // indirect
66-
go.opentelemetry.io/otel/sdk v1.20.0 // indirect
67-
go.opentelemetry.io/otel/trace v1.20.0 // indirect
68-
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
60+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.1 // indirect
61+
go.opentelemetry.io/otel v1.10.0 // indirect
62+
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.10.0 // indirect
63+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.10.0 // indirect
64+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.10.0 // indirect
65+
go.opentelemetry.io/otel/metric v0.31.0 // indirect
66+
go.opentelemetry.io/otel/sdk v1.10.0 // indirect
67+
go.opentelemetry.io/otel/trace v1.10.0 // indirect
68+
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
6969
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
70-
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
70+
golang.org/x/lint v0.0.0-20200302205851-738671d3881b // indirect
7171
golang.org/x/mod v0.10.0 // indirect
7272
golang.org/x/net v0.17.0 // indirect
7373
golang.org/x/oauth2 v0.11.0 // indirect
74-
golang.org/x/sys v0.14.0 // indirect
74+
golang.org/x/sync v0.3.0 // indirect
75+
golang.org/x/sys v0.13.0 // indirect
7576
golang.org/x/term v0.13.0 // indirect
7677
golang.org/x/text v0.13.0 // indirect
7778
golang.org/x/time v0.3.0 // indirect
78-
golang.org/x/tools v0.9.1 // indirect
79+
golang.org/x/tools v0.9.3 // indirect
7980
google.golang.org/appengine v1.6.7 // indirect
80-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
81+
google.golang.org/genproto v0.0.0-20231127180814-3a041ad873d4 // indirect
82+
google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect
8183
google.golang.org/grpc v1.59.0 // indirect
8284
google.golang.org/protobuf v1.31.0 // indirect
8385
gopkg.in/inf.v0 v0.9.1 // indirect
8486
gopkg.in/yaml.v2 v2.4.0 // indirect
8587
gopkg.in/yaml.v3 v3.0.1 // indirect
86-
k8s.io/apiserver v0.27.7 // indirect
87-
k8s.io/component-base v0.27.7 // indirect
88-
k8s.io/klog/v2 v2.90.1 // indirect
89-
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
90-
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
88+
k8s.io/apiserver v0.28.4 // indirect
89+
k8s.io/component-base v0.28.4 // indirect
90+
k8s.io/klog/v2 v2.100.1 // indirect
91+
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
92+
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
9193
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
9294
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
9395
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect

0 commit comments

Comments
 (0)