Skip to content

Commit 7a32951

Browse files
laxmikantbpandharetmshort
laxmikantbpandhare
authored and
tmshort
committed
bump k8s to 1.25 and go to 1.19 (openshift#260)
updated format defs Upstream-repository: api Upstream-commit: ff2dbc53d3817df9b62a83dbe83cb221e7c043f4
1 parent 5c55f4e commit 7a32951

21 files changed

+210
-473
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Set up Go
16-
uses: actions/setup-go@v2
16+
uses: actions/setup-go@v3
1717
with:
18-
go-version: 1.18
18+
go-version: 1.19
1919
id: go
2020
- name: Check out code into the Go module directory
2121
uses: actions/checkout@v2
@@ -37,9 +37,9 @@ jobs:
3737
runs-on: ubuntu-latest
3838
steps:
3939
- name: Set up Go
40-
uses: actions/setup-go@v2
40+
uses: actions/setup-go@v3
4141
with:
42-
go-version: 1.18
42+
go-version: 1.19
4343
id: go
4444
- name: Print out Go env
4545
run: go env

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

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

‎staging/api/crds/operators.coreos.com_catalogsources.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ spec:
155155
description: Represents the state of a CatalogSource. Note that Message and Reason represent the original status information, which may be migrated to be conditions based in the future. Any new features introduced will use conditions.
156156
type: array
157157
items:
158-
description: "Condition contains details for one aspect of the current state of this API Resource. --- This struct is intended for direct use as an array at the field path .status.conditions. For example, type FooStatus struct{ // Represents the observations of a foo's current state. // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge // +listType=map // +listMapKey=type Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
158+
description: "Condition contains details for one aspect of the current state of this API Resource. --- This struct is intended for direct use as an array at the field path .status.conditions. For example, \n type FooStatus struct{ // Represents the observations of a foo's current state. // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge // +listType=map // +listMapKey=type Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
159159
type: object
160160
required:
161161
- lastTransitionTime

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

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

‎staging/api/crds/operators.coreos.com_olmconfigs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ spec:
5050
conditions:
5151
type: array
5252
items:
53-
description: "Condition contains details for one aspect of the current state of this API Resource. --- This struct is intended for direct use as an array at the field path .status.conditions. For example, type FooStatus struct{ // Represents the observations of a foo's current state. // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge // +listType=map // +listMapKey=type Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
53+
description: "Condition contains details for one aspect of the current state of this API Resource. --- This struct is intended for direct use as an array at the field path .status.conditions. For example, \n type FooStatus struct{ // Represents the observations of a foo's current state. // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge // +listType=map // +listMapKey=type Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
5454
type: object
5555
required:
5656
- lastTransitionTime

‎staging/api/crds/operators.coreos.com_operatorconditions.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ spec:
4545
overrides:
4646
type: array
4747
items:
48-
description: "Condition contains details for one aspect of the current state of this API Resource. --- This struct is intended for direct use as an array at the field path .status.conditions. For example, type FooStatus struct{ // Represents the observations of a foo's current state. // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge // +listType=map // +listMapKey=type Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
48+
description: "Condition contains details for one aspect of the current state of this API Resource. --- This struct is intended for direct use as an array at the field path .status.conditions. For example, \n type FooStatus struct{ // Represents the observations of a foo's current state. // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge // +listType=map // +listMapKey=type Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
4949
type: object
5050
required:
5151
- message
@@ -95,7 +95,7 @@ spec:
9595
conditions:
9696
type: array
9797
items:
98-
description: "Condition contains details for one aspect of the current state of this API Resource. --- This struct is intended for direct use as an array at the field path .status.conditions. For example, type FooStatus struct{ // Represents the observations of a foo's current state. // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge // +listType=map // +listMapKey=type Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
98+
description: "Condition contains details for one aspect of the current state of this API Resource. --- This struct is intended for direct use as an array at the field path .status.conditions. For example, \n type FooStatus struct{ // Represents the observations of a foo's current state. // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge // +listType=map // +listMapKey=type Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
9999
type: object
100100
required:
101101
- lastTransitionTime
@@ -162,7 +162,7 @@ spec:
162162
conditions:
163163
type: array
164164
items:
165-
description: "Condition contains details for one aspect of the current state of this API Resource. --- This struct is intended for direct use as an array at the field path .status.conditions. For example, type FooStatus struct{ // Represents the observations of a foo's current state. // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge // +listType=map // +listMapKey=type Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
165+
description: "Condition contains details for one aspect of the current state of this API Resource. --- This struct is intended for direct use as an array at the field path .status.conditions. For example, \n type FooStatus struct{ // Represents the observations of a foo's current state. // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge // +listType=map // +listMapKey=type Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
166166
type: object
167167
required:
168168
- lastTransitionTime
@@ -209,7 +209,7 @@ spec:
209209
overrides:
210210
type: array
211211
items:
212-
description: "Condition contains details for one aspect of the current state of this API Resource. --- This struct is intended for direct use as an array at the field path .status.conditions. For example, type FooStatus struct{ // Represents the observations of a foo's current state. // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge // +listType=map // +listMapKey=type Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
212+
description: "Condition contains details for one aspect of the current state of this API Resource. --- This struct is intended for direct use as an array at the field path .status.conditions. For example, \n type FooStatus struct{ // Represents the observations of a foo's current state. // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge // +listType=map // +listMapKey=type Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
213213
type: object
214214
required:
215215
- message
@@ -259,7 +259,7 @@ spec:
259259
conditions:
260260
type: array
261261
items:
262-
description: "Condition contains details for one aspect of the current state of this API Resource. --- This struct is intended for direct use as an array at the field path .status.conditions. For example, type FooStatus struct{ // Represents the observations of a foo's current state. // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge // +listType=map // +listMapKey=type Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
262+
description: "Condition contains details for one aspect of the current state of this API Resource. --- This struct is intended for direct use as an array at the field path .status.conditions. For example, \n type FooStatus struct{ // Represents the observations of a foo's current state. // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge // +listType=map // +listMapKey=type Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
263263
type: object
264264
required:
265265
- lastTransitionTime

‎staging/api/crds/operators.coreos.com_operatorgroups.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ spec:
9999
description: Conditions is an array of the OperatorGroup's conditions.
100100
type: array
101101
items:
102-
description: "Condition contains details for one aspect of the current state of this API Resource. --- This struct is intended for direct use as an array at the field path .status.conditions. For example, type FooStatus struct{ // Represents the observations of a foo's current state. // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge // +listType=map // +listMapKey=type Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
102+
description: "Condition contains details for one aspect of the current state of this API Resource. --- This struct is intended for direct use as an array at the field path .status.conditions. For example, \n type FooStatus struct{ // Represents the observations of a foo's current state. // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge // +listType=map // +listMapKey=type Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
103103
type: object
104104
required:
105105
- lastTransitionTime

‎staging/api/crds/zz_defs.go

Lines changed: 12 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎staging/api/go.mod

Lines changed: 27 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,34 @@
11
module github.com/operator-framework/api
22

3-
go 1.18
3+
go 1.19
44

55
require (
66
github.com/blang/semver v3.5.1+incompatible
77
github.com/blang/semver/v4 v4.0.0
88
github.com/ghodss/yaml v1.0.0
99
github.com/go-bindata/go-bindata/v3 v3.1.3
10-
github.com/google/cel-go v0.10.1
11-
github.com/google/go-cmp v0.5.6 // indirect
10+
github.com/google/cel-go v0.12.4
1211
github.com/sirupsen/logrus v1.8.1
1312
github.com/spf13/cobra v1.4.0
1413
github.com/stretchr/testify v1.7.0
15-
google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368
16-
k8s.io/api v0.24.0
17-
k8s.io/apiextensions-apiserver v0.24.0
18-
k8s.io/apimachinery v0.24.0
19-
k8s.io/client-go v0.24.0
20-
sigs.k8s.io/controller-runtime v0.12.1
14+
google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21
15+
k8s.io/api v0.25.0
16+
k8s.io/apiextensions-apiserver v0.25.0
17+
k8s.io/apimachinery v0.25.0
18+
k8s.io/client-go v0.25.0
19+
sigs.k8s.io/controller-runtime v0.13.0
2120
)
2221

2322
require (
2423
github.com/PuerkitoBio/purell v1.1.1 // indirect
2524
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
26-
github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20210826220005-b48c857c3a0e // indirect
25+
github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20220418222510-f25a4f6275ed // indirect
2726
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
2827
github.com/beorn7/perks v1.0.1 // indirect
2928
github.com/cespare/xxhash/v2 v2.1.2 // indirect
3029
github.com/davecgh/go-spew v1.1.1 // indirect
3130
github.com/felixge/httpsnoop v1.0.1 // indirect
32-
github.com/go-logr/logr v1.2.0 // indirect
31+
github.com/go-logr/logr v1.2.3 // indirect
3332
github.com/go-openapi/jsonpointer v0.19.5 // indirect
3433
github.com/go-openapi/jsonreference v0.19.5 // indirect
3534
github.com/go-openapi/swag v0.19.14 // indirect
@@ -51,7 +50,7 @@ require (
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/pmezard/go-difflib v1.0.0 // indirect
54-
github.com/prometheus/client_golang v1.12.1 // indirect
53+
github.com/prometheus/client_golang v1.12.2 // indirect
5554
github.com/prometheus/client_model v0.2.0 // indirect
5655
github.com/prometheus/common v0.32.1 // indirect
5756
github.com/prometheus/procfs v0.7.3 // indirect
@@ -68,28 +67,27 @@ require (
6867
go.opentelemetry.io/otel/trace v0.20.0 // indirect
6968
go.opentelemetry.io/proto/otlp v0.7.0 // indirect
7069
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
71-
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
72-
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
70+
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
71+
golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
7372
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
74-
golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect
73+
golang.org/x/sys v0.0.0-20220907062415-87db552b00fd // indirect
7574
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
7675
golang.org/x/text v0.3.7 // indirect
77-
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
78-
golang.org/x/tools v0.1.10-0.20220218145154-897bd77cd717 // indirect
79-
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
76+
golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
77+
golang.org/x/tools v0.1.12 // indirect
8078
google.golang.org/appengine v1.6.7 // indirect
81-
google.golang.org/grpc v1.40.0 // indirect
82-
google.golang.org/protobuf v1.27.1 // indirect
79+
google.golang.org/grpc v1.47.0 // indirect
80+
google.golang.org/protobuf v1.28.0 // indirect
8381
gopkg.in/inf.v0 v0.9.1 // indirect
8482
gopkg.in/yaml.v2 v2.4.0 // indirect
85-
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
86-
k8s.io/apiserver v0.24.0 // indirect
87-
k8s.io/component-base v0.24.0 // indirect
88-
k8s.io/klog/v2 v2.60.1 // indirect
89-
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
90-
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
91-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.30 // indirect
92-
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
93-
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
83+
gopkg.in/yaml.v3 v3.0.1 // indirect
84+
k8s.io/apiserver v0.25.0 // indirect
85+
k8s.io/component-base v0.25.0 // indirect
86+
k8s.io/klog/v2 v2.70.1 // indirect
87+
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
88+
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect
89+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.32 // indirect
90+
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
91+
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
9492
sigs.k8s.io/yaml v1.3.0 // indirect
9593
)

0 commit comments

Comments
 (0)