Skip to content

Commit 087eeaa

Browse files
sgalsalehsgalsaleh
committed
Revert "update k0s version"
This reverts commit 0d75f20.
1 parent 0d75f20 commit 087eeaa

File tree

3 files changed

+146
-130
lines changed

3 files changed

+146
-130
lines changed

‎Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ ADMIN_CONSOLE_MIGRATIONS_IMAGE_OVERRIDE =
1313
ADMIN_CONSOLE_KURL_PROXY_IMAGE_OVERRIDE =
1414
EMBEDDED_OPERATOR_IMAGE_OVERRIDE =
1515
EMBEDDED_OPERATOR_BINARY_URL_OVERRIDE =
16-
K0S_VERSION = v1.28.13+k0s.0
17-
K0S_GO_VERSION = v1.28.13+k0s.0
18-
PREVIOUS_K0S_VERSION ?= v1.28.12+k0s.0
16+
K0S_VERSION = v1.28.11+k0s.0
17+
K0S_GO_VERSION = v1.28.11+k0s.0
18+
PREVIOUS_K0S_VERSION ?= v1.28.10+k0s.0
1919
K0S_BINARY_SOURCE_OVERRIDE =
2020
PREVIOUS_K0S_BINARY_SOURCE_OVERRIDE =
2121
TROUBLESHOOT_VERSION = v0.97.0

‎go.mod

