e2e-test: support ApisixRoute v2 #1103
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
@@ Coverage Diff @@
## master #1103 +/- ##
==========================================
- Coverage 30.38% 30.34% -0.05%
==========================================
Files 81 81
Lines 9390 9403 +13
==========================================
Hits 2853 2853
- Misses 6222 6235 +13
Partials 315 315
Continue to review full report at Codecov.
|
AlinsRan
force-pushed
the
e2e/v2/apisixroute
branch
from
8915486
to
0933f4d
Compare
AlinsRan
force-pushed
the
e2e/v2/apisixroute
branch
from
d695ad1
to
8d9f798
Compare
AlinsRan
force-pushed
the
e2e/v2/apisixroute
branch
from
074ae7f
to
bab9ca1
Compare
lingsamuel
reviewed
Jun 30, 2022
AlinsRan
force-pushed
the
e2e/v2/apisixroute
branch
from
bdbb40a
to
d48a929
Compare
AlinsRan
force-pushed
the
e2e/v2/apisixroute
branch
from
fc42fdf
to
40730de
Compare
AlinsRan
force-pushed
the
e2e/v2/apisixroute
branch
from
40730de
to
7f743f0
Compare
Comment on lines
+138
to
+146
| suites(scaffold.NewScaffold(&scaffold.Options{ | ||
| Name: "endpoints-port", | ||
| Kubeconfig: scaffold.GetKubeconfig(), | ||
| APISIXConfigPath: "testdata/apisix-gw-config.yaml", | ||
| IngressAPISIXReplicas: 1, | ||
| HTTPBinServicePort: 8080, | ||
| ApisixResourceVersion: scaffold.ApisixResourceVersion().V2beta3, | ||
| })) | ||
| }) |
There was a problem hiding this comment.
how ablout using suites(scaffold.NewDefaultScaffold()) ?
There was a problem hiding this comment.
how ablout using
suites(scaffold.NewDefaultScaffold())?
Separate configuration item HTTPBinServicePort:8080 are used here.
Comment on lines
+147
to
+155
| ginkgo.Describe("suite-endpoints: scaffold v2", func() { | ||
| suites(scaffold.NewScaffold(&scaffold.Options{ | ||
| Name: "endpoints-port", | ||
| Kubeconfig: scaffold.GetKubeconfig(), | ||
| APISIXConfigPath: "testdata/apisix-gw-config.yaml", | ||
| IngressAPISIXReplicas: 1, | ||
| HTTPBinServicePort: 8080, | ||
| ApisixResourceVersion: scaffold.ApisixResourceVersion().V2, | ||
| })) |
There was a problem hiding this comment.
Separate configuration item HTTPBinServicePort:8080 are used here.
Comment on lines
+221
to
+229
| suites(scaffold.NewScaffold(&scaffold.Options{ | ||
| Name: "sync", | ||
| Kubeconfig: scaffold.GetKubeconfig(), | ||
| APISIXConfigPath: "testdata/apisix-gw-config.yaml", | ||
| IngressAPISIXReplicas: 1, | ||
| HTTPBinServicePort: 80, | ||
| ApisixResourceVersion: scaffold.ApisixResourceVersion().V2beta3, | ||
| ApisixResourceSyncInterval: "60s", | ||
| })) |
There was a problem hiding this comment.
Separate configuration item ApisixResourceSyncInterval: "60s" are used here.
Comment on lines
+232
to
+240
| suites(scaffold.NewScaffold(&scaffold.Options{ | ||
| Name: "sync", | ||
| Kubeconfig: scaffold.GetKubeconfig(), | ||
| APISIXConfigPath: "testdata/apisix-gw-config.yaml", | ||
| IngressAPISIXReplicas: 1, | ||
| HTTPBinServicePort: 80, | ||
| ApisixResourceVersion: scaffold.ApisixResourceVersion().V2, | ||
| ApisixResourceSyncInterval: "60s", | ||
| })) |
There was a problem hiding this comment.
Separate configuration item ApisixResourceSyncInterval: "60s" are used here.
Comment on lines
+66
to
+86
| ginkgo.Describe("suite-ingress: scaffold v2beta3", func() { | ||
| suites(scaffold.NewScaffold(&scaffold.Options{ | ||
| Name: "webhook", | ||
| Kubeconfig: scaffold.GetKubeconfig(), | ||
| APISIXConfigPath: "testdata/apisix-gw-config.yaml", | ||
| IngressAPISIXReplicas: 1, | ||
| HTTPBinServicePort: 80, | ||
| ApisixResourceVersion: scaffold.ApisixResourceVersion().V2beta3, | ||
| EnableWebhooks: false, | ||
| })) | ||
| }) | ||
| ginkgo.Describe("suite-ingress: scaffold v2", func() { | ||
| suites(scaffold.NewScaffold(&scaffold.Options{ | ||
| Name: "webhook", | ||
| Kubeconfig: scaffold.GetKubeconfig(), | ||
| APISIXConfigPath: "testdata/apisix-gw-config.yaml", | ||
| IngressAPISIXReplicas: 1, | ||
| HTTPBinServicePort: 80, | ||
| ApisixResourceVersion: scaffold.ApisixResourceVersion().V2, | ||
| EnableWebhooks: false, | ||
| })) |
There was a problem hiding this comment.
This is to identify enablewebhooks.
lingsamuel
reviewed
Jul 1, 2022
| return s.CreateResourceFromStringWithNamespace(apc, namespace) | ||
| } | ||
| errString := fmt.Sprint("the resource ", kindValue, " does not support") | ||
| return errors.New(errString) |
| ) | ||
|
|
||
| func (s *Scaffold) replaceApiVersion(yml, ver string) string { | ||
| return versionRegex.ReplaceAllString(yml, "apiVersion: "+ver+"\n") | ||
| } | ||
|
|
||
| func (s *Scaffold) getKindValue(yml string) string { | ||
| kind := strings.Replace(kindRegex.FindString(yml), "\n", "", -1) |
tao12345666333
approved these changes
Jul 1, 2022
lingsamuel
approved these changes
Jul 1, 2022
|
let's move forward. thanks |
8 tasks
16 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Type of change:
What this PR does / why we need it:
fix: #1108
Pre-submission checklist: