8000 Merge branch 'main' into feat/use-cluster-ip-ingress · j1m-ryan/kubernetes-ingress@329c4d3 · GitHub
[go: up one dir, main page]
Skip to content

Commit 329c4d3

Browse files
author
Jim Ryan
authored
Merge branch 'main' into feat/use-cluster-ip-ingress
2 parents 701a219 + 12308e4 commit 329c4d3

File tree

15 files changed

+304
-128
lines changed

15 files changed

+304
-128
lines changed

‎.github/actions/smoke-tests/action.yaml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ name: Run Smoke Tests
33
description: Run Smoke Tests for the project
44

55
inputs:
6+
go_md5:
7+
required: true
8+
type: string
69
k8s-version:
710
description: Kubernetes version to use
811
required: false
@@ -39,7 +42,7 @@ runs:
3942
uses: actions/cache@v3
4043
with:
4144
path: ${{ github.workspace }}/dist
42-
key: nginx-ingress-${{ github.run_id }}-${{ github.run_number }}
45+
key: nginx-ingress-${{ inputs.go_md5 }}
4346

4447
- name: Ingress type
4548
id: ingress-type
@@ -87,7 +90,8 @@ runs:
8790
make -f tests/Makefile create-kind-cluster K8S_CLUSTER_NAME=${{ github.run_id }} K8S_CLUSTER_VERSION=${{ inputs.k8s-version }} K8S_TIMEOUT=${{ inputs.k8s-timeout }}
8891
make -f tests/Makefile image-load PREFIX=nginx/${{ steps.ingress-type.outputs.name }} TAG=${{ steps.ingress-type.outputs.tag }} K8S_CLUSTER_NAME=${{ github.run_id }}
8992
marker="${{ inputs.marker }}"
90-
sanitized_marker="${marker// /_}"
93+
nospaces="${marker// /_}"
94+
sanitized_marker="${nospaces//\'/}"
9195
name="${sanitized_marker:-${{ inputs.k8s-version }}}"
9296
echo "cluster_ip=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' ${{ github.run_id }}-control-plane)" >> $GITHUB_OUTPUT
9397
echo "cluster=$(echo nginx-${{ inputs.image }}-$name)" >> $GITHUB_OUTPUT

‎.github/data/matrix-regression.json‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"k8s": [],
3+
"images": [
4+
{
5+
"image": "debian"
6+
},
7+
{
8+
"image": "debian-plus"
9+
}
10+
]
11+
}

‎.github/data/matrix-smoke.json‎

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
{
2+
"images": [
3+
{
4+
"image": "debian",
5+
"marker": "ingresses"
6+
},
7+
{
8+
"image": "alpine",
9+
"marker": "vsr"
10+
},
11+
{
12+
"image": "alpine",
13+
"marker": "'policies and not policies_rl and not policies_ac and not policies_jwt and not policies_mtls'"
14+
},
15+
{
16+
"image": "alpine",
17+
"marker": "'policies_rl or policies_ac or policies_jwt or policies_mtls'"
18+
},
19+
{
20+
"image": "debian",
21+
"marker": "'vs and not vs_ipv6 and not vs_rewrite and not vs_responses and not vs_grpc and not vs_redirects and not vs_externalname and not vs_externaldns and not vs_certmanager'"
22+
},
23+
{
24+
"image": "debian",
25+
"marker": "'vs_grpc or vs_redirects or vs_externalname or vs_externaldns'"
26+
},
27+
{
28+
"image": "debian",
29+
"marker": "'vs_responses or vs_ipv6 or vs_rewrite or vs_certmanager'"
30+
},
31+
{
32+
"image": "ubi",
33+
"marker": "ts"
34+
},
35+
{
36+
"image": "debian-plus",
37+
"marker": "'vs and not vs_ipv6 and not vs_rewrite and not vs_responses and not vs_grpc and not vs_redirects and not vs_externalname and not vs_externaldns and not vs_certmanager'"
38+
},
39+
{
40+
"image": "debian-plus",
41+
"marker": "'vs_grpc or vs_redirects or vs_externalname or vs_externaldns'"
42+
},
43+
{
44+
"image": "debian-plus",
45+
"marker": "'vs_responses or vs_ipv6 or vs_rewrite or vs_certmanager'"
46+
},
47+
{
48+
"image": "debian-plus",
49+
"marker": "ts"
50+
},
51+
{
52+
"image": "alpine-plus",
53+
"marker": "ingresses"
54+
},
55+
{
56+
"image": "alpine-plus",
57+
"marker": "vsr"
58+
},
59+
{
60+
"image": "ubi-plus",
61+
"marker": "'policies and not policies_ac and not policies_jwt and not policies_mtls'"
62+
},
63+
{
64+
"image": "ubi-plus",
65+
"marker": "'policies_ac or policies_jwt or policies_mtls'"
66+
},
67+
{
68+
"image": "debian-plus-nap",
69+
"marker": "appprotect_waf_policies_allow"
70+
},
71+
{
72+
"image": "debian-plus-nap",
73+
"marker": "'appprotect_waf_policies and not appprotect_waf_policies_allow'"
74+
},
75+
{
76+
"image": "debian-plus-nap",
77+
"marker": "appprotect_waf_policies_grpc"
78+
},
79+
{
80+
"image": "debian-plus-nap",
81+
"marker": "'appprotect_watch or appprotect_batch or appprotect_integration'"
82+
},
83+
{
84+
"image": "debian-plus-nap",
85+
"marker": "'dos and not dos_learning'"
86+
},
87+
{
88+
"image": "debian-plus-nap",
89+
"marker": "dos_learning"
90+
}
91+
],
92+
"k8s": []
93+
}