Lines changed: 35 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ require (
1616
github.com/gosimple/slug v1.14.0
1717
github.com/jedib0t/go-pretty v4.3.0+incompatible
1818
github.com/k0sproject/dig v0.2.0
19-
github.com/k0sproject/k0s v1.28.14-0.20240821114553-2c70d4ff09ed
19+
github.com/k0sproject/k0s v1.28.12-0.20240618130209-434229eed353
2020
github.com/replicatedhq/embedded-cluster-kinds v1.4.7
2121
github.com/replicatedhq/embedded-cluster-operator v0.42.1
2222
github.com/replicatedhq/embedded-cluster-utils v1.0.0
@@ -39,20 +39,17 @@ require (
3939
)
4040

4141
require (
42-
github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6 // indirect
43-
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
42+
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
43+
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
4444
github.com/BurntSushi/toml v1.4.0 // indirect
4545
github.com/MakeNowJust/heredoc v1.0.0 // indirect
4646
github.com/Masterminds/goutils v1.1.1 // indirect
4747
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
4848
github.com/Masterminds/squirrel v1.5.4 // indirect
49-
github.com/Microsoft/hcsshim v0.12.6 // indirect
5049
github.com/beorn7/perks v1.0.1 // indirect
51-
github.com/blang/semver/v4 v4.0.0 // indirect
5250
github.com/cespare/xxhash/v2 v2.3.0 // indirect
53-
github.com/chai2010/gettext-go v1.0.3 // indirect
51+
github.com/chai2010/gettext-go v1.0.2 // indirect
5452
github.com/containerd/containerd v1.7.20 // indirect
55-
github.com/containerd/continuity v0.4.3 // indirect
5653
github.com/containerd/errdefs v0.1.0 // indirect
5754
github.com/containerd/log v0.1.0 // indirect
5855
github.com/containerd/platforms v0.2.1 // indirect
@@ -61,48 +58,48 @@ require (
6158
github.com/containers/storage v1.55.0 // indirect
6259
github.com/coreos/go-semver v0.3.1 // indirect
6360
github.com/cyphar/filepath-securejoin v0.3.1 // indirect
64-
github.com/docker/cli v27.1.2+incompatible // indirect
61+
github.com/docker/cli v27.1.1+incompatible // indirect
6562
github.com/docker/distribution v2.8.3+incompatible // indirect
66-
github.com/docker/docker v27.1.2+incompatible // indirect
63+
github.com/docker/docker v27.1.1+incompatible // indirect
6764
github.com/docker/docker-credential-helpers v0.8.2 // indirect
6865
github.com/docker/go-connections v0.5.0 // indirect
6966
github.com/docker/go-metrics v0.0.1 // indirect
7067
github.com/docker/go-units v0.5.0 // indirect
71-
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
68+
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
7269
github.com/felixge/httpsnoop v1.0.4 // indirect
7370
github.com/fsnotify/fsnotify v1.7.0 // indirect
7471
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
75-
github.com/go-errors/errors v1.5.1 // indirect
72+
github.com/go-errors/errors v1.4.2 // indirect
7673
github.com/go-gorp/gorp/v3 v3.1.0 // indirect
7774
github.com/go-logr/stdr v1.2.2 // indirect
7875
github.com/gobwas/glob v0.2.3 // indirect
7976
github.com/godbus/dbus/v5 v5.1.0 // indirect
8077
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
81-
github.com/google/btree v1.1.3 // indirect
78+
github.com/google/btree v1.1.2 // indirect
8279
github.com/google/go-cmp v0.6.0 // indirect
8380
github.com/google/go-querystring v1.1.0 // indirect
8481
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
8582
github.com/gorilla/mux v1.8.1 // indirect
8683
github.com/gosuri/uitable v0.0.4 // indirect
87-
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
88-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 // indirect
84+
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
8985
github.com/hashicorp/errwrap v1.1.0 // indirect
9086
github.com/hashicorp/go-multierror v1.1.1 // indirect
9187
github.com/hashicorp/golang-lru/arc/v2 v2.0.7 // indirect
92-
github.com/huandu/xstrings v1.5.0 // indirect
88+
github.com/huandu/xstrings v1.4.0 // indirect
9389
github.com/inconshreveable/mousetrap v1.1.0 // indirect
9490
github.com/jmespath/go-jmespath v0.4.0 // indirect
95-
github.com/jmoiron/sqlx v1.4.0 // indirect
91+
github.com/jmoiron/sqlx v1.3.5 // indirect
92+
github.com/karrick/godirwalk v1.17.0 // indirect
9693
github.com/klauspost/compress v1.17.9 // indirect
9794
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
9895
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
9996
github.com/lib/pq v1.10.9 // indirect
10097
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
10198
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
10299
github.com/moby/locker v1.0.1 // indirect
103-
github.com/moby/spdystream v0.5.0 // indirect
100+
github.com/moby/spdystream v0.4.0 // indirect
104101
github.com/moby/sys/mountinfo v0.7.2 // indirect
105-
github.com/moby/sys/user v0.3.0 // indirect
102+
github.com/moby/sys/user v0.2.0 // indirect
106103
github.com/moby/term v0.5.0 // indirect
107104
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
108105
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
@@ -111,55 +108,54 @@ require (
111108
github.com/opencontainers/image-spec v1.1.0 // indirect
112109
github.com/opencontainers/runtime-spec v1.2.0 // indirect
113110
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
114-
github.com/prometheus/client_golang v1.20.1 // indirect
111+
github.com/prometheus/client_golang v1.19.1 // indirect
115112
github.com/prometheus/client_model v0.6.1 // indirect
116113
github.com/prometheus/common v0.55.0 // indirect
117114
github.com/prometheus/procfs v0.15.1 // indirect
118115
github.com/redis/go-redis/v9 v9.5.2 // indirect
119116
github.com/rs/cors v1.11.0 // indirect
120-
github.com/rubenv/sql-migrate v1.7.0 // indirect
121-
github.com/shopspring/decimal v1.4.0 // indirect
122-
github.com/spf13/cast v1.7.0 // indirect
117+
github.com/rubenv/sql-migrate v1.5.2 // indirect
118+
github.com/shopspring/decimal v1.3.1 // indirect
119+
github.com/spf13/cast v1.6.0 // indirect
123120
github.com/spf13/cobra v1.8.1 // indirect
124121
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
125122
github.com/x448/float16 v0.8.4 // indirect
126123
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
127124
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
128125
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
129126
github.com/xlab/treeprint v1.2.0 // indirect
130-
go.etcd.io/etcd/api/v3 v3.5.15 // indirect
131-
go.etcd.io/etcd/client/pkg/v3 v3.5.15 // indirect
132-
go.etcd.io/etcd/client/v3 v3.5.15 // indirect
127+
go.etcd.io/etcd/api/v3 v3.5.14 // indirect
128+
go.etcd.io/etcd/client/pkg/v3 v3.5.14 // indirect
129+
go.etcd.io/etcd/client/v3 v3.5.14 // indirect
133130
go.opentelemetry.io/contrib/exporters/autoexport v0.52.0 // indirect
134131
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
135132
go.opentelemetry.io/otel v1.28.0 // indirect
136-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0 // indirect
137133
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0 // indirect
138134
go.opentelemetry.io/otel/metric v1.28.0 // indirect
139135
go.opentelemetry.io/otel/trace v1.28.0 // indirect
140-
go.starlark.net v0.0.0-20240725214946-42030a7cedce // indirect
141-
golang.org/x/exp v0.0.0-20240823005443-9b4947da3948 // indirect
136+
go.starlark.net v0.0.0-20230717150657-8a3343210976 // indirect
137+
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect
142138
golang.org/x/sync v0.8.0 // indirect
143139
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
144-
google.golang.org/genproto/googleapis/api v0.0.0-20240822170219-fc7c04adadcd // indirect
145-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240822170219-fc7c04adadcd // indirect
140+
google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect
141+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
146142
google.golang.org/grpc v1.65.0 // indirect
147143
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
148144
k8s.io/apiserver v0.31.0 // indirect
149-
k8s.io/cli-runtime v0.31.0 // indirect
145+
k8s.io/cli-runtime v0.30.3 // indirect
150146
k8s.io/component-base v0.31.0 // indirect
151-
k8s.io/kubectl v0.31.0 // indirect
147+
k8s.io/kubectl v0.30.3 // indirect
152148
oras.land/oras-go v1.2.6 // indirect
153-
sigs.k8s.io/kustomize/api v0.17.3 // indirect
154-
sigs.k8s.io/kustomize/kyaml v0.17.2 // indirect
149+
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
150+
sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect
155151
)
156152

157153
require (
158154
github.com/Masterminds/semver/v3 v3.2.1
159155
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
160156
github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
161157
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
162-
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
158+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
163159
github.com/evanphx/json-patch v5.9.0+incompatible
164160
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
165161
github.com/flosch/pongo2 v0.0.0-20200913210552-0d938eb266f3 // indirect
@@ -178,7 +174,7 @@ require (
178174
github.com/google/gofuzz v1.2.0 // indirect
179175
github.com/gorilla/schema v1.4.1 // indirect
180176
github.com/gorilla/securecookie v1.1.1 // indirect
181-
github.com/gorilla/websocket v1.5.3 // indirect
177+
github.com/gorilla/websocket v1.5.0 // indirect
182178
github.com/gosimple/unidecode v1.0.1 // indirect
183179
github.com/hashicorp/go-version v1.7.0 // indirect
184180
github.com/imdario/mergo v0.3.16 // indirect
@@ -221,7 +217,7 @@ require (
221217
golang.org/x/oauth2 v0.22.0 // indirect
222218
golang.org/x/sys v0.24.0 // indirect
223219
golang.org/x/text v0.17.0 // indirect
224-
golang.org/x/time v0.6.0 // indirect
220+
golang.org/x/time v0.5.0 // indirect
225221
google.golang.org/protobuf v1.34.2 // indirect
226222
gopkg.in/errgo.v1 v1.0.1 // indirect
227223
gopkg.in/httprequest.v1 v1.2.1 // indirect
@@ -231,8 +227,8 @@ require (
231227
k8s.io/apiextensions-apiserver v0.31.0 // indirect
232228
k8s.io/client-go v0.31.0
233229
k8s.io/klog/v2 v2.130.1 // indirect
234-
k8s.io/kube-openapi v0.0.0-20240822171749-76de80e0abd9 // indirect
235-
k8s.io/utils v0.0.0-20240821151609-f90d01438635
230+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
231+
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
236232
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
237233
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
238234
)

0 commit comments

Comments
 (0)