Skip to content

Commit 22206e1

Browse files
pdabelf5pdabelf5
authored
remove unused aws marketplace images (#6085)
1 parent abcde95 commit 22206e1

File tree

5 files changed

+14
-48
lines changed

5 files changed

+14
-48
lines changed

‎.github/config/config-gcr-retag

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
export TARGET_REGISTRY=gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev
2-
declare -a PLUS_TAG_POSTFIX_LIST=("" "-ubi" "-alpine" "-alpine-fips" "-mktpl" "-alpine-mktpl" "-alpine-mktpl-fips")
3-
declare -a NAP_WAF_TAG_POSTFIX_LIST=("" "-ubi" "-mktpl" "-ubi-mktpl" "-alpine-fips")
4-
declare -a NAP_DOS_TAG_POSTFIX_LIST=("" "-ubi" "-mktpl" "-ubi-mktpl")
5-
declare -a NAP_WAF_DOS_TAG_POSTFIX_LIST=("" "-ubi" "-mktpl" "-ubi-mktpl")
2+
declare -a PLUS_TAG_POSTFIX_LIST=("" "-ubi" "-alpine" "-alpine-fips" "-mktpl")
3+
declare -a NAP_WAF_TAG_POSTFIX_LIST=("" "-ubi" "-mktpl" "-alpine-fips")
4+
declare -a NAP_DOS_TAG_POSTFIX_LIST=("" "-ubi" "-mktpl")
5+
declare -a NAP_WAF_DOS_TAG_POSTFIX_LIST=("" "-ubi" "-mktpl")
66
declare -a ADDITIONAL_TAGS=()

‎.github/config/config-plus-gcr-release

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
export TARGET_REGISTRY=gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release
2-
declare -a PLUS_TAG_POSTFIX_LIST=("" "-ubi" "-alpine" "-mktpl" "-alpine-mktpl")
3-
declare -a NAP_WAF_TAG_POSTFIX_LIST=("" "-ubi" "-mktpl" "-ubi-mktpl")
2+
declare -a PLUS_TAG_POSTFIX_LIST=("" "-ubi" "-alpine" "-mktpl")
3+
declare -a NAP_WAF_TAG_POSTFIX_LIST=("" "-ubi" "-mktpl")
44
declare -a NAP_WAFV5_TAG_POSTFIX_LIST=("" "-ubi")
5-
declare -a NAP_DOS_TAG_POSTFIX_LIST=("" "-ubi" "-mktpl" "-ubi-mktpl")
6-
declare -a NAP_WAF_DOS_TAG_POSTFIX_LIST=("" "-ubi" "-mktpl" "-ubi-mktpl")
5+
declare -a NAP_DOS_TAG_POSTFIX_LIST=("" "-ubi" "-mktpl")
6+
declare -a NAP_WAF_DOS_TAG_POSTFIX_LIST=("" "-ubi" "-mktpl")
77
declare -a ADDITIONAL_TAGS=("latest" "${ADDITIONAL_TAG}")
88
export PUBLISH_OSS=false

‎.github/data/matrix-images-nap.json

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -33,24 +33,6 @@
3333
"platforms": "linux/amd64",
3434
"nap_modules": "waf,dos"
3535
},
36-
{
37-
"image": "ubi-9-plus-nap",
38-
"target": "aws",
39-
"platforms": "linux/amd64",
40-
"nap_modules": "waf"
41-
},
42-
{
43-
"image": "ubi-8-plus-nap",
44-
"target": "aws",
45-
"platforms": "linux/amd64",
46-
"nap_modules": "dos"
47-
},
48-
{
49-
"image": "ubi-8-plus-nap",
50-
"target": "aws",
51-
"platforms": "linux/amd64",
52-
"nap_modules": "waf,dos"
53-
},
5436
{
5537
"image": "alpine-plus-nap-fips",
5638
"target": "goreleaser",

‎.github/data/matrix-images-plus.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,14 @@
88
"linux/arm64, linux/amd64"
99
],
1010
"target": [
11-
"goreleaser",
12-
"aws"
11+
"goreleaser"
1312
],
1413
"include": [
14+
{
15+
"image": "debian-plus",
16+
"platforms": "linux/arm64, linux/amd64",
17+
"target": "aws"
18+
},
1519
{
1620
"image": "ubi-plus",
1721
"platforms": "linux/arm64, linux/amd64, linux/s390x",

‎.github/workflows/update-docker-images.yml

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,6 @@ jobs:
110110
image: gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic/nginx-plus-ingress
111111
target_image: gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic/nginx-plus-ingress
112112
platforms: "linux/arm64, linux/amd64"
113-
- tag: ${{ needs.variables.outputs.tag }}-alpine-mktpl
114-
target_tag: "${{ needs.variables.outputs.tag }}-${{ needs.variables.outputs.date }}-alpine-mktpl"
115-
image: gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic/nginx-plus-ingress
116-
target_image: gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic/nginx-plus-ingress
117-
platforms: "linux/arm64, linux/amd64"
118113
- tag: ${{ needs.variables.outputs.tag }}-ubi
119114
target_tag: "${{ needs.variables.outputs.tag }}-${{ needs.variables.outputs.date }}-ubi"
120115
image: gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic/nginx-plus-ingress
@@ -155,11 +150,6 @@ jobs:
155150
image: "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-nap/nginx-plus-ingress"
156151
target_image: "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-nap/nginx-plus-ingress"
157152
platforms: "linux/amd64"
158-
- tag: "${{ needs.variables.outputs.tag }}-ubi-mktpl"
159-
target_tag: "${{ needs.variables.outputs.tag }}-${{ needs.variables.outputs.date }}-ubi-mktpl"
160-
image: "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-nap/nginx-plus-ingress"
161-
target_image: "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-nap/nginx-plus-ingress"
162-
platforms: "linux/amd64"
163153
- tag: "${{ needs.variables.outputs.tag }}"
164154
target_tag: "${{ needs.variables.outputs.tag }}-${{ needs.variables.outputs.date }}"
165155
image: "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-nap-v5/nginx-plus-ingress"
@@ -180,11 +170,6 @@ jobs:
180170
image: "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-dos/nginx-plus-ingress"
181171
target_image: "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-dos/nginx-plus-ingress"
182172
platforms: "linux/amd64"
183-
- tag: "${{ needs.variables.outputs.tag }}-ubi-mktpl"
184-
target_tag: "${{ needs.variables.outputs.tag }}-${{ needs.variables.outputs.date }}-ubi-mktpl"
185-
image: "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-dos/nginx-plus-ingress"
186-
target_image: "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-dos/nginx-plus-ingress"
187-
platforms: "linux/amd64"
188173
- tag: "${{ needs.variables.outputs.tag }}-mktpl"
189174
target_tag: "${{ needs.variables.outputs.tag }}-${{ needs.variables.outputs.date }}-mktpl"
190175
image: "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-dos/nginx-plus-ingress"
@@ -200,11 +185,6 @@ jobs:
200185
image: "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-dos-nap/nginx-plus-ingress"
201186
target_image: "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-dos-nap/nginx-plus-ingress"
202187
platforms: "linux/amd64"
203-
- tag: "${{ needs.variables.outputs.tag }}-ubi-mktpl"
204-
target_tag: "${{ needs.variables.outputs.tag }}-${{ needs.variables.outputs.date }}-ubi-mktpl"
205-
image: "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-dos-nap/nginx-plus-ingress"
206-
target_image: "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-dos-nap/nginx-plus-ingress"
207-
platforms: "linux/amd64"
208188
- tag: "${{ needs.variables.outputs.tag }}-mktpl"
209189
target_tag: "${{ needs.variables.outputs.tag }}-${{ needs.variables.outputs.date }}-mktpl"
210190
image: "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-dos-nap/nginx-plus-ingress"

0 commit comments

Comments
 (0)