use latest patch image versions

cmd/buildtools/addon.go

@@ -22,7 +22,7 @@ func (c *addonComponent) getPackageNameAndVersion(wolfiAPKIndex []byte, k0sVersi
 		packageName = c.getWolfiPackageName(k0sVersion, semver.MustParse(upstreamVersion))
 	}
 
-	comparison := "=" + upstreamVersion
+	comparison := latestPatchComparison(semver.MustParse(upstreamVersion))
 	if c.getWolfiPackageVersionComparison != nil {
 		comparison = c.getWolfiPackageVersionComparison(k0sVersion, semver.MustParse(upstreamVersion))
 	}

cmd/buildtools/k0s.go

@@ -52,12 +52,7 @@ var k0sComponents = map[string]addonComponent{
 	},
 	"kube-proxy": {
 		getWolfiPackageName: func(k0sVersion *semver.Version, upstreamVersion *semver.Version) string {
-			return fmt.Sprintf("kube-proxy-%d.%d-default", k0sVersion.Major(), k0sVersion.Minor())
-		},
-		getWolfiPackageVersionComparison: func(k0sVersion *semver.Version, upstreamVersion *semver.Version) string {
-			// current k0s version is 1.29.6, which isn't available in wolfi packages, latest for that minor is 1.29.5
-			// to workaround this, match the greatest patch version of the same minor version
-			return fmt.Sprintf(">=%d.%d, <%d.%d", k0sVersion.Major(), k0sVersion.Minor(), k0sVersion.Major(), k0sVersion.Minor()+1)
+			return fmt.Sprintf("kube-proxy-%d.%d-default", upstreamVersion.Major(), upstreamVersion.Minor())
 		},
 	},
 	"envoy-distroless": {
@@ -70,10 +65,7 @@ var k0sComponents = map[string]addonComponent{
 			return fmt.Sprintf("kubernetes-pause-%d.%d", upstreamVersion.Major(), upstreamVersion.Minor())
 		},
 		getWolfiPackageVersionComparison: func(k0sVersion *semver.Version, upstreamVersion *semver.Version) string {
-			// pause package version follows the k8s version
-			// current k0s version is 1.29.6, which isn't available in wolfi packages, latest for that minor is 1.29.5
-			// to workaround this, match the greatest patch version of the same minor version
-			return fmt.Sprintf(">=%d.%d, <%d.%d", k0sVersion.Major(), k0sVersion.Minor(), k0sVersion.Major(), k0sVersion.Minor()+1)
+			return latestPatchComparison(k0sVersion) // pause package version follows the k8s version
 		},
 	},
 }

cmd/buildtools/openebs.go

@@ -35,8 +35,7 @@ var openebsComponents = map[string]addonComponent{
 			return fmt.Sprintf("kubectl-%d.%d-default", k0sVersion.Major(), k0sVersion.Minor())
 		},
 		getWolfiPackageVersionComparison: func(k0sVersion *semver.Version, upstreamVersion *semver.Version) string {
-			// match the greatest patch version of the same minor version
-			return fmt.Sprintf(">=%d.%d, <%d.%d", k0sVersion.Major(), k0sVersion.Minor(), k0sVersion.Major(), k0sVersion.Minor()+1)
+			return latestPatchComparison(k0sVersion) // since we're using the k0s version to identify the package
 		},
 		upstreamVersionInputOverride: "INPUT_KUBECTL_VERSION",
 	},

cmd/buildtools/utils.go

@@ -188,6 +188,16 @@ func ApkoLogin() error {
 	return nil
 }
 
