Skip to content

Commit c5301e0

Browse files
committed
Merge branch 'main' into PQA-2260
2 parents 1c12e3d + 87f7f90 commit c5301e0

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

Earthfile

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ ARG TARGETARCH
44

55
# Default image repositories used in the builds.
66
ARG SPECTRO_PUB_REPO=us-docker.pkg.dev/palette-images
7+
ARG SPECTRO_THIRD_PARTY_IMAGE=us-east1-docker.pkg.dev/spectro-images/third-party/spectro-third-party:4.5
78
ARG ALPINE_TAG=3.20
89
ARG ALPINE_IMG=$SPECTRO_PUB_REPO/edge/canvos/alpine:$ALPINE_TAG
910
FROM $ALPINE_IMG
@@ -19,16 +20,16 @@ ARG KAIROS_BASE_IMAGE_URL=$SPECTRO_PUB_REPO/edge
1920
ARG LUET_PROJECT=luet-repo
2021

2122
# Spectro Cloud and Kairos tags.
22-
ARG PE_VERSION=v4.5.3
23-
ARG SPECTRO_LUET_VERSION=v1.3.11
23+
ARG PE_VERSION=v4.5.8
24+
ARG SPECTRO_LUET_VERSION=v1.3.12
2425
ARG KAIROS_VERSION=v3.1.3
2526
ARG K3S_FLAVOR_TAG=k3s1
2627
ARG RKE2_FLAVOR_TAG=rke2r1
2728
ARG BASE_IMAGE_URL=quay.io/kairos
2829
ARG OSBUILDER_VERSION=v0.300.3
2930
ARG OSBUILDER_IMAGE=quay.io/kairos/osbuilder-tools:$OSBUILDER_VERSION
3031
ARG K3S_PROVIDER_VERSION=v4.5.0
31-
ARG KUBEADM_PROVIDER_VERSION=v4.5.0
32+
ARG KUBEADM_PROVIDER_VERSION=v4.5.1
3233
ARG RKE2_PROVIDER_VERSION=v4.5.0
3334
ARG NODEADM_PROVIDER_VERSION=v4.5.0
3435

@@ -80,7 +81,6 @@ ARG EFI_IMG_SIZE=2200
8081
# internal variables
8182
ARG GOLANG_VERSION=1.23
8283
ARG DEBUG=false
83-
ARG BUILDER_3RDPARTY_VERSION=4.4
8484

8585
IF [ "$OS_DISTRIBUTION" = "ubuntu" ] && [ "$BASE_IMAGE" = "" ]
8686
IF [ "$OS_VERSION" == 22 ] || [ "$OS_VERSION" == 20 ]
@@ -857,8 +857,7 @@ OS_RELEASE:
857857
download-third-party:
858858
ARG TARGETPLATFORM
859859
ARG binary
860-
FROM --platform=$TARGETPLATFORM gcr.io/spectro-images-public/builders/spectro-third-party:${BUILDER_3RDPARTY_VERSION}
861-
#FROM --platform=$TARGETPLATFORM $SPECTRO_PUB_REPO/builders/spectro-third-party:${BUILDER_3RDPARTY_VERSION}
860+
FROM --platform=$TARGETPLATFORM ${SPECTRO_THIRD_PARTY_IMAGE}
862861
ARG TARGETARCH
863862
SAVE ARTIFACT /binaries/${binary}/latest/$BIN_TYPE/$TARGETARCH/${binary} ${binary}
864863
SAVE ARTIFACT /binaries/${binary}/latest/$BIN_TYPE/$TARGETARCH/${binary}.version ${binary}.version

k8s_version.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,17 @@
7070
"1.28.11",
7171
"1.28.12",
7272
"1.28.13",
73+
"1.28.14",
7374
"1.29.3",
7475
"1.29.4",
7576
"1.29.5",
7677
"1.29.6",
7778
"1.29.7",
7879
"1.29.8",
80+
"1.29.9",
7981
"1.30.3",
80-
"1.30.4"
82+
"1.30.4",
83+
"1.30.5"
8184
],
8285
"kubeadm-fips": [
8386
"1.26.4",

0 commit comments

Comments
 (0)