From 68ec1e15b641fd215138a30caa59cd00f8940e2a Mon Sep 17 00:00:00 2001 From: Paul Abel Date: Mon, 21 Jul 2025 09:13:01 +0100 Subject: [PATCH 1/2] remove aws marketplace images from patching workflow --- .github/data/patch-images.json | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/.github/data/patch-images.json b/.github/data/patch-images.json index 4c4339035d..8be67afb10 100644 --- a/.github/data/patch-images.json +++ b/.github/data/patch-images.json @@ -23,12 +23,6 @@ "target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic/nginx-plus-ingress", "platforms": "linux/arm64, linux/amd64" }, - { - "source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic/nginx-plus-ingress", - "source_os": "mktpl", - "target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic/nginx-plus-ingress", - "platforms": "linux/arm64, linux/amd64" - }, { "source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic/nginx-plus-ingress", "source_os": "alpine", @@ -53,18 +47,6 @@ "target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-nap/nginx-plus-ingress", "platforms": "linux/amd64" }, - { - "source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-nap/nginx-plus-ingress", - "source_os": "mktpl", - "target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-nap/nginx-plus-ingress", - "platforms": "linux/amd64" - }, - { - "source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-nap/nginx-plus-ingress", - "source_os": "ubi", - "target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-nap/nginx-plus-ingress", - "platforms": "linux/amd64" - }, { "source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-nap/nginx-plus-ingress", "source_os": "ubi8", @@ -107,12 +89,6 @@ "target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-dos/nginx-plus-ingress", "platforms": "linux/amd64" }, - { - "source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-dos/nginx-plus-ingress", - "source_os": "mktpl", - "target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-dos/nginx-plus-ingress", - "platforms": "linux/amd64" - }, { "source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-dos/nginx-plus-ingress", "source_os": "ubi", @@ -125,12 +101,6 @@ "target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-dos-nap/nginx-plus-ingress", "platforms": "linux/amd64" }, - { - "source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-dos-nap/nginx-plus-ingress", - "source_os": "mktpl", - "target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-dos-nap/nginx-plus-ingress", - "platforms": "linux/amd64" - }, { "source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-dos-nap/nginx-plus-ingress", "source_os": "ubi", From b5e479ce6bd2b5bdb6a0cd3ed5d21632eefdc0d6 Mon Sep 17 00:00:00 2001 From: Paul Abel Date: Mon, 21 Jul 2025 09:23:50 +0100 Subject: [PATCH 2/2] revert ubi image --- .github/data/patch-images.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/data/patch-images.json b/.github/data/patch-images.json index 8be67afb10..3fd50dce87 100644 --- a/.github/data/patch-images.json +++ b/.github/data/patch-images.json @@ -47,6 +47,12 @@ "target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-nap/nginx-plus-ingress", "platforms": "linux/amd64" }, + { + "source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-nap/nginx-plus-ingress", + "source_os": "ubi", + "target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-nap/nginx-plus-ingress", + "platforms": "linux/amd64" + }, { "source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-nap/nginx-plus-ingress", "source_os": "ubi8",