+func latestPatchComparison(s *semver.Version) string {
+	return fmt.Sprintf(
+		">=%d.%d, <%d.%d",
+		s.Major(),
+		s.Minor(),
+		s.Major(),
+		s.Minor()+1,
+	)
+}
+
 func ApkoBuildAndPublish(componentName string, packageName string, packageVersion string, upstreamVersion string) error {
 	args := []string{
 		"apko-build-and-publish",

cmd/buildtools/velero.go

@@ -41,8 +41,7 @@ var veleroComponents = map[string]addonComponent{
 			return fmt.Sprintf("kubectl-%d.%d-default", k0sVersion.Major(), k0sVersion.Minor())
 		},
 		getWolfiPackageVersionComparison: func(k0sVersion *semver.Version, upstreamVersion *semver.Version) string {
-			// match the greatest patch version of the same minor version
-			return fmt.Sprintf(">=%d.%d, <%d.%d", k0sVersion.Major(), k0sVersion.Minor(), k0sVersion.Major(), k0sVersion.Minor()+1)
+			return latestPatchComparison(k0sVersion) // since we're using the k0s version to identify the package
 		},
 		upstreamVersionInputOverride: "INPUT_KUBECTL_VERSION",
 	},

pkg/addons/openebs/static/metadata.yaml

@@ -8,6 +8,6 @@
 version: 4.1.0
 location: oci://proxy.replicated.com/anonymous/registry.replicated.com/ec-charts/openebs
 images:
-    kubectl: 1.29.5-r0@sha256:0e6ba5cb5cd48a17a4700e9fac4a267d3ec847637890919301ac0c0fe5ac7068
-    openebs-linux-utils: 4.1.0@sha256:ae7c85c7d85e8b94abc1a92e3e8f4dc1fd20a62881a1d1dd722d01544a44bef8
-    openebs-provisioner-localpv: 4.1.0-r0@sha256:072a77f3bf6edbddd3fcb2c5bfcf3428297f4c1433bd88362003f0a47cb5be3b
+    kubectl: 1.29.5-r0@sha256:b02581e79105d18e18ab29668838c7ba6040a5c0c096cddbc9b110e9ba24843d
+    openebs-linux-utils: 4.1.0@sha256:8aad274b0c762113d39726a3012330554f6a601c471893276ffe3512bfc65368
+    openebs-provisioner-localpv: 4.1.0-r0@sha256:4952e2682529d737ee2ad09dc13debcab152daf04ddf9ab636c753a66f2799fd

pkg/addons/openebs/static/values.yaml

@@ -27,15 +27,15 @@ localpv-provisioner:
     image:
       registry: proxy.replicated.com/anonymous/
       repository: replicated/ec-openebs-linux-utils
-      tag: '4.1.0@sha256:ae7c85c7d85e8b94abc1a92e3e8f4dc1fd20a62881a1d1dd722d01544a44bef8'
+      tag: '4.1.0@sha256:8aad274b0c762113d39726a3012330554f6a601c471893276ffe3512bfc65368'
   hostpathClass:
     enabled: true
     isDefaultClass: true
   localpv:
     image:
       registry: proxy.replicated.com/anonymous/
       repository: replicated/ec-openebs-provisioner-localpv
-      tag: '4.1.0-r0@sha256:072a77f3bf6edbddd3fcb2c5bfcf3428297f4c1433bd88362003f0a47cb5be3b'
+      tag: '4.1.0-r0@sha256:4952e2682529d737ee2ad09dc13debcab152daf04ddf9ab636c753a66f2799fd'
 lvm-localpv:
   enabled: false
 mayastor:
@@ -44,6 +44,6 @@ preUpgradeHook:
   image:
     registry: proxy.replicated.com/anonymous
     repo: replicated/ec-kubectl
-    tag: '1.29.5-r0@sha256:0e6ba5cb5cd48a17a4700e9fac4a267d3ec847637890919301ac0c0fe5ac7068'
+    tag: '1.29.5-r0@sha256:b02581e79105d18e18ab29668838c7ba6040a5c0c096cddbc9b110e9ba24843d'
 zfs-localpv:
   enabled: false

pkg/addons/seaweedfs/static/metadata.yaml

@@ -8,4 +8,4 @@
 version: 4.0.0
 location: oci://proxy.replicated.com/anonymous/registry.replicated.com/ec-charts/seaweedfs
 images:
-    seaweedfs: 3.71-r1@sha256:1089b455e0281a809620354f56a0d294e90d2d8c961dfc1a226e91bc5a63e1e0
+    seaweedfs: 3.71-r1@sha256:00052fac6ea86bea6364d895fd91cb8d3a06756c4b3cc13e02da5cf850e6aa7b

pkg/addons/seaweedfs/static/values.yaml

@@ -16,7 +16,7 @@ global:
   replicationPlacment: "001"
   registry: "proxy.replicated.com/anonymous/"
 master:
-  imageOverride: 'proxy.replicated.com/anonymous/replicated/ec-seaweedfs:3.71-r1@sha256:1089b455e0281a809620354f56a0d294e90d2d8c961dfc1a226e91bc5a63e1e0'
+  imageOverride: 'proxy.replicated.com/anonymous/replicated/ec-seaweedfs:3.71-r1@sha256:00052fac6ea86bea6364d895fd91cb8d3a06756c4b3cc13e02da5cf850e6aa7b'
   replicas: 1
   disableHttp: true
   volumeSizeLimitMB: 30000
@@ -43,7 +43,7 @@ master:
 volume:
   # replicas must be at least replication (2) + 1 = 3
   replicas: 3
-  imageOverride: 'proxy.replicated.com/anonymous/replicated/ec-seaweedfs:3.71-r1@sha256:1089b455e0281a809620354f56a0d294e90d2d8c961dfc1a226e91bc5a63e1e0'
+  imageOverride: 'proxy.replicated.com/anonymous/replicated/ec-seaweedfs:3.71-r1@sha256:00052fac6ea86bea6364d895fd91cb8d3a06756c4b3cc13e02da5cf850e6aa7b'
   podAnnotations:
     backup.velero.io/backup-volumes: data
   affinity: |
@@ -78,7 +78,7 @@ volume:
     maxVolumes: 50
 filer:
   replicas: 3
-  imageOverride: 'proxy.replicated.com/anonymous/replicated/ec-seaweedfs:3.71-r1@sha256:1089b455e0281a809620354f56a0d294e90d2d8c961dfc1a226e91bc5a63e1e0'
+  imageOverride: 'proxy.replicated.com/anonymous/replicated/ec-seaweedfs:3.71-r1@sha256:00052fac6ea86bea6364d895fd91cb8d3a06756c4b3cc13e02da5cf850e6aa7b'
   podAnnotations:
     backup.velero.io/backup-volumes: data-filer,seaweedfs-filer-log-volume
   data:

pkg/addons/velero/static/metadata.yaml

@@ -8,7 +8,7 @@
 version: 6.7.0
 location: oci://proxy.replicated.com/anonymous/registry.replicated.com/ec-charts/velero
 images:
-    kubectl: 1.29.5-r0@sha256:0e6ba5cb5cd48a17a4700e9fac4a267d3ec847637890919301ac0c0fe5ac7068
-    velero: 1.13.2@sha256:891aecafcdb3e03b08b8494f71fbad42335a52c445cb0e164210d383558753e2
+    kubectl: 1.29.5-r0@sha256:b02581e79105d18e18ab29668838c7ba6040a5c0c096cddbc9b110e9ba24843d
+    velero: 1.13.2@sha256:f5609c28a5e1984e7b07a93c871a19ff3fb3d168663d3e459d41f12ef629925b
     velero-plugin-for-aws: 1.9.2@sha256:f2b81a1c1fcbf4e1a11b87ac0484c87e8ea7dd3facd76aa038f99cc4e1b1bcd7
-    velero-restore-helper: 1.13.2@sha256:56ac4f664d79f97534d41db2e46561d3862035cd527d092d016cb7289ec4ce8f
+    velero-restore-helper: 1.13.2@sha256:dac290e821ee7fa698bdce4d1e5c98ea8e36940cfca9b21cb0d93df67864d055

pkg/addons/velero/static/values.yaml

@@ -17,7 +17,7 @@ credentials:
 deployNodeAgent: true
 image:
   repository: proxy.replicated.com/anonymous/replicated/ec-velero
-  tag: '1.13.2@sha256:891aecafcdb3e03b08b8494f71fbad42335a52c445cb0e164210d383558753e2'
+  tag: '1.13.2@sha256:f5609c28a5e1984e7b07a93c871a19ff3fb3d168663d3e459d41f12ef629925b'
 initContainers:
 - image: 'proxy.replicated.com/anonymous/replicated/ec-velero-plugin-for-aws:1.9.2@sha256:f2b81a1c1fcbf4e1a11b87ac0484c87e8ea7dd3facd76aa038f99cc4e1b1bcd7'
   imagePullPolicy: IfNotPresent
@@ -28,14 +28,14 @@ initContainers:
 kubectl:
   image:
     repository: proxy.replicated.com/anonymous/replicated/ec-kubectl
-    tag: '1.29.5-r0@sha256:0e6ba5cb5cd48a17a4700e9fac4a267d3ec847637890919301ac0c0fe5ac7068'
+    tag: '1.29.5-r0@sha256:b02581e79105d18e18ab29668838c7ba6040a5c0c096cddbc9b110e9ba24843d'
 configMaps:
   fs-restore-action-config:
     labels:
       velero.io/plugin-config: ""
       velero.io/pod-volume-restore: RestoreItemAction
     data:
-      image: 'proxy.replicated.com/anonymous/replicated/ec-velero-restore-helper:1.13.2@sha256:56ac4f664d79f97534d41db2e46561d3862035cd527d092d016cb7289ec4ce8f'
+      image: 'proxy.replicated.com/anonymous/replicated/ec-velero-restore-helper:1.13.2@sha256:dac290e821ee7fa698bdce4d1e5c98ea8e36940cfca9b21cb0d93df67864d055'
 nodeAgent:
   podVolumePath: /var/lib/k0s/kubelet/pods
 snapshotsEnabled: false

pkg/config/static/metadata.yaml

@@ -6,11 +6,11 @@
 # $ output/bin/buildtools update images k0s
 #
 images:
-    calico-cni: 3.26.1-r16@sha256:73e0e5fb2f95622a3e0f5e255f640deed20e968b1ef4bd168e01ce9e72787e03
-    calico-kube-controllers: 3.26.1-r16@sha256:c8f308b1449bb419172b760f63fce43fa439613030f9dba99a24f0167867e155
-    calico-node: 3.26.1-r16@sha256:8d191279e2ea33dbae6f962fc9f668f44d8b7d2ea69d9f041a9ba471e10ae0f5
+    calico-cni: 3.26.4-r2@sha256:84ba84fd7bd080ea4ba5445aa25e7df83b8b0217ee28a944aa3d202c8b3625f7
+    calico-kube-controllers: 3.26.4-r2@sha256:e44501f0852ffeeab033af25a4b71af9583b389f3a9388043813937b67a41697
+    calico-node: 3.26.4-r2@sha256:c0eb53aa2ccd366dea99845f18a24fe51cce67863fc35ffbdda88d383d9ff6ae
     coredns: 1.11.3-r3@sha256:e8aa52ab1af3ed44f664ea79cba6099fea7fc8a3a4af3601a08244c6d5b34de6
-    envoy-distroless: 1.29.5-r0@sha256:c76b9996c720338ef42beb2e0ff66c4787b38e80d22ab12149ebc2011832f553
-    kube-proxy: 1.29.5-r0@sha256:d7d1c256a7bfd6d65b864107eb5ba37f16f8c84f1ee8e6d07eb263c49ed1b5b8
+    envoy-distroless: 1.29.6-r0@sha256:f38f813f786c17354f1d7bf91758068f3328fedede1ac84864dde8f2c635b7a5
+    kube-proxy: 1.29.5-r0@sha256:ef5aeb0610089a8216a138b92f3701f61aac6894861d81a31d23c6c4a6e31526
     metrics-server: 0.6.4-r9@sha256:58516a4f46ba645f4e0f367af41df6506951c3cd7903efd5f4ae3e17fd753e4a
-    pause: 1.29.5-r0@sha256:7a91a872a0a72a6a5576489744958b670871ac6a58ef606d668ef193d96fbce3
+    pause: 1.29.5-r0@sha256:3fb2eefc6eb8a9c33ffc416cdb28e353a51587efe10fc3427eddb76fd132e110