Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(ci): add kong 3.8 #1472

Merged
merged 3 commits into from
Dec 13, 2024
Merged

chore(ci): add kong 3.8 #1472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2531ce5
chore(ci): add kong 3.8
pmalek Dec 12, 2024
7910db9
Merge branch 'main' into kong-3.8
Prashansa-K Dec 13, 2024
937dde5
chore: fixed gw 3.8.0 tests (#1474)
Prashansa-K Dec 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/integration-enterprise.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ jobs:
- 'kong/kong-gateway:3.5'
- 'kong/kong-gateway:3.6'
- 'kong/kong-gateway:3.7'
- 'kong/kong-gateway:3.8'
- 'kong/kong-gateway-dev:latest'
env:
KONG_ANONYMOUS_REPORTS: "off"
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/integration.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ jobs:
- 'kong:3.5'
- 'kong:3.6'
- 'kong:3.7'
- 'kong:3.8'
- 'kong/kong:master'
env:
KONG_ANONYMOUS_REPORTS: "off"
Expand Down
8 changes: 4 additions & 4 deletions tests/integration/diff_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -758,14 +758,14 @@ func Test_Diff_NoDiffUnorderedArray(t *testing.T) {
runWhen string
}{
{
name: "no diffs with unordered arrays >=3.5.0 <3.8.1",
name: "no diffs with unordered arrays >=3.5.0 <3.8.0",
stateFile: "testdata/diff/004-no-diff-plugin/kong.yaml",
runWhen: ">=3.5.0 <3.8.1",
runWhen: ">=3.5.0 <3.8.0",
},
{
name: "no diffs with unordered arrays >=3.8.1",
name: "no diffs with unordered arrays >=3.8.0",
stateFile: "testdata/diff/004-no-diff-plugin/kong.yaml",
runWhen: ">=3.8.1",
runWhen: ">=3.8.0",
},
}
for _, tc := range tests {
Expand Down
14 changes: 7 additions & 7 deletions tests/integration/dump_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,16 @@ func Test_Dump_SelectTags_3x(t *testing.T) {
runWhen string
}{
{
name: "dump with select-tags >=3.1.0 <3.8.1",
name: "dump with select-tags >=3.1.0 <3.8.0",
stateFile: "testdata/dump/001-entities-with-tags/kong.yaml",
expectedFile: "testdata/dump/001-entities-with-tags/expected.yaml",
runWhen: ">=3.1.0 <3.8.1",
runWhen: ">=3.1.0 <3.8.0",
},
{
name: "dump with select-tags 3.8.1",
name: "dump with select-tags 3.8.0",
stateFile: "testdata/dump/001-entities-with-tags/kong.yaml",
expectedFile: "testdata/dump/001-entities-with-tags/expected381.yaml",
runWhen: ">=3.8.1",
runWhen: ">=3.8.0",
},
}
for _, tc := range tests {
Expand Down Expand Up @@ -131,14 +131,14 @@ func Test_Dump_SkipConsumers(t *testing.T) {
stateFile: "testdata/dump/002-skip-consumers/kong34.yaml",
expectedFile: "testdata/dump/002-skip-consumers/expected-no-skip-35.yaml",
skipConsumers: false,
runWhen: func(t *testing.T) { runWhen(t, "enterprise", ">=3.5.0 <3.8.1") },
runWhen: func(t *testing.T) { runWhen(t, "enterprise", ">=3.5.0 <3.8.0") },
},
{
name: "3.8.1 dump with no skip-consumers",
name: "3.8.0 dump with no skip-consumers",
stateFile: "testdata/dump/002-skip-consumers/kong34.yaml",
expectedFile: "testdata/dump/002-skip-consumers/expected-no-skip-381.yaml",
skipConsumers: false,
runWhen: func(t *testing.T) { runWhen(t, "enterprise", ">=3.8.1 <3.9.0") },
runWhen: func(t *testing.T) { runWhen(t, "enterprise", ">=3.8.0 <3.9.0") },
},
{
name: "3.9.0 dump with no skip-consumers",
Expand Down
12 changes: 6 additions & 6 deletions tests/integration/sync_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3322,26 +3322,26 @@ func Test_Sync_PluginsOnEntitiesFrom_3_0_0(t *testing.T) {
runWhen string
}{
{
name: "create plugins on services, routes and consumers <3.8.1",
name: "create plugins on services, routes and consumers <3.8.0",
kongFile: "testdata/sync/xxx-plugins-on-entities/kong.yaml",
expectedState: utils.KongRawState{
Services: svc1_207,
Routes: route1_20x,
Plugins: plugin_on_entities3x,
Consumers: consumer,
},
runWhen: ">=3.0.0 <3.8.1",
runWhen: ">=3.0.0 <3.8.0",
},
{
name: "create plugins on services, routes and consumers >=3.8.1",
name: "create plugins on services, routes and consumers >=3.8.0",
kongFile: "testdata/sync/xxx-plugins-on-entities/kong.yaml",
expectedState: utils.KongRawState{
Services: svc1_207,
Routes: route1_20x,
Plugins: plugin_on_entities381x,
Consumers: consumer,
},
runWhen: ">=3.8.1",
runWhen: ">=3.8.0",
},
}

Expand Down Expand Up @@ -5175,7 +5175,7 @@ func Test_Sync_ConsumerGroupsScopedPlugins_After360(t *testing.T) {
},
{
name: "creates consumer groups scoped plugins",
runWhen: ">=3.7.0 <3.8.1",
runWhen: ">=3.7.0 <3.8.0",
kongFile: "testdata/sync/025-consumer-groups-scoped-plugins/kong3x.yaml",
expectedState: utils.KongRawState{
Consumers: consumerGroupsConsumers,
Expand Down Expand Up @@ -5228,7 +5228,7 @@ func Test_Sync_ConsumerGroupsScopedPlugins_After360(t *testing.T) {
},
{
name: "creates consumer groups scoped plugins",
runWhen: ">=3.8.1 <3.9.0",
runWhen: ">=3.8.0 <3.9.0",
kongFile: "testdata/sync/025-consumer-groups-scoped-plugins/kong3x.yaml",
expectedState: utils.KongRawState{
Consumers: consumerGroupsConsumers,
Expand Down
Loading