Skip to content

Commit f08d6b2

Browse files
authored
Merge branch 'main' into kgo-to-ko
2 parents a1d4a1a + aaf38f3 commit f08d6b2

File tree

1,289 files changed

+226091
-17003
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,289 files changed

+226091
-17003
lines changed
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
name: Generate Instruction Files
2+
description: Generates the instruction files for the automated tests
3+
runs:
4+
using: composite
5+
steps:
6+
- name: Generate instruction files
7+
shell: bash
8+
working-directory: tools/automated-tests
9+
run: |
10+
npm ci
11+
npx playwright install --with-deps chromium
12+
npm run generate-instruction-files
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
name: Install deps
2+
description: Install deps
3+
runs:
4+
using: composite
5+
steps:
6+
# Configure Ruby to build Jekyll site
7+
- name: Set up Ruby
8+
uses: ruby/setup-ruby@84684c07c1965536eb4802c8daf1a77968df0cb1 # v1
9+
with:
10+
ruby-version: .ruby-version
11+
12+
- name: Ruby gem cache
13+
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
14+
with:
15+
path: ${{ github.workspace }}/vendor/bundle
16+
key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
17+
restore-keys: |
18+
${{ runner.os }}-gems-
19+
20+
- name: Bundle Setup
21+
shell: bash
22+
run: bundle config path ${{ github.workspace }}/vendor/bundle
23+
24+
- name: Bundle Install
25+
shell: bash
26+
run: bundle install --jobs 4 --retry 3
27+
28+
# Configure Node to build assets
29+
- uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
30+
with:
31+
node-version: "22"
32+
33+
- name: Cache node modules
34+
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
35+
env:
36+
cache-name: cache-node-modules
37+
with:
38+
path: ~/.npm
39+
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
40+
restore-keys: |
41+
${{ runner.os }}-build-${{ env.cache-name }}-
42+
43+
- name: npm install
44+
shell: bash
45+
run: npm ci
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: Run Publish Tests Report
2+
description: Publishes tests report to github
3+
runs:
4+
using: "composite"
5+
steps:
6+
- name: Publish Test Report
7+
uses: ctrf-io/github-test-reporter@024bc4b64d997ca9da86833c6b9548c55c620e40 # v1
8+
with:
9+
report-path: './tools/automated-tests/testReport.json'
10+
summary-report: true
11+
test-report: true
12+
failed-folded-report: true
13+
skipped-report: true
14+
report-order: 'summary-report,test-report,failed-folded-report,skipped-report'
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: Run site
2+
description: Run site
3+
runs:
4+
using: composite
5+
steps:
6+
- name: Build and run the site
7+
shell: bash
8+
env:
9+
ENABLE_ALGOLIA: 0
10+
LC_CTYPE: en_US.UTF-8
11+
LANG: C.UTF-8
12+
run: |
13+
npx netlify dev & npx wait-on http://localhost:8888

.github/styles/base/Dictionary.txt

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ autoscaler
5757
autoscalers
5858
autoscales
5959
autoscaling
60+
Avro
6061
aws
6162
AZs
6263
backfilled
@@ -96,13 +97,16 @@ callees
9697
CAs
9798
callout
9899
callouts
100+
camelCase
101+
cef
99102
certificate_admin
100103
charset
101104
chatbot
102105
chatbots
103106
cidr
104107
cidrs
105108
cleartext
109+
client_credentials
106110
client_payload
107111
client_status
108112
clipanion
@@ -231,6 +235,7 @@ etcd
231235
event_hook
232236
eventhooks
233237
eventTime
238+
example_service
234239
exfiltrate
235240
failover
236241
fapi
@@ -252,6 +257,7 @@ full_name
252257
Gateway
253258
GatewayClass
254259
gatewayclass
260+
gateway_entity
255261
gcloud
256262
gcp
257263
geo
@@ -357,6 +363,7 @@ io
357363
ip
358364
ips
359365
iptables
366+
IPinfo
360367
Istio
361368
Istio
362369
Istio's
@@ -388,11 +395,13 @@ jwt
388395
jwts
389396
kafka
390397
kafkactl
398+
KAi
391399
kbps
392400
kds
393401
keepalive
394402
keps
395403
ketama
404+
key_sources
396405
Keycloak
397406
Keycloak
398407
keyless
@@ -509,12 +518,15 @@ misconfiguration
509518
misconfigurations
510519
misconfigured
511520
Mockbin
521+
modelarmor
512522
Moesif
513523
Moesif
514524
moesif
515525
MongoDB
516526
MongoDB
517527
multimodal
528+
multitenant
529+
multitenancy
518530
mutex
519531
nameserver
520532
nameservers
@@ -649,6 +661,8 @@ readme
649661
readonly
650662
real_ip_header
651663
real_ip_recursive
664+
rebalance
665+
render_output
652666
Realtime
653667
realtime
654668
reconverge
@@ -679,6 +693,7 @@ resourceVersion
679693
Resty
680694
Resty
681695
resty
696+
Resync
682697
retryOn
683698
reusability
684699
rockspec
@@ -744,6 +759,7 @@ status_code
744759
stderr
745760
stdin
746761
stdout
762+
Streamable
747763
stream_listen
748764
stringified
749765
Styra
@@ -811,6 +827,7 @@ tlds
811827
tls
812828
TLSRoute
813829
TLSRoutes
830+
tokenization
814831
toolchain
815832
tooltip
816833
tproxy
@@ -855,6 +872,7 @@ Unicode
855872
unix
856873
unmanaged
857874
unmarshalled
875+
unnamespaced
858876
unnormalized
859877
unpackage
860878
unparsed
@@ -904,6 +922,7 @@ Valero
904922
validator
905923
validators
906924
vararg
925+
vc
907926
viewport
908927
viewports
909928
vms

