From a728e3989afe68eaa4c8db5ff1b6dbfcc07074d7 Mon Sep 17 00:00:00 2001 From: liamfallon Date: Tue, 1 Sep 2026 14:13:17 +0100 Subject: [PATCH 1/3] Fix 'make run-in-kind' by upgrading 'ensure-name-substring' Signed-off-by: liamfallon --- func/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/func/Dockerfile b/func/Dockerfile index e8c92dfdb..1c6f66b07 100644 --- a/func/Dockerfile +++ b/func/Dockerfile @@ -18,7 +18,7 @@ ARG PORCH_GHCR_PREFIX_URL=ghcr.io/kptdev/krm-functions-catalog ARG DOCKERHUB_MIRROR=docker.io FROM ${PORCH_GHCR_PREFIX_URL}/apply-setters:v0.2.4 AS apply-setters -FROM ${PORCH_GHCR_PREFIX_URL}/ensure-name-substring:v0.2.1 AS ensure-name-substring +FROM ${PORCH_GHCR_PREFIX_URL}/ensure-name-substring:v0.3.0 AS ensure-name-substring FROM ${PORCH_GHCR_PREFIX_URL}/search-replace:v0.2.3 AS search-replace FROM ${PORCH_GHCR_PREFIX_URL}/set-annotations:v0.1.7 AS set-annotations FROM ${PORCH_GHCR_PREFIX_URL}/set-image:v0.2.2 AS set-image From 784b83a94bfcc7135d9c83d10d7b0722baeadd53 Mon Sep 17 00:00:00 2001 From: liamfallon Date: Wed, 2 Sep 2026 07:18:00 +0100 Subject: [PATCH 2/3] Updated all krm function versions in Dockerfile Signed-off-by: liamfallon --- func/Dockerfile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/func/Dockerfile b/func/Dockerfile index 1c6f66b07..ecd20d1c9 100644 --- a/func/Dockerfile +++ b/func/Dockerfile @@ -17,16 +17,16 @@ ARG GOLANG_ALPINE_VERSION=latest ARG PORCH_GHCR_PREFIX_URL=ghcr.io/kptdev/krm-functions-catalog ARG DOCKERHUB_MIRROR=docker.io -FROM ${PORCH_GHCR_PREFIX_URL}/apply-setters:v0.2.4 AS apply-setters +FROM ${PORCH_GHCR_PREFIX_URL}/apply-setters:v0.3.0 AS apply-setters FROM ${PORCH_GHCR_PREFIX_URL}/ensure-name-substring:v0.3.0 AS ensure-name-substring -FROM ${PORCH_GHCR_PREFIX_URL}/search-replace:v0.2.3 AS search-replace -FROM ${PORCH_GHCR_PREFIX_URL}/set-annotations:v0.1.7 AS set-annotations -FROM ${PORCH_GHCR_PREFIX_URL}/set-image:v0.2.2 AS set-image -FROM ${PORCH_GHCR_PREFIX_URL}/set-labels:v0.2.4 AS set-labels -FROM ${PORCH_GHCR_PREFIX_URL}/set-namespace:v0.4.5 AS set-namespace +FROM ${PORCH_GHCR_PREFIX_URL}/search-replace:v0.2.4 AS search-replace +FROM ${PORCH_GHCR_PREFIX_URL}/set-annotations:v0.1.8 AS set-annotations +FROM ${PORCH_GHCR_PREFIX_URL}/set-image:v0.2.3 AS set-image +FROM ${PORCH_GHCR_PREFIX_URL}/set-labels:v0.2.5 AS set-labels +FROM ${PORCH_GHCR_PREFIX_URL}/set-namespace:v0.4.6 AS set-namespace FROM ${PORCH_GHCR_PREFIX_URL}/set-project-id:v0.2.1 AS set-project-id -FROM ${PORCH_GHCR_PREFIX_URL}/starlark:v0.5.5 AS starlark -FROM ${PORCH_GHCR_PREFIX_URL}/upsert-resource:v0.2.3 AS upsert-resource +FROM ${PORCH_GHCR_PREFIX_URL}/starlark:v0.5.6 AS starlark +FROM ${PORCH_GHCR_PREFIX_URL}/upsert-resource:v0.2.4 AS upsert-resource FROM ${DOCKERHUB_MIRROR}/golang:${GOLANG_ALPINE_VERSION} AS builder From ef5794bfd4d9e1f502788b7fb990d0ff1824bf86 Mon Sep 17 00:00:00 2001 From: liamfallon Date: Wed, 2 Sep 2026 16:17:31 +0100 Subject: [PATCH 3/3] Remove set-project-id KRM function Signed-off-by: liamfallon --- func/Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/func/Dockerfile b/func/Dockerfile index ecd20d1c9..7449fd92a 100644 --- a/func/Dockerfile +++ b/func/Dockerfile @@ -24,7 +24,6 @@ FROM ${PORCH_GHCR_PREFIX_URL}/set-annotations:v0.1.8 AS set-annotations FROM ${PORCH_GHCR_PREFIX_URL}/set-image:v0.2.3 AS set-image FROM ${PORCH_GHCR_PREFIX_URL}/set-labels:v0.2.5 AS set-labels FROM ${PORCH_GHCR_PREFIX_URL}/set-namespace:v0.4.6 AS set-namespace -FROM ${PORCH_GHCR_PREFIX_URL}/set-project-id:v0.2.1 AS set-project-id FROM ${PORCH_GHCR_PREFIX_URL}/starlark:v0.5.6 AS starlark FROM ${PORCH_GHCR_PREFIX_URL}/upsert-resource:v0.2.4 AS upsert-resource @@ -61,7 +60,6 @@ COPY --from=set-annotations --chown=root:root --chmod=555 /usr/local/bin/ COPY --from=set-image --chown=root:root --chmod=555 /usr/local/bin/function /home/nonroot/functions/set-image COPY --from=set-labels --chown=root:root --chmod=555 /usr/local/bin/function /home/nonroot/functions/set-labels COPY --from=set-namespace --chown=root:root --chmod=555 /usr/local/bin/function /home/nonroot/functions/set-namespace -COPY --from=set-project-id --chown=root:root --chmod=555 /usr/local/bin/function /home/nonroot/functions/set-project-id COPY --from=starlark --chown=root:root --chmod=555 /usr/local/bin/function /home/nonroot/functions/starlark COPY --from=upsert-resource --chown=root:root --chmod=555 /usr/local/bin/function /home/nonroot/functions/upsert-resource