Skip to content

Commit

Permalink
fix test
Browse files Browse the repository at this point in the history
Signed-off-by: Huabing Zhao <zhaohuabing@gmail.com>
  • Loading branch information
zhaohuabing committed Sep 29, 2024
1 parent ebdfeb5 commit d4ab7fc
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion test/e2e/e2e_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ func TestE2E(t *testing.T) {
Debug: *flags.ShowDebug,
CleanupBaseResources: *flags.CleanupBaseResources,
ManifestFS: []fs.FS{Manifests},
RunTest: *flags.RunTest,
RunTest: tests.BasicAuthTest.ShortName,
// SupportedFeatures cannot be empty, so we set it to SupportGateway
// All e2e tests should leave Features empty.
SupportedFeatures: sets.New[features.FeatureName](features.SupportGateway),
Expand Down
5 changes: 3 additions & 2 deletions test/e2e/tests/eg_upgrade.go
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,8 @@ func migrateChartCRDs(actionConfig *action.Configuration, gatewayChart *chart.Ch
}

for _, crd := range crds {
if crd.Name == "backendtlspolicies.gateway.networking.k8s.io" {
if crd.Name == "backendtlspolicies.gateway.networking.k8s.io" ||
crd.Name == "grpcroutes.gateway.networking.k8s.io" {
newVersion, err := getGWAPIVersion(crd.Object)
if err != nil {
return err
Expand All @@ -295,7 +296,7 @@ func migrateChartCRDs(actionConfig *action.Configuration, gatewayChart *chart.Ch
}

if existingVersion == "v1.0.0" {
// Delete the existing instance of the BTLS CRD
// Delete the existing instance of the BTLS and GRPCRoute CRDs
_, errs := actionConfig.KubeClient.Delete([]*resource.Info{crd})
if errs != nil {
return fmt.Errorf("failed to delete backendtlspolicies: %s", util.MultipleErrors("", errs))
Expand Down

0 comments on commit d4ab7fc

Please sign in to comment.