.github/styles/base/Kongterms.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ swap:
1212
Kong Ingress Controller: "{{site.kic_product_name}}"
1313
Kong Mesh: "{{site.mesh_product_name}}"
1414
Kong Enterprise: "{{site.ee_product_name}}"
15+
Kong Operator: "{{site.operator_product_name}}"
1516
Kong Gateway Operator: "{{site.gateway_operator_product_name}}"
1617
"{{site.kgo_product_name}}": "{{site.gateway_operator_product_name}}"
1718
ServiceHub: Service Hub

.github/styles/frontmatter/Dictionary.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,5 @@ kongplugininstallation
3333
CACertificate
3434
KeySet
3535
ControlPlane
36+
virtual_cluster
37+
gateway_entity

.github/styles/frontmatter/Keys.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,8 @@ topology_switcher
4545
discovery_default
4646
examples_groups
4747
basic_examples
48-
wasm
48+
wasm
49+
policy_target
50+
gateway_entity
51+
plugin_schema
52+
no_edit_link

.github/workflows/automated-tests.yaml

Lines changed: 7 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -20,53 +20,19 @@ jobs:
2020
- '3.12'
2121
steps:
2222
- name: Harden Runner
23-
uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
23+
uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
2424
with:
2525
egress-policy: audit
2626

2727
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
2828
with:
2929
submodules: 'recursive'
3030

31-
# Configure Ruby to build Jekyll site
32-
- name: Set up Ruby
33-
uses: ruby/setup-ruby@84684c07c1965536eb4802c8daf1a77968df0cb1 # v1
34-
with:
35-
ruby-version: .ruby-version
36-
37-
- name: Ruby gem cache
38-
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
39-
with:
40-
path: ${{ github.workspace }}/vendor/bundle
41-
key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
42-
restore-keys: |
43-
${{ runner.os }}-gems-
44-
- name: Bundle Setup
45-
run: bundle config path ${{ github.workspace }}/vendor/bundle
46-
- name: Bundle Install
47-
run: bundle install --jobs 4 --retry 3
48-
49-
# Configure Node to build assets
50-
- uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
51-
with:
52-
node-version: "22"
53-
- name: Cache node modules
54-
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
55-
env:
56-
cache-name: cache-node-modules
57-
with:
58-
path: ~/.npm
59-
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
60-
restore-keys: |
61-
${{ runner.os }}-build-${{ env.cache-name }}-
31+
- name: Install deps
32+
uses: './.github/reusable-steps/install-deps'
6233

63-
- name: npm install
64-
run: npm ci
6534
- name: Run site
66-
env:
67-
ENABLE_ALGOLIA: 0
68-
run: |
69-
npx netlify dev & npx wait-on http://localhost:8888
35+
uses: './.github/reusable-steps/run-site'
7036

7137
- name: Download Kong License
7238
uses: Kong/kong-license@master
@@ -75,28 +41,18 @@ jobs:
7541
op-token: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }}
7642

7743
- name: Generate instruction files
78-
working-directory: tools/automated-tests
79-
run: |
80-
npm ci
81-
npx playwright install --with-deps chromium
82-
npm run generate-instruction-files
44+
uses: './.github/reusable-steps/generate-instruction-files'
8345

8446
- name: Run tests
8547
working-directory: tools/automated-tests
8648
env:
8749
KONG_LICENSE_DATA: ${{ steps.getLicense.outputs.license }}
8850
RUNTIME: gateway
51+
PRODUCT: gateway
8952
GATEWAY_VERSION: ${{ matrix.gateway }}
9053
run: |
9154
DEBUG=tests:*,debug npm run run-tests
9255
9356
- name: Publish Test Report
94-
uses: ctrf-io/github-test-reporter@646f98cfc16c6f7a0e1f6100cabe2deb95dd2eef # v1
95-
with:
96-
report-path: './tools/automated-tests/testReport.json'
97-
summary-report: true
98-
test-report: true
99-
failed-folded-report: true
100-
skipped-report: true
101-
report-order: 'summary-report,test-report,failed-folded-report,skipped-report'
57+
uses: './.github/reusable-steps/publish-test-report'
10258
if: always()

.github/workflows/build-automated-tests-image.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
runs-on: ubuntu-latest
88
steps:
99
- name: Harden Runner
10-
uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
10+
uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
1111
with:
1212
egress-policy: audit
1313

0 commit comments

Comments
 (0)