Skip to content

Commit 0f8ab91

Browse files
asmacdotmshort
asmacdo
authored and
tmshort
committed
bump k8s to 1.25 (openshift#1024)
Signed-off-by: Austin Macdonald <[email protected]> Signed-off-by: Austin Macdonald <[email protected]> Upstream-repository: operator-registry Upstream-commit: 6d762ada58dfd90f41cc002d8f34c01811312f6f
1 parent 295e73a commit 0f8ab91

File tree

131 files changed

+46589
-102838
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

131 files changed

+46589
-102838
lines changed

‎go.mod

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ require (
5757
github.com/Azure/go-autorest/logger v0.2.1 // indirect
5858
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
5959
github.com/BurntSushi/toml v1.0.0 // indirect
60-
github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd // indirect
60+
github.com/MakeNowJust/heredoc v1.0.0 // indirect
6161
github.com/Masterminds/goutils v1.1.1 // indirect
6262
github.com/Masterminds/semver/v3 v3.1.1 // indirect
6363
github.com/Masterminds/sprig/v3 v3.2.2 // indirect
@@ -74,7 +74,7 @@ require (
7474
github.com/beorn7/perks v1.0.1 // indirect
7575
github.com/blang/semver v3.5.1+incompatible // indirect
7676
github.com/cespare/xxhash/v2 v2.1.2 // indirect
77-
github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5 // indirect
77+
github.com/chai2010/gettext-go v1.0.2 // indirect
7878
github.com/containerd/cgroups v1.0.3 // indirect
7979
github.com/containerd/containerd v1.6.3 // indirect
8080
github.com/containerd/continuity v0.2.2 // indirect
@@ -197,7 +197,7 @@ require (
197197
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
198198
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
199199
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
200-
github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca // indirect
200+
github.com/xlab/treeprint v1.1.0 // indirect
201201
github.com/zeebo/errs v1.3.0 // indirect
202202
go.etcd.io/bbolt v1.3.6 // indirect
203203
go.etcd.io/etcd/api/v3 v3.5.4 // indirect
@@ -243,18 +243,18 @@ require (
243243
gopkg.in/yaml.v3 v3.0.1 // indirect
244244
k8s.io/apiextensions-apiserver v0.25.3 // indirect
245245
k8s.io/apiserver v0.25.3 // indirect
246-
k8s.io/cli-runtime v0.24.0 // indirect
246+
k8s.io/cli-runtime v0.25.0 // indirect
247247
k8s.io/component-base v0.25.3 // indirect
248248
k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 // indirect
249249
k8s.io/klog v1.0.0 // indirect
250250
k8s.io/klog/v2 v2.80.1 // indirect
251251
k8s.io/kube-aggregator v0.25.3 // indirect
252-
k8s.io/kubectl v0.24.0 // indirect
252+
k8s.io/kubectl v0.25.0 // indirect
253253
oras.land/oras-go v1.1.0 // indirect
254254
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.33 // indirect
255255
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
256-
sigs.k8s.io/kustomize/api v0.11.4 // indirect
257-
sigs.k8s.io/kustomize/kyaml v0.13.6 // indirect
256+
sigs.k8s.io/kustomize/api v0.12.1 // indirect
257+
sigs.k8s.io/kustomize/kyaml v0.13.9 // indirect
258258
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
259259
sigs.k8s.io/yaml v1.3.0 // indirect
260260
)

‎go.sum

Lines changed: 14 additions & 58 deletions
Large diffs are not rendered by default.

‎pkg/manifests/csv.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
name: packageserver
66
namespace: openshift-operator-lifecycle-manager
77
labels:
8-
olm.version: 0.0.0-937160dfa3b7f48594968a596759c5633b85d02e
8+
olm.version: 0.0.0-f492d4420da0541be01aa74427ab5c426ca27118
99
olm.clusteroperator.name: operator-lifecycle-manager-packageserver
1010
annotations:
1111
include.release.openshift.io/self-managed-high-availability: "true"
@@ -159,7 +159,7 @@ spec:
159159
- packageserver
160160
topologyKey: "kubernetes.io/hostname"
161161
maturity: alpha
162-
version: 0.0.0-937160dfa3b7f48594968a596759c5633b85d02e
162+
version: 0.0.0-f492d4420da0541be01aa74427ab5c426ca27118
163163
apiservicedefinitions:
164164
owned:
165165
- group: packages.operators.coreos.com

‎staging/operator-registry/alpha/declcfg/declcfg.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,11 @@ type ChannelEntry struct {
5252
// Top-level fields are the source of truth, i.e. not CSV values.
5353
//
5454
// Notes:
55-
// - Any field slice type field or type containing a slice somewhere
56-
// where two types/fields are equal if their contents are equal regardless
57-
// of order must have a `hash:"set"` field tag for bundle comparison.
58-
// - Any fields that have a `json:"-"` tag must be included in the equality
59-
// evaluation in bundlesEqual().
55+
// - Any field slice type field or type containing a slice somewhere
56+
// where two types/fields are equal if their contents are equal regardless
57+
// of order must have a `hash:"set"` field tag for bundle comparison.
58+
// - Any fields that have a `json:"-"` tag must be included in the equality
59+
// evaluation in bundlesEqual().
6060
type Bundle struct {
6161
Schema string `json:"schema"`
6262
Name string `json:"name"`

‎staging/operator-registry/alpha/model/model.go

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,9 @@ type Channel struct {
141141
}
142142

143143
// TODO(joelanford): This function determines the channel head by finding the bundle that has 0
144-
// incoming edges, based on replaces and skips. It also expects to find exactly one such bundle.
145-
// Is this the correct algorithm?
144+
//
145+
// incoming edges, based on replaces and skips. It also expects to find exactly one such bundle.
146+
// Is this the correct algorithm?
146147
func (c Channel) Head() (*Bundle, error) {
147148
incoming := map[string]int{}
148149
for _, b := range c.Bundles {
@@ -210,11 +211,11 @@ func (c *Channel) Validate() error {
210211

211212
// validateReplacesChain checks the replaces chain of a channel.
212213
// Specifically the following rules must be followed:
213-
// 1. There must be exactly 1 channel head.
214-
// 2. Beginning at the head, the replaces chain must reach all non-skipped entries.
215-
// Non-skipped entries are defined as entries that are not skipped by any other entry in the channel.
216-
// 3. There must be no cycles in the replaces chain.
217-
// 4. The tail entry in the replaces chain is permitted to replace a non-existent entry.
214+
// 1. There must be exactly 1 channel head.
215+
// 2. Beginning at the head, the replaces chain must reach all non-skipped entries.
216+
// Non-skipped entries are defined as entries that are not skipped by any other entry in the channel.
217+
// 3. There must be no cycles in the replaces chain.
218+
// 4. The tail entry in the replaces chain is permitted to replace a non-existent entry.
218219
func (c *Channel) validateReplacesChain() error {
219220
head, err := c.Head()
220221
if err != nil {

‎staging/operator-registry/alpha/property/property.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,9 @@ type Package struct {
4040
}
4141

4242
// NOTICE: The Channel properties are for internal use only.
43-
// DO NOT use it for any public-facing functionalities.
44-
// This API is in alpha stage and it is subject to change.
43+
//
44+
// DO NOT use it for any public-facing functionalities.
45+
// This API is in alpha stage and it is subject to change.
4546
type Channel struct {
4647
ChannelName string `json:"channelName"`
4748
//Priority string `json:"priority"`
@@ -287,8 +288,9 @@ func MustBuildBundleObjectData(data []byte) Property {
287288
}
288289

289290
// NOTICE: The Channel properties are for internal use only.
290-
// DO NOT use it for any public-facing functionalities.
291-
// This API is in alpha stage and it is subject to change.
291+
//
292+
// DO NOT use it for any public-facing functionalities.
293+
// This API is in alpha stage and it is subject to change.
292294
func MustBuildChannelPriority(name string, priority int) Property {
293295
return MustBuild(&Channel{ChannelName: name, Priority: priority})
294296
}

‎staging/operator-registry/go.mod

Lines changed: 31 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/operator-framework/operator-registry
22

3-
go 1.18
3+
go 1.19
44

55
require (
66
github.com/adrg/xdg v0.4.0
@@ -12,18 +12,18 @@ require (
1212
github.com/ghodss/yaml v1.0.0
1313
github.com/golang-migrate/migrate/v4 v4.6.2
1414
github.com/golang/mock v1.5.0
15-
github.com/google/go-cmp v0.5.6
15+
github.com/google/go-cmp v0.5.8
1616
github.com/grpc-ecosystem/grpc-health-probe v0.4.11
1717
github.com/h2non/filetype v1.1.1
1818
github.com/h2non/go-is-svg v0.0.0-20160927212452-35e8c4b0612c
1919
github.com/joelanford/ignore v0.0.0-20210607151042-0d25dc18b62d
2020
github.com/mattn/go-sqlite3 v1.14.10
2121
github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2
22-
github.com/onsi/ginkgo/v2 v2.1.3
23-
github.com/onsi/gomega v1.18.1
22+
github.com/onsi/ginkgo/v2 v2.1.4
23+
github.com/onsi/gomega v1.19.0
2424
github.com/opencontainers/go-digest v1.0.0
2525
github.com/opencontainers/image-spec v1.0.2
26-
github.com/operator-framework/api v0.15.0
26+
github.com/operator-framework/api v0.17.2-0.20220915200120-ff2dbc53d381
2727
github.com/otiai10/copy v1.2.0
2828
github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2
2929
github.com/pkg/errors v0.9.1
@@ -32,27 +32,27 @@ require (
3232
github.com/stretchr/testify v1.7.0
3333
go.etcd.io/bbolt v1.3.6
3434
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4
35-
golang.org/x/net v0.4.0
35+
golang.org/x/net v0.0.0-20220722155237-a158d28d115b
3636
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4
37-
golang.org/x/sys v0.3.0
37+
golang.org/x/sys v0.0.0-20220907062415-87db552b00fd
3838
google.golang.org/grpc v1.47.0
3939
google.golang.org/grpc/cmd/protoc-gen-go-grpc v0.0.0-20200709232328-d8193ee9cc3e
4040
google.golang.org/protobuf v1.28.0
4141
gopkg.in/yaml.v2 v2.4.0
42-
k8s.io/api v0.24.0
43-
k8s.io/apiextensions-apiserver v0.24.0
44-
k8s.io/apimachinery v0.24.0
45-
k8s.io/client-go v0.24.0
46-
k8s.io/kubectl v0.24.0
47-
sigs.k8s.io/controller-runtime v0.12.1
42+
k8s.io/api v0.25.0
43+
k8s.io/apiextensions-apiserver v0.25.0
44+
k8s.io/apimachinery v0.25.0
45+
k8s.io/client-go v0.25.0
46+
k8s.io/kubectl v0.25.0
47+
sigs.k8s.io/controller-runtime v0.13.0
4848
sigs.k8s.io/kind v0.11.1
4949
sigs.k8s.io/yaml v1.3.0
5050
)
5151

5252
require (
5353
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
5454
github.com/BurntSushi/toml v0.3.1 // indirect
55-
github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd // indirect
55+
github.com/MakeNowJust/heredoc v1.0.0 // indirect
5656
github.com/Microsoft/go-winio v0.4.17 // indirect
5757
github.com/Microsoft/hcsshim v0.8.24 // indirect
5858
github.com/PuerkitoBio/purell v1.1.1 // indirect
@@ -61,6 +61,7 @@ require (
6161
github.com/alessio/shellescape v1.4.1 // indirect
6262
github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20220418222510-f25a4f6275ed // indirect
6363
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
64+
github.com/benbjohnson/clock v1.1.0 // indirect
6465
github.com/beorn7/perks v1.0.1 // indirect
6566
github.com/blang/semver v3.5.1+incompatible // indirect
6667
github.com/bshuster-repo/logrus-logstash-hook v0.4.1 // indirect
@@ -76,15 +77,15 @@ require (
7677
github.com/docker/go-metrics v0.0.1 // indirect
7778
github.com/docker/go-units v0.4.0 // indirect
7879
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
79-
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
80+
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
8081
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
81-
github.com/evanphx/json-patch/v5 v5.2.0 // indirect
82+
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
8283
github.com/felixge/httpsnoop v1.0.1 // indirect
8384
github.com/garyburd/redigo v1.6.0 // indirect
8485
github.com/go-git/gcfg v1.5.0 // indirect
8586
github.com/go-git/go-billy/v5 v5.1.0 // indirect
8687
github.com/go-git/go-git/v5 v5.3.0 // indirect
87-
github.com/go-logr/logr v1.2.0 // indirect
88+
github.com/go-logr/logr v1.2.3 // indirect
8889
github.com/go-openapi/jsonpointer v0.19.5 // indirect
8990
github.com/go-openapi/jsonreference v0.19.5 // indirect
9091
github.com/go-openapi/swag v0.19.14 // indirect
@@ -93,7 +94,6 @@ require (
9394
github.com/gogo/protobuf v1.3.2 // indirect
9495
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
9596
github.com/golang/protobuf v1.5.2 // indirect
96-
github.com/golang/snappy v0.0.3 // indirect
9797
github.com/google/cel-go v0.12.4 // indirect
9898
github.com/google/gnostic v0.5.7-v3refs // indirect
9999
github.com/google/gofuzz v1.1.0 // indirect
@@ -108,7 +108,7 @@ require (
108108
github.com/josharian/intern v1.0.0 // indirect
109109
github.com/json-iterator/go v1.1.12 // indirect
110110
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect
111-
github.com/klauspost/compress v1.12.3 // indirect
111+
github.com/klauspost/compress v1.11.13 // indirect
112112
github.com/mailru/easyjson v0.7.6 // indirect
113113
github.com/mattn/go-isatty v0.0.12 // indirect
114114
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
@@ -124,7 +124,7 @@ require (
124124
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
125125
github.com/pelletier/go-toml v1.9.3 // indirect
126126
github.com/pmezard/go-difflib v1.0.0 // indirect
127-
github.com/prometheus/client_golang v1.12.1 // indirect
127+
github.com/prometheus/client_golang v1.12.2 // indirect
128128
github.com/prometheus/client_model v0.2.0 // indirect
129129
github.com/prometheus/common v0.32.1 // indirect
130130
github.com/prometheus/procfs v0.7.3 // indirect
@@ -149,25 +149,24 @@ require (
149149
go.opentelemetry.io/proto/otlp v0.7.0 // indirect
150150
golang.org/x/crypto v0.0.0-20220408190544-5352b0902921 // indirect
151151
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
152-
golang.org/x/term v0.3.0 // indirect
153-
golang.org/x/text v0.5.0 // indirect
152+
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
153+
golang.org/x/text v0.3.7 // indirect
154154
golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
155155
golang.org/x/tools v0.1.12 // indirect
156-
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
157156
google.golang.org/appengine v1.6.7 // indirect
158157
google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
159158
gopkg.in/inf.v0 v0.9.1 // indirect
160159
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
161160
gopkg.in/warnings.v0 v0.1.2 // indirect
162-
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
163-
k8s.io/apiserver v0.24.0 // indirect
164-
k8s.io/component-base v0.24.0 // indirect
165-
k8s.io/klog/v2 v2.60.1 // indirect
166-
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
167-
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
168-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.30 // indirect
169-
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
170-
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
161+
gopkg.in/yaml.v3 v3.0.1 // indirect
162+
k8s.io/apiserver v0.25.0 // indirect
163+
k8s.io/component-base v0.25.0 // indirect
164+
k8s.io/klog/v2 v2.70.1 // indirect
165+
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
166+
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect
167+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.32 // indirect
168+
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
169+
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
171170
)
172171

173172
// latest tag resolves to a very old version. this is only used for spinning up local test registries

0 commit comments

Comments
 (0)