diff --git a/Makefile b/Makefile index 1a7bc2400..d42cb4e90 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ ADMIN_CONSOLE_IMAGE_OVERRIDE = ADMIN_CONSOLE_MIGRATIONS_IMAGE_OVERRIDE = EMBEDDED_OPERATOR_CHART_URL = oci://registry.replicated.com/library EMBEDDED_OPERATOR_CHART_NAME = embedded-cluster-operator -EMBEDDED_OPERATOR_CHART_VERSION = 0.35.2 +EMBEDDED_OPERATOR_CHART_VERSION = 0.36.0 EMBEDDED_OPERATOR_UTILS_IMAGE = busybox:1.36.1 EMBEDDED_CLUSTER_OPERATOR_IMAGE_OVERRIDE = OPENEBS_CHART_URL = https://openebs.github.io/openebs @@ -25,14 +25,14 @@ REGISTRY_CHART_VERSION = 2.2.3 REGISTRY_IMAGE_VERSION = 2.8.3 VELERO_CHART_URL = https://vmware-tanzu.github.io/helm-charts VELERO_CHART_NAME = vmware-tanzu/velero -VELERO_CHART_VERSION = 6.3.0 +VELERO_CHART_VERSION = 6.6.0 VELERO_IMAGE_VERSION = v1.13.2 VELERO_AWS_PLUGIN_IMAGE_VERSION = v1.9.2 -KUBECTL_VERSION = v1.30.1 -K0S_VERSION = v1.29.5+k0s.0 +KUBECTL_VERSION = v1.30.2 +K0S_VERSION = v1.30.1+k0s.0 PREVIOUS_K0S_VERSION ?= v1.28.8+k0s.0 K0S_BINARY_SOURCE_OVERRIDE = -TROUBLESHOOT_VERSION = v0.92.1 +TROUBLESHOOT_VERSION = v0.93.2 KOTS_VERSION = v$(shell echo $(ADMIN_CONSOLE_CHART_VERSION) | sed 's/\([0-9]\+\.[0-9]\+\.[0-9]\+\).*/\1/') KOTS_BINARY_URL_OVERRIDE = LOCAL_ARTIFACT_MIRROR_IMAGE ?= registry.replicated.com/library/embedded-cluster-local-artifact-mirror diff --git a/go.mod b/go.mod index c1810cf2c..a074a3dbf 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/gosimple/slug v1.14.0 github.com/jedib0t/go-pretty v4.3.0+incompatible github.com/k0sproject/dig v0.2.0 - github.com/k0sproject/k0s v1.29.6-0.20240527072442-22f6a125e881 + github.com/k0sproject/k0s v1.30.2-0.20240523094814-77a9ab21621b github.com/replicatedhq/embedded-cluster-kinds v1.3.7 github.com/replicatedhq/embedded-cluster-operator v0.34.9 github.com/replicatedhq/embedded-cluster-utils v1.0.0 @@ -54,6 +54,8 @@ require ( github.com/prometheus/common v0.51.1 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect + github.com/vishvananda/netlink v1.2.1-beta.2 // indirect + github.com/vishvananda/netns v0.0.4 // indirect github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect github.com/xeipuuv/gojsonschema v1.2.0 // indirect diff --git a/go.sum b/go.sum index 636ec980c..46942b175 100644 --- a/go.sum +++ b/go.sum @@ -159,8 +159,8 @@ github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4d github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/k0sproject/dig v0.2.0 h1:cNxEIl96g9kqSMfPSZLhpnZ0P8bWXKv08nxvsMHop5w= github.com/k0sproject/dig v0.2.0/go.mod h1:rBcqaQlJpcKdt2x/OE/lPvhGU50u/e95CSm5g/r4s78= -github.com/k0sproject/k0s v1.29.6-0.20240527072442-22f6a125e881 h1:AQpfVqdjBzPRoCoZsnIK13N8nZm3MxD8TK0kzuMyIek= -github.com/k0sproject/k0s v1.29.6-0.20240527072442-22f6a125e881/go.mod h1:BMvJa5DUWtFJ0Ur0413XaJAhdE7xNkOt1oTqbift7nE= +github.com/k0sproject/k0s v1.30.2-0.20240523094814-77a9ab21621b h1:ZrhzcavrZjU9QcVepl557zZ/k4KUM+EbI1k5cLyvGXk= +github.com/k0sproject/k0s v1.30.2-0.20240523094814-77a9ab21621b/go.mod h1:1p5GKkun4dY34fmoWct29R5W3ZR8sy7aM3idx7G4IGs= github.com/k0sproject/version v0.6.0 h1:Wi8wu9j+H36+okIQA47o/YHbzNpKeIYj8IjGdJOdqsI= github.com/k0sproject/version v0.6.0/go.mod h1:5/7Js62gDCLBP6mEs0mUcYEEkYneM5qXDKN/hyFlQTM= github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs= @@ -281,6 +281,11 @@ github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= github.com/urfave/cli/v2 v2.27.2 h1:6e0H+AkS+zDckwPCUrZkKX38mRaau4nL2uipkJpbkcI= github.com/urfave/cli/v2 v2.27.2/go.mod h1:g0+79LmHHATl7DAcHO99smiR/T7uGLw84w8Y42x+4eM= +github.com/vishvananda/netlink v1.2.1-beta.2 h1:Llsql0lnQEbHj0I1OuKyp8otXp0r3q0mPkuhwHfStVs= +github.com/vishvananda/netlink v1.2.1-beta.2/go.mod h1:twkDnbuQxJYemMlGd4JFIcuhgX83tXhKS2B/PRMpOho= +github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0= +github.com/vishvananda/netns v0.0.4 h1:Oeaw1EM2JMxD51g9uhtC0D7erkIjgmj8+JZc26m1YX8= +github.com/vishvananda/netns v0.0.4/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM= github.com/vmware-tanzu/velero v1.13.2 h1:72Rw+11HJB6XUYfH9/M/jle6duSLyGhMisMMYFr/1qs= github.com/vmware-tanzu/velero v1.13.2/go.mod h1:yHFPyr+iwpKRf66xJ88MriAHiX58tTnKmQXY2FQZClM= github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= @@ -365,7 +370,9 @@ golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200217220822-9197077df867/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=