forked from kgateway-dev/kgateway
-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
7 changed files
with
324 additions
and
230 deletions.
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| changelog: | ||
| - type: DEPENDENCY_BUMP | ||
| description: Bumped the go version to 1.23.3 | ||
| dependencyOwner: golang | ||
| dependencyRepo: go | ||
| dependencyTag: v1.23.3 | ||
| issueLink: https://github.com/solo-io/solo-projects/issues/7609 | ||
| resolvesIssue: false |
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| options: | ||
| env: | ||
| - "_GO_VERSION=1.21.5" | ||
| - "_GO_VERSION=1.23.3" | ||
|
|
||
| steps: | ||
| - name: gcr.io/cloud-builders/gsutil | ||
|
|
||
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,111 @@ | ||
| package gloo_test | ||
|
|
||
| import ( | ||
| "os/exec" | ||
|
|
||
| "github.com/google/uuid" | ||
| . "github.com/onsi/ginkgo/v2" | ||
| . "github.com/onsi/gomega" | ||
| gatewayv1 "github.com/solo-io/gloo/projects/gateway/pkg/api/v1" | ||
| gloov1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1" | ||
| "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/gloosnapshot" | ||
| "github.com/solo-io/gloo/test/helpers" | ||
| "github.com/solo-io/gloo/test/kube2e" | ||
| "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" | ||
|
|
||
| "github.com/solo-io/solo-kit/pkg/api/v1/clients" | ||
| ) | ||
|
|
||
| const ( | ||
| testServerName = "testserver" | ||
| testServerPort = 1234 | ||
| ) | ||
|
|
||
| var _ = Describe("EDS", func() { | ||
| var ( | ||
| testServerDestination *gloov1.Destination | ||
| testServerVs *gatewayv1.VirtualService | ||
|
|
||
| glooResources *gloosnapshot.ApiSnapshot | ||
| ) | ||
|
|
||
| BeforeEach(func() { | ||
| // Create a VirtualService routing directly to the testServer kubernetes service | ||
| testServerDestination = &gloov1.Destination{ | ||
| DestinationType: &gloov1.Destination_Kube{ | ||
| Kube: &gloov1.KubernetesServiceDestination{ | ||
| Ref: &core.ResourceRef{ | ||
| Namespace: testHelper.InstallNamespace, | ||
| Name: testServerName, | ||
| }, | ||
| Port: uint32(testServerPort), | ||
| }, | ||
| }, | ||
| } | ||
| testServerVs = helpers.NewVirtualServiceBuilder(). | ||
| WithName(testServerName). | ||
| WithNamespace(testHelper.InstallNamespace). | ||
| WithLabel(kube2e.UniqueTestResourceLabel, uuid.New().String()). | ||
| WithDomain(testServerName). | ||
| WithRoutePrefixMatcher(testServerName, "/"). | ||
| WithRouteActionToSingleDestination(testServerName, testServerDestination). | ||
| Build() | ||
|
|
||
| // The set of resources that these tests will generate | ||
| glooResources = &gloosnapshot.ApiSnapshot{ | ||
| VirtualServices: gatewayv1.VirtualServiceList{ | ||
| // many tests route to the TestServer Service so it makes sense to just | ||
| // always create it | ||
| // the other benefit is this ensures that all tests start with a valid Proxy CR | ||
| testServerVs, | ||
| }, | ||
| } | ||
| }) | ||
|
|
||
| JustBeforeEach(func() { | ||
| err := snapshotWriter.WriteSnapshot(glooResources, clients.WriteOpts{ | ||
| Ctx: ctx, | ||
| OverwriteExisting: false, | ||
| }) | ||
| Expect(err).NotTo(HaveOccurred()) | ||
| }) | ||
|
|
||
| JustAfterEach(func() { | ||
| err := snapshotWriter.DeleteSnapshot(glooResources, clients.DeleteOpts{ | ||
| Ctx: ctx, | ||
| IgnoreNotExist: true, | ||
| }) | ||
| Expect(err).NotTo(HaveOccurred()) | ||
| }) | ||
|
|
||
| Context("Rest EDS", Ordered, func() { | ||
| BeforeAll(func() { | ||
| // enable REST EDS | ||
| kube2e.UpdateRestEdsSetting(ctx, true, testHelper.InstallNamespace) | ||
| }) | ||
|
|
||
| AfterAll(func() { | ||
| // reset REST EDS to default | ||
| kube2e.UpdateRestEdsSetting(ctx, false, testHelper.InstallNamespace) | ||
| }) | ||
|
|
||
| // This test is inspired by the issue here: https://github.com/solo-io/gloo/issues/8968 | ||
| // There were some versions of Gloo Edge 1.15.x which depended on versions of envoy-gloo | ||
| // which did not have REST config subscription enabled, and so gateway-proxy logs would | ||
| // contain warnings about not finding a registered config subscription factory implementation | ||
| // for REST EDS. This test validates that we have not regressed to that state. | ||
| It("should not warn when REST EDS is configured", func() { | ||
| Consistently(func(g Gomega) { | ||
| // Get envoy logs from gateway-proxy deployment | ||
| logsCmd := exec.Command("kubectl", "logs", "-n", testHelper.InstallNamespace, | ||
| "deployment/gateway-proxy") | ||
| logsOut, err := logsCmd.Output() | ||
| g.Expect(err).NotTo(HaveOccurred()) | ||
|
|
||
| // ensure that the logs do not contain any presence of the text: | ||
| // Didn't find a registered config subscription factory implementation for name: 'envoy.config_subscription.rest' | ||
| g.Expect(string(logsOut)).NotTo(ContainSubstring("Didn't find a registered config subscription factory implementation for name: 'envoy.config_subscription.rest'")) | ||
| }, "10s", "1s").Should(Succeed()) | ||
| }) | ||
| }) | ||
| }) |
Oops, something went wrong.