‎.github/workflows/build-oss.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ on:
99
image:
1010
required: true
1111
type: string
12+
go_md5:
13+
required: true
14+
type: string
1215
tag:
1316
required: false
1417
type: string
@@ -42,7 +45,7 @@ jobs:
4245
uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
4346
with:
4447
path: ${{ github.workspace }}/dist
45-
key: nginx-ingress-${{ github.run_id }}-${{ github.run_number }}
48+
key: nginx-ingress-${{ inputs.go_md5 }}
4649

4750
- name: Setup QEMU
4851
uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0

‎.github/workflows/build-plus.yml‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ on:
1212
target:
1313
required: true
1414
type: string
15+
go_md5:
16+
required: true
17+
type: string
1518
nap_modules:
1619
required: false
1720
type: string
@@ -43,7 +46,7 @@ jobs:
4346
uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
4447
with:
4548
path: ${{ github.workspace }}/dist
46-
key: nginx-ingress-${{ github.run_id }}-${{ github.run_number }}
49+
key: nginx-ingress-${{ inputs.go_md5 }}
4750

4851
- name: Setup QEMU
4952
uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0
@@ -71,6 +74,23 @@ jobs:
7174
password: ${{ steps.auth.outputs.access_token }}
7275
if: github.event_name != 'pull_request'
7376

77+
- name: Authenticate to Google Cloud Marketplace
78+
id: auth-mktpl
79+
uses: google-github-actions/auth@67e9c72af6e0492df856527b474995862b7b6591 # v2.0.0
80+
with:
81+
token_format: access_token
82+
workload_identity_provider: ${{ secrets.GCR_WORKLOAD_IDENTITY_MKTPL }}
83+
service_account: ${{ secrets.GCR_SERVICE_ACCOUNT_MKTPL }}
84+
if: github.ref_type == 'tag' && ! contains(inputs.target, 'aws')
85+
86+
- name: Login to GCR for Marketplace
87+
uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
88+
with:
89+
registry: gcr.io
90+
username: oauth2accesstoken
91+
password: ${{ steps.auth-mktpl.outputs.access_token }}
92+
if: github.ref_type == 'tag' && ! contains(inputs.target, 'aws')
93+
7494
- name: Configure AWS Credentials
7595
uses: aws-actions/configure-aws-credentials@010d0da01d0b5a38af31e9c3470dbfdabdecca3a # v4.0.1
7696
with:
@@ -107,6 +127,7 @@ jobs:
107127
with:
108128
images: |
109129
name=gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic${{ contains(inputs.nap_modules, 'dos') && '-dos' || '' }}${{ contains(inputs.nap_modules, 'waf') && '-nap' || '' }}/nginx-plus-ingress
130+
name=gcr.io/f5-7626-networks-public/nginxinc/nginx-plus-ingress${{ contains(inputs.nap_modules, 'waf') && '-nap' || '' }}${{ contains(inputs.nap_modules, 'dos') && '-dos' || '' }},enable=${{ github.ref_type == 'tag' && ! contains(inputs.target, 'aws') && ! contains(inputs.image, 'alpine') && ! contains(inputs.image, 'ubi') }}
110131
name=docker-mgmt.nginx.com/nginx-ic${{ contains(inputs.nap_modules, 'waf') && '-nap' || '' }}${{ contains(inputs.nap_modules, 'dos') && '-dos' || '' }}/nginx-plus-ingress,enable=${{ github.ref_type != 'pull_request' && ! startsWith(github.ref, 'refs/heads/release-') && ! contains(inputs.target, 'aws') }}
111132
name=709825985650.dkr.ecr.us-east-1.amazonaws.com/nginx/nginx-plus-ingress${{ contains(inputs.nap_modules, 'dos') && '-dos' || '' }}${{ contains(inputs.nap_modules, 'waf') && '-nap' || '' }},enable=${{ github.ref_type == 'tag' && contains(inputs.target, 'aws') }}
112133
flavor: |

0 commit comments

Comments
 (0)
0