Skip to content

Commit 194bf95

Browse files
laveryalaverya
committed
Merge remote-tracking branch 'origin/main' into k0s-1-28-7
2 parents 98261f3 + a4c603f commit 194bf95

File tree

4 files changed

+47
-20
lines changed

4 files changed

+47
-20
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ADMIN_CONSOLE_IMAGE_OVERRIDE =
99
ADMIN_CONSOLE_MIGRATIONS_IMAGE_OVERRIDE =
1010
EMBEDDED_OPERATOR_CHART_URL = oci://registry.replicated.com/library
1111
EMBEDDED_OPERATOR_CHART_NAME = embedded-cluster-operator
12-
EMBEDDED_OPERATOR_CHART_VERSION = 0.27.0
12+
EMBEDDED_OPERATOR_CHART_VERSION = 0.28.0
1313
EMBEDDED_OPERATOR_UTILS_IMAGE = busybox:1.36.1
1414
EMBEDDED_CLUSTER_OPERATOR_IMAGE_OVERRIDE =
1515
OPENEBS_CHART_URL = https://openebs.github.io/charts

‎e2e/scripts/check-postupgrade-state.sh‎

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,33 @@ wait_for_installation() {
2525
done
2626
}
2727

28+
function retry() {
29+
local retries=$1
30+
shift
31+
32+
local count=0
33+
until "$@"; do
34+
exit=$?
35+
wait=$((2 ** $count))
36+
count=$(($count + 1))
37+
if [ $count -lt $retries ]; then
38+
echo "Retry $count/$retries exited $exit, retrying in $wait seconds..."
39+
sleep $wait
40+
else
41+
echo "Retry $count/$retries exited $exit, no more retries left."
42+
return $exit
43+
fi
44+
done
45+
return 0
46+
}
47+
48+
function check_nginx_version {
49+
if ! kubectl describe pod -n ingress-nginx | grep -q "4.9.1"; then
50+
return 1
51+
fi
52+
return 0
53+
}
54+
2855
main() {
2956
local installation_version=
3057
installation_version="$1"
@@ -75,7 +102,7 @@ main() {
75102
exit 1
76103
fi
77104
# ensure the new version made it into the pod
78-
if ! kubectl describe pod -n ingress-nginx | grep -q "4.9.1" ; then
105+
if ! retry 5 check_nginx_version ; then
79106
echo "4.9.1 not found in ingress-nginx pod"
80107
kubectl describe pod -n ingress-nginx
81108
exit 1

‎go.mod‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,21 @@ require (
1515
github.com/k0sproject/dig v0.2.0
1616
github.com/k0sproject/k0s v1.28.8-0.20240221081009-d83e1fe62960
1717
github.com/replicatedhq/embedded-cluster-kinds v1.1.2
18-
github.com/replicatedhq/embedded-cluster-operator v0.26.0
18+
github.com/replicatedhq/embedded-cluster-operator v0.27.0
1919
github.com/replicatedhq/embedded-cluster-utils v1.0.0
2020
github.com/replicatedhq/kotskinds v0.0.0-20230724164735-f83482cc9cfe
21-
github.com/replicatedhq/troubleshoot v0.85.0
21+
github.com/replicatedhq/troubleshoot v0.86.0
2222
github.com/sirupsen/logrus v1.9.3
2323
github.com/stretchr/testify v1.9.0
2424
github.com/urfave/cli/v2 v2.27.1
25-
golang.org/x/crypto v0.21.0
26-
golang.org/x/term v0.18.0
25+
golang.org/x/crypto v0.22.0
26+
golang.org/x/term v0.19.0
2727
gopkg.in/yaml.v2 v2.4.0
2828
gopkg.in/yaml.v3 v3.0.1
2929
k8s.io/api v0.29.3
3030
k8s.io/apimachinery v0.29.3
3131
oras.land/oras-go/v2 v2.5.0
32-
sigs.k8s.io/controller-runtime v0.17.2
32+
sigs.k8s.io/controller-runtime v0.17.3
3333
sigs.k8s.io/yaml v1.4.0
3434
)
3535

@@ -136,7 +136,7 @@ require (
136136
go.uber.org/zap v1.26.0 // indirect
137137
golang.org/x/net v0.22.0 // indirect
138138
golang.org/x/oauth2 v0.18.0 // indirect
139-
golang.org/x/sys v0.18.0 // indirect
139+
golang.org/x/sys v0.19.0 // indirect
140140
golang.org/x/text v0.14.0 // indirect
141141
golang.org/x/time v0.5.0 // indirect
142142
google.golang.org/appengine v1.6.8 // indirect

‎go.sum‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -243,14 +243,14 @@ github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k
243243
github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo=
244244
github.com/replicatedhq/embedded-cluster-kinds v1.1.2 h1:2ITzcUzh5uh0fsnfZsVHvkwS6XC6NGBbHf99gLgZM9M=
245245
github.com/replicatedhq/embedded-cluster-kinds v1.1.2/go.mod h1:LheSDOgMngMRAbwAj0sVZUVv2ciKIVR2bYTMeOBGwlg=
246-
github.com/replicatedhq/embedded-cluster-operator v0.26.0 h1:ys7qq054KdgpfQ+NmXIDzp3xTNrZdw4NmRyGONGNypI=
247-
github.com/replicatedhq/embedded-cluster-operator v0.26.0/go.mod h1:kP/gI2X/fhgTKSRBC52077RPYmHOpvwezChnM26nvDo=
246+
github.com/replicatedhq/embedded-cluster-operator v0.27.0 h1:Y/Ps7zNu+lLYbkvdHf/AKoexoH1L295OZ8DLI3CXGxI=
247+
github.com/replicatedhq/embedded-cluster-operator v0.27.0/go.mod h1:fia5+2ba2P7pBnEqVRkXpWnlJj8TrXmvjN6hr1equpQ=
248248
github.com/replicatedhq/embedded-cluster-utils v1.0.0 h1:Axdni1nYfl5zeOP9g5U79yvN8cRdClyU6hz0wV1Hmdc=
249249
github.com/replicatedhq/embedded-cluster-utils v1.0.0/go.mod h1:4JmMC2CwMCLxq05GEW3XSPPVotqyamAF/omrbB3pH+c=
250250
github.com/replicatedhq/kotskinds v0.0.0-20230724164735-f83482cc9cfe h1:3AJInd06UxzqHmgy8+24CPsT2tYSE0zToJZyuX9q+MA=
251251
github.com/replicatedhq/kotskinds v0.0.0-20230724164735-f83482cc9cfe/go.mod h1:QjhIUu3+OmHZ09u09j3FCoTt8F3BYtQglS+OLmftu9I=
252-
github.com/replicatedhq/troubleshoot v0.85.0 h1:7suHxyLURfkHitYU5SVnLWqAW4Cb4bZB06lgfg47mcc=
253-
github.com/replicatedhq/troubleshoot v0.85.0/go.mod h1:tyhEuUh6xj0i8VyLGTCTdOcnBuZ7MbSpsJT6X9GDZL8=
252+
github.com/replicatedhq/troubleshoot v0.86.0 h1:Wszbkes/AbG1szuwP52k0G+UPUEbB3U9xD7b9aXOfOk=
253+
github.com/replicatedhq/troubleshoot v0.86.0/go.mod h1:OwshoIi6l1rXFhS55GxnKTcVnQuUotKZOcWmabS6Oog=
254254
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
255255
github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis=
256256
github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
@@ -323,8 +323,8 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh
323323
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
324324
golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
325325
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
326-
golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
327-
golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
326+
golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30=
327+
golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M=
328328
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
329329
golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 h1:LfspQV/FYTatPTr/3HzIcmiUFH7PGP+OQ6mgDYo3yuQ=
330330
golang.org/x/exp v0.0.0-20240222234643-814bf88cf225/go.mod h1:CxmFvTBINI24O/j8iY7H1xHzx2i4OsyguNBmN/uPtqc=
@@ -378,12 +378,12 @@ golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBc
378378
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
379379
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
380380
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
381-
golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
382-
golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
381+
golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
382+
golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
383383
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
384384
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
385-
golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8=
386-
golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58=
385+
golang.org/x/term v0.19.0 h1:+ThwsDv+tYfnJFhF4L8jITxu1tdTWRTZpdsWgEgjL6Q=
386+
golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk=
387387
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
388388
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
389389
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@@ -491,8 +491,8 @@ k8s.io/utils v0.0.0-20231121161247-cf03d44ff3cf h1:iTzha1p7Fi83476ypNSz8nV9iR993
491491
k8s.io/utils v0.0.0-20231121161247-cf03d44ff3cf/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
492492
oras.land/oras-go/v2 v2.5.0 h1:o8Me9kLY74Vp5uw07QXPiitjsw7qNXi8Twd+19Zf02c=
493493
oras.land/oras-go/v2 v2.5.0/go.mod h1:z4eisnLP530vwIOUOJeBIj0aGI0L1C3d53atvCBqZHg=
494-
sigs.k8s.io/controller-runtime v0.17.2 h1:FwHwD1CTUemg0pW2otk7/U5/i5m2ymzvOXdbeGOUvw0=
495-
sigs.k8s.io/controller-runtime v0.17.2/go.mod h1:+MngTvIQQQhfXtwfdGw/UOQ/aIaqsYywfCINOtwMO/s=
494+
sigs.k8s.io/controller-runtime v0.17.3 h1:65QmN7r3FWgTxDMz9fvGnO1kbf2nu+acg9p2R9oYYYk=
495+
sigs.k8s.io/controller-runtime v0.17.3/go.mod h1:N0jpP5Lo7lMTF9aL56Z/B2oWBJjey6StQM0jRbKQXtY=
496496
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
497497
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
498498
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4=

0 commit comments

Comments
 (0)