diff --git a/.github/workflows/nightly-tests.yaml b/.github/workflows/nightly-tests.yaml index ced57976098..9aa66d4ff07 100644 --- a/.github/workflows/nightly-tests.yaml +++ b/.github/workflows/nightly-tests.yaml @@ -214,7 +214,7 @@ jobs: # runs-on: ubuntu-22.04 # timeout-minutes: 60 # # Previously, there was an environment variable, RELEASED_VERSION="LATEST" set. This made use of some internal code: - # # https://github.com/solo-io/gloo/blob/main/test/kube2e/util.go#L229-L241 + # # https://github.com/kgateway-dev/kgateway/blob/main/test/kube2e/util.go#L229-L241 # # which modified our testing process to pull the latest beta release. # # # # NOW, however, running this job is the same as normal CI. (building a local chart, then using it) diff --git a/.github/workflows/stalebot.yaml b/.github/workflows/stalebot.yaml index 1d798e817a7..695a5477b98 100644 --- a/.github/workflows/stalebot.yaml +++ b/.github/workflows/stalebot.yaml @@ -27,8 +27,8 @@ jobs: It will be closed in the next ${{ env.DAYS_BEFORE_ISSUE_CLOSE }} days unless it is tagged "no stalebot" or other activity occurs. close-issue-message: > This issue has been closed due to no activity in the last 12 months. - stale-issue-label: 'stale' # https://github.com/solo-io/gloo/labels/stale - exempt-issue-labels: 'no stalebot' # https://github.com/solo-io/gloo/labels/no%20stalebot + stale-issue-label: 'stale' # https://github.com/kgateway-dev/kgateway/labels/stale + exempt-issue-labels: 'no stalebot' # https://github.com/kgateway-dev/kgateway/labels/no%20stalebot enable-statistics: true operations-per-run: 1000 ascending: true # asc means oldest first diff --git a/.golangci.yaml b/.golangci.yaml index 871f3450d11..96d80d901ea 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -14,7 +14,6 @@ linters: # Given that we have not had linting enabled in this repository, it would be a large change to turn on all linters immediately. # We are aiming to progressively enable linters. # If you see a linter that can be added, please do so. - # See: https://github.com/solo-io/gloo-mesh-enterprise/blob/main/.golangci.yaml for a reference - bodyclose - ginkgolinter - goimports @@ -35,8 +34,6 @@ linters-settings: alias: metav1 - pkg: k8s.io/api/batch/v1 alias: batchv1 - - pkg: github.com/solo-io/gloo/test/kubernetes/testutils/clients - alias: kubetestclients nakedret: # The team consensus is that naked returns hinder the readability of the code. # However, named return values can still be useful as documentation for certain scenarios. diff --git a/.trivyignore b/.trivyignore index dc03698e110..c95c8c713ff 100644 --- a/.trivyignore +++ b/.trivyignore @@ -7,7 +7,7 @@ CVE-2022-1996 # Also Helm module is used in testing, which has no impact on exploitation. # Gloo-Edge data and control planes are not impacted at all by the helm module. # Glooctl is not a long running program, and does not affect future uses of Glooctl. -# https://github.com/solo-io/gloo/issues/7598 +# https://github.com/kgateway-dev/kgateway/issues/7598 # https://github.com/helm/helm/security/advisories/GHSA-6rx9-889q-vv2r CVE-2022-23524 # https://github.com/helm/helm/security/advisories/GHSA-53c4-hhmh-vw5q @@ -32,9 +32,9 @@ CVE-2023-2253 # and can be easily resolved by removing the misconfigured / malicious plugin # The helm bump will require bumping the k8s dependencies by +2 minor versions that can cause issues. # https://github.com/advisories/GHSA-r53h-jv2g-vpx6 -# https://github.com/solo-io/gloo/issues/9186 -# https://github.com/solo-io/gloo/issues/9187 -# https://github.com/solo-io/gloo/issues/9189 +# https://github.com/kgateway-dev/kgateway/issues/9186 +# https://github.com/kgateway-dev/kgateway/issues/9187 +# https://github.com/kgateway-dev/kgateway/issues/9189 CVE-2024-26147 # Ignore a few istio.io/istio vulnerabilities. These CVEs are from very old versions of istio for which patches have already been merged - these come up as false positives from trivy because we pin the dependencies and trivy is unable to determine that the pinned versions already have the fix. This is due to istio's tags not following go's strict semver and therefore falling back to a go pseudo version. diff --git a/Makefile b/Makefile index 770b444afea..d093aa521e5 100644 --- a/Makefile +++ b/Makefile @@ -41,7 +41,7 @@ SOURCES := $(shell find . -name "*.go" | grep -v test.go) # universal header validation has been enabled and if so, we expect # failures in `test/e2e/header_validation_test.go`. export ENVOY_GLOO_IMAGE ?= quay.io/solo-io/envoy-gloo:1.31.2-patch3 -export LDFLAGS := -X 'github.com/solo-io/gloo/pkg/version.Version=$(VERSION)' +export LDFLAGS := -X 'github.com/kgateway-dev/kgateway/pkg/version.Version=$(VERSION)' export GCFLAGS ?= UNAME_M := $(shell uname -m) @@ -143,7 +143,7 @@ fmt: # Formats code and imports .PHONY: fmt-v2 fmt-v2: - go run golang.org/x/tools/cmd/goimports -local "github.com/solo-io/gloo/" -w $(shell ls -d */ | grep -v vendor) + go run golang.org/x/tools/cmd/goimports -local "github.com/kgateway-dev/kgateway/" -w $(shell ls -d */ | grep -v vendor) .PHONY: fmt-changed fmt-changed: @@ -681,14 +681,14 @@ else # example: 1.16.0-beta4-{TEST_ASSET_ID} VERSION = $(shell echo $(git_tag) | cut -c 2-)-$(TEST_ASSET_ID) endif -LDFLAGS := "-X github.com/solo-io/gloo/pkg/version.Version=$(VERSION)" +LDFLAGS := "-X github.com/kgateway-dev/kgateway/pkg/version.Version=$(VERSION)" endif # TODO: delete this logic block when we have a github actions-managed release ifneq (,$(TAGGED_VERSION)) PUBLISH_CONTEXT := RELEASE VERSION := $(shell echo $(TAGGED_VERSION) | cut -c 2-) -LDFLAGS := "-X github.com/solo-io/gloo/pkg/version.Version=$(VERSION)" +LDFLAGS := "-X github.com/kgateway-dev/kgateway/pkg/version.Version=$(VERSION)" endif export VERSION diff --git a/ci/github-actions/go-test-summary/go_test_summary.go b/ci/github-actions/go-test-summary/go_test_summary.go index 0e886c3fb6c..1bc95f7baeb 100644 --- a/ci/github-actions/go-test-summary/go_test_summary.go +++ b/ci/github-actions/go-test-summary/go_test_summary.go @@ -3,7 +3,7 @@ package main import ( "flag" - "github.com/solo-io/gloo/ci/github-actions/go-test-summary/summary" + "github.com/kgateway-dev/kgateway/ci/github-actions/go-test-summary/summary" ) func main() { diff --git a/docs/cmd/generate_docs.go b/docs/cmd/generate_docs.go index b26012ec204..63c4854c78a 100644 --- a/docs/cmd/generate_docs.go +++ b/docs/cmd/generate_docs.go @@ -19,8 +19,8 @@ import ( "github.com/Masterminds/semver/v3" "github.com/google/go-github/v32/github" + . "github.com/kgateway-dev/kgateway/docs/cmd/securityscanutils" "github.com/rotisserie/eris" - . "github.com/solo-io/gloo/docs/cmd/securityscanutils" changelogdocutils "github.com/solo-io/go-utils/changeloggenutils" "github.com/solo-io/go-utils/githubutils" "github.com/solo-io/go-utils/versionutils" diff --git a/docs/cmd/test/securityscanutils/generate_securityscan_doc_test.go b/docs/cmd/test/securityscanutils/generate_securityscan_doc_test.go index 988b81c828c..2fb80e9488f 100644 --- a/docs/cmd/test/securityscanutils/generate_securityscan_doc_test.go +++ b/docs/cmd/test/securityscanutils/generate_securityscan_doc_test.go @@ -1,9 +1,9 @@ package securityscanutils_test import ( + . "github.com/kgateway-dev/kgateway/docs/cmd/securityscanutils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/solo-io/gloo/docs/cmd/securityscanutils" ) var _ = Describe("generate security scan docgen", func() { diff --git a/docs/content/crds/generate.go b/docs/content/crds/generate.go index e526e8af96b..6f093b8c968 100644 --- a/docs/content/crds/generate.go +++ b/docs/content/crds/generate.go @@ -8,9 +8,9 @@ import ( "strings" "github.com/hashicorp/go-multierror" + "github.com/kgateway-dev/kgateway/pkg/utils/cmdutils" + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1" "github.com/rotisserie/eris" - "github.com/solo-io/gloo/pkg/utils/cmdutils" - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1" "github.com/stoewer/go-strcase" "k8s.io/apimachinery/pkg/runtime/schema" ) diff --git a/docs/content/guides/dev/example-proxy-controller.go b/docs/content/guides/dev/example-proxy-controller.go index 0d4690bf173..15a019af1d7 100644 --- a/docs/content/guides/dev/example-proxy-controller.go +++ b/docs/content/guides/dev/example-proxy-controller.go @@ -12,8 +12,8 @@ import ( "os" "time" - v1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1" - matchers "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/core/matchers" + v1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" + matchers "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/core/matchers" "github.com/solo-io/k8s-utils/kubeutils" "github.com/solo-io/solo-kit/pkg/api/v1/clients" "github.com/solo-io/solo-kit/pkg/api/v1/clients/factory" diff --git a/docs/content/guides/dev/plugin.go b/docs/content/guides/dev/plugin.go index 3bd5c9e131b..5c98194b3c6 100644 --- a/docs/content/guides/dev/plugin.go +++ b/docs/content/guides/dev/plugin.go @@ -11,9 +11,9 @@ import ( "time" cluster_v3 "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3" - v1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1" - "github.com/solo-io/gloo/projects/gloo/pkg/discovery" - "github.com/solo-io/gloo/projects/gloo/pkg/plugins" + v1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/discovery" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/plugins" "github.com/solo-io/solo-kit/pkg/api/v1/clients" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" diff --git a/docs/content/guides/dev/registry.go b/docs/content/guides/dev/registry.go index df7b8e4f08b..57cbce427dc 100644 --- a/docs/content/guides/dev/registry.go +++ b/docs/content/guides/dev/registry.go @@ -6,28 +6,28 @@ package docs_demo // package registry import ( - "github.com/solo-io/gloo/projects/gloo/pkg/bootstrap" - "github.com/solo-io/gloo/projects/gloo/pkg/plugins" - "github.com/solo-io/gloo/projects/gloo/pkg/plugins/aws" - "github.com/solo-io/gloo/projects/gloo/pkg/plugins/azure" - "github.com/solo-io/gloo/projects/gloo/pkg/plugins/basicroute" - "github.com/solo-io/gloo/projects/gloo/pkg/plugins/consul" - "github.com/solo-io/gloo/projects/gloo/pkg/plugins/cors" - "github.com/solo-io/gloo/projects/gloo/pkg/plugins/faultinjection" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/bootstrap" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/plugins" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/plugins/aws" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/plugins/azure" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/plugins/basicroute" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/plugins/consul" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/plugins/cors" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/plugins/faultinjection" // add our plugin's import here: - "github.com/solo-io/gloo/projects/gloo/pkg/plugins/gce" - "github.com/solo-io/gloo/projects/gloo/pkg/plugins/grpc" - "github.com/solo-io/gloo/projects/gloo/pkg/plugins/hcm" - "github.com/solo-io/gloo/projects/gloo/pkg/plugins/kubernetes" - "github.com/solo-io/gloo/projects/gloo/pkg/plugins/linkerd" - "github.com/solo-io/gloo/projects/gloo/pkg/plugins/loadbalancer" - "github.com/solo-io/gloo/projects/gloo/pkg/plugins/rest" - "github.com/solo-io/gloo/projects/gloo/pkg/plugins/static" - "github.com/solo-io/gloo/projects/gloo/pkg/plugins/stats" - "github.com/solo-io/gloo/projects/gloo/pkg/plugins/transformation" - "github.com/solo-io/gloo/projects/gloo/pkg/plugins/upstreamconn" - "github.com/solo-io/gloo/projects/gloo/pkg/plugins/upstreamssl" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/plugins/gce" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/plugins/grpc" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/plugins/hcm" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/plugins/kubernetes" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/plugins/linkerd" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/plugins/loadbalancer" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/plugins/rest" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/plugins/static" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/plugins/stats" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/plugins/transformation" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/plugins/upstreamconn" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/plugins/upstreamssl" ) type registry struct { diff --git a/docs/examples/http-passthrough-auth/main.go b/docs/examples/http-passthrough-auth/main.go index c0f27784270..25130a499b8 100644 --- a/docs/examples/http-passthrough-auth/main.go +++ b/docs/examples/http-passthrough-auth/main.go @@ -1,7 +1,7 @@ package main import ( - v1 "github.com/solo-io/gloo/examples/http-passthrough-auth/pkg/auth/v1" + v1 "github.com/kgateway-dev/kgateway/examples/http-passthrough-auth/pkg/auth/v1" ) func main() { diff --git a/generate.go b/generate.go index 30e7e208659..b9b2e6a3803 100644 --- a/generate.go +++ b/generate.go @@ -38,7 +38,7 @@ func main() { generateOptions := cmd.GenerateOptions{ SkipGenMocks: true, CustomCompileProtos: []string{ - "github.com/solo-io/gloo/projects/gloo/api/grpc", + "github.com/kgateway-dev/kgateway/projects/gloo/api/grpc", }, SkipGeneratedTests: true, // helps to cut down on time spent searching for imports, not strictly necessary @@ -57,7 +57,7 @@ func main() { }, RenderOptions: &options.RenderOptions{ SkipLinksForPathPrefixes: []string{ - "github.com/solo-io/gloo/projects/gloo/api/external", + "github.com/kgateway-dev/kgateway/projects/gloo/api/external", }, }, }, @@ -76,7 +76,7 @@ func main() { // These messages are part of our internal API, and therefore aren't required // Also they are quite large and can cause the Proxy CRD to become too large, - // resulting in: https://github.com/solo-io/gloo/issues/4789 + // resulting in: https://github.com/kgateway-dev/kgateway/issues/4789 "gloo.solo.io.HttpListener", "gloo.solo.io.TcpListener", "gloo.solo.io.HybridListener", @@ -98,6 +98,6 @@ func main() { } func removeExternalApiDocs() error { - const externalApiDocsPath = "docs/content/reference/api/github.com/solo-io/gloo/projects/gloo/api/external" + const externalApiDocsPath = "docs/content/reference/api/github.com/kgateway-dev/kgateway/projects/gloo/api/external" return os.RemoveAll(externalApiDocsPath) } diff --git a/go.mod b/go.mod index 8d76ef57a49..235b1736d8c 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/solo-io/gloo +module github.com/kgateway-dev/kgateway go 1.23.3 diff --git a/install/helm/gloo/generate.go b/install/helm/gloo/generate.go index 4dca714e050..46d58599b7f 100644 --- a/install/helm/gloo/generate.go +++ b/install/helm/gloo/generate.go @@ -5,8 +5,8 @@ import ( "os" "github.com/ghodss/yaml" + "github.com/kgateway-dev/kgateway/install/helm/gloo/generate" errors "github.com/rotisserie/eris" - "github.com/solo-io/gloo/install/helm/gloo/generate" "github.com/solo-io/go-utils/log" "github.com/solo-io/k8s-utils/installutils/helmchart" ) diff --git a/install/helm/gloo/generate/values.go b/install/helm/gloo/generate/values.go index 7365ec357cf..bc34fa28b7c 100644 --- a/install/helm/gloo/generate/values.go +++ b/install/helm/gloo/generate/values.go @@ -186,7 +186,7 @@ type Settings struct { Linkerd *bool `json:"linkerd,omitempty" desc:"Enable automatic Linkerd integration in Gloo Edge"` DisableProxyGarbageCollection *bool `json:"disableProxyGarbageCollection,omitempty" desc:"Set this option to determine the state of an Envoy listener when the corresponding Proxy resource has no routes. If false (default), Gloo Edge will propagate the state of the Proxy to Envoy, resetting the listener to a clean slate with no routes. If true, Gloo Edge will keep serving the routes from the last applied valid configuration."` RegexMaxProgramSize *uint32 `json:"regexMaxProgramSize,omitempty" desc:"Set this field to specify the RE2 default max program size which is a rough estimate of how complex the compiled regex is to evaluate. If not specified, this defaults to 1024."` - DisableKubernetesDestinations *bool `json:"disableKubernetesDestinations,omitempty" desc:"Enable or disable Gloo Edge to scan Kubernetes services in the cluster and create in-memory Upstream resources to represent them. These resources enable Gloo Edge to route requests to a Kubernetes service. Note that if you have a large number of services in your cluster and you do not restrict the namespaces that Gloo Edge watches, the API snapshot increases which can have a negative impact on the Gloo Edge translation time. In addition, load balancing is done in kube-proxy which can have further performance impacts. Using Gloo Upstreams as a routing destination bypasses kube-proxy as the request is routed to the pod directly. Alternatively, you can use [Kubernetes](https://docs.solo.io/gloo-edge/latest/reference/api/github.com/solo-io/gloo/projects/gloo/api/v1/options/kubernetes/kubernetes.proto.sk/) Upstream resources as a routing destination to forward requests to the pod directly. For more information, see the [docs](https://docs.solo.io/gloo-edge/latest/guides/traffic_management/destination_types/kubernetes_services/)."` + DisableKubernetesDestinations *bool `json:"disableKubernetesDestinations,omitempty" desc:"Enable or disable Gloo Edge to scan Kubernetes services in the cluster and create in-memory Upstream resources to represent them. These resources enable Gloo Edge to route requests to a Kubernetes service. Note that if you have a large number of services in your cluster and you do not restrict the namespaces that Gloo Edge watches, the API snapshot increases which can have a negative impact on the Gloo Edge translation time. In addition, load balancing is done in kube-proxy which can have further performance impacts. Using Gloo Upstreams as a routing destination bypasses kube-proxy as the request is routed to the pod directly. Alternatively, you can use [Kubernetes](https://docs.solo.io/gloo-edge/latest/reference/api/github.com/kgateway-dev/kgateway/projects/gloo/api/v1/options/kubernetes/kubernetes.proto.sk/) Upstream resources as a routing destination to forward requests to the pod directly. For more information, see the [docs](https://docs.solo.io/gloo-edge/latest/guides/traffic_management/destination_types/kubernetes_services/)."` Aws AwsSettings `json:"aws,omitempty"` RateLimit interface{} `json:"rateLimit,omitempty" desc:"Partial config for Gloo Edge Enterprise’s rate-limiting service, based on Envoy’s rate-limit service; supports Envoy’s rate-limit service API. (reference here: https://github.com/lyft/ratelimit#configuration) Configure rate-limit descriptors here, which define the limits for requests based on their descriptors. Configure rate-limits (composed of actions, which define how request characteristics get translated into descriptors) on the VirtualHost or its routes."` RatelimitServer interface{} `json:"ratelimitServer,omitempty" desc:"External Ratelimit Server configuration for Gloo Edge Open Sources’s rate-limiting service, based on Envoy’s rate-limit service; supports Envoy’s rate-limit service API. (reference here: https://docs.solo.io/gloo-edge/main/guides/security/rate_limiting/)"` @@ -451,7 +451,7 @@ type GatewayValidation struct { WarnRouteShortCircuiting *bool `json:"warnRouteShortCircuiting,omitempty" desc:"Write a warning to route resources if validation produced a route ordering warning (defaults to false). By setting to true, this means that Gloo Edge will start assigning warnings to resources that would result in route short-circuiting within a virtual host."` SecretName *string `json:"secretName,omitempty" desc:"Name of the Kubernetes Secret containing TLS certificates used by the validation webhook server. This secret will be created by the certGen Job if the certGen Job is enabled."` FailurePolicy *string `json:"failurePolicy,omitempty" desc:"Specify how to handle unrecognized errors for Gloo resources that are returned from the Gateway validation endpoint. Supported values are 'Ignore' or 'Fail'"` - KubeCoreFailurePolicy *string `json:"kubeCoreFailurePolicy,omitempty" desc:"Specify how to handle unrecognized errors for Kubernetes core resources that are returned by the Gateway validation endpoint. Currently the [validation webhook](https://github.com/solo-io/gloo/blob/main/install/helm/gloo/templates/5-gateway-validation-webhook-configuration.yaml) is configured to handle errors for Kubernetes secrets and namespaces. Supported values are 'Ignore' or 'Fail'. If you set this value to 'Fail', you cannot modify these core resources if the 'gloo' service is unavailable."` + KubeCoreFailurePolicy *string `json:"kubeCoreFailurePolicy,omitempty" desc:"Specify how to handle unrecognized errors for Kubernetes core resources that are returned by the Gateway validation endpoint. Currently the [validation webhook](https://github.com/kgateway-dev/kgateway/blob/main/install/helm/gloo/templates/5-gateway-validation-webhook-configuration.yaml) is configured to handle errors for Kubernetes secrets and namespaces. Supported values are 'Ignore' or 'Fail'. If you set this value to 'Fail', you cannot modify these core resources if the 'gloo' service is unavailable."` Webhook *Webhook `json:"webhook,omitempty" desc:"webhook specific configuration"` ValidationServerGrpcMaxSizeBytes *int `json:"validationServerGrpcMaxSizeBytes,omitempty" desc:"gRPC max message size in bytes for the gloo validation server"` LivenessProbeEnabled *bool `json:"livenessProbeEnabled,omitempty" desc:"Set to true to enable a liveness probe for the gateway (default is false). You must also set the 'Probes' value to true."` @@ -590,8 +590,8 @@ type GatewayProxyGatewaySettings struct { HttpsHybridGateway map[string]interface{} `json:"httpsHybridGateway,omitempty" desc:"custom yaml to use for hybrid gateway settings for the https gateway"` CustomHttpGateway map[string]interface{} `json:"customHttpGateway,omitempty" desc:"custom yaml to use for http gateway settings"` CustomHttpsGateway map[string]interface{} `json:"customHttpsGateway,omitempty" desc:"custom yaml to use for https gateway settings"` - AccessLoggingService map[string]interface{} `json:"accessLoggingService,omitempty" desc:"custom yaml to use for access logging service (https://docs.solo.io/gloo-edge/latest/reference/api/github.com/solo-io/gloo/projects/gloo/api/v1/options/als/als.proto.sk/)"` - GatewayOptions map[string]interface{} `json:"options,omitempty" desc:"custom options for http(s) gateways (https://docs.solo.io/gloo-edge/latest/reference/api/github.com/solo-io/gloo/projects/gloo/api/v1/options.proto.sk/#listeneroptions)"` + AccessLoggingService map[string]interface{} `json:"accessLoggingService,omitempty" desc:"custom yaml to use for access logging service (https://docs.solo.io/gloo-edge/latest/reference/api/github.com/kgateway-dev/kgateway/projects/gloo/api/v1/options/als/als.proto.sk/)"` + GatewayOptions map[string]interface{} `json:"options,omitempty" desc:"custom options for http(s) gateways (https://docs.solo.io/gloo-edge/latest/reference/api/github.com/kgateway-dev/kgateway/projects/gloo/api/v1/options.proto.sk/#listeneroptions)"` HttpGatewayKubeOverride map[string]interface{} `json:"httpGatewayKubeOverride,omitempty"` HttpsGatewayKubeOverride map[string]interface{} `json:"httpsGatewayKubeOverride,omitempty"` *KubeResourceOverride diff --git a/install/test/5-gateway-validation-webhook-configuration_test.go b/install/test/5-gateway-validation-webhook-configuration_test.go index 2ad99b016ce..f41cc21c5ae 100644 --- a/install/test/5-gateway-validation-webhook-configuration_test.go +++ b/install/test/5-gateway-validation-webhook-configuration_test.go @@ -10,13 +10,13 @@ import ( "strings" "github.com/golang/protobuf/ptypes/wrappers" + glootestutils "github.com/kgateway-dev/kgateway/test/testutils" "github.com/onsi/gomega/types" - glootestutils "github.com/solo-io/gloo/test/testutils" v1 "k8s.io/api/admissionregistration/v1" + gloostringutils "github.com/kgateway-dev/kgateway/pkg/utils/stringutils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - gloostringutils "github.com/solo-io/gloo/pkg/utils/stringutils" "github.com/solo-io/go-utils/stringutils" "github.com/solo-io/k8s-utils/installutils/kuberesource" . "github.com/solo-io/k8s-utils/manifesttestutils" diff --git a/install/test/grpc_json_transcoder_test.go b/install/test/grpc_json_transcoder_test.go index 428cf64a197..ff99b6687fd 100644 --- a/install/test/grpc_json_transcoder_test.go +++ b/install/test/grpc_json_transcoder_test.go @@ -8,11 +8,11 @@ import ( "os" "strconv" + "github.com/kgateway-dev/kgateway/projects/gateway/pkg/defaults" + glootestutils "github.com/kgateway-dev/kgateway/test/testutils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/types" - "github.com/solo-io/gloo/projects/gateway/pkg/defaults" - glootestutils "github.com/solo-io/gloo/test/testutils" . "github.com/solo-io/k8s-utils/manifesttestutils" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" ) diff --git a/install/test/helm_suite_test.go b/install/test/helm_suite_test.go index ff3e8854fab..a7930d9a07e 100644 --- a/install/test/helm_suite_test.go +++ b/install/test/helm_suite_test.go @@ -11,14 +11,14 @@ import ( "text/template" "github.com/ghodss/yaml" + "github.com/kgateway-dev/kgateway/pkg/cliutil/helm" + "github.com/kgateway-dev/kgateway/projects/gloo/cli/pkg/cmd/install" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/defaults" + "github.com/kgateway-dev/kgateway/test/makefile" + glootestutils "github.com/kgateway-dev/kgateway/test/testutils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/pkg/errors" - "github.com/solo-io/gloo/pkg/cliutil/helm" - "github.com/solo-io/gloo/projects/gloo/cli/pkg/cmd/install" - "github.com/solo-io/gloo/projects/gloo/pkg/defaults" - "github.com/solo-io/gloo/test/makefile" - glootestutils "github.com/solo-io/gloo/test/testutils" soloHelm "github.com/solo-io/go-utils/helmutils" "github.com/solo-io/go-utils/testutils" "github.com/solo-io/k8s-utils/installutils/kuberesource" diff --git a/install/test/helm_test.go b/install/test/helm_test.go index 77632a0437c..07d577362ff 100644 --- a/install/test/helm_test.go +++ b/install/test/helm_test.go @@ -14,16 +14,16 @@ import ( "github.com/ghodss/yaml" "github.com/golang/protobuf/proto" + values "github.com/kgateway-dev/kgateway/install/helm/gloo/generate" + "github.com/kgateway-dev/kgateway/install/test/securitycontext" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/projects/gateway/pkg/defaults" + "github.com/kgateway-dev/kgateway/test/gomega/matchers" + glootestutils "github.com/kgateway-dev/kgateway/test/testutils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/format" "github.com/onsi/gomega/types" - values "github.com/solo-io/gloo/install/helm/gloo/generate" - "github.com/solo-io/gloo/install/test/securitycontext" - "github.com/solo-io/gloo/pkg/utils/kubeutils" - "github.com/solo-io/gloo/projects/gateway/pkg/defaults" - "github.com/solo-io/gloo/test/gomega/matchers" - glootestutils "github.com/solo-io/gloo/test/testutils" "github.com/solo-io/k8s-utils/installutils/kuberesource" . "github.com/solo-io/k8s-utils/manifesttestutils" "github.com/solo-io/solo-kit/pkg/api/v1/resources" @@ -2838,7 +2838,7 @@ spec: "prometheus.io/path": "/metrics", "prometheus.io/port": "8081", "prometheus.io/scrape": "true", - // This annotation was introduced to resolve https://github.com/solo-io/gloo/issues/8392 + // This annotation was introduced to resolve https://github.com/kgateway-dev/kgateway/issues/8392 // It triggers a new rollout of the gateway proxy if the config map it uses changes // As of PR 8733, changing the values of the deployment spec doesn't change the gateway-proxy config map, so it is safe to hardcode the checksum in the tests "checksum/gateway-proxy-envoy-config": "27068cd033014d38f6c77522484e957ab25fa1be34a900a1f5241b8f7d62f525", @@ -3523,7 +3523,7 @@ spec: Expect(istioProxyContainer.Image).To(Equal("my-istio-reg/my-istio-repo:my-istio-tag")) Expect(istioProxyContainer.ImagePullPolicy).To(Equal(corev1.PullAlways)) - // Volumes env added to support more recent istio versions as of https://github.com/solo-io/gloo/pull/8666 + // Volumes env added to support more recent istio versions as of https://github.com/kgateway-dev/kgateway/pull/8666 Expect(istioProxyContainer.VolumeMounts[4]).To(Equal(corev1.VolumeMount{Name: "credential-socket", MountPath: "/var/run/secrets/credential-uds"})) Expect(istioProxyContainer.VolumeMounts[5]).To(Equal(corev1.VolumeMount{Name: "workload-socket", MountPath: "/var/run/secrets/workload-spiffe-uds"})) Expect(istioProxyContainer.VolumeMounts[6]).To(Equal(corev1.VolumeMount{Name: "workload-certs", MountPath: "/var/run/secrets/workload-spiffe-credentials"})) @@ -3560,7 +3560,7 @@ spec: Expect(istioProxyContainer.Image).To(Equal("my-istio-reg/my-istio-repo:my-istio-tag")) Expect(istioProxyContainer.ImagePullPolicy).To(Equal(corev1.PullAlways)) - // Volumes env added to support more recent istio versions as of https://github.com/solo-io/gloo/pull/8666 + // Volumes env added to support more recent istio versions as of https://github.com/kgateway-dev/kgateway/pull/8666 Expect(istioProxyContainer.VolumeMounts[4]).To(Equal(corev1.VolumeMount{Name: "credential-socket", MountPath: "/var/run/secrets/credential-uds"})) Expect(istioProxyContainer.VolumeMounts[5]).To(Equal(corev1.VolumeMount{Name: "workload-socket", MountPath: "/var/run/secrets/workload-spiffe-uds"})) Expect(istioProxyContainer.VolumeMounts[6]).To(Equal(corev1.VolumeMount{Name: "workload-certs", MountPath: "/var/run/secrets/workload-spiffe-credentials"})) @@ -7384,7 +7384,7 @@ metadata: }) }) - // Lines ending with whitespace causes malformatted config map (https://github.com/solo-io/gloo/issues/4645) + // Lines ending with whitespace causes malformatted config map (https://github.com/kgateway-dev/kgateway/issues/4645) It("should not contain trailing whitespace", func() { out, err := exec.Command("helm", "template", "../helm/gloo").Output() Expect(err).NotTo(HaveOccurred(), "Helm template Generation error") @@ -7421,7 +7421,7 @@ metadata: func appendIfNilPath(queue []reflect.Type, newVal reflect.Type) []reflect.Type { if newVal.Kind() == reflect.Struct { pkgName := newVal.PkgPath() - if pkgName == "github.com/solo-io/gloo/install/helm/gloo/generate" { + if pkgName == "github.com/kgateway-dev/kgateway/install/helm/gloo/generate" { return append(queue, newVal) } } diff --git a/install/test/k8sgateway_test.go b/install/test/k8sgateway_test.go index ff08c05ec67..4af173e2a6b 100644 --- a/install/test/k8sgateway_test.go +++ b/install/test/k8sgateway_test.go @@ -5,14 +5,14 @@ package test import ( "fmt" + "github.com/kgateway-dev/kgateway/install/utils/kuberesource" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1" + "github.com/kgateway-dev/kgateway/projects/gateway2/wellknown" + "github.com/kgateway-dev/kgateway/test/gomega/matchers" + glootestutils "github.com/kgateway-dev/kgateway/test/testutils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/solo-io/gloo/install/utils/kuberesource" - "github.com/solo-io/gloo/pkg/utils/kubeutils" - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1" - "github.com/solo-io/gloo/projects/gateway2/wellknown" - "github.com/solo-io/gloo/test/gomega/matchers" - glootestutils "github.com/solo-io/gloo/test/testutils" . "github.com/solo-io/k8s-utils/manifesttestutils" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" diff --git a/install/test/rbac_test.go b/install/test/rbac_test.go index cb63b56fb5c..af1fece99b5 100644 --- a/install/test/rbac_test.go +++ b/install/test/rbac_test.go @@ -5,7 +5,7 @@ package test import ( "fmt" - glootestutils "github.com/solo-io/gloo/test/testutils" + glootestutils "github.com/kgateway-dev/kgateway/test/testutils" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" . "github.com/onsi/ginkgo/v2" diff --git a/install/test/svc_accnt_test.go b/install/test/svc_accnt_test.go index d56e9947678..005d9e2d82c 100644 --- a/install/test/svc_accnt_test.go +++ b/install/test/svc_accnt_test.go @@ -3,8 +3,8 @@ package test import ( + glootestutils "github.com/kgateway-dev/kgateway/test/testutils" . "github.com/onsi/ginkgo/v2" - glootestutils "github.com/solo-io/gloo/test/testutils" . "github.com/onsi/gomega" . "github.com/solo-io/k8s-utils/manifesttestutils" diff --git a/install/utils/kuberesource/unstructured.go b/install/utils/kuberesource/unstructured.go index 599aa8fc018..d26a56f2e8c 100644 --- a/install/utils/kuberesource/unstructured.go +++ b/install/utils/kuberesource/unstructured.go @@ -3,8 +3,8 @@ package kuberesource import ( "encoding/json" + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1" "github.com/pkg/errors" - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" diff --git a/install/utils/kuberesource/unstructured_test.go b/install/utils/kuberesource/unstructured_test.go index 8bb3ac24b5a..207b00e4da2 100644 --- a/install/utils/kuberesource/unstructured_test.go +++ b/install/utils/kuberesource/unstructured_test.go @@ -9,7 +9,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1" + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/pkg/bootstrap/leaderelector/identity_test.go b/pkg/bootstrap/leaderelector/identity_test.go index 43cb4c31722..52bbdd9fee4 100644 --- a/pkg/bootstrap/leaderelector/identity_test.go +++ b/pkg/bootstrap/leaderelector/identity_test.go @@ -1,9 +1,9 @@ package leaderelector_test import ( + "github.com/kgateway-dev/kgateway/pkg/bootstrap/leaderelector" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/solo-io/gloo/pkg/bootstrap/leaderelector" ) var _ = Describe("Identity", func() { diff --git a/pkg/bootstrap/leaderelector/kube/factory.go b/pkg/bootstrap/leaderelector/kube/factory.go index 1baca62ef96..41bcb61e880 100644 --- a/pkg/bootstrap/leaderelector/kube/factory.go +++ b/pkg/bootstrap/leaderelector/kube/factory.go @@ -6,8 +6,8 @@ import ( "sync/atomic" "time" - "github.com/solo-io/gloo/pkg/bootstrap/leaderelector" - "github.com/solo-io/gloo/pkg/utils/envutils" + "github.com/kgateway-dev/kgateway/pkg/bootstrap/leaderelector" + "github.com/kgateway-dev/kgateway/pkg/utils/envutils" "github.com/solo-io/go-utils/contextutils" "k8s.io/client-go/rest" k8sleaderelection "k8s.io/client-go/tools/leaderelection" @@ -110,7 +110,7 @@ func (f *kubeElectionFactory) StartElection(ctx context.Context, config *leadere config.OnStoppedLeading() if recoverIfKubeAPIServerIsUnreachable { // Recreate the elected channel and reset the identity to a follower - // Ref: https://github.com/solo-io/gloo/issues/7346 + // Ref: https://github.com/kgateway-dev/kgateway/issues/7346 elected = make(chan struct{}) identity.Reset(elected) // Die if we are unable to recover from this within the recoveryTimeout diff --git a/pkg/bootstrap/leaderelector/leader_test.go b/pkg/bootstrap/leaderelector/leader_test.go index 21dde6924e0..76f27ea071e 100644 --- a/pkg/bootstrap/leaderelector/leader_test.go +++ b/pkg/bootstrap/leaderelector/leader_test.go @@ -4,9 +4,9 @@ import ( "context" "sync/atomic" + "github.com/kgateway-dev/kgateway/pkg/bootstrap/leaderelector" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/solo-io/gloo/pkg/bootstrap/leaderelector" ) var _ = Describe("Leader Startup Action", func() { diff --git a/pkg/bootstrap/leaderelector/singlereplica/factory.go b/pkg/bootstrap/leaderelector/singlereplica/factory.go index 561829dd1f0..24b341520f4 100644 --- a/pkg/bootstrap/leaderelector/singlereplica/factory.go +++ b/pkg/bootstrap/leaderelector/singlereplica/factory.go @@ -3,7 +3,7 @@ package singlereplica import ( "context" - "github.com/solo-io/gloo/pkg/bootstrap/leaderelector" + "github.com/kgateway-dev/kgateway/pkg/bootstrap/leaderelector" "github.com/solo-io/go-utils/contextutils" ) diff --git a/pkg/cliutil/input_test.go b/pkg/cliutil/input_test.go index f6ab2f742cb..e02a729bd8b 100644 --- a/pkg/cliutil/input_test.go +++ b/pkg/cliutil/input_test.go @@ -1,10 +1,10 @@ package cliutil_test import ( + . "github.com/kgateway-dev/kgateway/pkg/cliutil" + "github.com/kgateway-dev/kgateway/pkg/cliutil/testutil" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/solo-io/gloo/pkg/cliutil" - "github.com/solo-io/gloo/pkg/cliutil/testutil" ) var _ = Describe("GetBoolInput", func() { diff --git a/pkg/cliutil/install/kubernetes.go b/pkg/cliutil/install/kubernetes.go index 81f96bc29ea..c94bcb6f3f9 100644 --- a/pkg/cliutil/install/kubernetes.go +++ b/pkg/cliutil/install/kubernetes.go @@ -7,7 +7,7 @@ import ( "os" "os/exec" - "github.com/solo-io/gloo/pkg/cliutil" + "github.com/kgateway-dev/kgateway/pkg/cliutil" ) // Deprecated: Prefer kubectl.Cli diff --git a/pkg/cliutil/nsselect/select.go b/pkg/cliutil/nsselect/select.go index 9fb5418737b..8836aa05f28 100644 --- a/pkg/cliutil/nsselect/select.go +++ b/pkg/cliutil/nsselect/select.go @@ -6,7 +6,7 @@ import ( "github.com/solo-io/go-utils/contextutils" - "github.com/solo-io/gloo/pkg/cliutil" + "github.com/kgateway-dev/kgateway/pkg/cliutil" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" survey "gopkg.in/AlecAivazis/survey.v1" ) diff --git a/pkg/cliutil/testutil/testutil.go b/pkg/cliutil/testutil/testutil.go index 80aae70f29c..b0cc21a89e2 100644 --- a/pkg/cliutil/testutil/testutil.go +++ b/pkg/cliutil/testutil/testutil.go @@ -7,9 +7,9 @@ import ( expect "github.com/Netflix/go-expect" "github.com/hinshun/vt10x" + "github.com/kgateway-dev/kgateway/pkg/cliutil" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/solo-io/gloo/pkg/cliutil" "gopkg.in/AlecAivazis/survey.v1/terminal" ) diff --git a/pkg/cliutil/uri.go b/pkg/cliutil/uri.go index 9429bf04cb3..c7c47035f69 100644 --- a/pkg/cliutil/uri.go +++ b/pkg/cliutil/uri.go @@ -14,10 +14,10 @@ import ( "strings" "time" - "github.com/solo-io/gloo/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" "github.com/avast/retry-go/v4" - "github.com/solo-io/gloo/pkg/utils/kubeutils/portforward" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils/portforward" "github.com/hashicorp/go-multierror" errors "github.com/rotisserie/eris" diff --git a/pkg/github-action-utils/version.go b/pkg/github-action-utils/version.go index 25189901f8e..e8071fdb06f 100644 --- a/pkg/github-action-utils/version.go +++ b/pkg/github-action-utils/version.go @@ -5,8 +5,8 @@ import ( "math" "os" + "github.com/kgateway-dev/kgateway/pkg/version" "github.com/pkg/errors" - "github.com/solo-io/gloo/pkg/version" "github.com/solo-io/go-utils/changelogutils" "github.com/solo-io/go-utils/versionutils" "github.com/solo-io/go-utils/vfsutils" diff --git a/pkg/listers/listers.go b/pkg/listers/listers.go index 7387057642c..f24e6b28c13 100644 --- a/pkg/listers/listers.go +++ b/pkg/listers/listers.go @@ -4,7 +4,7 @@ import ( "context" ) -//go:generate go run github.com/golang/mock/mockgen -destination mocks/mock_listers.go -package mocks github.com/solo-io/gloo/pkg/listers NamespaceLister +//go:generate go run github.com/golang/mock/mockgen -destination mocks/mock_listers.go -package mocks github.com/kgateway-dev/kgateway/pkg/listers NamespaceLister type NamespaceLister interface { List(ctx context.Context) ([]string, error) diff --git a/pkg/listers/mocks/mock_listers.go b/pkg/listers/mocks/mock_listers.go index a6cdb355bd5..fd0448c6527 100644 --- a/pkg/listers/mocks/mock_listers.go +++ b/pkg/listers/mocks/mock_listers.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/solo-io/gloo/pkg/listers (interfaces: NamespaceLister) +// Source: github.com/kgateway-dev/kgateway/pkg/listers (interfaces: NamespaceLister) // Package mocks is a generated GoMock package. package mocks diff --git a/pkg/schemes/extended_scheme.go b/pkg/schemes/extended_scheme.go index 91f2d563118..61b28dc8e6f 100644 --- a/pkg/schemes/extended_scheme.go +++ b/pkg/schemes/extended_scheme.go @@ -3,7 +3,7 @@ package schemes import ( "fmt" - "github.com/solo-io/gloo/projects/gateway2/wellknown" + "github.com/kgateway-dev/kgateway/projects/gateway2/wellknown" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/runtime" diff --git a/pkg/schemes/scheme.go b/pkg/schemes/scheme.go index 8c1e5f3fee0..8cc232dc809 100644 --- a/pkg/schemes/scheme.go +++ b/pkg/schemes/scheme.go @@ -12,7 +12,7 @@ import ( gwv1a2 "sigs.k8s.io/gateway-api/apis/v1alpha2" gwv1b1 "sigs.k8s.io/gateway-api/apis/v1beta1" - sologatewayv1alpha1 "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1" + sologatewayv1alpha1 "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1" ) // SchemeBuilder contains all the Schemes for registering the CRDs with which Gloo Gateway interacts. @@ -49,7 +49,7 @@ func AddToScheme(s *runtime.Scheme) error { // DefaultScheme returns a scheme with all the types registered for Gloo Gateway // We intentionally do not perform this operation in an init!! -// See https://github.com/solo-io/gloo/pull/9692 for context +// See https://github.com/kgateway-dev/kgateway/pull/9692 for context func DefaultScheme() *runtime.Scheme { s := runtime.NewScheme() _ = AddToScheme(s) diff --git a/pkg/utils/channelutils/wait_test.go b/pkg/utils/channelutils/wait_test.go index 31a26986ce3..957f8492775 100644 --- a/pkg/utils/channelutils/wait_test.go +++ b/pkg/utils/channelutils/wait_test.go @@ -7,7 +7,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/solo-io/gloo/pkg/utils/channelutils" + . "github.com/kgateway-dev/kgateway/pkg/utils/channelutils" ) var _ = Describe("Wait", func() { diff --git a/pkg/utils/envoyutils/admincli/client.go b/pkg/utils/envoyutils/admincli/client.go index 962f5b0e39c..d37cbfb3f0e 100644 --- a/pkg/utils/envoyutils/admincli/client.go +++ b/pkg/utils/envoyutils/admincli/client.go @@ -10,13 +10,13 @@ import ( adminv3 "github.com/envoyproxy/go-control-plane/envoy/admin/v3" clusterv3 "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3" listenerv3 "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3" - "github.com/solo-io/gloo/pkg/utils/cmdutils" - "github.com/solo-io/gloo/pkg/utils/protoutils" - "github.com/solo-io/gloo/pkg/utils/requestutils/curl" + "github.com/kgateway-dev/kgateway/pkg/utils/cmdutils" + "github.com/kgateway-dev/kgateway/pkg/utils/protoutils" + "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" "github.com/solo-io/go-utils/threadsafe" - "github.com/solo-io/gloo/pkg/utils/kubeutils/kubectl" - "github.com/solo-io/gloo/pkg/utils/kubeutils/portforward" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils/kubectl" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils/portforward" ) const ( diff --git a/pkg/utils/envoyutils/admincli/client_test.go b/pkg/utils/envoyutils/admincli/client_test.go index e146e0e1efb..146aea3d994 100644 --- a/pkg/utils/envoyutils/admincli/client_test.go +++ b/pkg/utils/envoyutils/admincli/client_test.go @@ -3,10 +3,10 @@ package admincli_test import ( "context" + "github.com/kgateway-dev/kgateway/pkg/utils/envoyutils/admincli" + "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/solo-io/gloo/pkg/utils/envoyutils/admincli" - "github.com/solo-io/gloo/pkg/utils/requestutils/curl" "github.com/solo-io/go-utils/threadsafe" ) diff --git a/pkg/utils/envoyutils/bootstrap/bootstrap.go b/pkg/utils/envoyutils/bootstrap/bootstrap.go index 6d22d3f519b..8700e5fea77 100644 --- a/pkg/utils/envoyutils/bootstrap/bootstrap.go +++ b/pkg/utils/envoyutils/bootstrap/bootstrap.go @@ -16,8 +16,8 @@ import ( "github.com/golang/protobuf/jsonpb" "github.com/golang/protobuf/proto" anypb "github.com/golang/protobuf/ptypes/any" + "github.com/kgateway-dev/kgateway/projects/gateway2/utils" "github.com/rotisserie/eris" - "github.com/solo-io/gloo/projects/gateway2/utils" envoycache "github.com/solo-io/solo-kit/pkg/api/v1/control-plane/cache" ) diff --git a/pkg/utils/envoyutils/bootstrap/bootstrap_test.go b/pkg/utils/envoyutils/bootstrap/bootstrap_test.go index 7aff40bbb94..dbfe83a3ea1 100644 --- a/pkg/utils/envoyutils/bootstrap/bootstrap_test.go +++ b/pkg/utils/envoyutils/bootstrap/bootstrap_test.go @@ -3,8 +3,8 @@ package bootstrap import ( "context" + "github.com/kgateway-dev/kgateway/projects/gateway2/utils" envoytransformation "github.com/solo-io/envoy-gloo/go/config/filter/http/transformation/v2" - "github.com/solo-io/gloo/projects/gateway2/utils" envoycache "github.com/solo-io/solo-kit/pkg/api/v1/control-plane/cache" "github.com/solo-io/solo-kit/pkg/api/v1/control-plane/resource" diff --git a/pkg/utils/envoyutils/validation/validation.go b/pkg/utils/envoyutils/validation/validation.go index 7c0eb255405..f4ac03dd699 100644 --- a/pkg/utils/envoyutils/validation/validation.go +++ b/pkg/utils/envoyutils/validation/validation.go @@ -3,10 +3,10 @@ package validation import ( "context" + "github.com/kgateway-dev/kgateway/pkg/utils/envoyutils/bootstrap" + "github.com/kgateway-dev/kgateway/pkg/utils/envutils" + "github.com/kgateway-dev/kgateway/projects/envoyinit/pkg/runner" "github.com/rotisserie/eris" - "github.com/solo-io/gloo/pkg/utils/envoyutils/bootstrap" - "github.com/solo-io/gloo/pkg/utils/envutils" - "github.com/solo-io/gloo/projects/envoyinit/pkg/runner" "github.com/solo-io/go-utils/contextutils" envoycache "github.com/solo-io/solo-kit/pkg/api/v1/control-plane/cache" ) diff --git a/pkg/utils/glooadminutils/admincli/client.go b/pkg/utils/glooadminutils/admincli/client.go index 59b56b4b371..2629bdf2188 100644 --- a/pkg/utils/glooadminutils/admincli/client.go +++ b/pkg/utils/glooadminutils/admincli/client.go @@ -5,10 +5,10 @@ import ( "encoding/json" "io" + "github.com/kgateway-dev/kgateway/pkg/utils/cmdutils" + "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" + "github.com/kgateway-dev/kgateway/projects/gateway2/admin" "github.com/rotisserie/eris" - "github.com/solo-io/gloo/pkg/utils/cmdutils" - "github.com/solo-io/gloo/pkg/utils/requestutils/curl" - "github.com/solo-io/gloo/projects/gateway2/admin" "github.com/solo-io/go-utils/threadsafe" ) diff --git a/pkg/utils/glooadminutils/admincli/client_test.go b/pkg/utils/glooadminutils/admincli/client_test.go index b0fcd8a6b26..62cc0df4338 100644 --- a/pkg/utils/glooadminutils/admincli/client_test.go +++ b/pkg/utils/glooadminutils/admincli/client_test.go @@ -3,10 +3,10 @@ package admincli_test import ( "context" + "github.com/kgateway-dev/kgateway/pkg/utils/glooadminutils/admincli" + "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/solo-io/gloo/pkg/utils/glooadminutils/admincli" - "github.com/solo-io/gloo/pkg/utils/requestutils/curl" "github.com/solo-io/go-utils/threadsafe" ) diff --git a/pkg/utils/helmutils/client.go b/pkg/utils/helmutils/client.go index cc0edafa63d..6cb1be74b60 100644 --- a/pkg/utils/helmutils/client.go +++ b/pkg/utils/helmutils/client.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/solo-io/gloo/pkg/utils/cmdutils" + "github.com/kgateway-dev/kgateway/pkg/utils/cmdutils" ) // Client is a utility for executing `helm` commands diff --git a/pkg/utils/kubeutils/kubectl/cli.go b/pkg/utils/kubeutils/kubectl/cli.go index 3332675f080..6899e9dc9ac 100644 --- a/pkg/utils/kubeutils/kubectl/cli.go +++ b/pkg/utils/kubeutils/kubectl/cli.go @@ -12,12 +12,12 @@ import ( "k8s.io/apimachinery/pkg/types" - "github.com/solo-io/gloo/pkg/utils/cmdutils" - "github.com/solo-io/gloo/pkg/utils/requestutils/curl" + "github.com/kgateway-dev/kgateway/pkg/utils/cmdutils" + "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" "github.com/solo-io/k8s-utils/testutils/kube" "github.com/avast/retry-go/v4" - "github.com/solo-io/gloo/pkg/utils/kubeutils/portforward" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils/portforward" ) // Cli is a utility for executing `kubectl` commands diff --git a/pkg/utils/kubeutils/portforward/api_forwarder.go b/pkg/utils/kubeutils/portforward/api_forwarder.go index 385f68f100f..734b380336e 100644 --- a/pkg/utils/kubeutils/portforward/api_forwarder.go +++ b/pkg/utils/kubeutils/portforward/api_forwarder.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/solo-io/gloo/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" "k8s.io/client-go/rest" diff --git a/pkg/utils/namespaces/namespaces_test.go b/pkg/utils/namespaces/namespaces_test.go index 2cda091a5dc..aa7b9b7ac0a 100644 --- a/pkg/utils/namespaces/namespaces_test.go +++ b/pkg/utils/namespaces/namespaces_test.go @@ -4,7 +4,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/solo-io/gloo/pkg/utils/namespaces" + "github.com/kgateway-dev/kgateway/pkg/utils/namespaces" ) var _ = Describe("Namespaces", func() { diff --git a/pkg/utils/probes/probes_test.go b/pkg/utils/probes/probes_test.go index 69df1ccc94c..10573656257 100644 --- a/pkg/utils/probes/probes_test.go +++ b/pkg/utils/probes/probes_test.go @@ -7,9 +7,9 @@ import ( "net/http" "time" + . "github.com/kgateway-dev/kgateway/pkg/utils/probes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/solo-io/gloo/pkg/utils/probes" ) var _ = Describe("Probes", func() { diff --git a/pkg/utils/regexutils/regex_test.go b/pkg/utils/regexutils/regex_test.go index b4362d7759a..2e295f29bde 100644 --- a/pkg/utils/regexutils/regex_test.go +++ b/pkg/utils/regexutils/regex_test.go @@ -1,9 +1,9 @@ package regexutils_test import ( + . "github.com/kgateway-dev/kgateway/pkg/utils/regexutils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/solo-io/gloo/pkg/utils/regexutils" ) var _ = Describe("Regex", func() { diff --git a/pkg/utils/requestutils/curl/request_test.go b/pkg/utils/requestutils/curl/request_test.go index 1b9e34719ce..ad5519f5723 100644 --- a/pkg/utils/requestutils/curl/request_test.go +++ b/pkg/utils/requestutils/curl/request_test.go @@ -1,9 +1,9 @@ package curl_test import ( + "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" . "github.com/onsi/gomega" "github.com/onsi/gomega/types" - "github.com/solo-io/gloo/pkg/utils/requestutils/curl" . "github.com/onsi/ginkgo/v2" ) diff --git a/pkg/utils/setuputils/main_setup.go b/pkg/utils/setuputils/main_setup.go index c2d862d5f50..b70e6531290 100644 --- a/pkg/utils/setuputils/main_setup.go +++ b/pkg/utils/setuputils/main_setup.go @@ -4,13 +4,13 @@ import ( "context" "os" - "github.com/solo-io/gloo/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" "github.com/go-logr/zapr" - "github.com/solo-io/gloo/pkg/bootstrap/leaderelector" - kube2 "github.com/solo-io/gloo/pkg/bootstrap/leaderelector/kube" - "github.com/solo-io/gloo/pkg/bootstrap/leaderelector/singlereplica" - "github.com/solo-io/gloo/pkg/version" + "github.com/kgateway-dev/kgateway/pkg/bootstrap/leaderelector" + kube2 "github.com/kgateway-dev/kgateway/pkg/bootstrap/leaderelector/kube" + "github.com/kgateway-dev/kgateway/pkg/bootstrap/leaderelector/singlereplica" + "github.com/kgateway-dev/kgateway/pkg/version" "github.com/solo-io/go-utils/contextutils" "go.uber.org/zap" "go.uber.org/zap/zapcore" diff --git a/pkg/utils/sliceutils/sliceutils_test.go b/pkg/utils/sliceutils/sliceutils_test.go index 1e777d710bb..da093dcd63a 100644 --- a/pkg/utils/sliceutils/sliceutils_test.go +++ b/pkg/utils/sliceutils/sliceutils_test.go @@ -4,7 +4,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/solo-io/gloo/pkg/utils/sliceutils" + . "github.com/kgateway-dev/kgateway/pkg/utils/sliceutils" ) var _ = Describe("SliceUtils", func() { diff --git a/pkg/utils/stringutils/stringutils_test.go b/pkg/utils/stringutils/stringutils_test.go index 900153f531f..d3d6110ba8f 100644 --- a/pkg/utils/stringutils/stringutils_test.go +++ b/pkg/utils/stringutils/stringutils_test.go @@ -4,7 +4,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/solo-io/gloo/pkg/utils/stringutils" + . "github.com/kgateway-dev/kgateway/pkg/utils/stringutils" ) var _ = Describe("StringUtils", func() { diff --git a/pkg/version/enterprise_version_test.go b/pkg/version/enterprise_version_test.go index d1017328f19..545607d8622 100644 --- a/pkg/version/enterprise_version_test.go +++ b/pkg/version/enterprise_version_test.go @@ -1,9 +1,9 @@ package version_test import ( + "github.com/kgateway-dev/kgateway/pkg/version" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/solo-io/gloo/pkg/version" "github.com/spf13/afero" ) diff --git a/projects/envoyinit/README.md b/projects/envoyinit/README.md index 63c83c297b6..8c159175055 100644 --- a/projects/envoyinit/README.md +++ b/projects/envoyinit/README.md @@ -8,12 +8,12 @@ The [Envoy Proxy](https://www.envoyproxy.io/) is a cloud-native, high-performanc The Gloo Gateway service proxies provide all the functionality of the [open source Envoy Proxy](https://github.com/solo-io/envoy-gloo), in addition to some custom extensions. The source code for these proxies is maintained at [envoy-gloo](https://github.com/solo-io/envoy-gloo) ### Versioning -In the [Makefile](https://github.com/solo-io/gloo/blob/main/Makefile), the `ENVOY_GLOO_IMAGE` value defines the version of `envoy-gloo` that Gloo Gateway depends on. +In the [Makefile](https://github.com/kgateway-dev/kgateway/blob/main/Makefile), the `ENVOY_GLOO_IMAGE` value defines the version of `envoy-gloo` that Gloo Gateway depends on. Envoy publishes new minor releases [each quarter](https://www.envoyproxy.io/docs/envoy/latest/version_history/version_history#). Gloo attempts to follow this cadence, and increment our minor version of `envoy-gloo` as well. ## Build -*All make targets are currently defined in the [Makefile](https://github.com/solo-io/gloo/blob/main/Makefile) at the root of the repository.* +*All make targets are currently defined in the [Makefile](https://github.com/kgateway-dev/kgateway/blob/main/Makefile) at the root of the repository.* The `VERSION` env variable determines the name of the tag for the image. @@ -38,16 +38,16 @@ Envoy is configured with [Bootstrap configuration](https://www.envoyproxy.io/doc In Gloo Gateway, Envoy configuration is processed in the following order: -1. The bootstrap configuration is defined in a [ConfigMap](https://github.com/solo-io/gloo/blob/main/install/helm/gloo/templates/9-gateway-proxy-configmap.yaml) +1. The bootstrap configuration is defined in a [ConfigMap](https://github.com/kgateway-dev/kgateway/blob/main/install/helm/gloo/templates/9-gateway-proxy-configmap.yaml) 2. The ConfigMap is mounted as a volume on the Pod 3. At [initialization](./cmd/main.go), the container reads the configuration, and transforms it using the [Kubernetes Downward API](https://kubernetes.io/docs/tasks/inject-data-application/downward-api-volume-expose-pod-information/#the-downward-api) 4. The transformed configuration is provided to the Envoy executable ### Dynamic -Envoy receives dynamic configuration via the [xDS protocol](https://www.envoyproxy.io/docs/envoy/latest/api-docs/xds_protocol#xds-protocol). The Gloo [xDS](https://github.com/solo-io/gloo/tree/main/projects/gloo/pkg/xds) package contains relevant code for serving dynamic configuration. +Envoy receives dynamic configuration via the [xDS protocol](https://www.envoyproxy.io/docs/envoy/latest/api-docs/xds_protocol#xds-protocol). The Gloo [xDS](https://github.com/kgateway-dev/kgateway/tree/main/projects/gloo/pkg/xds) package contains relevant code for serving dynamic configuration. ## Debug -It can be useful to run the Envoy proxy, without the control-plane, as a way of validating proxy behavior. Please refer to [Running the Gateway Proxy locally](https://github.com/solo-io/gloo/tree/main/install/local-gateway-proxy) for further instructions. +It can be useful to run the Envoy proxy, without the control-plane, as a way of validating proxy behavior. Please refer to [Running the Gateway Proxy locally](https://github.com/kgateway-dev/kgateway/tree/main/install/local-gateway-proxy) for further instructions. ## Testing Tests are run using [Ginkgo](https://onsi.github.io/ginkgo/). diff --git a/projects/envoyinit/cmd/main.go b/projects/envoyinit/cmd/main.go index e69e9aafd8e..c8b72da9b6b 100644 --- a/projects/envoyinit/cmd/main.go +++ b/projects/envoyinit/cmd/main.go @@ -6,8 +6,8 @@ import ( // The filter types are autogenerated by looking at all packages in go-control-plane and gloo // api extensions. As a result, this will need to be re-run when updating go-control-plane // or gloo extensions if new packages are added. - _ "github.com/solo-io/gloo/projects/envoyinit/hack/filter_types" - "github.com/solo-io/gloo/projects/envoyinit/pkg/runner" + _ "github.com/kgateway-dev/kgateway/projects/envoyinit/hack/filter_types" + "github.com/kgateway-dev/kgateway/projects/envoyinit/pkg/runner" ) func main() { diff --git a/projects/envoyinit/pkg/downward/downward_test.go b/projects/envoyinit/pkg/downward/downward_test.go index 70a2a7609f0..5d2e22242d2 100644 --- a/projects/envoyinit/pkg/downward/downward_test.go +++ b/projects/envoyinit/pkg/downward/downward_test.go @@ -4,7 +4,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/solo-io/gloo/projects/envoyinit/pkg/downward" + . "github.com/kgateway-dev/kgateway/projects/envoyinit/pkg/downward" ) var _ = Describe("Downward", func() { diff --git a/projects/envoyinit/pkg/downward/template_test.go b/projects/envoyinit/pkg/downward/template_test.go index 474337efb0b..05b83184eb3 100644 --- a/projects/envoyinit/pkg/downward/template_test.go +++ b/projects/envoyinit/pkg/downward/template_test.go @@ -4,7 +4,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/solo-io/gloo/projects/envoyinit/pkg/downward" + . "github.com/kgateway-dev/kgateway/projects/envoyinit/pkg/downward" ) type mockDownward struct { diff --git a/projects/envoyinit/pkg/downward/transform_test.go b/projects/envoyinit/pkg/downward/transform_test.go index 44540e88eef..427698b519b 100644 --- a/projects/envoyinit/pkg/downward/transform_test.go +++ b/projects/envoyinit/pkg/downward/transform_test.go @@ -9,7 +9,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/solo-io/gloo/projects/envoyinit/pkg/downward" + . "github.com/kgateway-dev/kgateway/projects/envoyinit/pkg/downward" ) var _ = Describe("Transform", func() { diff --git a/projects/envoyinit/pkg/runner/run.go b/projects/envoyinit/pkg/runner/run.go index 5726efa90d8..d15168aa14d 100644 --- a/projects/envoyinit/pkg/runner/run.go +++ b/projects/envoyinit/pkg/runner/run.go @@ -8,9 +8,9 @@ import ( "syscall" "time" + "github.com/kgateway-dev/kgateway/pkg/utils/cmdutils" + "github.com/kgateway-dev/kgateway/projects/envoyinit/pkg/downward" "github.com/rotisserie/eris" - "github.com/solo-io/gloo/pkg/utils/cmdutils" - "github.com/solo-io/gloo/projects/envoyinit/pkg/downward" "github.com/solo-io/go-utils/contextutils" ) diff --git a/projects/gateway2/Makefile b/projects/gateway2/Makefile index 2a1b63892bf..06f9beaf8df 100644 --- a/projects/gateway2/Makefile +++ b/projects/gateway2/Makefile @@ -3,7 +3,7 @@ ifneq (,$(TAGGED_VERSION)) VERSION := $(shell echo $(TAGGED_VERSION) | cut -c 2-) endif -LDFLAGS := "-X github.com/solo-io/gloo/pkg/version.Version=$(VERSION)" +LDFLAGS := "-X github.com/kgateway-dev/kgateway/pkg/version.Version=$(VERSION)" # TODO (Law[revert]): need to add CLI tests here, see CI pr.yaml workflow .PHONY: test diff --git a/projects/gateway2/admin/resources.go b/projects/gateway2/admin/resources.go index 7ffe0a69288..009a173becf 100644 --- a/projects/gateway2/admin/resources.go +++ b/projects/gateway2/admin/resources.go @@ -3,8 +3,8 @@ package admin import ( "slices" - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1" - "github.com/solo-io/gloo/projects/gateway2/wellknown" + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1" + "github.com/kgateway-dev/kgateway/projects/gateway2/wellknown" "k8s.io/apimachinery/pkg/runtime/schema" ) diff --git a/projects/gateway2/admin/response_test.go b/projects/gateway2/admin/response_test.go index 6253194389a..272634b7f2e 100644 --- a/projects/gateway2/admin/response_test.go +++ b/projects/gateway2/admin/response_test.go @@ -1,10 +1,10 @@ package admin_test import ( + "github.com/kgateway-dev/kgateway/projects/gateway2/admin" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/rotisserie/eris" - "github.com/solo-io/gloo/projects/gateway2/admin" crdv1 "github.com/solo-io/solo-kit/pkg/api/v1/clients/kube/crd/solo.io/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/projects/gateway2/admin/server.go b/projects/gateway2/admin/server.go index 61d820b125e..17bb7e0d892 100644 --- a/projects/gateway2/admin/server.go +++ b/projects/gateway2/admin/server.go @@ -10,7 +10,7 @@ import ( "sort" envoycache "github.com/envoyproxy/go-control-plane/pkg/cache/v3" - "github.com/solo-io/gloo/projects/gateway2/controller" + "github.com/kgateway-dev/kgateway/projects/gateway2/controller" "github.com/solo-io/go-utils/contextutils" "istio.io/istio/pkg/kube/krt" ) diff --git a/projects/gateway2/api/applyconfiguration/api/v1alpha1/aiextensionstats.go b/projects/gateway2/api/applyconfiguration/api/v1alpha1/aiextensionstats.go index 63ac2141135..6ead71bee74 100644 --- a/projects/gateway2/api/applyconfiguration/api/v1alpha1/aiextensionstats.go +++ b/projects/gateway2/api/applyconfiguration/api/v1alpha1/aiextensionstats.go @@ -3,7 +3,7 @@ package v1alpha1 import ( - v1alpha1 "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1" + v1alpha1 "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1" ) // AiExtensionStatsApplyConfiguration represents a declarative configuration of the AiExtensionStats type for use diff --git a/projects/gateway2/api/applyconfiguration/api/v1alpha1/directresponse.go b/projects/gateway2/api/applyconfiguration/api/v1alpha1/directresponse.go index fae6309f968..d9602ae23f9 100644 --- a/projects/gateway2/api/applyconfiguration/api/v1alpha1/directresponse.go +++ b/projects/gateway2/api/applyconfiguration/api/v1alpha1/directresponse.go @@ -3,8 +3,8 @@ package v1alpha1 import ( - internal "github.com/solo-io/gloo/projects/gateway2/api/applyconfiguration/internal" - apiv1alpha1 "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1" + internal "github.com/kgateway-dev/kgateway/projects/gateway2/api/applyconfiguration/internal" + apiv1alpha1 "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" managedfields "k8s.io/apimachinery/pkg/util/managedfields" @@ -55,7 +55,7 @@ func ExtractDirectResponseStatus(directResponse *apiv1alpha1.DirectResponse, fie func extractDirectResponse(directResponse *apiv1alpha1.DirectResponse, fieldManager string, subresource string) (*DirectResponseApplyConfiguration, error) { b := &DirectResponseApplyConfiguration{} - err := managedfields.ExtractInto(directResponse, internal.Parser().Type("com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.DirectResponse"), fieldManager, b, subresource) + err := managedfields.ExtractInto(directResponse, internal.Parser().Type("com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.DirectResponse"), fieldManager, b, subresource) if err != nil { return nil, err } diff --git a/projects/gateway2/api/applyconfiguration/api/v1alpha1/gatewayparameters.go b/projects/gateway2/api/applyconfiguration/api/v1alpha1/gatewayparameters.go index 616046fe57e..80f553e2c4b 100644 --- a/projects/gateway2/api/applyconfiguration/api/v1alpha1/gatewayparameters.go +++ b/projects/gateway2/api/applyconfiguration/api/v1alpha1/gatewayparameters.go @@ -3,8 +3,8 @@ package v1alpha1 import ( - internal "github.com/solo-io/gloo/projects/gateway2/api/applyconfiguration/internal" - apiv1alpha1 "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1" + internal "github.com/kgateway-dev/kgateway/projects/gateway2/api/applyconfiguration/internal" + apiv1alpha1 "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" managedfields "k8s.io/apimachinery/pkg/util/managedfields" @@ -55,7 +55,7 @@ func ExtractGatewayParametersStatus(gatewayParameters *apiv1alpha1.GatewayParame func extractGatewayParameters(gatewayParameters *apiv1alpha1.GatewayParameters, fieldManager string, subresource string) (*GatewayParametersApplyConfiguration, error) { b := &GatewayParametersApplyConfiguration{} - err := managedfields.ExtractInto(gatewayParameters, internal.Parser().Type("com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.GatewayParameters"), fieldManager, b, subresource) + err := managedfields.ExtractInto(gatewayParameters, internal.Parser().Type("com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.GatewayParameters"), fieldManager, b, subresource) if err != nil { return nil, err } diff --git a/projects/gateway2/api/applyconfiguration/api/v1alpha1/gatewayparametersspec.go b/projects/gateway2/api/applyconfiguration/api/v1alpha1/gatewayparametersspec.go index e243fc7d295..e7f04337fd1 100644 --- a/projects/gateway2/api/applyconfiguration/api/v1alpha1/gatewayparametersspec.go +++ b/projects/gateway2/api/applyconfiguration/api/v1alpha1/gatewayparametersspec.go @@ -3,7 +3,7 @@ package v1alpha1 import ( - apiv1alpha1 "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1" + apiv1alpha1 "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1" ) // GatewayParametersSpecApplyConfiguration represents a declarative configuration of the GatewayParametersSpec type for use diff --git a/projects/gateway2/api/applyconfiguration/api/v1alpha1/httplistenerpolicy.go b/projects/gateway2/api/applyconfiguration/api/v1alpha1/httplistenerpolicy.go index ca80adfbc99..612ba432cdd 100644 --- a/projects/gateway2/api/applyconfiguration/api/v1alpha1/httplistenerpolicy.go +++ b/projects/gateway2/api/applyconfiguration/api/v1alpha1/httplistenerpolicy.go @@ -3,8 +3,8 @@ package v1alpha1 import ( - internal "github.com/solo-io/gloo/projects/gateway2/api/applyconfiguration/internal" - apiv1alpha1 "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1" + internal "github.com/kgateway-dev/kgateway/projects/gateway2/api/applyconfiguration/internal" + apiv1alpha1 "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" managedfields "k8s.io/apimachinery/pkg/util/managedfields" @@ -55,7 +55,7 @@ func ExtractHttpListenerPolicyStatus(httpListenerPolicy *apiv1alpha1.HttpListene func extractHttpListenerPolicy(httpListenerPolicy *apiv1alpha1.HttpListenerPolicy, fieldManager string, subresource string) (*HttpListenerPolicyApplyConfiguration, error) { b := &HttpListenerPolicyApplyConfiguration{} - err := managedfields.ExtractInto(httpListenerPolicy, internal.Parser().Type("com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.HttpListenerPolicy"), fieldManager, b, subresource) + err := managedfields.ExtractInto(httpListenerPolicy, internal.Parser().Type("com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.HttpListenerPolicy"), fieldManager, b, subresource) if err != nil { return nil, err } diff --git a/projects/gateway2/api/applyconfiguration/api/v1alpha1/listenerpolicy.go b/projects/gateway2/api/applyconfiguration/api/v1alpha1/listenerpolicy.go index a4f18f300a1..2d162270a7f 100644 --- a/projects/gateway2/api/applyconfiguration/api/v1alpha1/listenerpolicy.go +++ b/projects/gateway2/api/applyconfiguration/api/v1alpha1/listenerpolicy.go @@ -3,8 +3,8 @@ package v1alpha1 import ( - internal "github.com/solo-io/gloo/projects/gateway2/api/applyconfiguration/internal" - apiv1alpha1 "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1" + internal "github.com/kgateway-dev/kgateway/projects/gateway2/api/applyconfiguration/internal" + apiv1alpha1 "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" managedfields "k8s.io/apimachinery/pkg/util/managedfields" @@ -55,7 +55,7 @@ func ExtractListenerPolicyStatus(listenerPolicy *apiv1alpha1.ListenerPolicy, fie func extractListenerPolicy(listenerPolicy *apiv1alpha1.ListenerPolicy, fieldManager string, subresource string) (*ListenerPolicyApplyConfiguration, error) { b := &ListenerPolicyApplyConfiguration{} - err := managedfields.ExtractInto(listenerPolicy, internal.Parser().Type("com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.ListenerPolicy"), fieldManager, b, subresource) + err := managedfields.ExtractInto(listenerPolicy, internal.Parser().Type("com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.ListenerPolicy"), fieldManager, b, subresource) if err != nil { return nil, err } diff --git a/projects/gateway2/api/applyconfiguration/api/v1alpha1/routepolicy.go b/projects/gateway2/api/applyconfiguration/api/v1alpha1/routepolicy.go index fe323a8f5db..4ecc4a564fc 100644 --- a/projects/gateway2/api/applyconfiguration/api/v1alpha1/routepolicy.go +++ b/projects/gateway2/api/applyconfiguration/api/v1alpha1/routepolicy.go @@ -3,8 +3,8 @@ package v1alpha1 import ( - internal "github.com/solo-io/gloo/projects/gateway2/api/applyconfiguration/internal" - apiv1alpha1 "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1" + internal "github.com/kgateway-dev/kgateway/projects/gateway2/api/applyconfiguration/internal" + apiv1alpha1 "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" managedfields "k8s.io/apimachinery/pkg/util/managedfields" @@ -55,7 +55,7 @@ func ExtractRoutePolicyStatus(routePolicy *apiv1alpha1.RoutePolicy, fieldManager func extractRoutePolicy(routePolicy *apiv1alpha1.RoutePolicy, fieldManager string, subresource string) (*RoutePolicyApplyConfiguration, error) { b := &RoutePolicyApplyConfiguration{} - err := managedfields.ExtractInto(routePolicy, internal.Parser().Type("com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.RoutePolicy"), fieldManager, b, subresource) + err := managedfields.ExtractInto(routePolicy, internal.Parser().Type("com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.RoutePolicy"), fieldManager, b, subresource) if err != nil { return nil, err } diff --git a/projects/gateway2/api/applyconfiguration/api/v1alpha1/upstream.go b/projects/gateway2/api/applyconfiguration/api/v1alpha1/upstream.go index bb0323e6ed5..fd9f3e11614 100644 --- a/projects/gateway2/api/applyconfiguration/api/v1alpha1/upstream.go +++ b/projects/gateway2/api/applyconfiguration/api/v1alpha1/upstream.go @@ -3,8 +3,8 @@ package v1alpha1 import ( - internal "github.com/solo-io/gloo/projects/gateway2/api/applyconfiguration/internal" - apiv1alpha1 "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1" + internal "github.com/kgateway-dev/kgateway/projects/gateway2/api/applyconfiguration/internal" + apiv1alpha1 "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" managedfields "k8s.io/apimachinery/pkg/util/managedfields" @@ -55,7 +55,7 @@ func ExtractUpstreamStatus(upstream *apiv1alpha1.Upstream, fieldManager string) func extractUpstream(upstream *apiv1alpha1.Upstream, fieldManager string, subresource string) (*UpstreamApplyConfiguration, error) { b := &UpstreamApplyConfiguration{} - err := managedfields.ExtractInto(upstream, internal.Parser().Type("com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.Upstream"), fieldManager, b, subresource) + err := managedfields.ExtractInto(upstream, internal.Parser().Type("com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.Upstream"), fieldManager, b, subresource) if err != nil { return nil, err } diff --git a/projects/gateway2/api/applyconfiguration/internal/internal.go b/projects/gateway2/api/applyconfiguration/internal/internal.go index 9978655c6fe..aa4ef77de74 100644 --- a/projects/gateway2/api/applyconfiguration/internal/internal.go +++ b/projects/gateway2/api/applyconfiguration/internal/internal.go @@ -23,7 +23,7 @@ func Parser() *typed.Parser { var parserOnce sync.Once var parser *typed.Parser var schemaYAML = typed.YAMLObject(`types: -- name: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.AiExtension +- name: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.AiExtension map: fields: - name: enabled @@ -37,7 +37,7 @@ var schemaYAML = typed.YAMLObject(`types: elementRelationship: atomic - name: image type: - namedType: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.Image + namedType: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.Image - name: ports type: list: @@ -52,17 +52,17 @@ var schemaYAML = typed.YAMLObject(`types: namedType: io.k8s.api.core.v1.SecurityContext - name: stats type: - namedType: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.AiExtensionStats -- name: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.AiExtensionStats + namedType: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.AiExtensionStats +- name: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.AiExtensionStats map: fields: - name: customLabels type: list: elementType: - namedType: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.CustomLabel + namedType: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.CustomLabel elementRelationship: atomic -- name: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.AwsUpstream +- name: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.AwsUpstream map: fields: - name: region @@ -72,7 +72,7 @@ var schemaYAML = typed.YAMLObject(`types: type: namedType: io.k8s.api.core.v1.LocalObjectReference default: {} -- name: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.CustomLabel +- name: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.CustomLabel map: fields: - name: keyDelimiter @@ -89,7 +89,7 @@ var schemaYAML = typed.YAMLObject(`types: type: scalar: string default: "" -- name: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.DirectResponse +- name: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.DirectResponse map: fields: - name: apiVersion @@ -104,13 +104,13 @@ var schemaYAML = typed.YAMLObject(`types: default: {} - name: spec type: - namedType: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.DirectResponseSpec + namedType: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.DirectResponseSpec default: {} - name: status type: - namedType: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.DirectResponseStatus + namedType: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.DirectResponseStatus default: {} -- name: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.DirectResponseSpec +- name: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.DirectResponseSpec map: fields: - name: body @@ -120,7 +120,7 @@ var schemaYAML = typed.YAMLObject(`types: type: scalar: numeric default: 0 -- name: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.DirectResponseStatus +- name: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.DirectResponseStatus map: elementType: scalar: untyped @@ -132,7 +132,7 @@ var schemaYAML = typed.YAMLObject(`types: elementType: namedType: __untyped_deduced_ elementRelationship: separable -- name: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.EnvoyBootstrap +- name: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.EnvoyBootstrap map: fields: - name: componentLogLevels @@ -143,22 +143,22 @@ var schemaYAML = typed.YAMLObject(`types: - name: logLevel type: scalar: string -- name: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.EnvoyContainer +- name: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.EnvoyContainer map: fields: - name: bootstrap type: - namedType: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.EnvoyBootstrap + namedType: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.EnvoyBootstrap - name: image type: - namedType: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.Image + namedType: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.Image - name: resources type: namedType: io.k8s.api.core.v1.ResourceRequirements - name: securityContext type: namedType: io.k8s.api.core.v1.SecurityContext -- name: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.GatewayParameters +- name: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.GatewayParameters map: fields: - name: apiVersion @@ -173,22 +173,22 @@ var schemaYAML = typed.YAMLObject(`types: default: {} - name: spec type: - namedType: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.GatewayParametersSpec + namedType: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.GatewayParametersSpec default: {} - name: status type: - namedType: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.GatewayParametersStatus + namedType: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.GatewayParametersStatus default: {} -- name: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.GatewayParametersSpec +- name: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.GatewayParametersSpec map: fields: - name: kube type: - namedType: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.KubernetesProxyConfig + namedType: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.KubernetesProxyConfig - name: selfManaged type: - namedType: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.SelfManagedGateway -- name: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.GatewayParametersStatus + namedType: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.SelfManagedGateway +- name: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.GatewayParametersStatus map: elementType: scalar: untyped @@ -200,7 +200,7 @@ var schemaYAML = typed.YAMLObject(`types: elementType: namedType: __untyped_deduced_ elementRelationship: separable -- name: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.GracefulShutdownSpec +- name: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.GracefulShutdownSpec map: fields: - name: enabled @@ -209,7 +209,7 @@ var schemaYAML = typed.YAMLObject(`types: - name: sleepTimeSeconds type: scalar: numeric -- name: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.Host +- name: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.Host map: fields: - name: host @@ -220,7 +220,7 @@ var schemaYAML = typed.YAMLObject(`types: type: scalar: numeric default: 0 -- name: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.HttpListenerPolicy +- name: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.HttpListenerPolicy map: fields: - name: apiVersion @@ -235,13 +235,13 @@ var schemaYAML = typed.YAMLObject(`types: default: {} - name: spec type: - namedType: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.HttpListenerPolicySpec + namedType: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.HttpListenerPolicySpec default: {} - name: status type: - namedType: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.PolicyStatus + namedType: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.PolicyStatus default: {} -- name: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.HttpListenerPolicySpec +- name: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.HttpListenerPolicySpec map: fields: - name: compress @@ -249,9 +249,9 @@ var schemaYAML = typed.YAMLObject(`types: scalar: boolean - name: targetRef type: - namedType: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.LocalPolicyTargetReference + namedType: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.LocalPolicyTargetReference default: {} -- name: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.Image +- name: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.Image map: fields: - name: digest @@ -269,12 +269,12 @@ var schemaYAML = typed.YAMLObject(`types: - name: tag type: scalar: string -- name: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.IstioContainer +- name: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.IstioContainer map: fields: - name: image type: - namedType: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.Image + namedType: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.Image - name: istioDiscoveryAddress type: scalar: string @@ -293,7 +293,7 @@ var schemaYAML = typed.YAMLObject(`types: - name: securityContext type: namedType: io.k8s.api.core.v1.SecurityContext -- name: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.IstioIntegration +- name: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.IstioIntegration map: fields: - name: customSidecars @@ -304,41 +304,41 @@ var schemaYAML = typed.YAMLObject(`types: elementRelationship: atomic - name: istioProxyContainer type: - namedType: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.IstioContainer -- name: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.KubernetesProxyConfig + namedType: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.IstioContainer +- name: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.KubernetesProxyConfig map: fields: - name: aiExtension type: - namedType: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.AiExtension + namedType: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.AiExtension - name: deployment type: - namedType: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.ProxyDeployment + namedType: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.ProxyDeployment - name: envoyContainer type: - namedType: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.EnvoyContainer + namedType: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.EnvoyContainer - name: floatingUserId type: scalar: boolean - name: istio type: - namedType: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.IstioIntegration + namedType: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.IstioIntegration - name: podTemplate type: - namedType: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.Pod + namedType: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.Pod - name: sdsContainer type: - namedType: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.SdsContainer + namedType: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.SdsContainer - name: service type: - namedType: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.Service + namedType: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.Service - name: serviceAccount type: - namedType: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.ServiceAccount + namedType: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.ServiceAccount - name: stats type: - namedType: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.StatsConfig -- name: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.ListenerPolicy + namedType: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.StatsConfig +- name: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.ListenerPolicy map: fields: - name: apiVersion @@ -353,13 +353,13 @@ var schemaYAML = typed.YAMLObject(`types: default: {} - name: spec type: - namedType: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.ListenerPolicySpec + namedType: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.ListenerPolicySpec default: {} - name: status type: - namedType: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.PolicyStatus + namedType: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.PolicyStatus default: {} -- name: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.ListenerPolicySpec +- name: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.ListenerPolicySpec map: fields: - name: perConnectionBufferLimitBytes @@ -367,9 +367,9 @@ var schemaYAML = typed.YAMLObject(`types: scalar: numeric - name: targetRef type: - namedType: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.LocalPolicyTargetReference + namedType: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.LocalPolicyTargetReference default: {} -- name: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.LocalPolicyTargetReference +- name: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.LocalPolicyTargetReference map: fields: - name: group @@ -384,7 +384,7 @@ var schemaYAML = typed.YAMLObject(`types: type: scalar: string default: "" -- name: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.Pod +- name: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.Pod map: fields: - name: affinity @@ -402,7 +402,7 @@ var schemaYAML = typed.YAMLObject(`types: scalar: string - name: gracefulShutdown type: - namedType: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.GracefulShutdownSpec + namedType: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.GracefulShutdownSpec - name: imagePullSecrets type: list: @@ -432,7 +432,7 @@ var schemaYAML = typed.YAMLObject(`types: elementType: namedType: io.k8s.api.core.v1.Toleration elementRelationship: atomic -- name: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.PolicyAncestorStatus +- name: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.PolicyAncestorStatus map: fields: - name: ancestorRef @@ -451,14 +451,14 @@ var schemaYAML = typed.YAMLObject(`types: type: scalar: string default: "" -- name: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.PolicyStatus +- name: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.PolicyStatus map: fields: - name: ancestors type: list: elementType: - namedType: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.PolicyAncestorStatus + namedType: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.PolicyAncestorStatus elementRelationship: atomic - name: conditions type: @@ -468,13 +468,13 @@ var schemaYAML = typed.YAMLObject(`types: elementRelationship: associative keys: - type -- name: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.ProxyDeployment +- name: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.ProxyDeployment map: fields: - name: replicas type: scalar: numeric -- name: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.RoutePolicy +- name: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.RoutePolicy map: fields: - name: apiVersion @@ -489,44 +489,44 @@ var schemaYAML = typed.YAMLObject(`types: default: {} - name: spec type: - namedType: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.RoutePolicySpec + namedType: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.RoutePolicySpec default: {} - name: status type: - namedType: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.PolicyStatus + namedType: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.PolicyStatus default: {} -- name: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.RoutePolicySpec +- name: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.RoutePolicySpec map: fields: - name: targetRef type: - namedType: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.LocalPolicyTargetReference + namedType: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.LocalPolicyTargetReference default: {} - name: timeout type: scalar: numeric -- name: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.SdsBootstrap +- name: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.SdsBootstrap map: fields: - name: logLevel type: scalar: string -- name: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.SdsContainer +- name: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.SdsContainer map: fields: - name: bootstrap type: - namedType: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.SdsBootstrap + namedType: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.SdsBootstrap - name: image type: - namedType: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.Image + namedType: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.Image - name: resources type: namedType: io.k8s.api.core.v1.ResourceRequirements - name: securityContext type: namedType: io.k8s.api.core.v1.SecurityContext -- name: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.SelfManagedGateway +- name: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.SelfManagedGateway map: elementType: scalar: untyped @@ -538,7 +538,7 @@ var schemaYAML = typed.YAMLObject(`types: elementType: namedType: __untyped_deduced_ elementRelationship: separable -- name: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.Service +- name: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.Service map: fields: - name: clusterIP @@ -557,7 +557,7 @@ var schemaYAML = typed.YAMLObject(`types: - name: type type: scalar: string -- name: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.ServiceAccount +- name: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.ServiceAccount map: fields: - name: extraAnnotations @@ -570,16 +570,16 @@ var schemaYAML = typed.YAMLObject(`types: map: elementType: scalar: string -- name: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.StaticUpstream +- name: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.StaticUpstream map: fields: - name: hosts type: list: elementType: - namedType: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.Host + namedType: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.Host elementRelationship: atomic -- name: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.StatsConfig +- name: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.StatsConfig map: fields: - name: enableStatsRoute @@ -594,7 +594,7 @@ var schemaYAML = typed.YAMLObject(`types: - name: statsRoutePrefixRewrite type: scalar: string -- name: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.Upstream +- name: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.Upstream map: fields: - name: apiVersion @@ -609,22 +609,22 @@ var schemaYAML = typed.YAMLObject(`types: default: {} - name: spec type: - namedType: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.UpstreamSpec + namedType: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.UpstreamSpec default: {} - name: status type: - namedType: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.UpstreamStatus + namedType: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.UpstreamStatus default: {} -- name: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.UpstreamSpec +- name: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.UpstreamSpec map: fields: - name: aws type: - namedType: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.AwsUpstream + namedType: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.AwsUpstream - name: static type: - namedType: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.StaticUpstream -- name: com.github.solo-io.gloo.projects.gateway2.api.v1alpha1.UpstreamStatus + namedType: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.StaticUpstream +- name: com.github.kgateway-dev.kgateway.projects.gateway2.api.v1alpha1.UpstreamStatus map: fields: - name: conditions diff --git a/projects/gateway2/api/applyconfiguration/utils.go b/projects/gateway2/api/applyconfiguration/utils.go index d877f6a89c0..270bdede446 100644 --- a/projects/gateway2/api/applyconfiguration/utils.go +++ b/projects/gateway2/api/applyconfiguration/utils.go @@ -3,9 +3,9 @@ package applyconfiguration import ( - apiv1alpha1 "github.com/solo-io/gloo/projects/gateway2/api/applyconfiguration/api/v1alpha1" - internal "github.com/solo-io/gloo/projects/gateway2/api/applyconfiguration/internal" - v1alpha1 "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1" + apiv1alpha1 "github.com/kgateway-dev/kgateway/projects/gateway2/api/applyconfiguration/api/v1alpha1" + internal "github.com/kgateway-dev/kgateway/projects/gateway2/api/applyconfiguration/internal" + v1alpha1 "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" testing "k8s.io/client-go/testing" diff --git a/projects/gateway2/cmd/main.go b/projects/gateway2/cmd/main.go index 44ec14320be..47286287dd9 100644 --- a/projects/gateway2/cmd/main.go +++ b/projects/gateway2/cmd/main.go @@ -3,8 +3,8 @@ package main import ( "context" - "github.com/solo-io/gloo/pkg/utils/probes" - "github.com/solo-io/gloo/projects/gateway2/setup" + "github.com/kgateway-dev/kgateway/pkg/utils/probes" + "github.com/kgateway-dev/kgateway/projects/gateway2/setup" "github.com/solo-io/go-utils/log" ) diff --git a/projects/gateway2/cmd/modelschema/main.go b/projects/gateway2/cmd/modelschema/main.go index f4351095cc8..5634b9b3389 100644 --- a/projects/gateway2/cmd/modelschema/main.go +++ b/projects/gateway2/cmd/modelschema/main.go @@ -8,7 +8,7 @@ import ( "os" "strings" - openapi "github.com/solo-io/gloo/projects/gateway2/pkg/generated/openapi" + openapi "github.com/kgateway-dev/kgateway/projects/gateway2/pkg/generated/openapi" "k8s.io/kube-openapi/pkg/common" "k8s.io/kube-openapi/pkg/validation/spec" diff --git a/projects/gateway2/controller/controller.go b/projects/gateway2/controller/controller.go index 1623135f08b..e0404d424d7 100644 --- a/projects/gateway2/controller/controller.go +++ b/projects/gateway2/controller/controller.go @@ -19,9 +19,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" apiv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1" - "github.com/solo-io/gloo/projects/gateway2/deployer" - "github.com/solo-io/gloo/projects/gateway2/wellknown" + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1" + "github.com/kgateway-dev/kgateway/projects/gateway2/deployer" + "github.com/kgateway-dev/kgateway/projects/gateway2/wellknown" ) const ( diff --git a/projects/gateway2/controller/controller_suite_test.go b/projects/gateway2/controller/controller_suite_test.go index 82858d178d6..c0223bc8a19 100644 --- a/projects/gateway2/controller/controller_suite_test.go +++ b/projects/gateway2/controller/controller_suite_test.go @@ -11,13 +11,13 @@ import ( "sigs.k8s.io/controller-runtime/pkg/config" - "github.com/solo-io/gloo/pkg/schemes" + "github.com/kgateway-dev/kgateway/pkg/schemes" + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1" + "github.com/kgateway-dev/kgateway/projects/gateway2/controller" + "github.com/kgateway-dev/kgateway/projects/gateway2/wellknown" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1" - "github.com/solo-io/gloo/projects/gateway2/controller" - "github.com/solo-io/gloo/projects/gateway2/wellknown" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/sets" diff --git a/projects/gateway2/controller/gw_controller.go b/projects/gateway2/controller/gw_controller.go index 1f752afc661..3bd1f2050a6 100644 --- a/projects/gateway2/controller/gw_controller.go +++ b/projects/gateway2/controller/gw_controller.go @@ -4,7 +4,7 @@ import ( "context" "slices" - "github.com/solo-io/gloo/projects/gateway2/deployer" + "github.com/kgateway-dev/kgateway/projects/gateway2/deployer" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/projects/gateway2/controller/scheme.go b/projects/gateway2/controller/scheme.go index f3815c81bac..1af1e3d0b8b 100644 --- a/projects/gateway2/controller/scheme.go +++ b/projects/gateway2/controller/scheme.go @@ -12,7 +12,7 @@ import ( gwv1a2 "sigs.k8s.io/gateway-api/apis/v1alpha2" gwv1b1 "sigs.k8s.io/gateway-api/apis/v1beta1" - sologatewayv1alpha1 "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1" + sologatewayv1alpha1 "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1" ) // SchemeBuilder contains all the Schemes for registering the CRDs with which Gloo Gateway interacts. @@ -41,7 +41,7 @@ func AddToScheme(s *runtime.Scheme) error { // DefaultScheme returns a scheme with all the types registered for Gloo Gateway // We intentionally do not perform this operation in an init!! -// See https://github.com/solo-io/gloo/pull/9692 for context +// See https://github.com/kgateway-dev/kgateway/pull/9692 for context func DefaultScheme() *runtime.Scheme { s := runtime.NewScheme() _ = AddToScheme(s) diff --git a/projects/gateway2/controller/start.go b/projects/gateway2/controller/start.go index e663f6151b3..ec1e68a307d 100644 --- a/projects/gateway2/controller/start.go +++ b/projects/gateway2/controller/start.go @@ -7,7 +7,7 @@ import ( "k8s.io/utils/ptr" "sigs.k8s.io/controller-runtime/pkg/config" - glooschemes "github.com/solo-io/gloo/pkg/schemes" + glooschemes "github.com/kgateway-dev/kgateway/pkg/schemes" "github.com/solo-io/go-utils/contextutils" "k8s.io/apimachinery/pkg/util/sets" @@ -18,18 +18,18 @@ import ( metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server" envoycache "github.com/envoyproxy/go-control-plane/pkg/cache/v3" - "github.com/solo-io/gloo/projects/gateway2/deployer" - "github.com/solo-io/gloo/projects/gateway2/extensions2" - "github.com/solo-io/gloo/projects/gateway2/extensions2/common" - extensionsplug "github.com/solo-io/gloo/projects/gateway2/extensions2/plugin" - "github.com/solo-io/gloo/projects/gateway2/extensions2/registry" - "github.com/solo-io/gloo/projects/gateway2/extensions2/settings" - "github.com/solo-io/gloo/projects/gateway2/ir" - "github.com/solo-io/gloo/projects/gateway2/krtcollections" - "github.com/solo-io/gloo/projects/gateway2/pkg/client/clientset/versioned" - "github.com/solo-io/gloo/projects/gateway2/proxy_syncer" - "github.com/solo-io/gloo/projects/gateway2/utils/krtutil" - "github.com/solo-io/gloo/projects/gateway2/wellknown" + "github.com/kgateway-dev/kgateway/projects/gateway2/deployer" + "github.com/kgateway-dev/kgateway/projects/gateway2/extensions2" + "github.com/kgateway-dev/kgateway/projects/gateway2/extensions2/common" + extensionsplug "github.com/kgateway-dev/kgateway/projects/gateway2/extensions2/plugin" + "github.com/kgateway-dev/kgateway/projects/gateway2/extensions2/registry" + "github.com/kgateway-dev/kgateway/projects/gateway2/extensions2/settings" + "github.com/kgateway-dev/kgateway/projects/gateway2/ir" + "github.com/kgateway-dev/kgateway/projects/gateway2/krtcollections" + "github.com/kgateway-dev/kgateway/projects/gateway2/pkg/client/clientset/versioned" + "github.com/kgateway-dev/kgateway/projects/gateway2/proxy_syncer" + "github.com/kgateway-dev/kgateway/projects/gateway2/utils/krtutil" + "github.com/kgateway-dev/kgateway/projects/gateway2/wellknown" uzap "go.uber.org/zap" istiokube "istio.io/istio/pkg/kube" "istio.io/istio/pkg/kube/krt" diff --git a/projects/gateway2/controller/typed_client.go b/projects/gateway2/controller/typed_client.go index d65431e9b00..a1a6084b85b 100644 --- a/projects/gateway2/controller/typed_client.go +++ b/projects/gateway2/controller/typed_client.go @@ -133,7 +133,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/solo-io/gloo/projects/gateway2/controller" + "github.com/kgateway-dev/kgateway/projects/gateway2/controller" _ "k8s.io/client-go/plugin/pkg/client/auth/gcp" ) diff --git a/projects/gateway2/deployer/deployer.go b/projects/gateway2/deployer/deployer.go index eb0ce8b2ac0..2acc0228f10 100644 --- a/projects/gateway2/deployer/deployer.go +++ b/projects/gateway2/deployer/deployer.go @@ -9,11 +9,11 @@ import ( "io/fs" "path/filepath" + "github.com/kgateway-dev/kgateway/pkg/version" + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1" + "github.com/kgateway-dev/kgateway/projects/gateway2/helm" + "github.com/kgateway-dev/kgateway/projects/gateway2/wellknown" "github.com/rotisserie/eris" - "github.com/solo-io/gloo/pkg/version" - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1" - "github.com/solo-io/gloo/projects/gateway2/helm" - "github.com/solo-io/gloo/projects/gateway2/wellknown" "golang.org/x/exp/slices" "helm.sh/helm/v3/pkg/action" "helm.sh/helm/v3/pkg/chart" diff --git a/projects/gateway2/deployer/deployer_test.go b/projects/gateway2/deployer/deployer_test.go index fb920f7217b..cfc1cc26bb4 100644 --- a/projects/gateway2/deployer/deployer_test.go +++ b/projects/gateway2/deployer/deployer_test.go @@ -8,15 +8,15 @@ import ( envoy_config_bootstrap "github.com/envoyproxy/go-control-plane/envoy/config/bootstrap/v3" _ "github.com/envoyproxy/go-control-plane/envoy/extensions/upstreams/http/v3" "github.com/ghodss/yaml" + "github.com/kgateway-dev/kgateway/pkg/schemes" + "github.com/kgateway-dev/kgateway/pkg/version" + gw2_v1alpha1 "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1" + "github.com/kgateway-dev/kgateway/projects/gateway2/deployer" + "github.com/kgateway-dev/kgateway/projects/gateway2/wellknown" + "github.com/kgateway-dev/kgateway/projects/gateway2/xds" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/types" - "github.com/solo-io/gloo/pkg/schemes" - "github.com/solo-io/gloo/pkg/version" - gw2_v1alpha1 "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1" - "github.com/solo-io/gloo/projects/gateway2/deployer" - "github.com/solo-io/gloo/projects/gateway2/wellknown" - "github.com/solo-io/gloo/projects/gateway2/xds" jsonpb "google.golang.org/protobuf/encoding/protojson" "google.golang.org/protobuf/proto" appsv1 "k8s.io/api/apps/v1" @@ -36,13 +36,13 @@ import ( // // There is some import within this package that this suite relies on. Chasing that down is // *hard* tho due to the import tree, and best done in a followup. - // _ "github.com/solo-io/gloo/projects/gloo/pkg/translator" + // _ "github.com/kgateway-dev/kgateway/projects/gloo/pkg/translator" // // The above TODO is a result of proto types being registered for free somewhere through // the translator import. What we really need is to register all proto types, which is // "correctly" available to use via `envoyinit`; note that the autogeneration of these types // is currently broken. see: https://github.com/kgateway-dev/kgateway/issues/10491 - _ "github.com/solo-io/gloo/projects/envoyinit/hack/filter_types" + _ "github.com/kgateway-dev/kgateway/projects/envoyinit/hack/filter_types" ) // testBootstrap implements resources.Resource in order to use protoutils.UnmarshalYAML diff --git a/projects/gateway2/deployer/merge.go b/projects/gateway2/deployer/merge.go index 2f0313919f0..53e20123cba 100644 --- a/projects/gateway2/deployer/merge.go +++ b/projects/gateway2/deployer/merge.go @@ -1,7 +1,7 @@ package deployer import ( - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1" + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/util/intstr" ) diff --git a/projects/gateway2/deployer/merge_test.go b/projects/gateway2/deployer/merge_test.go index 0c44ba65f66..8b088d72d99 100644 --- a/projects/gateway2/deployer/merge_test.go +++ b/projects/gateway2/deployer/merge_test.go @@ -1,9 +1,9 @@ package deployer import ( + gw2_v1alpha1 "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - gw2_v1alpha1 "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1" "k8s.io/utils/ptr" ) diff --git a/projects/gateway2/deployer/values.go b/projects/gateway2/deployer/values.go index 05ca53f12f1..488be8d495f 100644 --- a/projects/gateway2/deployer/values.go +++ b/projects/gateway2/deployer/values.go @@ -1,7 +1,7 @@ package deployer import ( - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1" + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1" corev1 "k8s.io/api/core/v1" ) diff --git a/projects/gateway2/deployer/values_helpers.go b/projects/gateway2/deployer/values_helpers.go index c27423f7ce2..00a5e6e391d 100644 --- a/projects/gateway2/deployer/values_helpers.go +++ b/projects/gateway2/deployer/values_helpers.go @@ -6,9 +6,9 @@ import ( "sort" "strings" + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1" + "github.com/kgateway-dev/kgateway/projects/gateway2/ports" "github.com/rotisserie/eris" - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1" - "github.com/solo-io/gloo/projects/gateway2/ports" "golang.org/x/exp/slices" "k8s.io/utils/ptr" api "sigs.k8s.io/gateway-api/apis/v1" diff --git a/projects/gateway2/deployer/values_helpers_test.go b/projects/gateway2/deployer/values_helpers_test.go index 8773dc1f088..956b9d1636a 100644 --- a/projects/gateway2/deployer/values_helpers_test.go +++ b/projects/gateway2/deployer/values_helpers_test.go @@ -1,9 +1,9 @@ package deployer_test import ( + "github.com/kgateway-dev/kgateway/projects/gateway2/deployer" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/solo-io/gloo/projects/gateway2/deployer" ) var _ = Describe("Values Helpers", func() { diff --git a/projects/gateway2/endpoints/prioritize.go b/projects/gateway2/endpoints/prioritize.go index b2106f2cf5e..cbd5c7be081 100644 --- a/projects/gateway2/endpoints/prioritize.go +++ b/projects/gateway2/endpoints/prioritize.go @@ -4,7 +4,7 @@ import ( "sort" "strings" - "github.com/solo-io/gloo/projects/gateway2/ir" + "github.com/kgateway-dev/kgateway/projects/gateway2/ir" "go.uber.org/zap" "istio.io/api/networking/v1alpha3" diff --git a/projects/gateway2/extensions2/common/krt.go b/projects/gateway2/extensions2/common/krt.go index ea12ae1606f..e536b732044 100644 --- a/projects/gateway2/extensions2/common/krt.go +++ b/projects/gateway2/extensions2/common/krt.go @@ -4,11 +4,11 @@ import ( "fmt" "github.com/go-logr/logr" - "github.com/solo-io/gloo/projects/gateway2/extensions2/settings" - "github.com/solo-io/gloo/projects/gateway2/ir" - "github.com/solo-io/gloo/projects/gateway2/krtcollections" - "github.com/solo-io/gloo/projects/gateway2/pkg/client/clientset/versioned" - "github.com/solo-io/gloo/projects/gateway2/utils/krtutil" + "github.com/kgateway-dev/kgateway/projects/gateway2/extensions2/settings" + "github.com/kgateway-dev/kgateway/projects/gateway2/ir" + "github.com/kgateway-dev/kgateway/projects/gateway2/krtcollections" + "github.com/kgateway-dev/kgateway/projects/gateway2/pkg/client/clientset/versioned" + "github.com/kgateway-dev/kgateway/projects/gateway2/utils/krtutil" "istio.io/istio/pkg/kube" istiokube "istio.io/istio/pkg/kube" "istio.io/istio/pkg/kube/kclient" diff --git a/projects/gateway2/extensions2/factory.go b/projects/gateway2/extensions2/factory.go index 905e8f4224c..59990c75863 100644 --- a/projects/gateway2/extensions2/factory.go +++ b/projects/gateway2/extensions2/factory.go @@ -3,9 +3,9 @@ package extensions2 import ( "context" - extensionsplug "github.com/solo-io/gloo/projects/gateway2/extensions2/plugin" + extensionsplug "github.com/kgateway-dev/kgateway/projects/gateway2/extensions2/plugin" - "github.com/solo-io/gloo/projects/gateway2/extensions2/common" + "github.com/kgateway-dev/kgateway/projects/gateway2/extensions2/common" ) type K8sGatewayExtensionsFactory func(ctx context.Context, commoncol *common.CommonCollections) extensionsplug.Plugin diff --git a/projects/gateway2/extensions2/plugin/plugin.go b/projects/gateway2/extensions2/plugin/plugin.go index d5cac6040c5..b5e220e4182 100644 --- a/projects/gateway2/extensions2/plugin/plugin.go +++ b/projects/gateway2/extensions2/plugin/plugin.go @@ -5,10 +5,10 @@ import ( envoy_config_cluster_v3 "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3" envoy_config_endpoint_v3 "github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3" - "github.com/solo-io/gloo/projects/gateway2/ir" + "github.com/kgateway-dev/kgateway/projects/gateway2/ir" gwv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/solo-io/gloo/projects/gateway2/reports" + "github.com/kgateway-dev/kgateway/projects/gateway2/reports" "istio.io/istio/pkg/kube/krt" "k8s.io/apimachinery/pkg/runtime/schema" ) diff --git a/projects/gateway2/extensions2/plugins/destrule/destrule.go b/projects/gateway2/extensions2/plugins/destrule/destrule.go index 1f59b963324..f4315984bf2 100644 --- a/projects/gateway2/extensions2/plugins/destrule/destrule.go +++ b/projects/gateway2/extensions2/plugins/destrule/destrule.go @@ -4,7 +4,7 @@ import ( "fmt" "slices" - "github.com/solo-io/gloo/projects/gateway2/utils/krtutil" + "github.com/kgateway-dev/kgateway/projects/gateway2/utils/krtutil" "google.golang.org/protobuf/proto" "istio.io/api/networking/v1alpha3" networkingclient "istio.io/client-go/pkg/apis/networking/v1" diff --git a/projects/gateway2/extensions2/plugins/destrule/destrule_plugin.go b/projects/gateway2/extensions2/plugins/destrule/destrule_plugin.go index c43c38d9423..2309e41a4de 100644 --- a/projects/gateway2/extensions2/plugins/destrule/destrule_plugin.go +++ b/projects/gateway2/extensions2/plugins/destrule/destrule_plugin.go @@ -11,10 +11,10 @@ import ( envoy_config_cluster_v3 "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3" envoy_config_endpoint_v3 "github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3" envoy_type_v3 "github.com/envoyproxy/go-control-plane/envoy/type/v3" - "github.com/solo-io/gloo/projects/gateway2/endpoints" - "github.com/solo-io/gloo/projects/gateway2/extensions2/common" - extensionsplug "github.com/solo-io/gloo/projects/gateway2/extensions2/plugin" - "github.com/solo-io/gloo/projects/gateway2/ir" + "github.com/kgateway-dev/kgateway/projects/gateway2/endpoints" + "github.com/kgateway-dev/kgateway/projects/gateway2/extensions2/common" + extensionsplug "github.com/kgateway-dev/kgateway/projects/gateway2/extensions2/plugin" + "github.com/kgateway-dev/kgateway/projects/gateway2/ir" "github.com/solo-io/go-utils/contextutils" "istio.io/api/networking/v1alpha3" "istio.io/istio/pkg/config/schema/gvr" diff --git a/projects/gateway2/extensions2/plugins/directresponse/direct_response_plugin.go b/projects/gateway2/extensions2/plugins/directresponse/direct_response_plugin.go index af8f0afaade..9656e8b508c 100644 --- a/projects/gateway2/extensions2/plugins/directresponse/direct_response_plugin.go +++ b/projects/gateway2/extensions2/plugins/directresponse/direct_response_plugin.go @@ -11,12 +11,12 @@ import ( corev3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" envoy_config_listener_v3 "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3" envoy_config_route_v3 "github.com/envoyproxy/go-control-plane/envoy/config/route/v3" - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1" - "github.com/solo-io/gloo/projects/gateway2/extensions2/common" - extensionplug "github.com/solo-io/gloo/projects/gateway2/extensions2/plugin" - "github.com/solo-io/gloo/projects/gateway2/ir" - "github.com/solo-io/gloo/projects/gateway2/pkg/client/clientset/versioned" - "github.com/solo-io/gloo/projects/gateway2/plugins" + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1" + "github.com/kgateway-dev/kgateway/projects/gateway2/extensions2/common" + extensionplug "github.com/kgateway-dev/kgateway/projects/gateway2/extensions2/plugin" + "github.com/kgateway-dev/kgateway/projects/gateway2/ir" + "github.com/kgateway-dev/kgateway/projects/gateway2/pkg/client/clientset/versioned" + "github.com/kgateway-dev/kgateway/projects/gateway2/plugins" skubeclient "istio.io/istio/pkg/config/schema/kubeclient" "istio.io/istio/pkg/kube/kclient" "istio.io/istio/pkg/kube/krt" diff --git a/projects/gateway2/extensions2/plugins/istio/plugin.go b/projects/gateway2/extensions2/plugins/istio/plugin.go index 836fb3b963e..9b0bfdb5bd2 100644 --- a/projects/gateway2/extensions2/plugins/istio/plugin.go +++ b/projects/gateway2/extensions2/plugins/istio/plugin.go @@ -16,11 +16,11 @@ import ( sockets_raw_buffer "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/raw_buffer/v3" tlsv3 "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3" "github.com/envoyproxy/go-control-plane/pkg/wellknown" - "github.com/solo-io/gloo/pkg/utils/envutils" - "github.com/solo-io/gloo/projects/gateway2/extensions2/common" - extensionsplug "github.com/solo-io/gloo/projects/gateway2/extensions2/plugin" - "github.com/solo-io/gloo/projects/gateway2/ir" - ourwellknown "github.com/solo-io/gloo/projects/gateway2/wellknown" + "github.com/kgateway-dev/kgateway/pkg/utils/envutils" + "github.com/kgateway-dev/kgateway/projects/gateway2/extensions2/common" + extensionsplug "github.com/kgateway-dev/kgateway/projects/gateway2/extensions2/plugin" + "github.com/kgateway-dev/kgateway/projects/gateway2/ir" + ourwellknown "github.com/kgateway-dev/kgateway/projects/gateway2/wellknown" "github.com/solo-io/go-utils/contextutils" corev1 "k8s.io/api/core/v1" ) diff --git a/projects/gateway2/extensions2/plugins/kubernetes/k8s.go b/projects/gateway2/extensions2/plugins/kubernetes/k8s.go index 4f519b03703..1439a3b3b8b 100644 --- a/projects/gateway2/extensions2/plugins/kubernetes/k8s.go +++ b/projects/gateway2/extensions2/plugins/kubernetes/k8s.go @@ -9,12 +9,12 @@ import ( envoy_config_cluster_v3 "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3" envoy_config_core_v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" - "github.com/solo-io/gloo/projects/gateway2/extensions2/common" - extensionsplug "github.com/solo-io/gloo/projects/gateway2/extensions2/plugin" - "github.com/solo-io/gloo/projects/gateway2/extensions2/settings" - "github.com/solo-io/gloo/projects/gateway2/ir" - "github.com/solo-io/gloo/projects/gateway2/krtcollections" - "github.com/solo-io/gloo/projects/gateway2/utils/krtutil" + "github.com/kgateway-dev/kgateway/projects/gateway2/extensions2/common" + extensionsplug "github.com/kgateway-dev/kgateway/projects/gateway2/extensions2/plugin" + "github.com/kgateway-dev/kgateway/projects/gateway2/extensions2/settings" + "github.com/kgateway-dev/kgateway/projects/gateway2/ir" + "github.com/kgateway-dev/kgateway/projects/gateway2/krtcollections" + "github.com/kgateway-dev/kgateway/projects/gateway2/utils/krtutil" "istio.io/istio/pkg/kube/kclient" "istio.io/istio/pkg/kube/krt" corev1 "k8s.io/api/core/v1" diff --git a/projects/gateway2/extensions2/plugins/listenerpolicy/listener_policy_plugin.go b/projects/gateway2/extensions2/plugins/listenerpolicy/listener_policy_plugin.go index df9e849a5ae..9176ad1fb2a 100644 --- a/projects/gateway2/extensions2/plugins/listenerpolicy/listener_policy_plugin.go +++ b/projects/gateway2/extensions2/plugins/listenerpolicy/listener_policy_plugin.go @@ -8,13 +8,13 @@ import ( envoy_config_listener_v3 "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3" envoy_config_route_v3 "github.com/envoyproxy/go-control-plane/envoy/config/route/v3" - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1" - "github.com/solo-io/gloo/projects/gateway2/extensions2/common" - extensionplug "github.com/solo-io/gloo/projects/gateway2/extensions2/plugin" - extensionsplug "github.com/solo-io/gloo/projects/gateway2/extensions2/plugin" - "github.com/solo-io/gloo/projects/gateway2/ir" - "github.com/solo-io/gloo/projects/gateway2/plugins" - "github.com/solo-io/gloo/projects/gateway2/utils/krtutil" + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1" + "github.com/kgateway-dev/kgateway/projects/gateway2/extensions2/common" + extensionplug "github.com/kgateway-dev/kgateway/projects/gateway2/extensions2/plugin" + extensionsplug "github.com/kgateway-dev/kgateway/projects/gateway2/extensions2/plugin" + "github.com/kgateway-dev/kgateway/projects/gateway2/ir" + "github.com/kgateway-dev/kgateway/projects/gateway2/plugins" + "github.com/kgateway-dev/kgateway/projects/gateway2/utils/krtutil" wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" "istio.io/istio/pkg/kube/krt" ) diff --git a/projects/gateway2/extensions2/plugins/routepolicy/route_policy_plugin.go b/projects/gateway2/extensions2/plugins/routepolicy/route_policy_plugin.go index 1a139575346..48f62978c7e 100644 --- a/projects/gateway2/extensions2/plugins/routepolicy/route_policy_plugin.go +++ b/projects/gateway2/extensions2/plugins/routepolicy/route_policy_plugin.go @@ -9,13 +9,13 @@ import ( envoy_config_listener_v3 "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3" envoy_config_route_v3 "github.com/envoyproxy/go-control-plane/envoy/config/route/v3" - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1" - "github.com/solo-io/gloo/projects/gateway2/extensions2/common" - extensionplug "github.com/solo-io/gloo/projects/gateway2/extensions2/plugin" - extensionsplug "github.com/solo-io/gloo/projects/gateway2/extensions2/plugin" - "github.com/solo-io/gloo/projects/gateway2/ir" - "github.com/solo-io/gloo/projects/gateway2/plugins" - "github.com/solo-io/gloo/projects/gateway2/utils/krtutil" + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1" + "github.com/kgateway-dev/kgateway/projects/gateway2/extensions2/common" + extensionplug "github.com/kgateway-dev/kgateway/projects/gateway2/extensions2/plugin" + extensionsplug "github.com/kgateway-dev/kgateway/projects/gateway2/extensions2/plugin" + "github.com/kgateway-dev/kgateway/projects/gateway2/ir" + "github.com/kgateway-dev/kgateway/projects/gateway2/plugins" + "github.com/kgateway-dev/kgateway/projects/gateway2/utils/krtutil" "istio.io/istio/pkg/kube/krt" ) diff --git a/projects/gateway2/extensions2/plugins/upstream/aws.go b/projects/gateway2/extensions2/plugins/upstream/aws.go index f9a162c359b..ebb84780d85 100644 --- a/projects/gateway2/extensions2/plugins/upstream/aws.go +++ b/projects/gateway2/extensions2/plugins/upstream/aws.go @@ -11,10 +11,10 @@ import ( envoy_config_core_v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" envoyauth "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3" "github.com/envoyproxy/go-control-plane/pkg/wellknown" + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1" + "github.com/kgateway-dev/kgateway/projects/gateway2/extensions2/pluginutils" + "github.com/kgateway-dev/kgateway/projects/gateway2/ir" awspb "github.com/solo-io/envoy-gloo/go/config/filter/http/aws_lambda/v2" - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1" - "github.com/solo-io/gloo/projects/gateway2/extensions2/pluginutils" - "github.com/solo-io/gloo/projects/gateway2/ir" "google.golang.org/protobuf/types/known/anypb" ) diff --git a/projects/gateway2/extensions2/plugins/upstream/plugin.go b/projects/gateway2/extensions2/plugins/upstream/plugin.go index 61f76eb3439..80070332c5b 100644 --- a/projects/gateway2/extensions2/plugins/upstream/plugin.go +++ b/projects/gateway2/extensions2/plugins/upstream/plugin.go @@ -13,14 +13,14 @@ import ( envoy_config_cluster_v3 "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3" envoy_config_listener_v3 "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3" envoy_config_route_v3 "github.com/envoyproxy/go-control-plane/envoy/config/route/v3" + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1" + "github.com/kgateway-dev/kgateway/projects/gateway2/extensions2/common" + extensionsplug "github.com/kgateway-dev/kgateway/projects/gateway2/extensions2/plugin" + "github.com/kgateway-dev/kgateway/projects/gateway2/ir" + "github.com/kgateway-dev/kgateway/projects/gateway2/krtcollections" + "github.com/kgateway-dev/kgateway/projects/gateway2/pkg/client/clientset/versioned" + "github.com/kgateway-dev/kgateway/projects/gateway2/plugins" awspb "github.com/solo-io/envoy-gloo/go/config/filter/http/aws_lambda/v2" - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1" - "github.com/solo-io/gloo/projects/gateway2/extensions2/common" - extensionsplug "github.com/solo-io/gloo/projects/gateway2/extensions2/plugin" - "github.com/solo-io/gloo/projects/gateway2/ir" - "github.com/solo-io/gloo/projects/gateway2/krtcollections" - "github.com/solo-io/gloo/projects/gateway2/pkg/client/clientset/versioned" - "github.com/solo-io/gloo/projects/gateway2/plugins" skubeclient "istio.io/istio/pkg/config/schema/kubeclient" "istio.io/istio/pkg/kube/kclient" "istio.io/istio/pkg/kube/krt" diff --git a/projects/gateway2/extensions2/plugins/upstream/static.go b/projects/gateway2/extensions2/plugins/upstream/static.go index 1f3189f3891..ddcdbd9c6ff 100644 --- a/projects/gateway2/extensions2/plugins/upstream/static.go +++ b/projects/gateway2/extensions2/plugins/upstream/static.go @@ -7,8 +7,8 @@ import ( envoy_config_cluster_v3 "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3" envoy_config_core_v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" envoy_config_endpoint_v3 "github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3" - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1" - "github.com/solo-io/gloo/projects/gateway2/ir" + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1" + "github.com/kgateway-dev/kgateway/projects/gateway2/ir" ) func processStatic(ctx context.Context, in *v1alpha1.StaticUpstream, out *envoy_config_cluster_v3.Cluster) { diff --git a/projects/gateway2/extensions2/pluginutils/pluginutils.go b/projects/gateway2/extensions2/pluginutils/pluginutils.go index 2e95ca2db6a..fd71394a0ca 100644 --- a/projects/gateway2/extensions2/pluginutils/pluginutils.go +++ b/projects/gateway2/extensions2/pluginutils/pluginutils.go @@ -6,8 +6,8 @@ import ( envoy_config_endpoint_v3 "github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3" "github.com/golang/protobuf/proto" anypb "github.com/golang/protobuf/ptypes/any" + "github.com/kgateway-dev/kgateway/projects/gateway2/utils" "github.com/pkg/errors" - "github.com/solo-io/gloo/projects/gateway2/utils" ) func EnvoySingleEndpointLoadAssignment(out *envoy_config_cluster_v3.Cluster, address string, port uint32) { diff --git a/projects/gateway2/extensions2/registry/registry.go b/projects/gateway2/extensions2/registry/registry.go index 4e44d342d9b..529a7bec744 100644 --- a/projects/gateway2/extensions2/registry/registry.go +++ b/projects/gateway2/extensions2/registry/registry.go @@ -4,15 +4,15 @@ import ( "context" "maps" - "github.com/solo-io/gloo/projects/gateway2/extensions2/common" - extensionsplug "github.com/solo-io/gloo/projects/gateway2/extensions2/plugin" - "github.com/solo-io/gloo/projects/gateway2/extensions2/plugins/destrule" - "github.com/solo-io/gloo/projects/gateway2/extensions2/plugins/directresponse" - "github.com/solo-io/gloo/projects/gateway2/extensions2/plugins/istio" - "github.com/solo-io/gloo/projects/gateway2/extensions2/plugins/kubernetes" - "github.com/solo-io/gloo/projects/gateway2/extensions2/plugins/listenerpolicy" - "github.com/solo-io/gloo/projects/gateway2/extensions2/plugins/routepolicy" - "github.com/solo-io/gloo/projects/gateway2/extensions2/plugins/upstream" + "github.com/kgateway-dev/kgateway/projects/gateway2/extensions2/common" + extensionsplug "github.com/kgateway-dev/kgateway/projects/gateway2/extensions2/plugin" + "github.com/kgateway-dev/kgateway/projects/gateway2/extensions2/plugins/destrule" + "github.com/kgateway-dev/kgateway/projects/gateway2/extensions2/plugins/directresponse" + "github.com/kgateway-dev/kgateway/projects/gateway2/extensions2/plugins/istio" + "github.com/kgateway-dev/kgateway/projects/gateway2/extensions2/plugins/kubernetes" + "github.com/kgateway-dev/kgateway/projects/gateway2/extensions2/plugins/listenerpolicy" + "github.com/kgateway-dev/kgateway/projects/gateway2/extensions2/plugins/routepolicy" + "github.com/kgateway-dev/kgateway/projects/gateway2/extensions2/plugins/upstream" "k8s.io/apimachinery/pkg/runtime/schema" gwv1 "sigs.k8s.io/gateway-api/apis/v1" ) diff --git a/projects/gateway2/generate.sh b/projects/gateway2/generate.sh index 6aff1bdcbaa..a952ffadde6 100755 --- a/projects/gateway2/generate.sh +++ b/projects/gateway2/generate.sh @@ -10,8 +10,8 @@ set -x APIS_PKG="" readonly SCRIPT_ROOT="$(cd "$(dirname "${BASH_SOURCE}")" && pwd)" -readonly OUTPUT_PKG=github.com/solo-io/gloo/projects/gateway2/pkg/client -readonly APIS_PKG=github.com/solo-io/gloo/projects/gateway2 +readonly OUTPUT_PKG=github.com/kgateway-dev/kgateway/projects/gateway2/pkg/client +readonly APIS_PKG=github.com/kgateway-dev/kgateway/projects/gateway2 readonly CLIENTSET_NAME=versioned readonly CLIENTSET_PKG_NAME=clientset readonly VERSIONS=(v1alpha1) diff --git a/projects/gateway2/ir/gw2.go b/projects/gateway2/ir/gw2.go index 6450232c148..43df3489c4e 100644 --- a/projects/gateway2/ir/gw2.go +++ b/projects/gateway2/ir/gw2.go @@ -1,7 +1,7 @@ package ir import ( - "github.com/solo-io/gloo/projects/gateway2/plugins" + "github.com/kgateway-dev/kgateway/projects/gateway2/plugins" "google.golang.org/protobuf/types/known/anypb" gwv1 "sigs.k8s.io/gateway-api/apis/v1" ) diff --git a/projects/gateway2/ir/iface.go b/projects/gateway2/ir/iface.go index dc3dc00987e..19f55a942e4 100644 --- a/projects/gateway2/ir/iface.go +++ b/projects/gateway2/ir/iface.go @@ -8,7 +8,7 @@ import ( envoy_config_cluster_v3 "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3" envoy_config_listener_v3 "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3" envoy_config_route_v3 "github.com/envoyproxy/go-control-plane/envoy/config/route/v3" - "github.com/solo-io/gloo/projects/gateway2/plugins" + "github.com/kgateway-dev/kgateway/projects/gateway2/plugins" anypb "google.golang.org/protobuf/types/known/anypb" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/projects/gateway2/ir/model.go b/projects/gateway2/ir/model.go index 2c9795755d5..6905cf845af 100644 --- a/projects/gateway2/ir/model.go +++ b/projects/gateway2/ir/model.go @@ -8,7 +8,7 @@ import ( "maps" envoy_config_endpoint_v3 "github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3" - "github.com/solo-io/gloo/projects/gateway2/utils" + "github.com/kgateway-dev/kgateway/projects/gateway2/utils" "istio.io/istio/pkg/kube/krt" ) diff --git a/projects/gateway2/krtcollections/builtin.go b/projects/gateway2/krtcollections/builtin.go index 23b4b70f8b2..78310b19868 100644 --- a/projects/gateway2/krtcollections/builtin.go +++ b/projects/gateway2/krtcollections/builtin.go @@ -15,10 +15,10 @@ import ( envoy_config_route_v3 "github.com/envoyproxy/go-control-plane/envoy/config/route/v3" envoy_type_matcher_v3 "github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3" envoytype "github.com/envoyproxy/go-control-plane/envoy/type/v3" - extensionplug "github.com/solo-io/gloo/projects/gateway2/extensions2/plugin" - extensionsplug "github.com/solo-io/gloo/projects/gateway2/extensions2/plugin" - "github.com/solo-io/gloo/projects/gateway2/ir" - "github.com/solo-io/gloo/projects/gateway2/plugins" + extensionplug "github.com/kgateway-dev/kgateway/projects/gateway2/extensions2/plugin" + extensionsplug "github.com/kgateway-dev/kgateway/projects/gateway2/extensions2/plugin" + "github.com/kgateway-dev/kgateway/projects/gateway2/ir" + "github.com/kgateway-dev/kgateway/projects/gateway2/plugins" gwv1 "sigs.k8s.io/gateway-api/apis/v1" ) diff --git a/projects/gateway2/krtcollections/endpoints.go b/projects/gateway2/krtcollections/endpoints.go index da3572aca12..9151887cb68 100644 --- a/projects/gateway2/krtcollections/endpoints.go +++ b/projects/gateway2/krtcollections/endpoints.go @@ -9,10 +9,10 @@ import ( "google.golang.org/protobuf/types/known/structpb" "google.golang.org/protobuf/types/known/wrapperspb" - "github.com/solo-io/gloo/projects/gateway2/extensions2/settings" - "github.com/solo-io/gloo/projects/gateway2/ir" - "github.com/solo-io/gloo/projects/gateway2/utils/krtutil" - "github.com/solo-io/gloo/projects/gateway2/wellknown" + "github.com/kgateway-dev/kgateway/projects/gateway2/extensions2/settings" + "github.com/kgateway-dev/kgateway/projects/gateway2/ir" + "github.com/kgateway-dev/kgateway/projects/gateway2/utils/krtutil" + "github.com/kgateway-dev/kgateway/projects/gateway2/wellknown" "github.com/solo-io/go-utils/contextutils" "istio.io/istio/pkg/kube/krt" corev1 "k8s.io/api/core/v1" diff --git a/projects/gateway2/krtcollections/endpoints_test.go b/projects/gateway2/krtcollections/endpoints_test.go index 2e96abdbb48..f96ccf5ec0d 100644 --- a/projects/gateway2/krtcollections/endpoints_test.go +++ b/projects/gateway2/krtcollections/endpoints_test.go @@ -7,10 +7,10 @@ import ( envoy_config_core_v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" endpointv3 "github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3" "github.com/fgrosse/zaptest" + "github.com/kgateway-dev/kgateway/projects/gateway2/ir" + "github.com/kgateway-dev/kgateway/projects/gateway2/utils/krtutil" "github.com/onsi/gomega" . "github.com/onsi/gomega" - "github.com/solo-io/gloo/projects/gateway2/ir" - "github.com/solo-io/gloo/projects/gateway2/utils/krtutil" "github.com/solo-io/go-utils/contextutils" "google.golang.org/protobuf/types/known/wrapperspb" "istio.io/istio/pkg/kube/krt" diff --git a/projects/gateway2/krtcollections/ns.go b/projects/gateway2/krtcollections/ns.go index f7bab3cd3fa..14270439818 100644 --- a/projects/gateway2/krtcollections/ns.go +++ b/projects/gateway2/krtcollections/ns.go @@ -4,7 +4,7 @@ import ( "context" "maps" - "github.com/solo-io/gloo/projects/gateway2/utils/krtutil" + "github.com/kgateway-dev/kgateway/projects/gateway2/utils/krtutil" "istio.io/istio/pkg/kube" "istio.io/istio/pkg/kube/kclient" "istio.io/istio/pkg/kube/krt" diff --git a/projects/gateway2/krtcollections/pods.go b/projects/gateway2/krtcollections/pods.go index af566c22acb..e1930c9be64 100644 --- a/projects/gateway2/krtcollections/pods.go +++ b/projects/gateway2/krtcollections/pods.go @@ -3,8 +3,8 @@ package krtcollections import ( "maps" - "github.com/solo-io/gloo/projects/gateway2/ir" - "github.com/solo-io/gloo/projects/gateway2/utils/krtutil" + "github.com/kgateway-dev/kgateway/projects/gateway2/ir" + "github.com/kgateway-dev/kgateway/projects/gateway2/utils/krtutil" "istio.io/api/label" "istio.io/istio/pkg/kube" "istio.io/istio/pkg/kube/kclient" diff --git a/projects/gateway2/krtcollections/pods_test.go b/projects/gateway2/krtcollections/pods_test.go index b09df9a14b8..bca3322f59c 100644 --- a/projects/gateway2/krtcollections/pods_test.go +++ b/projects/gateway2/krtcollections/pods_test.go @@ -4,12 +4,12 @@ import ( "context" "testing" + "github.com/kgateway-dev/kgateway/projects/gateway2/ir" + "github.com/kgateway-dev/kgateway/projects/gateway2/krtcollections" + . "github.com/kgateway-dev/kgateway/projects/gateway2/krtcollections" + "github.com/kgateway-dev/kgateway/projects/gateway2/utils/krtutil" "github.com/onsi/gomega" . "github.com/onsi/gomega" - "github.com/solo-io/gloo/projects/gateway2/ir" - "github.com/solo-io/gloo/projects/gateway2/krtcollections" - . "github.com/solo-io/gloo/projects/gateway2/krtcollections" - "github.com/solo-io/gloo/projects/gateway2/utils/krtutil" "istio.io/istio/pkg/kube/krt" "istio.io/istio/pkg/kube/krt/krttest" corev1 "k8s.io/api/core/v1" diff --git a/projects/gateway2/krtcollections/policy.go b/projects/gateway2/krtcollections/policy.go index c086cad102e..cd1f6a91940 100644 --- a/projects/gateway2/krtcollections/policy.go +++ b/projects/gateway2/krtcollections/policy.go @@ -5,10 +5,10 @@ import ( "fmt" "slices" - extensionsplug "github.com/solo-io/gloo/projects/gateway2/extensions2/plugin" - "github.com/solo-io/gloo/projects/gateway2/ir" - "github.com/solo-io/gloo/projects/gateway2/translator/backendref" - "github.com/solo-io/gloo/projects/gateway2/utils/krtutil" + extensionsplug "github.com/kgateway-dev/kgateway/projects/gateway2/extensions2/plugin" + "github.com/kgateway-dev/kgateway/projects/gateway2/ir" + "github.com/kgateway-dev/kgateway/projects/gateway2/translator/backendref" + "github.com/kgateway-dev/kgateway/projects/gateway2/utils/krtutil" "istio.io/istio/pkg/kube/krt" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/projects/gateway2/krtcollections/policy_test.go b/projects/gateway2/krtcollections/policy_test.go index 6b19b47b888..db9e7729448 100644 --- a/projects/gateway2/krtcollections/policy_test.go +++ b/projects/gateway2/krtcollections/policy_test.go @@ -12,9 +12,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" - extensionsplug "github.com/solo-io/gloo/projects/gateway2/extensions2/plugin" - "github.com/solo-io/gloo/projects/gateway2/ir" - "github.com/solo-io/gloo/projects/gateway2/utils/krtutil" + extensionsplug "github.com/kgateway-dev/kgateway/projects/gateway2/extensions2/plugin" + "github.com/kgateway-dev/kgateway/projects/gateway2/ir" + "github.com/kgateway-dev/kgateway/projects/gateway2/utils/krtutil" gwv1 "sigs.k8s.io/gateway-api/apis/v1" gwv1a2 "sigs.k8s.io/gateway-api/apis/v1alpha2" gwv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" diff --git a/projects/gateway2/krtcollections/secrets.go b/projects/gateway2/krtcollections/secrets.go index f3ea23824fe..e9fe59f4771 100644 --- a/projects/gateway2/krtcollections/secrets.go +++ b/projects/gateway2/krtcollections/secrets.go @@ -1,7 +1,7 @@ package krtcollections import ( - "github.com/solo-io/gloo/projects/gateway2/ir" + "github.com/kgateway-dev/kgateway/projects/gateway2/ir" "istio.io/istio/pkg/kube/krt" "k8s.io/apimachinery/pkg/runtime/schema" gwv1 "sigs.k8s.io/gateway-api/apis/v1" diff --git a/projects/gateway2/krtcollections/setup.go b/projects/gateway2/krtcollections/setup.go index 41c5243abb9..0cb8aecf0a0 100644 --- a/projects/gateway2/krtcollections/setup.go +++ b/projects/gateway2/krtcollections/setup.go @@ -9,9 +9,9 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" - extensionsplug "github.com/solo-io/gloo/projects/gateway2/extensions2/plugin" - "github.com/solo-io/gloo/projects/gateway2/ir" - "github.com/solo-io/gloo/projects/gateway2/utils/krtutil" + extensionsplug "github.com/kgateway-dev/kgateway/projects/gateway2/extensions2/plugin" + "github.com/kgateway-dev/kgateway/projects/gateway2/ir" + "github.com/kgateway-dev/kgateway/projects/gateway2/utils/krtutil" "istio.io/istio/pkg/config/schema/gvk" "istio.io/istio/pkg/config/schema/gvr" skubeclient "istio.io/istio/pkg/config/schema/kubeclient" diff --git a/projects/gateway2/krtcollections/uniqueclients.go b/projects/gateway2/krtcollections/uniqueclients.go index a5329b892cb..995805397c6 100644 --- a/projects/gateway2/krtcollections/uniqueclients.go +++ b/projects/gateway2/krtcollections/uniqueclients.go @@ -11,9 +11,9 @@ import ( envoy_config_core_v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" envoy_service_discovery_v3 "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3" xdsserver "github.com/envoyproxy/go-control-plane/pkg/server/v3" - "github.com/solo-io/gloo/projects/gateway2/ir" - "github.com/solo-io/gloo/projects/gateway2/utils/krtutil" - "github.com/solo-io/gloo/projects/gateway2/xds" + "github.com/kgateway-dev/kgateway/projects/gateway2/ir" + "github.com/kgateway-dev/kgateway/projects/gateway2/utils/krtutil" + "github.com/kgateway-dev/kgateway/projects/gateway2/xds" "github.com/solo-io/go-utils/contextutils" "go.uber.org/zap" "google.golang.org/protobuf/types/known/structpb" diff --git a/projects/gateway2/krtcollections/uniqueclients_test.go b/projects/gateway2/krtcollections/uniqueclients_test.go index d87083734eb..fe36fd6d4b5 100644 --- a/projects/gateway2/krtcollections/uniqueclients_test.go +++ b/projects/gateway2/krtcollections/uniqueclients_test.go @@ -7,12 +7,12 @@ import ( corev3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" envoy_service_discovery_v3 "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3" + . "github.com/kgateway-dev/kgateway/projects/gateway2/krtcollections" + "github.com/kgateway-dev/kgateway/projects/gateway2/utils" + "github.com/kgateway-dev/kgateway/projects/gateway2/utils/krtutil" + "github.com/kgateway-dev/kgateway/projects/gateway2/wellknown" + "github.com/kgateway-dev/kgateway/projects/gateway2/xds" . "github.com/onsi/gomega" - . "github.com/solo-io/gloo/projects/gateway2/krtcollections" - "github.com/solo-io/gloo/projects/gateway2/utils" - "github.com/solo-io/gloo/projects/gateway2/utils/krtutil" - "github.com/solo-io/gloo/projects/gateway2/wellknown" - "github.com/solo-io/gloo/projects/gateway2/xds" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/structpb" "istio.io/istio/pkg/kube/krt" diff --git a/projects/gateway2/pkg/client/clientset/versioned/clientset.go b/projects/gateway2/pkg/client/clientset/versioned/clientset.go index 456dd746d9d..9dcf90bee4b 100644 --- a/projects/gateway2/pkg/client/clientset/versioned/clientset.go +++ b/projects/gateway2/pkg/client/clientset/versioned/clientset.go @@ -6,7 +6,7 @@ import ( "fmt" "net/http" - gatewayv1alpha1 "github.com/solo-io/gloo/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1" + gatewayv1alpha1 "github.com/kgateway-dev/kgateway/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1" discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" flowcontrol "k8s.io/client-go/util/flowcontrol" diff --git a/projects/gateway2/pkg/client/clientset/versioned/fake/clientset_generated.go b/projects/gateway2/pkg/client/clientset/versioned/fake/clientset_generated.go index 639bdb1af99..12484dbfe24 100644 --- a/projects/gateway2/pkg/client/clientset/versioned/fake/clientset_generated.go +++ b/projects/gateway2/pkg/client/clientset/versioned/fake/clientset_generated.go @@ -3,10 +3,10 @@ package fake import ( - applyconfiguration "github.com/solo-io/gloo/projects/gateway2/api/applyconfiguration" - clientset "github.com/solo-io/gloo/projects/gateway2/pkg/client/clientset/versioned" - gatewayv1alpha1 "github.com/solo-io/gloo/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1" - fakegatewayv1alpha1 "github.com/solo-io/gloo/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1/fake" + applyconfiguration "github.com/kgateway-dev/kgateway/projects/gateway2/api/applyconfiguration" + clientset "github.com/kgateway-dev/kgateway/projects/gateway2/pkg/client/clientset/versioned" + gatewayv1alpha1 "github.com/kgateway-dev/kgateway/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1" + fakegatewayv1alpha1 "github.com/kgateway-dev/kgateway/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1/fake" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/discovery" diff --git a/projects/gateway2/pkg/client/clientset/versioned/fake/register.go b/projects/gateway2/pkg/client/clientset/versioned/fake/register.go index e7cecf3eaa3..cf38342cf0b 100644 --- a/projects/gateway2/pkg/client/clientset/versioned/fake/register.go +++ b/projects/gateway2/pkg/client/clientset/versioned/fake/register.go @@ -3,7 +3,7 @@ package fake import ( - gatewayv1alpha1 "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1" + gatewayv1alpha1 "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/projects/gateway2/pkg/client/clientset/versioned/scheme/register.go b/projects/gateway2/pkg/client/clientset/versioned/scheme/register.go index 85fc2156276..235205001e0 100644 --- a/projects/gateway2/pkg/client/clientset/versioned/scheme/register.go +++ b/projects/gateway2/pkg/client/clientset/versioned/scheme/register.go @@ -3,7 +3,7 @@ package scheme import ( - gatewayv1alpha1 "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1" + gatewayv1alpha1 "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1/api_client.go b/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1/api_client.go index 0375f812f26..343f867179d 100644 --- a/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1/api_client.go +++ b/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1/api_client.go @@ -5,8 +5,8 @@ package v1alpha1 import ( "net/http" - v1alpha1 "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1" - "github.com/solo-io/gloo/projects/gateway2/pkg/client/clientset/versioned/scheme" + v1alpha1 "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1" + "github.com/kgateway-dev/kgateway/projects/gateway2/pkg/client/clientset/versioned/scheme" rest "k8s.io/client-go/rest" ) diff --git a/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1/directresponse.go b/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1/directresponse.go index 513f93e37ee..6f892be43d9 100644 --- a/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1/directresponse.go +++ b/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1/directresponse.go @@ -5,9 +5,9 @@ package v1alpha1 import ( "context" - apiv1alpha1 "github.com/solo-io/gloo/projects/gateway2/api/applyconfiguration/api/v1alpha1" - v1alpha1 "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1" - scheme "github.com/solo-io/gloo/projects/gateway2/pkg/client/clientset/versioned/scheme" + apiv1alpha1 "github.com/kgateway-dev/kgateway/projects/gateway2/api/applyconfiguration/api/v1alpha1" + v1alpha1 "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1" + scheme "github.com/kgateway-dev/kgateway/projects/gateway2/pkg/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1/fake/fake_api_client.go b/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1/fake/fake_api_client.go index 3ec322e61f2..e8048619a0e 100644 --- a/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1/fake/fake_api_client.go +++ b/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1/fake/fake_api_client.go @@ -3,7 +3,7 @@ package fake import ( - v1alpha1 "github.com/solo-io/gloo/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1" + v1alpha1 "github.com/kgateway-dev/kgateway/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" ) diff --git a/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1/fake/fake_directresponse.go b/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1/fake/fake_directresponse.go index 682aef090d7..85faed63ce1 100644 --- a/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1/fake/fake_directresponse.go +++ b/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1/fake/fake_directresponse.go @@ -7,8 +7,8 @@ import ( json "encoding/json" "fmt" - apiv1alpha1 "github.com/solo-io/gloo/projects/gateway2/api/applyconfiguration/api/v1alpha1" - v1alpha1 "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1" + apiv1alpha1 "github.com/kgateway-dev/kgateway/projects/gateway2/api/applyconfiguration/api/v1alpha1" + v1alpha1 "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" types "k8s.io/apimachinery/pkg/types" diff --git a/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1/fake/fake_gatewayparameters.go b/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1/fake/fake_gatewayparameters.go index 05fcfbe0310..f83616142c1 100644 --- a/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1/fake/fake_gatewayparameters.go +++ b/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1/fake/fake_gatewayparameters.go @@ -7,8 +7,8 @@ import ( json "encoding/json" "fmt" - apiv1alpha1 "github.com/solo-io/gloo/projects/gateway2/api/applyconfiguration/api/v1alpha1" - v1alpha1 "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1" + apiv1alpha1 "github.com/kgateway-dev/kgateway/projects/gateway2/api/applyconfiguration/api/v1alpha1" + v1alpha1 "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" types "k8s.io/apimachinery/pkg/types" diff --git a/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1/fake/fake_httplistenerpolicy.go b/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1/fake/fake_httplistenerpolicy.go index 30094217c95..579db463312 100644 --- a/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1/fake/fake_httplistenerpolicy.go +++ b/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1/fake/fake_httplistenerpolicy.go @@ -7,8 +7,8 @@ import ( json "encoding/json" "fmt" - apiv1alpha1 "github.com/solo-io/gloo/projects/gateway2/api/applyconfiguration/api/v1alpha1" - v1alpha1 "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1" + apiv1alpha1 "github.com/kgateway-dev/kgateway/projects/gateway2/api/applyconfiguration/api/v1alpha1" + v1alpha1 "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" types "k8s.io/apimachinery/pkg/types" diff --git a/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1/fake/fake_listenerpolicy.go b/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1/fake/fake_listenerpolicy.go index 71b2ccf4387..269413bdca8 100644 --- a/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1/fake/fake_listenerpolicy.go +++ b/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1/fake/fake_listenerpolicy.go @@ -7,8 +7,8 @@ import ( json "encoding/json" "fmt" - apiv1alpha1 "github.com/solo-io/gloo/projects/gateway2/api/applyconfiguration/api/v1alpha1" - v1alpha1 "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1" + apiv1alpha1 "github.com/kgateway-dev/kgateway/projects/gateway2/api/applyconfiguration/api/v1alpha1" + v1alpha1 "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" types "k8s.io/apimachinery/pkg/types" diff --git a/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1/fake/fake_routepolicy.go b/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1/fake/fake_routepolicy.go index 99afd3fb7e4..40a46bfda46 100644 --- a/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1/fake/fake_routepolicy.go +++ b/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1/fake/fake_routepolicy.go @@ -7,8 +7,8 @@ import ( json "encoding/json" "fmt" - apiv1alpha1 "github.com/solo-io/gloo/projects/gateway2/api/applyconfiguration/api/v1alpha1" - v1alpha1 "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1" + apiv1alpha1 "github.com/kgateway-dev/kgateway/projects/gateway2/api/applyconfiguration/api/v1alpha1" + v1alpha1 "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" types "k8s.io/apimachinery/pkg/types" diff --git a/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1/fake/fake_upstream.go b/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1/fake/fake_upstream.go index b7e736712df..bd2e987b4b9 100644 --- a/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1/fake/fake_upstream.go +++ b/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1/fake/fake_upstream.go @@ -7,8 +7,8 @@ import ( json "encoding/json" "fmt" - apiv1alpha1 "github.com/solo-io/gloo/projects/gateway2/api/applyconfiguration/api/v1alpha1" - v1alpha1 "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1" + apiv1alpha1 "github.com/kgateway-dev/kgateway/projects/gateway2/api/applyconfiguration/api/v1alpha1" + v1alpha1 "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" types "k8s.io/apimachinery/pkg/types" diff --git a/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1/gatewayparameters.go b/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1/gatewayparameters.go index fb2100f3592..e90159f92da 100644 --- a/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1/gatewayparameters.go +++ b/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1/gatewayparameters.go @@ -5,9 +5,9 @@ package v1alpha1 import ( "context" - apiv1alpha1 "github.com/solo-io/gloo/projects/gateway2/api/applyconfiguration/api/v1alpha1" - v1alpha1 "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1" - scheme "github.com/solo-io/gloo/projects/gateway2/pkg/client/clientset/versioned/scheme" + apiv1alpha1 "github.com/kgateway-dev/kgateway/projects/gateway2/api/applyconfiguration/api/v1alpha1" + v1alpha1 "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1" + scheme "github.com/kgateway-dev/kgateway/projects/gateway2/pkg/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1/httplistenerpolicy.go b/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1/httplistenerpolicy.go index 231a3f19186..f4e5d198599 100644 --- a/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1/httplistenerpolicy.go +++ b/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1/httplistenerpolicy.go @@ -5,9 +5,9 @@ package v1alpha1 import ( "context" - apiv1alpha1 "github.com/solo-io/gloo/projects/gateway2/api/applyconfiguration/api/v1alpha1" - v1alpha1 "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1" - scheme "github.com/solo-io/gloo/projects/gateway2/pkg/client/clientset/versioned/scheme" + apiv1alpha1 "github.com/kgateway-dev/kgateway/projects/gateway2/api/applyconfiguration/api/v1alpha1" + v1alpha1 "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1" + scheme "github.com/kgateway-dev/kgateway/projects/gateway2/pkg/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1/listenerpolicy.go b/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1/listenerpolicy.go index e2dc70cbaeb..fe241e16f2e 100644 --- a/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1/listenerpolicy.go +++ b/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1/listenerpolicy.go @@ -5,9 +5,9 @@ package v1alpha1 import ( "context" - apiv1alpha1 "github.com/solo-io/gloo/projects/gateway2/api/applyconfiguration/api/v1alpha1" - v1alpha1 "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1" - scheme "github.com/solo-io/gloo/projects/gateway2/pkg/client/clientset/versioned/scheme" + apiv1alpha1 "github.com/kgateway-dev/kgateway/projects/gateway2/api/applyconfiguration/api/v1alpha1" + v1alpha1 "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1" + scheme "github.com/kgateway-dev/kgateway/projects/gateway2/pkg/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1/routepolicy.go b/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1/routepolicy.go index 3d26956eec2..f7ab5bcc0c2 100644 --- a/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1/routepolicy.go +++ b/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1/routepolicy.go @@ -5,9 +5,9 @@ package v1alpha1 import ( "context" - apiv1alpha1 "github.com/solo-io/gloo/projects/gateway2/api/applyconfiguration/api/v1alpha1" - v1alpha1 "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1" - scheme "github.com/solo-io/gloo/projects/gateway2/pkg/client/clientset/versioned/scheme" + apiv1alpha1 "github.com/kgateway-dev/kgateway/projects/gateway2/api/applyconfiguration/api/v1alpha1" + v1alpha1 "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1" + scheme "github.com/kgateway-dev/kgateway/projects/gateway2/pkg/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1/upstream.go b/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1/upstream.go index e3baca022ef..51f5a79e5c1 100644 --- a/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1/upstream.go +++ b/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1/upstream.go @@ -5,9 +5,9 @@ package v1alpha1 import ( "context" - apiv1alpha1 "github.com/solo-io/gloo/projects/gateway2/api/applyconfiguration/api/v1alpha1" - v1alpha1 "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1" - scheme "github.com/solo-io/gloo/projects/gateway2/pkg/client/clientset/versioned/scheme" + apiv1alpha1 "github.com/kgateway-dev/kgateway/projects/gateway2/api/applyconfiguration/api/v1alpha1" + v1alpha1 "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1" + scheme "github.com/kgateway-dev/kgateway/projects/gateway2/pkg/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/projects/gateway2/pkg/generated/openapi/zz_generated.openapi.go b/projects/gateway2/pkg/generated/openapi/zz_generated.openapi.go index a502c2ed865..4fb16fe9520 100644 --- a/projects/gateway2/pkg/generated/openapi/zz_generated.openapi.go +++ b/projects/gateway2/pkg/generated/openapi/zz_generated.openapi.go @@ -16,399 +16,399 @@ import ( func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenAPIDefinition { return map[string]common.OpenAPIDefinition{ - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.AiExtension": schema_projects_gateway2_api_v1alpha1_AiExtension(ref), - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.AiExtensionStats": schema_projects_gateway2_api_v1alpha1_AiExtensionStats(ref), - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.AwsUpstream": schema_projects_gateway2_api_v1alpha1_AwsUpstream(ref), - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.CustomLabel": schema_projects_gateway2_api_v1alpha1_CustomLabel(ref), - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.DirectResponse": schema_projects_gateway2_api_v1alpha1_DirectResponse(ref), - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.DirectResponseList": schema_projects_gateway2_api_v1alpha1_DirectResponseList(ref), - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.DirectResponseSpec": schema_projects_gateway2_api_v1alpha1_DirectResponseSpec(ref), - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.DirectResponseStatus": schema_projects_gateway2_api_v1alpha1_DirectResponseStatus(ref), - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.EnvoyBootstrap": schema_projects_gateway2_api_v1alpha1_EnvoyBootstrap(ref), - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.EnvoyContainer": schema_projects_gateway2_api_v1alpha1_EnvoyContainer(ref), - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.GatewayParameters": schema_projects_gateway2_api_v1alpha1_GatewayParameters(ref), - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.GatewayParametersList": schema_projects_gateway2_api_v1alpha1_GatewayParametersList(ref), - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.GatewayParametersSpec": schema_projects_gateway2_api_v1alpha1_GatewayParametersSpec(ref), - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.GatewayParametersStatus": schema_projects_gateway2_api_v1alpha1_GatewayParametersStatus(ref), - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.GracefulShutdownSpec": schema_projects_gateway2_api_v1alpha1_GracefulShutdownSpec(ref), - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.Host": schema_projects_gateway2_api_v1alpha1_Host(ref), - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.HttpListenerPolicy": schema_projects_gateway2_api_v1alpha1_HttpListenerPolicy(ref), - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.HttpListenerPolicyList": schema_projects_gateway2_api_v1alpha1_HttpListenerPolicyList(ref), - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.HttpListenerPolicySpec": schema_projects_gateway2_api_v1alpha1_HttpListenerPolicySpec(ref), - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.Image": schema_projects_gateway2_api_v1alpha1_Image(ref), - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.IstioContainer": schema_projects_gateway2_api_v1alpha1_IstioContainer(ref), - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.IstioIntegration": schema_projects_gateway2_api_v1alpha1_IstioIntegration(ref), - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.KubernetesProxyConfig": schema_projects_gateway2_api_v1alpha1_KubernetesProxyConfig(ref), - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.ListenerPolicy": schema_projects_gateway2_api_v1alpha1_ListenerPolicy(ref), - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.ListenerPolicyList": schema_projects_gateway2_api_v1alpha1_ListenerPolicyList(ref), - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.ListenerPolicySpec": schema_projects_gateway2_api_v1alpha1_ListenerPolicySpec(ref), - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.LocalPolicyTargetReference": schema_projects_gateway2_api_v1alpha1_LocalPolicyTargetReference(ref), - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.Pod": schema_projects_gateway2_api_v1alpha1_Pod(ref), - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.PolicyAncestorStatus": schema_projects_gateway2_api_v1alpha1_PolicyAncestorStatus(ref), - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.PolicyStatus": schema_projects_gateway2_api_v1alpha1_PolicyStatus(ref), - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.ProxyDeployment": schema_projects_gateway2_api_v1alpha1_ProxyDeployment(ref), - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.RoutePolicy": schema_projects_gateway2_api_v1alpha1_RoutePolicy(ref), - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.RoutePolicyList": schema_projects_gateway2_api_v1alpha1_RoutePolicyList(ref), - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.RoutePolicySpec": schema_projects_gateway2_api_v1alpha1_RoutePolicySpec(ref), - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.SdsBootstrap": schema_projects_gateway2_api_v1alpha1_SdsBootstrap(ref), - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.SdsContainer": schema_projects_gateway2_api_v1alpha1_SdsContainer(ref), - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.SelfManagedGateway": schema_projects_gateway2_api_v1alpha1_SelfManagedGateway(ref), - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.Service": schema_projects_gateway2_api_v1alpha1_Service(ref), - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.ServiceAccount": schema_projects_gateway2_api_v1alpha1_ServiceAccount(ref), - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.StaticUpstream": schema_projects_gateway2_api_v1alpha1_StaticUpstream(ref), - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.StatsConfig": schema_projects_gateway2_api_v1alpha1_StatsConfig(ref), - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.Upstream": schema_projects_gateway2_api_v1alpha1_Upstream(ref), - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.UpstreamList": schema_projects_gateway2_api_v1alpha1_UpstreamList(ref), - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.UpstreamSpec": schema_projects_gateway2_api_v1alpha1_UpstreamSpec(ref), - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.UpstreamStatus": schema_projects_gateway2_api_v1alpha1_UpstreamStatus(ref), - "k8s.io/api/core/v1.AWSElasticBlockStoreVolumeSource": schema_k8sio_api_core_v1_AWSElasticBlockStoreVolumeSource(ref), - "k8s.io/api/core/v1.Affinity": schema_k8sio_api_core_v1_Affinity(ref), - "k8s.io/api/core/v1.AppArmorProfile": schema_k8sio_api_core_v1_AppArmorProfile(ref), - "k8s.io/api/core/v1.AttachedVolume": schema_k8sio_api_core_v1_AttachedVolume(ref), - "k8s.io/api/core/v1.AvoidPods": schema_k8sio_api_core_v1_AvoidPods(ref), - "k8s.io/api/core/v1.AzureDiskVolumeSource": schema_k8sio_api_core_v1_AzureDiskVolumeSource(ref), - "k8s.io/api/core/v1.AzureFilePersistentVolumeSource": schema_k8sio_api_core_v1_AzureFilePersistentVolumeSource(ref), - "k8s.io/api/core/v1.AzureFileVolumeSource": schema_k8sio_api_core_v1_AzureFileVolumeSource(ref), - "k8s.io/api/core/v1.Binding": schema_k8sio_api_core_v1_Binding(ref), - "k8s.io/api/core/v1.CSIPersistentVolumeSource": schema_k8sio_api_core_v1_CSIPersistentVolumeSource(ref), - "k8s.io/api/core/v1.CSIVolumeSource": schema_k8sio_api_core_v1_CSIVolumeSource(ref), - "k8s.io/api/core/v1.Capabilities": schema_k8sio_api_core_v1_Capabilities(ref), - "k8s.io/api/core/v1.CephFSPersistentVolumeSource": schema_k8sio_api_core_v1_CephFSPersistentVolumeSource(ref), - "k8s.io/api/core/v1.CephFSVolumeSource": schema_k8sio_api_core_v1_CephFSVolumeSource(ref), - "k8s.io/api/core/v1.CinderPersistentVolumeSource": schema_k8sio_api_core_v1_CinderPersistentVolumeSource(ref), - "k8s.io/api/core/v1.CinderVolumeSource": schema_k8sio_api_core_v1_CinderVolumeSource(ref), - "k8s.io/api/core/v1.ClientIPConfig": schema_k8sio_api_core_v1_ClientIPConfig(ref), - "k8s.io/api/core/v1.ClusterTrustBundleProjection": schema_k8sio_api_core_v1_ClusterTrustBundleProjection(ref), - "k8s.io/api/core/v1.ComponentCondition": schema_k8sio_api_core_v1_ComponentCondition(ref), - "k8s.io/api/core/v1.ComponentStatus": schema_k8sio_api_core_v1_ComponentStatus(ref), - "k8s.io/api/core/v1.ComponentStatusList": schema_k8sio_api_core_v1_ComponentStatusList(ref), - "k8s.io/api/core/v1.ConfigMap": schema_k8sio_api_core_v1_ConfigMap(ref), - "k8s.io/api/core/v1.ConfigMapEnvSource": schema_k8sio_api_core_v1_ConfigMapEnvSource(ref), - "k8s.io/api/core/v1.ConfigMapKeySelector": schema_k8sio_api_core_v1_ConfigMapKeySelector(ref), - "k8s.io/api/core/v1.ConfigMapList": schema_k8sio_api_core_v1_ConfigMapList(ref), - "k8s.io/api/core/v1.ConfigMapNodeConfigSource": schema_k8sio_api_core_v1_ConfigMapNodeConfigSource(ref), - "k8s.io/api/core/v1.ConfigMapProjection": schema_k8sio_api_core_v1_ConfigMapProjection(ref), - "k8s.io/api/core/v1.ConfigMapVolumeSource": schema_k8sio_api_core_v1_ConfigMapVolumeSource(ref), - "k8s.io/api/core/v1.Container": schema_k8sio_api_core_v1_Container(ref), - "k8s.io/api/core/v1.ContainerImage": schema_k8sio_api_core_v1_ContainerImage(ref), - "k8s.io/api/core/v1.ContainerPort": schema_k8sio_api_core_v1_ContainerPort(ref), - "k8s.io/api/core/v1.ContainerResizePolicy": schema_k8sio_api_core_v1_ContainerResizePolicy(ref), - "k8s.io/api/core/v1.ContainerState": schema_k8sio_api_core_v1_ContainerState(ref), - "k8s.io/api/core/v1.ContainerStateRunning": schema_k8sio_api_core_v1_ContainerStateRunning(ref), - "k8s.io/api/core/v1.ContainerStateTerminated": schema_k8sio_api_core_v1_ContainerStateTerminated(ref), - "k8s.io/api/core/v1.ContainerStateWaiting": schema_k8sio_api_core_v1_ContainerStateWaiting(ref), - "k8s.io/api/core/v1.ContainerStatus": schema_k8sio_api_core_v1_ContainerStatus(ref), - "k8s.io/api/core/v1.ContainerUser": schema_k8sio_api_core_v1_ContainerUser(ref), - "k8s.io/api/core/v1.DaemonEndpoint": schema_k8sio_api_core_v1_DaemonEndpoint(ref), - "k8s.io/api/core/v1.DownwardAPIProjection": schema_k8sio_api_core_v1_DownwardAPIProjection(ref), - "k8s.io/api/core/v1.DownwardAPIVolumeFile": schema_k8sio_api_core_v1_DownwardAPIVolumeFile(ref), - "k8s.io/api/core/v1.DownwardAPIVolumeSource": schema_k8sio_api_core_v1_DownwardAPIVolumeSource(ref), - "k8s.io/api/core/v1.EmptyDirVolumeSource": schema_k8sio_api_core_v1_EmptyDirVolumeSource(ref), - "k8s.io/api/core/v1.EndpointAddress": schema_k8sio_api_core_v1_EndpointAddress(ref), - "k8s.io/api/core/v1.EndpointPort": schema_k8sio_api_core_v1_EndpointPort(ref), - "k8s.io/api/core/v1.EndpointSubset": schema_k8sio_api_core_v1_EndpointSubset(ref), - "k8s.io/api/core/v1.Endpoints": schema_k8sio_api_core_v1_Endpoints(ref), - "k8s.io/api/core/v1.EndpointsList": schema_k8sio_api_core_v1_EndpointsList(ref), - "k8s.io/api/core/v1.EnvFromSource": schema_k8sio_api_core_v1_EnvFromSource(ref), - "k8s.io/api/core/v1.EnvVar": schema_k8sio_api_core_v1_EnvVar(ref), - "k8s.io/api/core/v1.EnvVarSource": schema_k8sio_api_core_v1_EnvVarSource(ref), - "k8s.io/api/core/v1.EphemeralContainer": schema_k8sio_api_core_v1_EphemeralContainer(ref), - "k8s.io/api/core/v1.EphemeralContainerCommon": schema_k8sio_api_core_v1_EphemeralContainerCommon(ref), - "k8s.io/api/core/v1.EphemeralVolumeSource": schema_k8sio_api_core_v1_EphemeralVolumeSource(ref), - "k8s.io/api/core/v1.Event": schema_k8sio_api_core_v1_Event(ref), - "k8s.io/api/core/v1.EventList": schema_k8sio_api_core_v1_EventList(ref), - "k8s.io/api/core/v1.EventSeries": schema_k8sio_api_core_v1_EventSeries(ref), - "k8s.io/api/core/v1.EventSource": schema_k8sio_api_core_v1_EventSource(ref), - "k8s.io/api/core/v1.ExecAction": schema_k8sio_api_core_v1_ExecAction(ref), - "k8s.io/api/core/v1.FCVolumeSource": schema_k8sio_api_core_v1_FCVolumeSource(ref), - "k8s.io/api/core/v1.FlexPersistentVolumeSource": schema_k8sio_api_core_v1_FlexPersistentVolumeSource(ref), - "k8s.io/api/core/v1.FlexVolumeSource": schema_k8sio_api_core_v1_FlexVolumeSource(ref), - "k8s.io/api/core/v1.FlockerVolumeSource": schema_k8sio_api_core_v1_FlockerVolumeSource(ref), - "k8s.io/api/core/v1.GCEPersistentDiskVolumeSource": schema_k8sio_api_core_v1_GCEPersistentDiskVolumeSource(ref), - "k8s.io/api/core/v1.GRPCAction": schema_k8sio_api_core_v1_GRPCAction(ref), - "k8s.io/api/core/v1.GitRepoVolumeSource": schema_k8sio_api_core_v1_GitRepoVolumeSource(ref), - "k8s.io/api/core/v1.GlusterfsPersistentVolumeSource": schema_k8sio_api_core_v1_GlusterfsPersistentVolumeSource(ref), - "k8s.io/api/core/v1.GlusterfsVolumeSource": schema_k8sio_api_core_v1_GlusterfsVolumeSource(ref), - "k8s.io/api/core/v1.HTTPGetAction": schema_k8sio_api_core_v1_HTTPGetAction(ref), - "k8s.io/api/core/v1.HTTPHeader": schema_k8sio_api_core_v1_HTTPHeader(ref), - "k8s.io/api/core/v1.HostAlias": schema_k8sio_api_core_v1_HostAlias(ref), - "k8s.io/api/core/v1.HostIP": schema_k8sio_api_core_v1_HostIP(ref), - "k8s.io/api/core/v1.HostPathVolumeSource": schema_k8sio_api_core_v1_HostPathVolumeSource(ref), - "k8s.io/api/core/v1.ISCSIPersistentVolumeSource": schema_k8sio_api_core_v1_ISCSIPersistentVolumeSource(ref), - "k8s.io/api/core/v1.ISCSIVolumeSource": schema_k8sio_api_core_v1_ISCSIVolumeSource(ref), - "k8s.io/api/core/v1.ImageVolumeSource": schema_k8sio_api_core_v1_ImageVolumeSource(ref), - "k8s.io/api/core/v1.KeyToPath": schema_k8sio_api_core_v1_KeyToPath(ref), - "k8s.io/api/core/v1.Lifecycle": schema_k8sio_api_core_v1_Lifecycle(ref), - "k8s.io/api/core/v1.LifecycleHandler": schema_k8sio_api_core_v1_LifecycleHandler(ref), - "k8s.io/api/core/v1.LimitRange": schema_k8sio_api_core_v1_LimitRange(ref), - "k8s.io/api/core/v1.LimitRangeItem": schema_k8sio_api_core_v1_LimitRangeItem(ref), - "k8s.io/api/core/v1.LimitRangeList": schema_k8sio_api_core_v1_LimitRangeList(ref), - "k8s.io/api/core/v1.LimitRangeSpec": schema_k8sio_api_core_v1_LimitRangeSpec(ref), - "k8s.io/api/core/v1.LinuxContainerUser": schema_k8sio_api_core_v1_LinuxContainerUser(ref), - "k8s.io/api/core/v1.List": schema_k8sio_api_core_v1_List(ref), - "k8s.io/api/core/v1.LoadBalancerIngress": schema_k8sio_api_core_v1_LoadBalancerIngress(ref), - "k8s.io/api/core/v1.LoadBalancerStatus": schema_k8sio_api_core_v1_LoadBalancerStatus(ref), - "k8s.io/api/core/v1.LocalObjectReference": schema_k8sio_api_core_v1_LocalObjectReference(ref), - "k8s.io/api/core/v1.LocalVolumeSource": schema_k8sio_api_core_v1_LocalVolumeSource(ref), - "k8s.io/api/core/v1.ModifyVolumeStatus": schema_k8sio_api_core_v1_ModifyVolumeStatus(ref), - "k8s.io/api/core/v1.NFSVolumeSource": schema_k8sio_api_core_v1_NFSVolumeSource(ref), - "k8s.io/api/core/v1.Namespace": schema_k8sio_api_core_v1_Namespace(ref), - "k8s.io/api/core/v1.NamespaceCondition": schema_k8sio_api_core_v1_NamespaceCondition(ref), - "k8s.io/api/core/v1.NamespaceList": schema_k8sio_api_core_v1_NamespaceList(ref), - "k8s.io/api/core/v1.NamespaceSpec": schema_k8sio_api_core_v1_NamespaceSpec(ref), - "k8s.io/api/core/v1.NamespaceStatus": schema_k8sio_api_core_v1_NamespaceStatus(ref), - "k8s.io/api/core/v1.Node": schema_k8sio_api_core_v1_Node(ref), - "k8s.io/api/core/v1.NodeAddress": schema_k8sio_api_core_v1_NodeAddress(ref), - "k8s.io/api/core/v1.NodeAffinity": schema_k8sio_api_core_v1_NodeAffinity(ref), - "k8s.io/api/core/v1.NodeCondition": schema_k8sio_api_core_v1_NodeCondition(ref), - "k8s.io/api/core/v1.NodeConfigSource": schema_k8sio_api_core_v1_NodeConfigSource(ref), - "k8s.io/api/core/v1.NodeConfigStatus": schema_k8sio_api_core_v1_NodeConfigStatus(ref), - "k8s.io/api/core/v1.NodeDaemonEndpoints": schema_k8sio_api_core_v1_NodeDaemonEndpoints(ref), - "k8s.io/api/core/v1.NodeFeatures": schema_k8sio_api_core_v1_NodeFeatures(ref), - "k8s.io/api/core/v1.NodeList": schema_k8sio_api_core_v1_NodeList(ref), - "k8s.io/api/core/v1.NodeProxyOptions": schema_k8sio_api_core_v1_NodeProxyOptions(ref), - "k8s.io/api/core/v1.NodeRuntimeHandler": schema_k8sio_api_core_v1_NodeRuntimeHandler(ref), - "k8s.io/api/core/v1.NodeRuntimeHandlerFeatures": schema_k8sio_api_core_v1_NodeRuntimeHandlerFeatures(ref), - "k8s.io/api/core/v1.NodeSelector": schema_k8sio_api_core_v1_NodeSelector(ref), - "k8s.io/api/core/v1.NodeSelectorRequirement": schema_k8sio_api_core_v1_NodeSelectorRequirement(ref), - "k8s.io/api/core/v1.NodeSelectorTerm": schema_k8sio_api_core_v1_NodeSelectorTerm(ref), - "k8s.io/api/core/v1.NodeSpec": schema_k8sio_api_core_v1_NodeSpec(ref), - "k8s.io/api/core/v1.NodeStatus": schema_k8sio_api_core_v1_NodeStatus(ref), - "k8s.io/api/core/v1.NodeSystemInfo": schema_k8sio_api_core_v1_NodeSystemInfo(ref), - "k8s.io/api/core/v1.ObjectFieldSelector": schema_k8sio_api_core_v1_ObjectFieldSelector(ref), - "k8s.io/api/core/v1.ObjectReference": schema_k8sio_api_core_v1_ObjectReference(ref), - "k8s.io/api/core/v1.PersistentVolume": schema_k8sio_api_core_v1_PersistentVolume(ref), - "k8s.io/api/core/v1.PersistentVolumeClaim": schema_k8sio_api_core_v1_PersistentVolumeClaim(ref), - "k8s.io/api/core/v1.PersistentVolumeClaimCondition": schema_k8sio_api_core_v1_PersistentVolumeClaimCondition(ref), - "k8s.io/api/core/v1.PersistentVolumeClaimList": schema_k8sio_api_core_v1_PersistentVolumeClaimList(ref), - "k8s.io/api/core/v1.PersistentVolumeClaimSpec": schema_k8sio_api_core_v1_PersistentVolumeClaimSpec(ref), - "k8s.io/api/core/v1.PersistentVolumeClaimStatus": schema_k8sio_api_core_v1_PersistentVolumeClaimStatus(ref), - "k8s.io/api/core/v1.PersistentVolumeClaimTemplate": schema_k8sio_api_core_v1_PersistentVolumeClaimTemplate(ref), - "k8s.io/api/core/v1.PersistentVolumeClaimVolumeSource": schema_k8sio_api_core_v1_PersistentVolumeClaimVolumeSource(ref), - "k8s.io/api/core/v1.PersistentVolumeList": schema_k8sio_api_core_v1_PersistentVolumeList(ref), - "k8s.io/api/core/v1.PersistentVolumeSource": schema_k8sio_api_core_v1_PersistentVolumeSource(ref), - "k8s.io/api/core/v1.PersistentVolumeSpec": schema_k8sio_api_core_v1_PersistentVolumeSpec(ref), - "k8s.io/api/core/v1.PersistentVolumeStatus": schema_k8sio_api_core_v1_PersistentVolumeStatus(ref), - "k8s.io/api/core/v1.PhotonPersistentDiskVolumeSource": schema_k8sio_api_core_v1_PhotonPersistentDiskVolumeSource(ref), - "k8s.io/api/core/v1.Pod": schema_k8sio_api_core_v1_Pod(ref), - "k8s.io/api/core/v1.PodAffinity": schema_k8sio_api_core_v1_PodAffinity(ref), - "k8s.io/api/core/v1.PodAffinityTerm": schema_k8sio_api_core_v1_PodAffinityTerm(ref), - "k8s.io/api/core/v1.PodAntiAffinity": schema_k8sio_api_core_v1_PodAntiAffinity(ref), - "k8s.io/api/core/v1.PodAttachOptions": schema_k8sio_api_core_v1_PodAttachOptions(ref), - "k8s.io/api/core/v1.PodCondition": schema_k8sio_api_core_v1_PodCondition(ref), - "k8s.io/api/core/v1.PodDNSConfig": schema_k8sio_api_core_v1_PodDNSConfig(ref), - "k8s.io/api/core/v1.PodDNSConfigOption": schema_k8sio_api_core_v1_PodDNSConfigOption(ref), - "k8s.io/api/core/v1.PodExecOptions": schema_k8sio_api_core_v1_PodExecOptions(ref), - "k8s.io/api/core/v1.PodIP": schema_k8sio_api_core_v1_PodIP(ref), - "k8s.io/api/core/v1.PodList": schema_k8sio_api_core_v1_PodList(ref), - "k8s.io/api/core/v1.PodLogOptions": schema_k8sio_api_core_v1_PodLogOptions(ref), - "k8s.io/api/core/v1.PodOS": schema_k8sio_api_core_v1_PodOS(ref), - "k8s.io/api/core/v1.PodPortForwardOptions": schema_k8sio_api_core_v1_PodPortForwardOptions(ref), - "k8s.io/api/core/v1.PodProxyOptions": schema_k8sio_api_core_v1_PodProxyOptions(ref), - "k8s.io/api/core/v1.PodReadinessGate": schema_k8sio_api_core_v1_PodReadinessGate(ref), - "k8s.io/api/core/v1.PodResourceClaim": schema_k8sio_api_core_v1_PodResourceClaim(ref), - "k8s.io/api/core/v1.PodResourceClaimStatus": schema_k8sio_api_core_v1_PodResourceClaimStatus(ref), - "k8s.io/api/core/v1.PodSchedulingGate": schema_k8sio_api_core_v1_PodSchedulingGate(ref), - "k8s.io/api/core/v1.PodSecurityContext": schema_k8sio_api_core_v1_PodSecurityContext(ref), - "k8s.io/api/core/v1.PodSignature": schema_k8sio_api_core_v1_PodSignature(ref), - "k8s.io/api/core/v1.PodSpec": schema_k8sio_api_core_v1_PodSpec(ref), - "k8s.io/api/core/v1.PodStatus": schema_k8sio_api_core_v1_PodStatus(ref), - "k8s.io/api/core/v1.PodStatusResult": schema_k8sio_api_core_v1_PodStatusResult(ref), - "k8s.io/api/core/v1.PodTemplate": schema_k8sio_api_core_v1_PodTemplate(ref), - "k8s.io/api/core/v1.PodTemplateList": schema_k8sio_api_core_v1_PodTemplateList(ref), - "k8s.io/api/core/v1.PodTemplateSpec": schema_k8sio_api_core_v1_PodTemplateSpec(ref), - "k8s.io/api/core/v1.PortStatus": schema_k8sio_api_core_v1_PortStatus(ref), - "k8s.io/api/core/v1.PortworxVolumeSource": schema_k8sio_api_core_v1_PortworxVolumeSource(ref), - "k8s.io/api/core/v1.PreferAvoidPodsEntry": schema_k8sio_api_core_v1_PreferAvoidPodsEntry(ref), - "k8s.io/api/core/v1.PreferredSchedulingTerm": schema_k8sio_api_core_v1_PreferredSchedulingTerm(ref), - "k8s.io/api/core/v1.Probe": schema_k8sio_api_core_v1_Probe(ref), - "k8s.io/api/core/v1.ProbeHandler": schema_k8sio_api_core_v1_ProbeHandler(ref), - "k8s.io/api/core/v1.ProjectedVolumeSource": schema_k8sio_api_core_v1_ProjectedVolumeSource(ref), - "k8s.io/api/core/v1.QuobyteVolumeSource": schema_k8sio_api_core_v1_QuobyteVolumeSource(ref), - "k8s.io/api/core/v1.RBDPersistentVolumeSource": schema_k8sio_api_core_v1_RBDPersistentVolumeSource(ref), - "k8s.io/api/core/v1.RBDVolumeSource": schema_k8sio_api_core_v1_RBDVolumeSource(ref), - "k8s.io/api/core/v1.RangeAllocation": schema_k8sio_api_core_v1_RangeAllocation(ref), - "k8s.io/api/core/v1.ReplicationController": schema_k8sio_api_core_v1_ReplicationController(ref), - "k8s.io/api/core/v1.ReplicationControllerCondition": schema_k8sio_api_core_v1_ReplicationControllerCondition(ref), - "k8s.io/api/core/v1.ReplicationControllerList": schema_k8sio_api_core_v1_ReplicationControllerList(ref), - "k8s.io/api/core/v1.ReplicationControllerSpec": schema_k8sio_api_core_v1_ReplicationControllerSpec(ref), - "k8s.io/api/core/v1.ReplicationControllerStatus": schema_k8sio_api_core_v1_ReplicationControllerStatus(ref), - "k8s.io/api/core/v1.ResourceClaim": schema_k8sio_api_core_v1_ResourceClaim(ref), - "k8s.io/api/core/v1.ResourceFieldSelector": schema_k8sio_api_core_v1_ResourceFieldSelector(ref), - "k8s.io/api/core/v1.ResourceHealth": schema_k8sio_api_core_v1_ResourceHealth(ref), - "k8s.io/api/core/v1.ResourceQuota": schema_k8sio_api_core_v1_ResourceQuota(ref), - "k8s.io/api/core/v1.ResourceQuotaList": schema_k8sio_api_core_v1_ResourceQuotaList(ref), - "k8s.io/api/core/v1.ResourceQuotaSpec": schema_k8sio_api_core_v1_ResourceQuotaSpec(ref), - "k8s.io/api/core/v1.ResourceQuotaStatus": schema_k8sio_api_core_v1_ResourceQuotaStatus(ref), - "k8s.io/api/core/v1.ResourceRequirements": schema_k8sio_api_core_v1_ResourceRequirements(ref), - "k8s.io/api/core/v1.ResourceStatus": schema_k8sio_api_core_v1_ResourceStatus(ref), - "k8s.io/api/core/v1.SELinuxOptions": schema_k8sio_api_core_v1_SELinuxOptions(ref), - "k8s.io/api/core/v1.ScaleIOPersistentVolumeSource": schema_k8sio_api_core_v1_ScaleIOPersistentVolumeSource(ref), - "k8s.io/api/core/v1.ScaleIOVolumeSource": schema_k8sio_api_core_v1_ScaleIOVolumeSource(ref), - "k8s.io/api/core/v1.ScopeSelector": schema_k8sio_api_core_v1_ScopeSelector(ref), - "k8s.io/api/core/v1.ScopedResourceSelectorRequirement": schema_k8sio_api_core_v1_ScopedResourceSelectorRequirement(ref), - "k8s.io/api/core/v1.SeccompProfile": schema_k8sio_api_core_v1_SeccompProfile(ref), - "k8s.io/api/core/v1.Secret": schema_k8sio_api_core_v1_Secret(ref), - "k8s.io/api/core/v1.SecretEnvSource": schema_k8sio_api_core_v1_SecretEnvSource(ref), - "k8s.io/api/core/v1.SecretKeySelector": schema_k8sio_api_core_v1_SecretKeySelector(ref), - "k8s.io/api/core/v1.SecretList": schema_k8sio_api_core_v1_SecretList(ref), - "k8s.io/api/core/v1.SecretProjection": schema_k8sio_api_core_v1_SecretProjection(ref), - "k8s.io/api/core/v1.SecretReference": schema_k8sio_api_core_v1_SecretReference(ref), - "k8s.io/api/core/v1.SecretVolumeSource": schema_k8sio_api_core_v1_SecretVolumeSource(ref), - "k8s.io/api/core/v1.SecurityContext": schema_k8sio_api_core_v1_SecurityContext(ref), - "k8s.io/api/core/v1.SerializedReference": schema_k8sio_api_core_v1_SerializedReference(ref), - "k8s.io/api/core/v1.Service": schema_k8sio_api_core_v1_Service(ref), - "k8s.io/api/core/v1.ServiceAccount": schema_k8sio_api_core_v1_ServiceAccount(ref), - "k8s.io/api/core/v1.ServiceAccountList": schema_k8sio_api_core_v1_ServiceAccountList(ref), - "k8s.io/api/core/v1.ServiceAccountTokenProjection": schema_k8sio_api_core_v1_ServiceAccountTokenProjection(ref), - "k8s.io/api/core/v1.ServiceList": schema_k8sio_api_core_v1_ServiceList(ref), - "k8s.io/api/core/v1.ServicePort": schema_k8sio_api_core_v1_ServicePort(ref), - "k8s.io/api/core/v1.ServiceProxyOptions": schema_k8sio_api_core_v1_ServiceProxyOptions(ref), - "k8s.io/api/core/v1.ServiceSpec": schema_k8sio_api_core_v1_ServiceSpec(ref), - "k8s.io/api/core/v1.ServiceStatus": schema_k8sio_api_core_v1_ServiceStatus(ref), - "k8s.io/api/core/v1.SessionAffinityConfig": schema_k8sio_api_core_v1_SessionAffinityConfig(ref), - "k8s.io/api/core/v1.SleepAction": schema_k8sio_api_core_v1_SleepAction(ref), - "k8s.io/api/core/v1.StorageOSPersistentVolumeSource": schema_k8sio_api_core_v1_StorageOSPersistentVolumeSource(ref), - "k8s.io/api/core/v1.StorageOSVolumeSource": schema_k8sio_api_core_v1_StorageOSVolumeSource(ref), - "k8s.io/api/core/v1.Sysctl": schema_k8sio_api_core_v1_Sysctl(ref), - "k8s.io/api/core/v1.TCPSocketAction": schema_k8sio_api_core_v1_TCPSocketAction(ref), - "k8s.io/api/core/v1.Taint": schema_k8sio_api_core_v1_Taint(ref), - "k8s.io/api/core/v1.Toleration": schema_k8sio_api_core_v1_Toleration(ref), - "k8s.io/api/core/v1.TopologySelectorLabelRequirement": schema_k8sio_api_core_v1_TopologySelectorLabelRequirement(ref), - "k8s.io/api/core/v1.TopologySelectorTerm": schema_k8sio_api_core_v1_TopologySelectorTerm(ref), - "k8s.io/api/core/v1.TopologySpreadConstraint": schema_k8sio_api_core_v1_TopologySpreadConstraint(ref), - "k8s.io/api/core/v1.TypedLocalObjectReference": schema_k8sio_api_core_v1_TypedLocalObjectReference(ref), - "k8s.io/api/core/v1.TypedObjectReference": schema_k8sio_api_core_v1_TypedObjectReference(ref), - "k8s.io/api/core/v1.Volume": schema_k8sio_api_core_v1_Volume(ref), - "k8s.io/api/core/v1.VolumeDevice": schema_k8sio_api_core_v1_VolumeDevice(ref), - "k8s.io/api/core/v1.VolumeMount": schema_k8sio_api_core_v1_VolumeMount(ref), - "k8s.io/api/core/v1.VolumeMountStatus": schema_k8sio_api_core_v1_VolumeMountStatus(ref), - "k8s.io/api/core/v1.VolumeNodeAffinity": schema_k8sio_api_core_v1_VolumeNodeAffinity(ref), - "k8s.io/api/core/v1.VolumeProjection": schema_k8sio_api_core_v1_VolumeProjection(ref), - "k8s.io/api/core/v1.VolumeResourceRequirements": schema_k8sio_api_core_v1_VolumeResourceRequirements(ref), - "k8s.io/api/core/v1.VolumeSource": schema_k8sio_api_core_v1_VolumeSource(ref), - "k8s.io/api/core/v1.VsphereVirtualDiskVolumeSource": schema_k8sio_api_core_v1_VsphereVirtualDiskVolumeSource(ref), - "k8s.io/api/core/v1.WeightedPodAffinityTerm": schema_k8sio_api_core_v1_WeightedPodAffinityTerm(ref), - "k8s.io/api/core/v1.WindowsSecurityContextOptions": schema_k8sio_api_core_v1_WindowsSecurityContextOptions(ref), - "k8s.io/apimachinery/pkg/api/resource.Quantity": schema_apimachinery_pkg_api_resource_Quantity(ref), - "k8s.io/apimachinery/pkg/api/resource.int64Amount": schema_apimachinery_pkg_api_resource_int64Amount(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.APIGroup": schema_pkg_apis_meta_v1_APIGroup(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.APIGroupList": schema_pkg_apis_meta_v1_APIGroupList(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.APIResource": schema_pkg_apis_meta_v1_APIResource(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.APIResourceList": schema_pkg_apis_meta_v1_APIResourceList(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.APIVersions": schema_pkg_apis_meta_v1_APIVersions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ApplyOptions": schema_pkg_apis_meta_v1_ApplyOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Condition": schema_pkg_apis_meta_v1_Condition(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.CreateOptions": schema_pkg_apis_meta_v1_CreateOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.DeleteOptions": schema_pkg_apis_meta_v1_DeleteOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Duration": schema_pkg_apis_meta_v1_Duration(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.FieldSelectorRequirement": schema_pkg_apis_meta_v1_FieldSelectorRequirement(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.FieldsV1": schema_pkg_apis_meta_v1_FieldsV1(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GetOptions": schema_pkg_apis_meta_v1_GetOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GroupKind": schema_pkg_apis_meta_v1_GroupKind(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GroupResource": schema_pkg_apis_meta_v1_GroupResource(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersion": schema_pkg_apis_meta_v1_GroupVersion(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionForDiscovery": schema_pkg_apis_meta_v1_GroupVersionForDiscovery(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionKind": schema_pkg_apis_meta_v1_GroupVersionKind(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionResource": schema_pkg_apis_meta_v1_GroupVersionResource(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.InternalEvent": schema_pkg_apis_meta_v1_InternalEvent(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelector": schema_pkg_apis_meta_v1_LabelSelector(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelectorRequirement": schema_pkg_apis_meta_v1_LabelSelectorRequirement(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.List": schema_pkg_apis_meta_v1_List(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta": schema_pkg_apis_meta_v1_ListMeta(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ListOptions": schema_pkg_apis_meta_v1_ListOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ManagedFieldsEntry": schema_pkg_apis_meta_v1_ManagedFieldsEntry(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.MicroTime": schema_pkg_apis_meta_v1_MicroTime(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta": schema_pkg_apis_meta_v1_ObjectMeta(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.OwnerReference": schema_pkg_apis_meta_v1_OwnerReference(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.PartialObjectMetadata": schema_pkg_apis_meta_v1_PartialObjectMetadata(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.PartialObjectMetadataList": schema_pkg_apis_meta_v1_PartialObjectMetadataList(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Patch": schema_pkg_apis_meta_v1_Patch(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.PatchOptions": schema_pkg_apis_meta_v1_PatchOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Preconditions": schema_pkg_apis_meta_v1_Preconditions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.RootPaths": schema_pkg_apis_meta_v1_RootPaths(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ServerAddressByClientCIDR": schema_pkg_apis_meta_v1_ServerAddressByClientCIDR(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Status": schema_pkg_apis_meta_v1_Status(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.StatusCause": schema_pkg_apis_meta_v1_StatusCause(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.StatusDetails": schema_pkg_apis_meta_v1_StatusDetails(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Table": schema_pkg_apis_meta_v1_Table(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.TableColumnDefinition": schema_pkg_apis_meta_v1_TableColumnDefinition(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.TableOptions": schema_pkg_apis_meta_v1_TableOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.TableRow": schema_pkg_apis_meta_v1_TableRow(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.TableRowCondition": schema_pkg_apis_meta_v1_TableRowCondition(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Time": schema_pkg_apis_meta_v1_Time(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Timestamp": schema_pkg_apis_meta_v1_Timestamp(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.TypeMeta": schema_pkg_apis_meta_v1_TypeMeta(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.UpdateOptions": schema_pkg_apis_meta_v1_UpdateOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.WatchEvent": schema_pkg_apis_meta_v1_WatchEvent(ref), - "k8s.io/apimachinery/pkg/runtime.RawExtension": schema_k8sio_apimachinery_pkg_runtime_RawExtension(ref), - "k8s.io/apimachinery/pkg/runtime.TypeMeta": schema_k8sio_apimachinery_pkg_runtime_TypeMeta(ref), - "k8s.io/apimachinery/pkg/runtime.Unknown": schema_k8sio_apimachinery_pkg_runtime_Unknown(ref), - "k8s.io/apimachinery/pkg/util/intstr.IntOrString": schema_apimachinery_pkg_util_intstr_IntOrString(ref), - "k8s.io/apimachinery/pkg/version.Info": schema_k8sio_apimachinery_pkg_version_Info(ref), - "sigs.k8s.io/gateway-api/apis/v1.AllowedRoutes": schema_sigsk8sio_gateway_api_apis_v1_AllowedRoutes(ref), - "sigs.k8s.io/gateway-api/apis/v1.BackendObjectReference": schema_sigsk8sio_gateway_api_apis_v1_BackendObjectReference(ref), - "sigs.k8s.io/gateway-api/apis/v1.BackendRef": schema_sigsk8sio_gateway_api_apis_v1_BackendRef(ref), - "sigs.k8s.io/gateway-api/apis/v1.CommonRouteSpec": schema_sigsk8sio_gateway_api_apis_v1_CommonRouteSpec(ref), - "sigs.k8s.io/gateway-api/apis/v1.CookieConfig": schema_sigsk8sio_gateway_api_apis_v1_CookieConfig(ref), - "sigs.k8s.io/gateway-api/apis/v1.Fraction": schema_sigsk8sio_gateway_api_apis_v1_Fraction(ref), - "sigs.k8s.io/gateway-api/apis/v1.FrontendTLSValidation": schema_sigsk8sio_gateway_api_apis_v1_FrontendTLSValidation(ref), - "sigs.k8s.io/gateway-api/apis/v1.GRPCBackendRef": schema_sigsk8sio_gateway_api_apis_v1_GRPCBackendRef(ref), - "sigs.k8s.io/gateway-api/apis/v1.GRPCHeaderMatch": schema_sigsk8sio_gateway_api_apis_v1_GRPCHeaderMatch(ref), - "sigs.k8s.io/gateway-api/apis/v1.GRPCMethodMatch": schema_sigsk8sio_gateway_api_apis_v1_GRPCMethodMatch(ref), - "sigs.k8s.io/gateway-api/apis/v1.GRPCRoute": schema_sigsk8sio_gateway_api_apis_v1_GRPCRoute(ref), - "sigs.k8s.io/gateway-api/apis/v1.GRPCRouteFilter": schema_sigsk8sio_gateway_api_apis_v1_GRPCRouteFilter(ref), - "sigs.k8s.io/gateway-api/apis/v1.GRPCRouteList": schema_sigsk8sio_gateway_api_apis_v1_GRPCRouteList(ref), - "sigs.k8s.io/gateway-api/apis/v1.GRPCRouteMatch": schema_sigsk8sio_gateway_api_apis_v1_GRPCRouteMatch(ref), - "sigs.k8s.io/gateway-api/apis/v1.GRPCRouteRule": schema_sigsk8sio_gateway_api_apis_v1_GRPCRouteRule(ref), - "sigs.k8s.io/gateway-api/apis/v1.GRPCRouteSpec": schema_sigsk8sio_gateway_api_apis_v1_GRPCRouteSpec(ref), - "sigs.k8s.io/gateway-api/apis/v1.GRPCRouteStatus": schema_sigsk8sio_gateway_api_apis_v1_GRPCRouteStatus(ref), - "sigs.k8s.io/gateway-api/apis/v1.Gateway": schema_sigsk8sio_gateway_api_apis_v1_Gateway(ref), - "sigs.k8s.io/gateway-api/apis/v1.GatewayAddress": schema_sigsk8sio_gateway_api_apis_v1_GatewayAddress(ref), - "sigs.k8s.io/gateway-api/apis/v1.GatewayBackendTLS": schema_sigsk8sio_gateway_api_apis_v1_GatewayBackendTLS(ref), - "sigs.k8s.io/gateway-api/apis/v1.GatewayClass": schema_sigsk8sio_gateway_api_apis_v1_GatewayClass(ref), - "sigs.k8s.io/gateway-api/apis/v1.GatewayClassList": schema_sigsk8sio_gateway_api_apis_v1_GatewayClassList(ref), - "sigs.k8s.io/gateway-api/apis/v1.GatewayClassSpec": schema_sigsk8sio_gateway_api_apis_v1_GatewayClassSpec(ref), - "sigs.k8s.io/gateway-api/apis/v1.GatewayClassStatus": schema_sigsk8sio_gateway_api_apis_v1_GatewayClassStatus(ref), - "sigs.k8s.io/gateway-api/apis/v1.GatewayInfrastructure": schema_sigsk8sio_gateway_api_apis_v1_GatewayInfrastructure(ref), - "sigs.k8s.io/gateway-api/apis/v1.GatewayList": schema_sigsk8sio_gateway_api_apis_v1_GatewayList(ref), - "sigs.k8s.io/gateway-api/apis/v1.GatewaySpec": schema_sigsk8sio_gateway_api_apis_v1_GatewaySpec(ref), - "sigs.k8s.io/gateway-api/apis/v1.GatewayStatus": schema_sigsk8sio_gateway_api_apis_v1_GatewayStatus(ref), - "sigs.k8s.io/gateway-api/apis/v1.GatewayStatusAddress": schema_sigsk8sio_gateway_api_apis_v1_GatewayStatusAddress(ref), - "sigs.k8s.io/gateway-api/apis/v1.GatewayTLSConfig": schema_sigsk8sio_gateway_api_apis_v1_GatewayTLSConfig(ref), - "sigs.k8s.io/gateway-api/apis/v1.HTTPBackendRef": schema_sigsk8sio_gateway_api_apis_v1_HTTPBackendRef(ref), - "sigs.k8s.io/gateway-api/apis/v1.HTTPHeader": schema_sigsk8sio_gateway_api_apis_v1_HTTPHeader(ref), - "sigs.k8s.io/gateway-api/apis/v1.HTTPHeaderFilter": schema_sigsk8sio_gateway_api_apis_v1_HTTPHeaderFilter(ref), - "sigs.k8s.io/gateway-api/apis/v1.HTTPHeaderMatch": schema_sigsk8sio_gateway_api_apis_v1_HTTPHeaderMatch(ref), - "sigs.k8s.io/gateway-api/apis/v1.HTTPPathMatch": schema_sigsk8sio_gateway_api_apis_v1_HTTPPathMatch(ref), - "sigs.k8s.io/gateway-api/apis/v1.HTTPPathModifier": schema_sigsk8sio_gateway_api_apis_v1_HTTPPathModifier(ref), - "sigs.k8s.io/gateway-api/apis/v1.HTTPQueryParamMatch": schema_sigsk8sio_gateway_api_apis_v1_HTTPQueryParamMatch(ref), - "sigs.k8s.io/gateway-api/apis/v1.HTTPRequestMirrorFilter": schema_sigsk8sio_gateway_api_apis_v1_HTTPRequestMirrorFilter(ref), - "sigs.k8s.io/gateway-api/apis/v1.HTTPRequestRedirectFilter": schema_sigsk8sio_gateway_api_apis_v1_HTTPRequestRedirectFilter(ref), - "sigs.k8s.io/gateway-api/apis/v1.HTTPRoute": schema_sigsk8sio_gateway_api_apis_v1_HTTPRoute(ref), - "sigs.k8s.io/gateway-api/apis/v1.HTTPRouteFilter": schema_sigsk8sio_gateway_api_apis_v1_HTTPRouteFilter(ref), - "sigs.k8s.io/gateway-api/apis/v1.HTTPRouteList": schema_sigsk8sio_gateway_api_apis_v1_HTTPRouteList(ref), - "sigs.k8s.io/gateway-api/apis/v1.HTTPRouteMatch": schema_sigsk8sio_gateway_api_apis_v1_HTTPRouteMatch(ref), - "sigs.k8s.io/gateway-api/apis/v1.HTTPRouteRetry": schema_sigsk8sio_gateway_api_apis_v1_HTTPRouteRetry(ref), - "sigs.k8s.io/gateway-api/apis/v1.HTTPRouteRule": schema_sigsk8sio_gateway_api_apis_v1_HTTPRouteRule(ref), - "sigs.k8s.io/gateway-api/apis/v1.HTTPRouteSpec": schema_sigsk8sio_gateway_api_apis_v1_HTTPRouteSpec(ref), - "sigs.k8s.io/gateway-api/apis/v1.HTTPRouteStatus": schema_sigsk8sio_gateway_api_apis_v1_HTTPRouteStatus(ref), - "sigs.k8s.io/gateway-api/apis/v1.HTTPRouteTimeouts": schema_sigsk8sio_gateway_api_apis_v1_HTTPRouteTimeouts(ref), - "sigs.k8s.io/gateway-api/apis/v1.HTTPURLRewriteFilter": schema_sigsk8sio_gateway_api_apis_v1_HTTPURLRewriteFilter(ref), - "sigs.k8s.io/gateway-api/apis/v1.Listener": schema_sigsk8sio_gateway_api_apis_v1_Listener(ref), - "sigs.k8s.io/gateway-api/apis/v1.ListenerStatus": schema_sigsk8sio_gateway_api_apis_v1_ListenerStatus(ref), - "sigs.k8s.io/gateway-api/apis/v1.LocalObjectReference": schema_sigsk8sio_gateway_api_apis_v1_LocalObjectReference(ref), - "sigs.k8s.io/gateway-api/apis/v1.LocalParametersReference": schema_sigsk8sio_gateway_api_apis_v1_LocalParametersReference(ref), - "sigs.k8s.io/gateway-api/apis/v1.ObjectReference": schema_sigsk8sio_gateway_api_apis_v1_ObjectReference(ref), - "sigs.k8s.io/gateway-api/apis/v1.ParametersReference": schema_sigsk8sio_gateway_api_apis_v1_ParametersReference(ref), - "sigs.k8s.io/gateway-api/apis/v1.ParentReference": schema_sigsk8sio_gateway_api_apis_v1_ParentReference(ref), - "sigs.k8s.io/gateway-api/apis/v1.RouteGroupKind": schema_sigsk8sio_gateway_api_apis_v1_RouteGroupKind(ref), - "sigs.k8s.io/gateway-api/apis/v1.RouteNamespaces": schema_sigsk8sio_gateway_api_apis_v1_RouteNamespaces(ref), - "sigs.k8s.io/gateway-api/apis/v1.RouteParentStatus": schema_sigsk8sio_gateway_api_apis_v1_RouteParentStatus(ref), - "sigs.k8s.io/gateway-api/apis/v1.RouteStatus": schema_sigsk8sio_gateway_api_apis_v1_RouteStatus(ref), - "sigs.k8s.io/gateway-api/apis/v1.SecretObjectReference": schema_sigsk8sio_gateway_api_apis_v1_SecretObjectReference(ref), - "sigs.k8s.io/gateway-api/apis/v1.SessionPersistence": schema_sigsk8sio_gateway_api_apis_v1_SessionPersistence(ref), - "sigs.k8s.io/gateway-api/apis/v1.SupportedFeature": schema_sigsk8sio_gateway_api_apis_v1_SupportedFeature(ref), + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.AiExtension": schema_projects_gateway2_api_v1alpha1_AiExtension(ref), + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.AiExtensionStats": schema_projects_gateway2_api_v1alpha1_AiExtensionStats(ref), + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.AwsUpstream": schema_projects_gateway2_api_v1alpha1_AwsUpstream(ref), + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.CustomLabel": schema_projects_gateway2_api_v1alpha1_CustomLabel(ref), + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.DirectResponse": schema_projects_gateway2_api_v1alpha1_DirectResponse(ref), + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.DirectResponseList": schema_projects_gateway2_api_v1alpha1_DirectResponseList(ref), + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.DirectResponseSpec": schema_projects_gateway2_api_v1alpha1_DirectResponseSpec(ref), + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.DirectResponseStatus": schema_projects_gateway2_api_v1alpha1_DirectResponseStatus(ref), + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.EnvoyBootstrap": schema_projects_gateway2_api_v1alpha1_EnvoyBootstrap(ref), + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.EnvoyContainer": schema_projects_gateway2_api_v1alpha1_EnvoyContainer(ref), + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.GatewayParameters": schema_projects_gateway2_api_v1alpha1_GatewayParameters(ref), + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.GatewayParametersList": schema_projects_gateway2_api_v1alpha1_GatewayParametersList(ref), + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.GatewayParametersSpec": schema_projects_gateway2_api_v1alpha1_GatewayParametersSpec(ref), + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.GatewayParametersStatus": schema_projects_gateway2_api_v1alpha1_GatewayParametersStatus(ref), + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.GracefulShutdownSpec": schema_projects_gateway2_api_v1alpha1_GracefulShutdownSpec(ref), + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.Host": schema_projects_gateway2_api_v1alpha1_Host(ref), + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.HttpListenerPolicy": schema_projects_gateway2_api_v1alpha1_HttpListenerPolicy(ref), + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.HttpListenerPolicyList": schema_projects_gateway2_api_v1alpha1_HttpListenerPolicyList(ref), + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.HttpListenerPolicySpec": schema_projects_gateway2_api_v1alpha1_HttpListenerPolicySpec(ref), + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.Image": schema_projects_gateway2_api_v1alpha1_Image(ref), + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.IstioContainer": schema_projects_gateway2_api_v1alpha1_IstioContainer(ref), + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.IstioIntegration": schema_projects_gateway2_api_v1alpha1_IstioIntegration(ref), + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.KubernetesProxyConfig": schema_projects_gateway2_api_v1alpha1_KubernetesProxyConfig(ref), + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.ListenerPolicy": schema_projects_gateway2_api_v1alpha1_ListenerPolicy(ref), + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.ListenerPolicyList": schema_projects_gateway2_api_v1alpha1_ListenerPolicyList(ref), + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.ListenerPolicySpec": schema_projects_gateway2_api_v1alpha1_ListenerPolicySpec(ref), + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.LocalPolicyTargetReference": schema_projects_gateway2_api_v1alpha1_LocalPolicyTargetReference(ref), + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.Pod": schema_projects_gateway2_api_v1alpha1_Pod(ref), + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.PolicyAncestorStatus": schema_projects_gateway2_api_v1alpha1_PolicyAncestorStatus(ref), + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.PolicyStatus": schema_projects_gateway2_api_v1alpha1_PolicyStatus(ref), + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.ProxyDeployment": schema_projects_gateway2_api_v1alpha1_ProxyDeployment(ref), + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.RoutePolicy": schema_projects_gateway2_api_v1alpha1_RoutePolicy(ref), + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.RoutePolicyList": schema_projects_gateway2_api_v1alpha1_RoutePolicyList(ref), + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.RoutePolicySpec": schema_projects_gateway2_api_v1alpha1_RoutePolicySpec(ref), + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.SdsBootstrap": schema_projects_gateway2_api_v1alpha1_SdsBootstrap(ref), + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.SdsContainer": schema_projects_gateway2_api_v1alpha1_SdsContainer(ref), + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.SelfManagedGateway": schema_projects_gateway2_api_v1alpha1_SelfManagedGateway(ref), + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.Service": schema_projects_gateway2_api_v1alpha1_Service(ref), + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.ServiceAccount": schema_projects_gateway2_api_v1alpha1_ServiceAccount(ref), + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.StaticUpstream": schema_projects_gateway2_api_v1alpha1_StaticUpstream(ref), + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.StatsConfig": schema_projects_gateway2_api_v1alpha1_StatsConfig(ref), + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.Upstream": schema_projects_gateway2_api_v1alpha1_Upstream(ref), + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.UpstreamList": schema_projects_gateway2_api_v1alpha1_UpstreamList(ref), + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.UpstreamSpec": schema_projects_gateway2_api_v1alpha1_UpstreamSpec(ref), + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.UpstreamStatus": schema_projects_gateway2_api_v1alpha1_UpstreamStatus(ref), + "k8s.io/api/core/v1.AWSElasticBlockStoreVolumeSource": schema_k8sio_api_core_v1_AWSElasticBlockStoreVolumeSource(ref), + "k8s.io/api/core/v1.Affinity": schema_k8sio_api_core_v1_Affinity(ref), + "k8s.io/api/core/v1.AppArmorProfile": schema_k8sio_api_core_v1_AppArmorProfile(ref), + "k8s.io/api/core/v1.AttachedVolume": schema_k8sio_api_core_v1_AttachedVolume(ref), + "k8s.io/api/core/v1.AvoidPods": schema_k8sio_api_core_v1_AvoidPods(ref), + "k8s.io/api/core/v1.AzureDiskVolumeSource": schema_k8sio_api_core_v1_AzureDiskVolumeSource(ref), + "k8s.io/api/core/v1.AzureFilePersistentVolumeSource": schema_k8sio_api_core_v1_AzureFilePersistentVolumeSource(ref), + "k8s.io/api/core/v1.AzureFileVolumeSource": schema_k8sio_api_core_v1_AzureFileVolumeSource(ref), + "k8s.io/api/core/v1.Binding": schema_k8sio_api_core_v1_Binding(ref), + "k8s.io/api/core/v1.CSIPersistentVolumeSource": schema_k8sio_api_core_v1_CSIPersistentVolumeSource(ref), + "k8s.io/api/core/v1.CSIVolumeSource": schema_k8sio_api_core_v1_CSIVolumeSource(ref), + "k8s.io/api/core/v1.Capabilities": schema_k8sio_api_core_v1_Capabilities(ref), + "k8s.io/api/core/v1.CephFSPersistentVolumeSource": schema_k8sio_api_core_v1_CephFSPersistentVolumeSource(ref), + "k8s.io/api/core/v1.CephFSVolumeSource": schema_k8sio_api_core_v1_CephFSVolumeSource(ref), + "k8s.io/api/core/v1.CinderPersistentVolumeSource": schema_k8sio_api_core_v1_CinderPersistentVolumeSource(ref), + "k8s.io/api/core/v1.CinderVolumeSource": schema_k8sio_api_core_v1_CinderVolumeSource(ref), + "k8s.io/api/core/v1.ClientIPConfig": schema_k8sio_api_core_v1_ClientIPConfig(ref), + "k8s.io/api/core/v1.ClusterTrustBundleProjection": schema_k8sio_api_core_v1_ClusterTrustBundleProjection(ref), + "k8s.io/api/core/v1.ComponentCondition": schema_k8sio_api_core_v1_ComponentCondition(ref), + "k8s.io/api/core/v1.ComponentStatus": schema_k8sio_api_core_v1_ComponentStatus(ref), + "k8s.io/api/core/v1.ComponentStatusList": schema_k8sio_api_core_v1_ComponentStatusList(ref), + "k8s.io/api/core/v1.ConfigMap": schema_k8sio_api_core_v1_ConfigMap(ref), + "k8s.io/api/core/v1.ConfigMapEnvSource": schema_k8sio_api_core_v1_ConfigMapEnvSource(ref), + "k8s.io/api/core/v1.ConfigMapKeySelector": schema_k8sio_api_core_v1_ConfigMapKeySelector(ref), + "k8s.io/api/core/v1.ConfigMapList": schema_k8sio_api_core_v1_ConfigMapList(ref), + "k8s.io/api/core/v1.ConfigMapNodeConfigSource": schema_k8sio_api_core_v1_ConfigMapNodeConfigSource(ref), + "k8s.io/api/core/v1.ConfigMapProjection": schema_k8sio_api_core_v1_ConfigMapProjection(ref), + "k8s.io/api/core/v1.ConfigMapVolumeSource": schema_k8sio_api_core_v1_ConfigMapVolumeSource(ref), + "k8s.io/api/core/v1.Container": schema_k8sio_api_core_v1_Container(ref), + "k8s.io/api/core/v1.ContainerImage": schema_k8sio_api_core_v1_ContainerImage(ref), + "k8s.io/api/core/v1.ContainerPort": schema_k8sio_api_core_v1_ContainerPort(ref), + "k8s.io/api/core/v1.ContainerResizePolicy": schema_k8sio_api_core_v1_ContainerResizePolicy(ref), + "k8s.io/api/core/v1.ContainerState": schema_k8sio_api_core_v1_ContainerState(ref), + "k8s.io/api/core/v1.ContainerStateRunning": schema_k8sio_api_core_v1_ContainerStateRunning(ref), + "k8s.io/api/core/v1.ContainerStateTerminated": schema_k8sio_api_core_v1_ContainerStateTerminated(ref), + "k8s.io/api/core/v1.ContainerStateWaiting": schema_k8sio_api_core_v1_ContainerStateWaiting(ref), + "k8s.io/api/core/v1.ContainerStatus": schema_k8sio_api_core_v1_ContainerStatus(ref), + "k8s.io/api/core/v1.ContainerUser": schema_k8sio_api_core_v1_ContainerUser(ref), + "k8s.io/api/core/v1.DaemonEndpoint": schema_k8sio_api_core_v1_DaemonEndpoint(ref), + "k8s.io/api/core/v1.DownwardAPIProjection": schema_k8sio_api_core_v1_DownwardAPIProjection(ref), + "k8s.io/api/core/v1.DownwardAPIVolumeFile": schema_k8sio_api_core_v1_DownwardAPIVolumeFile(ref), + "k8s.io/api/core/v1.DownwardAPIVolumeSource": schema_k8sio_api_core_v1_DownwardAPIVolumeSource(ref), + "k8s.io/api/core/v1.EmptyDirVolumeSource": schema_k8sio_api_core_v1_EmptyDirVolumeSource(ref), + "k8s.io/api/core/v1.EndpointAddress": schema_k8sio_api_core_v1_EndpointAddress(ref), + "k8s.io/api/core/v1.EndpointPort": schema_k8sio_api_core_v1_EndpointPort(ref), + "k8s.io/api/core/v1.EndpointSubset": schema_k8sio_api_core_v1_EndpointSubset(ref), + "k8s.io/api/core/v1.Endpoints": schema_k8sio_api_core_v1_Endpoints(ref), + "k8s.io/api/core/v1.EndpointsList": schema_k8sio_api_core_v1_EndpointsList(ref), + "k8s.io/api/core/v1.EnvFromSource": schema_k8sio_api_core_v1_EnvFromSource(ref), + "k8s.io/api/core/v1.EnvVar": schema_k8sio_api_core_v1_EnvVar(ref), + "k8s.io/api/core/v1.EnvVarSource": schema_k8sio_api_core_v1_EnvVarSource(ref), + "k8s.io/api/core/v1.EphemeralContainer": schema_k8sio_api_core_v1_EphemeralContainer(ref), + "k8s.io/api/core/v1.EphemeralContainerCommon": schema_k8sio_api_core_v1_EphemeralContainerCommon(ref), + "k8s.io/api/core/v1.EphemeralVolumeSource": schema_k8sio_api_core_v1_EphemeralVolumeSource(ref), + "k8s.io/api/core/v1.Event": schema_k8sio_api_core_v1_Event(ref), + "k8s.io/api/core/v1.EventList": schema_k8sio_api_core_v1_EventList(ref), + "k8s.io/api/core/v1.EventSeries": schema_k8sio_api_core_v1_EventSeries(ref), + "k8s.io/api/core/v1.EventSource": schema_k8sio_api_core_v1_EventSource(ref), + "k8s.io/api/core/v1.ExecAction": schema_k8sio_api_core_v1_ExecAction(ref), + "k8s.io/api/core/v1.FCVolumeSource": schema_k8sio_api_core_v1_FCVolumeSource(ref), + "k8s.io/api/core/v1.FlexPersistentVolumeSource": schema_k8sio_api_core_v1_FlexPersistentVolumeSource(ref), + "k8s.io/api/core/v1.FlexVolumeSource": schema_k8sio_api_core_v1_FlexVolumeSource(ref), + "k8s.io/api/core/v1.FlockerVolumeSource": schema_k8sio_api_core_v1_FlockerVolumeSource(ref), + "k8s.io/api/core/v1.GCEPersistentDiskVolumeSource": schema_k8sio_api_core_v1_GCEPersistentDiskVolumeSource(ref), + "k8s.io/api/core/v1.GRPCAction": schema_k8sio_api_core_v1_GRPCAction(ref), + "k8s.io/api/core/v1.GitRepoVolumeSource": schema_k8sio_api_core_v1_GitRepoVolumeSource(ref), + "k8s.io/api/core/v1.GlusterfsPersistentVolumeSource": schema_k8sio_api_core_v1_GlusterfsPersistentVolumeSource(ref), + "k8s.io/api/core/v1.GlusterfsVolumeSource": schema_k8sio_api_core_v1_GlusterfsVolumeSource(ref), + "k8s.io/api/core/v1.HTTPGetAction": schema_k8sio_api_core_v1_HTTPGetAction(ref), + "k8s.io/api/core/v1.HTTPHeader": schema_k8sio_api_core_v1_HTTPHeader(ref), + "k8s.io/api/core/v1.HostAlias": schema_k8sio_api_core_v1_HostAlias(ref), + "k8s.io/api/core/v1.HostIP": schema_k8sio_api_core_v1_HostIP(ref), + "k8s.io/api/core/v1.HostPathVolumeSource": schema_k8sio_api_core_v1_HostPathVolumeSource(ref), + "k8s.io/api/core/v1.ISCSIPersistentVolumeSource": schema_k8sio_api_core_v1_ISCSIPersistentVolumeSource(ref), + "k8s.io/api/core/v1.ISCSIVolumeSource": schema_k8sio_api_core_v1_ISCSIVolumeSource(ref), + "k8s.io/api/core/v1.ImageVolumeSource": schema_k8sio_api_core_v1_ImageVolumeSource(ref), + "k8s.io/api/core/v1.KeyToPath": schema_k8sio_api_core_v1_KeyToPath(ref), + "k8s.io/api/core/v1.Lifecycle": schema_k8sio_api_core_v1_Lifecycle(ref), + "k8s.io/api/core/v1.LifecycleHandler": schema_k8sio_api_core_v1_LifecycleHandler(ref), + "k8s.io/api/core/v1.LimitRange": schema_k8sio_api_core_v1_LimitRange(ref), + "k8s.io/api/core/v1.LimitRangeItem": schema_k8sio_api_core_v1_LimitRangeItem(ref), + "k8s.io/api/core/v1.LimitRangeList": schema_k8sio_api_core_v1_LimitRangeList(ref), + "k8s.io/api/core/v1.LimitRangeSpec": schema_k8sio_api_core_v1_LimitRangeSpec(ref), + "k8s.io/api/core/v1.LinuxContainerUser": schema_k8sio_api_core_v1_LinuxContainerUser(ref), + "k8s.io/api/core/v1.List": schema_k8sio_api_core_v1_List(ref), + "k8s.io/api/core/v1.LoadBalancerIngress": schema_k8sio_api_core_v1_LoadBalancerIngress(ref), + "k8s.io/api/core/v1.LoadBalancerStatus": schema_k8sio_api_core_v1_LoadBalancerStatus(ref), + "k8s.io/api/core/v1.LocalObjectReference": schema_k8sio_api_core_v1_LocalObjectReference(ref), + "k8s.io/api/core/v1.LocalVolumeSource": schema_k8sio_api_core_v1_LocalVolumeSource(ref), + "k8s.io/api/core/v1.ModifyVolumeStatus": schema_k8sio_api_core_v1_ModifyVolumeStatus(ref), + "k8s.io/api/core/v1.NFSVolumeSource": schema_k8sio_api_core_v1_NFSVolumeSource(ref), + "k8s.io/api/core/v1.Namespace": schema_k8sio_api_core_v1_Namespace(ref), + "k8s.io/api/core/v1.NamespaceCondition": schema_k8sio_api_core_v1_NamespaceCondition(ref), + "k8s.io/api/core/v1.NamespaceList": schema_k8sio_api_core_v1_NamespaceList(ref), + "k8s.io/api/core/v1.NamespaceSpec": schema_k8sio_api_core_v1_NamespaceSpec(ref), + "k8s.io/api/core/v1.NamespaceStatus": schema_k8sio_api_core_v1_NamespaceStatus(ref), + "k8s.io/api/core/v1.Node": schema_k8sio_api_core_v1_Node(ref), + "k8s.io/api/core/v1.NodeAddress": schema_k8sio_api_core_v1_NodeAddress(ref), + "k8s.io/api/core/v1.NodeAffinity": schema_k8sio_api_core_v1_NodeAffinity(ref), + "k8s.io/api/core/v1.NodeCondition": schema_k8sio_api_core_v1_NodeCondition(ref), + "k8s.io/api/core/v1.NodeConfigSource": schema_k8sio_api_core_v1_NodeConfigSource(ref), + "k8s.io/api/core/v1.NodeConfigStatus": schema_k8sio_api_core_v1_NodeConfigStatus(ref), + "k8s.io/api/core/v1.NodeDaemonEndpoints": schema_k8sio_api_core_v1_NodeDaemonEndpoints(ref), + "k8s.io/api/core/v1.NodeFeatures": schema_k8sio_api_core_v1_NodeFeatures(ref), + "k8s.io/api/core/v1.NodeList": schema_k8sio_api_core_v1_NodeList(ref), + "k8s.io/api/core/v1.NodeProxyOptions": schema_k8sio_api_core_v1_NodeProxyOptions(ref), + "k8s.io/api/core/v1.NodeRuntimeHandler": schema_k8sio_api_core_v1_NodeRuntimeHandler(ref), + "k8s.io/api/core/v1.NodeRuntimeHandlerFeatures": schema_k8sio_api_core_v1_NodeRuntimeHandlerFeatures(ref), + "k8s.io/api/core/v1.NodeSelector": schema_k8sio_api_core_v1_NodeSelector(ref), + "k8s.io/api/core/v1.NodeSelectorRequirement": schema_k8sio_api_core_v1_NodeSelectorRequirement(ref), + "k8s.io/api/core/v1.NodeSelectorTerm": schema_k8sio_api_core_v1_NodeSelectorTerm(ref), + "k8s.io/api/core/v1.NodeSpec": schema_k8sio_api_core_v1_NodeSpec(ref), + "k8s.io/api/core/v1.NodeStatus": schema_k8sio_api_core_v1_NodeStatus(ref), + "k8s.io/api/core/v1.NodeSystemInfo": schema_k8sio_api_core_v1_NodeSystemInfo(ref), + "k8s.io/api/core/v1.ObjectFieldSelector": schema_k8sio_api_core_v1_ObjectFieldSelector(ref), + "k8s.io/api/core/v1.ObjectReference": schema_k8sio_api_core_v1_ObjectReference(ref), + "k8s.io/api/core/v1.PersistentVolume": schema_k8sio_api_core_v1_PersistentVolume(ref), + "k8s.io/api/core/v1.PersistentVolumeClaim": schema_k8sio_api_core_v1_PersistentVolumeClaim(ref), + "k8s.io/api/core/v1.PersistentVolumeClaimCondition": schema_k8sio_api_core_v1_PersistentVolumeClaimCondition(ref), + "k8s.io/api/core/v1.PersistentVolumeClaimList": schema_k8sio_api_core_v1_PersistentVolumeClaimList(ref), + "k8s.io/api/core/v1.PersistentVolumeClaimSpec": schema_k8sio_api_core_v1_PersistentVolumeClaimSpec(ref), + "k8s.io/api/core/v1.PersistentVolumeClaimStatus": schema_k8sio_api_core_v1_PersistentVolumeClaimStatus(ref), + "k8s.io/api/core/v1.PersistentVolumeClaimTemplate": schema_k8sio_api_core_v1_PersistentVolumeClaimTemplate(ref), + "k8s.io/api/core/v1.PersistentVolumeClaimVolumeSource": schema_k8sio_api_core_v1_PersistentVolumeClaimVolumeSource(ref), + "k8s.io/api/core/v1.PersistentVolumeList": schema_k8sio_api_core_v1_PersistentVolumeList(ref), + "k8s.io/api/core/v1.PersistentVolumeSource": schema_k8sio_api_core_v1_PersistentVolumeSource(ref), + "k8s.io/api/core/v1.PersistentVolumeSpec": schema_k8sio_api_core_v1_PersistentVolumeSpec(ref), + "k8s.io/api/core/v1.PersistentVolumeStatus": schema_k8sio_api_core_v1_PersistentVolumeStatus(ref), + "k8s.io/api/core/v1.PhotonPersistentDiskVolumeSource": schema_k8sio_api_core_v1_PhotonPersistentDiskVolumeSource(ref), + "k8s.io/api/core/v1.Pod": schema_k8sio_api_core_v1_Pod(ref), + "k8s.io/api/core/v1.PodAffinity": schema_k8sio_api_core_v1_PodAffinity(ref), + "k8s.io/api/core/v1.PodAffinityTerm": schema_k8sio_api_core_v1_PodAffinityTerm(ref), + "k8s.io/api/core/v1.PodAntiAffinity": schema_k8sio_api_core_v1_PodAntiAffinity(ref), + "k8s.io/api/core/v1.PodAttachOptions": schema_k8sio_api_core_v1_PodAttachOptions(ref), + "k8s.io/api/core/v1.PodCondition": schema_k8sio_api_core_v1_PodCondition(ref), + "k8s.io/api/core/v1.PodDNSConfig": schema_k8sio_api_core_v1_PodDNSConfig(ref), + "k8s.io/api/core/v1.PodDNSConfigOption": schema_k8sio_api_core_v1_PodDNSConfigOption(ref), + "k8s.io/api/core/v1.PodExecOptions": schema_k8sio_api_core_v1_PodExecOptions(ref), + "k8s.io/api/core/v1.PodIP": schema_k8sio_api_core_v1_PodIP(ref), + "k8s.io/api/core/v1.PodList": schema_k8sio_api_core_v1_PodList(ref), + "k8s.io/api/core/v1.PodLogOptions": schema_k8sio_api_core_v1_PodLogOptions(ref), + "k8s.io/api/core/v1.PodOS": schema_k8sio_api_core_v1_PodOS(ref), + "k8s.io/api/core/v1.PodPortForwardOptions": schema_k8sio_api_core_v1_PodPortForwardOptions(ref), + "k8s.io/api/core/v1.PodProxyOptions": schema_k8sio_api_core_v1_PodProxyOptions(ref), + "k8s.io/api/core/v1.PodReadinessGate": schema_k8sio_api_core_v1_PodReadinessGate(ref), + "k8s.io/api/core/v1.PodResourceClaim": schema_k8sio_api_core_v1_PodResourceClaim(ref), + "k8s.io/api/core/v1.PodResourceClaimStatus": schema_k8sio_api_core_v1_PodResourceClaimStatus(ref), + "k8s.io/api/core/v1.PodSchedulingGate": schema_k8sio_api_core_v1_PodSchedulingGate(ref), + "k8s.io/api/core/v1.PodSecurityContext": schema_k8sio_api_core_v1_PodSecurityContext(ref), + "k8s.io/api/core/v1.PodSignature": schema_k8sio_api_core_v1_PodSignature(ref), + "k8s.io/api/core/v1.PodSpec": schema_k8sio_api_core_v1_PodSpec(ref), + "k8s.io/api/core/v1.PodStatus": schema_k8sio_api_core_v1_PodStatus(ref), + "k8s.io/api/core/v1.PodStatusResult": schema_k8sio_api_core_v1_PodStatusResult(ref), + "k8s.io/api/core/v1.PodTemplate": schema_k8sio_api_core_v1_PodTemplate(ref), + "k8s.io/api/core/v1.PodTemplateList": schema_k8sio_api_core_v1_PodTemplateList(ref), + "k8s.io/api/core/v1.PodTemplateSpec": schema_k8sio_api_core_v1_PodTemplateSpec(ref), + "k8s.io/api/core/v1.PortStatus": schema_k8sio_api_core_v1_PortStatus(ref), + "k8s.io/api/core/v1.PortworxVolumeSource": schema_k8sio_api_core_v1_PortworxVolumeSource(ref), + "k8s.io/api/core/v1.PreferAvoidPodsEntry": schema_k8sio_api_core_v1_PreferAvoidPodsEntry(ref), + "k8s.io/api/core/v1.PreferredSchedulingTerm": schema_k8sio_api_core_v1_PreferredSchedulingTerm(ref), + "k8s.io/api/core/v1.Probe": schema_k8sio_api_core_v1_Probe(ref), + "k8s.io/api/core/v1.ProbeHandler": schema_k8sio_api_core_v1_ProbeHandler(ref), + "k8s.io/api/core/v1.ProjectedVolumeSource": schema_k8sio_api_core_v1_ProjectedVolumeSource(ref), + "k8s.io/api/core/v1.QuobyteVolumeSource": schema_k8sio_api_core_v1_QuobyteVolumeSource(ref), + "k8s.io/api/core/v1.RBDPersistentVolumeSource": schema_k8sio_api_core_v1_RBDPersistentVolumeSource(ref), + "k8s.io/api/core/v1.RBDVolumeSource": schema_k8sio_api_core_v1_RBDVolumeSource(ref), + "k8s.io/api/core/v1.RangeAllocation": schema_k8sio_api_core_v1_RangeAllocation(ref), + "k8s.io/api/core/v1.ReplicationController": schema_k8sio_api_core_v1_ReplicationController(ref), + "k8s.io/api/core/v1.ReplicationControllerCondition": schema_k8sio_api_core_v1_ReplicationControllerCondition(ref), + "k8s.io/api/core/v1.ReplicationControllerList": schema_k8sio_api_core_v1_ReplicationControllerList(ref), + "k8s.io/api/core/v1.ReplicationControllerSpec": schema_k8sio_api_core_v1_ReplicationControllerSpec(ref), + "k8s.io/api/core/v1.ReplicationControllerStatus": schema_k8sio_api_core_v1_ReplicationControllerStatus(ref), + "k8s.io/api/core/v1.ResourceClaim": schema_k8sio_api_core_v1_ResourceClaim(ref), + "k8s.io/api/core/v1.ResourceFieldSelector": schema_k8sio_api_core_v1_ResourceFieldSelector(ref), + "k8s.io/api/core/v1.ResourceHealth": schema_k8sio_api_core_v1_ResourceHealth(ref), + "k8s.io/api/core/v1.ResourceQuota": schema_k8sio_api_core_v1_ResourceQuota(ref), + "k8s.io/api/core/v1.ResourceQuotaList": schema_k8sio_api_core_v1_ResourceQuotaList(ref), + "k8s.io/api/core/v1.ResourceQuotaSpec": schema_k8sio_api_core_v1_ResourceQuotaSpec(ref), + "k8s.io/api/core/v1.ResourceQuotaStatus": schema_k8sio_api_core_v1_ResourceQuotaStatus(ref), + "k8s.io/api/core/v1.ResourceRequirements": schema_k8sio_api_core_v1_ResourceRequirements(ref), + "k8s.io/api/core/v1.ResourceStatus": schema_k8sio_api_core_v1_ResourceStatus(ref), + "k8s.io/api/core/v1.SELinuxOptions": schema_k8sio_api_core_v1_SELinuxOptions(ref), + "k8s.io/api/core/v1.ScaleIOPersistentVolumeSource": schema_k8sio_api_core_v1_ScaleIOPersistentVolumeSource(ref), + "k8s.io/api/core/v1.ScaleIOVolumeSource": schema_k8sio_api_core_v1_ScaleIOVolumeSource(ref), + "k8s.io/api/core/v1.ScopeSelector": schema_k8sio_api_core_v1_ScopeSelector(ref), + "k8s.io/api/core/v1.ScopedResourceSelectorRequirement": schema_k8sio_api_core_v1_ScopedResourceSelectorRequirement(ref), + "k8s.io/api/core/v1.SeccompProfile": schema_k8sio_api_core_v1_SeccompProfile(ref), + "k8s.io/api/core/v1.Secret": schema_k8sio_api_core_v1_Secret(ref), + "k8s.io/api/core/v1.SecretEnvSource": schema_k8sio_api_core_v1_SecretEnvSource(ref), + "k8s.io/api/core/v1.SecretKeySelector": schema_k8sio_api_core_v1_SecretKeySelector(ref), + "k8s.io/api/core/v1.SecretList": schema_k8sio_api_core_v1_SecretList(ref), + "k8s.io/api/core/v1.SecretProjection": schema_k8sio_api_core_v1_SecretProjection(ref), + "k8s.io/api/core/v1.SecretReference": schema_k8sio_api_core_v1_SecretReference(ref), + "k8s.io/api/core/v1.SecretVolumeSource": schema_k8sio_api_core_v1_SecretVolumeSource(ref), + "k8s.io/api/core/v1.SecurityContext": schema_k8sio_api_core_v1_SecurityContext(ref), + "k8s.io/api/core/v1.SerializedReference": schema_k8sio_api_core_v1_SerializedReference(ref), + "k8s.io/api/core/v1.Service": schema_k8sio_api_core_v1_Service(ref), + "k8s.io/api/core/v1.ServiceAccount": schema_k8sio_api_core_v1_ServiceAccount(ref), + "k8s.io/api/core/v1.ServiceAccountList": schema_k8sio_api_core_v1_ServiceAccountList(ref), + "k8s.io/api/core/v1.ServiceAccountTokenProjection": schema_k8sio_api_core_v1_ServiceAccountTokenProjection(ref), + "k8s.io/api/core/v1.ServiceList": schema_k8sio_api_core_v1_ServiceList(ref), + "k8s.io/api/core/v1.ServicePort": schema_k8sio_api_core_v1_ServicePort(ref), + "k8s.io/api/core/v1.ServiceProxyOptions": schema_k8sio_api_core_v1_ServiceProxyOptions(ref), + "k8s.io/api/core/v1.ServiceSpec": schema_k8sio_api_core_v1_ServiceSpec(ref), + "k8s.io/api/core/v1.ServiceStatus": schema_k8sio_api_core_v1_ServiceStatus(ref), + "k8s.io/api/core/v1.SessionAffinityConfig": schema_k8sio_api_core_v1_SessionAffinityConfig(ref), + "k8s.io/api/core/v1.SleepAction": schema_k8sio_api_core_v1_SleepAction(ref), + "k8s.io/api/core/v1.StorageOSPersistentVolumeSource": schema_k8sio_api_core_v1_StorageOSPersistentVolumeSource(ref), + "k8s.io/api/core/v1.StorageOSVolumeSource": schema_k8sio_api_core_v1_StorageOSVolumeSource(ref), + "k8s.io/api/core/v1.Sysctl": schema_k8sio_api_core_v1_Sysctl(ref), + "k8s.io/api/core/v1.TCPSocketAction": schema_k8sio_api_core_v1_TCPSocketAction(ref), + "k8s.io/api/core/v1.Taint": schema_k8sio_api_core_v1_Taint(ref), + "k8s.io/api/core/v1.Toleration": schema_k8sio_api_core_v1_Toleration(ref), + "k8s.io/api/core/v1.TopologySelectorLabelRequirement": schema_k8sio_api_core_v1_TopologySelectorLabelRequirement(ref), + "k8s.io/api/core/v1.TopologySelectorTerm": schema_k8sio_api_core_v1_TopologySelectorTerm(ref), + "k8s.io/api/core/v1.TopologySpreadConstraint": schema_k8sio_api_core_v1_TopologySpreadConstraint(ref), + "k8s.io/api/core/v1.TypedLocalObjectReference": schema_k8sio_api_core_v1_TypedLocalObjectReference(ref), + "k8s.io/api/core/v1.TypedObjectReference": schema_k8sio_api_core_v1_TypedObjectReference(ref), + "k8s.io/api/core/v1.Volume": schema_k8sio_api_core_v1_Volume(ref), + "k8s.io/api/core/v1.VolumeDevice": schema_k8sio_api_core_v1_VolumeDevice(ref), + "k8s.io/api/core/v1.VolumeMount": schema_k8sio_api_core_v1_VolumeMount(ref), + "k8s.io/api/core/v1.VolumeMountStatus": schema_k8sio_api_core_v1_VolumeMountStatus(ref), + "k8s.io/api/core/v1.VolumeNodeAffinity": schema_k8sio_api_core_v1_VolumeNodeAffinity(ref), + "k8s.io/api/core/v1.VolumeProjection": schema_k8sio_api_core_v1_VolumeProjection(ref), + "k8s.io/api/core/v1.VolumeResourceRequirements": schema_k8sio_api_core_v1_VolumeResourceRequirements(ref), + "k8s.io/api/core/v1.VolumeSource": schema_k8sio_api_core_v1_VolumeSource(ref), + "k8s.io/api/core/v1.VsphereVirtualDiskVolumeSource": schema_k8sio_api_core_v1_VsphereVirtualDiskVolumeSource(ref), + "k8s.io/api/core/v1.WeightedPodAffinityTerm": schema_k8sio_api_core_v1_WeightedPodAffinityTerm(ref), + "k8s.io/api/core/v1.WindowsSecurityContextOptions": schema_k8sio_api_core_v1_WindowsSecurityContextOptions(ref), + "k8s.io/apimachinery/pkg/api/resource.Quantity": schema_apimachinery_pkg_api_resource_Quantity(ref), + "k8s.io/apimachinery/pkg/api/resource.int64Amount": schema_apimachinery_pkg_api_resource_int64Amount(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.APIGroup": schema_pkg_apis_meta_v1_APIGroup(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.APIGroupList": schema_pkg_apis_meta_v1_APIGroupList(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.APIResource": schema_pkg_apis_meta_v1_APIResource(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.APIResourceList": schema_pkg_apis_meta_v1_APIResourceList(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.APIVersions": schema_pkg_apis_meta_v1_APIVersions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ApplyOptions": schema_pkg_apis_meta_v1_ApplyOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Condition": schema_pkg_apis_meta_v1_Condition(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.CreateOptions": schema_pkg_apis_meta_v1_CreateOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.DeleteOptions": schema_pkg_apis_meta_v1_DeleteOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Duration": schema_pkg_apis_meta_v1_Duration(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.FieldSelectorRequirement": schema_pkg_apis_meta_v1_FieldSelectorRequirement(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.FieldsV1": schema_pkg_apis_meta_v1_FieldsV1(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GetOptions": schema_pkg_apis_meta_v1_GetOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GroupKind": schema_pkg_apis_meta_v1_GroupKind(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GroupResource": schema_pkg_apis_meta_v1_GroupResource(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersion": schema_pkg_apis_meta_v1_GroupVersion(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionForDiscovery": schema_pkg_apis_meta_v1_GroupVersionForDiscovery(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionKind": schema_pkg_apis_meta_v1_GroupVersionKind(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionResource": schema_pkg_apis_meta_v1_GroupVersionResource(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.InternalEvent": schema_pkg_apis_meta_v1_InternalEvent(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelector": schema_pkg_apis_meta_v1_LabelSelector(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelectorRequirement": schema_pkg_apis_meta_v1_LabelSelectorRequirement(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.List": schema_pkg_apis_meta_v1_List(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta": schema_pkg_apis_meta_v1_ListMeta(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ListOptions": schema_pkg_apis_meta_v1_ListOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ManagedFieldsEntry": schema_pkg_apis_meta_v1_ManagedFieldsEntry(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.MicroTime": schema_pkg_apis_meta_v1_MicroTime(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta": schema_pkg_apis_meta_v1_ObjectMeta(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.OwnerReference": schema_pkg_apis_meta_v1_OwnerReference(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.PartialObjectMetadata": schema_pkg_apis_meta_v1_PartialObjectMetadata(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.PartialObjectMetadataList": schema_pkg_apis_meta_v1_PartialObjectMetadataList(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Patch": schema_pkg_apis_meta_v1_Patch(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.PatchOptions": schema_pkg_apis_meta_v1_PatchOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Preconditions": schema_pkg_apis_meta_v1_Preconditions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.RootPaths": schema_pkg_apis_meta_v1_RootPaths(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ServerAddressByClientCIDR": schema_pkg_apis_meta_v1_ServerAddressByClientCIDR(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Status": schema_pkg_apis_meta_v1_Status(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.StatusCause": schema_pkg_apis_meta_v1_StatusCause(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.StatusDetails": schema_pkg_apis_meta_v1_StatusDetails(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Table": schema_pkg_apis_meta_v1_Table(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.TableColumnDefinition": schema_pkg_apis_meta_v1_TableColumnDefinition(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.TableOptions": schema_pkg_apis_meta_v1_TableOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.TableRow": schema_pkg_apis_meta_v1_TableRow(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.TableRowCondition": schema_pkg_apis_meta_v1_TableRowCondition(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Time": schema_pkg_apis_meta_v1_Time(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Timestamp": schema_pkg_apis_meta_v1_Timestamp(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.TypeMeta": schema_pkg_apis_meta_v1_TypeMeta(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.UpdateOptions": schema_pkg_apis_meta_v1_UpdateOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.WatchEvent": schema_pkg_apis_meta_v1_WatchEvent(ref), + "k8s.io/apimachinery/pkg/runtime.RawExtension": schema_k8sio_apimachinery_pkg_runtime_RawExtension(ref), + "k8s.io/apimachinery/pkg/runtime.TypeMeta": schema_k8sio_apimachinery_pkg_runtime_TypeMeta(ref), + "k8s.io/apimachinery/pkg/runtime.Unknown": schema_k8sio_apimachinery_pkg_runtime_Unknown(ref), + "k8s.io/apimachinery/pkg/util/intstr.IntOrString": schema_apimachinery_pkg_util_intstr_IntOrString(ref), + "k8s.io/apimachinery/pkg/version.Info": schema_k8sio_apimachinery_pkg_version_Info(ref), + "sigs.k8s.io/gateway-api/apis/v1.AllowedRoutes": schema_sigsk8sio_gateway_api_apis_v1_AllowedRoutes(ref), + "sigs.k8s.io/gateway-api/apis/v1.BackendObjectReference": schema_sigsk8sio_gateway_api_apis_v1_BackendObjectReference(ref), + "sigs.k8s.io/gateway-api/apis/v1.BackendRef": schema_sigsk8sio_gateway_api_apis_v1_BackendRef(ref), + "sigs.k8s.io/gateway-api/apis/v1.CommonRouteSpec": schema_sigsk8sio_gateway_api_apis_v1_CommonRouteSpec(ref), + "sigs.k8s.io/gateway-api/apis/v1.CookieConfig": schema_sigsk8sio_gateway_api_apis_v1_CookieConfig(ref), + "sigs.k8s.io/gateway-api/apis/v1.Fraction": schema_sigsk8sio_gateway_api_apis_v1_Fraction(ref), + "sigs.k8s.io/gateway-api/apis/v1.FrontendTLSValidation": schema_sigsk8sio_gateway_api_apis_v1_FrontendTLSValidation(ref), + "sigs.k8s.io/gateway-api/apis/v1.GRPCBackendRef": schema_sigsk8sio_gateway_api_apis_v1_GRPCBackendRef(ref), + "sigs.k8s.io/gateway-api/apis/v1.GRPCHeaderMatch": schema_sigsk8sio_gateway_api_apis_v1_GRPCHeaderMatch(ref), + "sigs.k8s.io/gateway-api/apis/v1.GRPCMethodMatch": schema_sigsk8sio_gateway_api_apis_v1_GRPCMethodMatch(ref), + "sigs.k8s.io/gateway-api/apis/v1.GRPCRoute": schema_sigsk8sio_gateway_api_apis_v1_GRPCRoute(ref), + "sigs.k8s.io/gateway-api/apis/v1.GRPCRouteFilter": schema_sigsk8sio_gateway_api_apis_v1_GRPCRouteFilter(ref), + "sigs.k8s.io/gateway-api/apis/v1.GRPCRouteList": schema_sigsk8sio_gateway_api_apis_v1_GRPCRouteList(ref), + "sigs.k8s.io/gateway-api/apis/v1.GRPCRouteMatch": schema_sigsk8sio_gateway_api_apis_v1_GRPCRouteMatch(ref), + "sigs.k8s.io/gateway-api/apis/v1.GRPCRouteRule": schema_sigsk8sio_gateway_api_apis_v1_GRPCRouteRule(ref), + "sigs.k8s.io/gateway-api/apis/v1.GRPCRouteSpec": schema_sigsk8sio_gateway_api_apis_v1_GRPCRouteSpec(ref), + "sigs.k8s.io/gateway-api/apis/v1.GRPCRouteStatus": schema_sigsk8sio_gateway_api_apis_v1_GRPCRouteStatus(ref), + "sigs.k8s.io/gateway-api/apis/v1.Gateway": schema_sigsk8sio_gateway_api_apis_v1_Gateway(ref), + "sigs.k8s.io/gateway-api/apis/v1.GatewayAddress": schema_sigsk8sio_gateway_api_apis_v1_GatewayAddress(ref), + "sigs.k8s.io/gateway-api/apis/v1.GatewayBackendTLS": schema_sigsk8sio_gateway_api_apis_v1_GatewayBackendTLS(ref), + "sigs.k8s.io/gateway-api/apis/v1.GatewayClass": schema_sigsk8sio_gateway_api_apis_v1_GatewayClass(ref), + "sigs.k8s.io/gateway-api/apis/v1.GatewayClassList": schema_sigsk8sio_gateway_api_apis_v1_GatewayClassList(ref), + "sigs.k8s.io/gateway-api/apis/v1.GatewayClassSpec": schema_sigsk8sio_gateway_api_apis_v1_GatewayClassSpec(ref), + "sigs.k8s.io/gateway-api/apis/v1.GatewayClassStatus": schema_sigsk8sio_gateway_api_apis_v1_GatewayClassStatus(ref), + "sigs.k8s.io/gateway-api/apis/v1.GatewayInfrastructure": schema_sigsk8sio_gateway_api_apis_v1_GatewayInfrastructure(ref), + "sigs.k8s.io/gateway-api/apis/v1.GatewayList": schema_sigsk8sio_gateway_api_apis_v1_GatewayList(ref), + "sigs.k8s.io/gateway-api/apis/v1.GatewaySpec": schema_sigsk8sio_gateway_api_apis_v1_GatewaySpec(ref), + "sigs.k8s.io/gateway-api/apis/v1.GatewayStatus": schema_sigsk8sio_gateway_api_apis_v1_GatewayStatus(ref), + "sigs.k8s.io/gateway-api/apis/v1.GatewayStatusAddress": schema_sigsk8sio_gateway_api_apis_v1_GatewayStatusAddress(ref), + "sigs.k8s.io/gateway-api/apis/v1.GatewayTLSConfig": schema_sigsk8sio_gateway_api_apis_v1_GatewayTLSConfig(ref), + "sigs.k8s.io/gateway-api/apis/v1.HTTPBackendRef": schema_sigsk8sio_gateway_api_apis_v1_HTTPBackendRef(ref), + "sigs.k8s.io/gateway-api/apis/v1.HTTPHeader": schema_sigsk8sio_gateway_api_apis_v1_HTTPHeader(ref), + "sigs.k8s.io/gateway-api/apis/v1.HTTPHeaderFilter": schema_sigsk8sio_gateway_api_apis_v1_HTTPHeaderFilter(ref), + "sigs.k8s.io/gateway-api/apis/v1.HTTPHeaderMatch": schema_sigsk8sio_gateway_api_apis_v1_HTTPHeaderMatch(ref), + "sigs.k8s.io/gateway-api/apis/v1.HTTPPathMatch": schema_sigsk8sio_gateway_api_apis_v1_HTTPPathMatch(ref), + "sigs.k8s.io/gateway-api/apis/v1.HTTPPathModifier": schema_sigsk8sio_gateway_api_apis_v1_HTTPPathModifier(ref), + "sigs.k8s.io/gateway-api/apis/v1.HTTPQueryParamMatch": schema_sigsk8sio_gateway_api_apis_v1_HTTPQueryParamMatch(ref), + "sigs.k8s.io/gateway-api/apis/v1.HTTPRequestMirrorFilter": schema_sigsk8sio_gateway_api_apis_v1_HTTPRequestMirrorFilter(ref), + "sigs.k8s.io/gateway-api/apis/v1.HTTPRequestRedirectFilter": schema_sigsk8sio_gateway_api_apis_v1_HTTPRequestRedirectFilter(ref), + "sigs.k8s.io/gateway-api/apis/v1.HTTPRoute": schema_sigsk8sio_gateway_api_apis_v1_HTTPRoute(ref), + "sigs.k8s.io/gateway-api/apis/v1.HTTPRouteFilter": schema_sigsk8sio_gateway_api_apis_v1_HTTPRouteFilter(ref), + "sigs.k8s.io/gateway-api/apis/v1.HTTPRouteList": schema_sigsk8sio_gateway_api_apis_v1_HTTPRouteList(ref), + "sigs.k8s.io/gateway-api/apis/v1.HTTPRouteMatch": schema_sigsk8sio_gateway_api_apis_v1_HTTPRouteMatch(ref), + "sigs.k8s.io/gateway-api/apis/v1.HTTPRouteRetry": schema_sigsk8sio_gateway_api_apis_v1_HTTPRouteRetry(ref), + "sigs.k8s.io/gateway-api/apis/v1.HTTPRouteRule": schema_sigsk8sio_gateway_api_apis_v1_HTTPRouteRule(ref), + "sigs.k8s.io/gateway-api/apis/v1.HTTPRouteSpec": schema_sigsk8sio_gateway_api_apis_v1_HTTPRouteSpec(ref), + "sigs.k8s.io/gateway-api/apis/v1.HTTPRouteStatus": schema_sigsk8sio_gateway_api_apis_v1_HTTPRouteStatus(ref), + "sigs.k8s.io/gateway-api/apis/v1.HTTPRouteTimeouts": schema_sigsk8sio_gateway_api_apis_v1_HTTPRouteTimeouts(ref), + "sigs.k8s.io/gateway-api/apis/v1.HTTPURLRewriteFilter": schema_sigsk8sio_gateway_api_apis_v1_HTTPURLRewriteFilter(ref), + "sigs.k8s.io/gateway-api/apis/v1.Listener": schema_sigsk8sio_gateway_api_apis_v1_Listener(ref), + "sigs.k8s.io/gateway-api/apis/v1.ListenerStatus": schema_sigsk8sio_gateway_api_apis_v1_ListenerStatus(ref), + "sigs.k8s.io/gateway-api/apis/v1.LocalObjectReference": schema_sigsk8sio_gateway_api_apis_v1_LocalObjectReference(ref), + "sigs.k8s.io/gateway-api/apis/v1.LocalParametersReference": schema_sigsk8sio_gateway_api_apis_v1_LocalParametersReference(ref), + "sigs.k8s.io/gateway-api/apis/v1.ObjectReference": schema_sigsk8sio_gateway_api_apis_v1_ObjectReference(ref), + "sigs.k8s.io/gateway-api/apis/v1.ParametersReference": schema_sigsk8sio_gateway_api_apis_v1_ParametersReference(ref), + "sigs.k8s.io/gateway-api/apis/v1.ParentReference": schema_sigsk8sio_gateway_api_apis_v1_ParentReference(ref), + "sigs.k8s.io/gateway-api/apis/v1.RouteGroupKind": schema_sigsk8sio_gateway_api_apis_v1_RouteGroupKind(ref), + "sigs.k8s.io/gateway-api/apis/v1.RouteNamespaces": schema_sigsk8sio_gateway_api_apis_v1_RouteNamespaces(ref), + "sigs.k8s.io/gateway-api/apis/v1.RouteParentStatus": schema_sigsk8sio_gateway_api_apis_v1_RouteParentStatus(ref), + "sigs.k8s.io/gateway-api/apis/v1.RouteStatus": schema_sigsk8sio_gateway_api_apis_v1_RouteStatus(ref), + "sigs.k8s.io/gateway-api/apis/v1.SecretObjectReference": schema_sigsk8sio_gateway_api_apis_v1_SecretObjectReference(ref), + "sigs.k8s.io/gateway-api/apis/v1.SessionPersistence": schema_sigsk8sio_gateway_api_apis_v1_SessionPersistence(ref), + "sigs.k8s.io/gateway-api/apis/v1.SupportedFeature": schema_sigsk8sio_gateway_api_apis_v1_SupportedFeature(ref), } } @@ -429,7 +429,7 @@ func schema_projects_gateway2_api_v1alpha1_AiExtension(ref common.ReferenceCallb "image": { SchemaProps: spec.SchemaProps{ Description: "The extension's container image. See https://kubernetes.io/docs/concepts/containers/images for details.", - Ref: ref("github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.Image"), + Ref: ref("github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.Image"), }, }, "securityContext": { @@ -475,14 +475,14 @@ func schema_projects_gateway2_api_v1alpha1_AiExtension(ref common.ReferenceCallb "stats": { SchemaProps: spec.SchemaProps{ Description: "Additional stats config for AI Extension. This config can be useful for adding custom labels to the request metrics.\n\nExample: ```yaml stats:\n customLabels:\n - name: \"subject\"\n metadataNamespace: \"envoy.filters.http.jwt_authn\"\n metadataKey: \"principal:sub\"\n - name: \"issuer\"\n metadataNamespace: \"envoy.filters.http.jwt_authn\"\n metadataKey: \"principal:iss\"\n```", - Ref: ref("github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.AiExtensionStats"), + Ref: ref("github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.AiExtensionStats"), }, }, }, }, }, Dependencies: []string{ - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.AiExtensionStats", "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.Image", "k8s.io/api/core/v1.ContainerPort", "k8s.io/api/core/v1.EnvVar", "k8s.io/api/core/v1.ResourceRequirements", "k8s.io/api/core/v1.SecurityContext"}, + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.AiExtensionStats", "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.Image", "k8s.io/api/core/v1.ContainerPort", "k8s.io/api/core/v1.EnvVar", "k8s.io/api/core/v1.ResourceRequirements", "k8s.io/api/core/v1.SecurityContext"}, } } @@ -499,7 +499,7 @@ func schema_projects_gateway2_api_v1alpha1_AiExtensionStats(ref common.Reference Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.CustomLabel"), + Ref: ref("github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.CustomLabel"), }, }, }, @@ -509,7 +509,7 @@ func schema_projects_gateway2_api_v1alpha1_AiExtensionStats(ref common.Reference }, }, Dependencies: []string{ - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.CustomLabel"}, + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.CustomLabel"}, } } @@ -612,20 +612,20 @@ func schema_projects_gateway2_api_v1alpha1_DirectResponse(ref common.ReferenceCa "spec": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.DirectResponseSpec"), + Ref: ref("github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.DirectResponseSpec"), }, }, "status": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.DirectResponseStatus"), + Ref: ref("github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.DirectResponseStatus"), }, }, }, }, }, Dependencies: []string{ - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.DirectResponseSpec", "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.DirectResponseStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.DirectResponseSpec", "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.DirectResponseStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } @@ -662,7 +662,7 @@ func schema_projects_gateway2_api_v1alpha1_DirectResponseList(ref common.Referen Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.DirectResponse"), + Ref: ref("github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.DirectResponse"), }, }, }, @@ -673,7 +673,7 @@ func schema_projects_gateway2_api_v1alpha1_DirectResponseList(ref common.Referen }, }, Dependencies: []string{ - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.DirectResponse", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.DirectResponse", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, } } @@ -763,13 +763,13 @@ func schema_projects_gateway2_api_v1alpha1_EnvoyContainer(ref common.ReferenceCa "bootstrap": { SchemaProps: spec.SchemaProps{ Description: "Initial envoy configuration.", - Ref: ref("github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.EnvoyBootstrap"), + Ref: ref("github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.EnvoyBootstrap"), }, }, "image": { SchemaProps: spec.SchemaProps{ Description: "The envoy container image. See https://kubernetes.io/docs/concepts/containers/images for details.\n\nDefault values, which may be overridden individually:\n\n\tregistry: quay.io/solo-io\n\trepository: gloo-envoy-wrapper (OSS) / gloo-ee-envoy-wrapper (EE)\n\ttag: (OSS) / (EE)\n\tpullPolicy: IfNotPresent", - Ref: ref("github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.Image"), + Ref: ref("github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.Image"), }, }, "securityContext": { @@ -788,7 +788,7 @@ func schema_projects_gateway2_api_v1alpha1_EnvoyContainer(ref common.ReferenceCa }, }, Dependencies: []string{ - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.EnvoyBootstrap", "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.Image", "k8s.io/api/core/v1.ResourceRequirements", "k8s.io/api/core/v1.SecurityContext"}, + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.EnvoyBootstrap", "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.Image", "k8s.io/api/core/v1.ResourceRequirements", "k8s.io/api/core/v1.SecurityContext"}, } } @@ -822,20 +822,20 @@ func schema_projects_gateway2_api_v1alpha1_GatewayParameters(ref common.Referenc "spec": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.GatewayParametersSpec"), + Ref: ref("github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.GatewayParametersSpec"), }, }, "status": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.GatewayParametersStatus"), + Ref: ref("github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.GatewayParametersStatus"), }, }, }, }, }, Dependencies: []string{ - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.GatewayParametersSpec", "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.GatewayParametersStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.GatewayParametersSpec", "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.GatewayParametersStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } @@ -872,7 +872,7 @@ func schema_projects_gateway2_api_v1alpha1_GatewayParametersList(ref common.Refe Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.GatewayParameters"), + Ref: ref("github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.GatewayParameters"), }, }, }, @@ -883,7 +883,7 @@ func schema_projects_gateway2_api_v1alpha1_GatewayParametersList(ref common.Refe }, }, Dependencies: []string{ - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.GatewayParameters", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.GatewayParameters", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, } } @@ -897,20 +897,20 @@ func schema_projects_gateway2_api_v1alpha1_GatewayParametersSpec(ref common.Refe "kube": { SchemaProps: spec.SchemaProps{ Description: "The proxy will be deployed on Kubernetes.", - Ref: ref("github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.KubernetesProxyConfig"), + Ref: ref("github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.KubernetesProxyConfig"), }, }, "selfManaged": { SchemaProps: spec.SchemaProps{ Description: "The proxy will be self-managed and not auto-provisioned.", - Ref: ref("github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.SelfManagedGateway"), + Ref: ref("github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.SelfManagedGateway"), }, }, }, }, }, Dependencies: []string{ - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.KubernetesProxyConfig", "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.SelfManagedGateway"}, + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.KubernetesProxyConfig", "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.SelfManagedGateway"}, } } @@ -1007,20 +1007,20 @@ func schema_projects_gateway2_api_v1alpha1_HttpListenerPolicy(ref common.Referen "spec": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.HttpListenerPolicySpec"), + Ref: ref("github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.HttpListenerPolicySpec"), }, }, "status": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.PolicyStatus"), + Ref: ref("github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.PolicyStatus"), }, }, }, }, }, Dependencies: []string{ - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.HttpListenerPolicySpec", "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.PolicyStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.HttpListenerPolicySpec", "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.PolicyStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } @@ -1057,7 +1057,7 @@ func schema_projects_gateway2_api_v1alpha1_HttpListenerPolicyList(ref common.Ref Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.HttpListenerPolicy"), + Ref: ref("github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.HttpListenerPolicy"), }, }, }, @@ -1068,7 +1068,7 @@ func schema_projects_gateway2_api_v1alpha1_HttpListenerPolicyList(ref common.Ref }, }, Dependencies: []string{ - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.HttpListenerPolicy", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.HttpListenerPolicy", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, } } @@ -1081,7 +1081,7 @@ func schema_projects_gateway2_api_v1alpha1_HttpListenerPolicySpec(ref common.Ref "targetRef": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.LocalPolicyTargetReference"), + Ref: ref("github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.LocalPolicyTargetReference"), }, }, "compress": { @@ -1094,7 +1094,7 @@ func schema_projects_gateway2_api_v1alpha1_HttpListenerPolicySpec(ref common.Ref }, }, Dependencies: []string{ - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.LocalPolicyTargetReference"}, + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.LocalPolicyTargetReference"}, } } @@ -1157,7 +1157,7 @@ func schema_projects_gateway2_api_v1alpha1_IstioContainer(ref common.ReferenceCa "image": { SchemaProps: spec.SchemaProps{ Description: "The envoy container image. See https://kubernetes.io/docs/concepts/containers/images for details.", - Ref: ref("github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.Image"), + Ref: ref("github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.Image"), }, }, "securityContext": { @@ -1204,7 +1204,7 @@ func schema_projects_gateway2_api_v1alpha1_IstioContainer(ref common.ReferenceCa }, }, Dependencies: []string{ - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.Image", "k8s.io/api/core/v1.ResourceRequirements", "k8s.io/api/core/v1.SecurityContext"}, + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.Image", "k8s.io/api/core/v1.ResourceRequirements", "k8s.io/api/core/v1.SecurityContext"}, } } @@ -1218,7 +1218,7 @@ func schema_projects_gateway2_api_v1alpha1_IstioIntegration(ref common.Reference "istioProxyContainer": { SchemaProps: spec.SchemaProps{ Description: "Configuration for the container running istio-proxy. Note that if Istio integration is not enabled, the istio container will not be injected into the gateway proxy deployment.", - Ref: ref("github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.IstioContainer"), + Ref: ref("github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.IstioContainer"), }, }, "customSidecars": { @@ -1239,7 +1239,7 @@ func schema_projects_gateway2_api_v1alpha1_IstioIntegration(ref common.Reference }, }, Dependencies: []string{ - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.IstioContainer", "k8s.io/api/core/v1.Container"}, + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.IstioContainer", "k8s.io/api/core/v1.Container"}, } } @@ -1253,55 +1253,55 @@ func schema_projects_gateway2_api_v1alpha1_KubernetesProxyConfig(ref common.Refe "deployment": { SchemaProps: spec.SchemaProps{ Description: "Use a Kubernetes deployment as the proxy workload type. Currently, this is the only supported workload type.", - Ref: ref("github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.ProxyDeployment"), + Ref: ref("github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.ProxyDeployment"), }, }, "envoyContainer": { SchemaProps: spec.SchemaProps{ Description: "Configuration for the container running Envoy.", - Ref: ref("github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.EnvoyContainer"), + Ref: ref("github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.EnvoyContainer"), }, }, "sdsContainer": { SchemaProps: spec.SchemaProps{ Description: "Configuration for the container running the Secret Discovery Service (SDS).", - Ref: ref("github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.SdsContainer"), + Ref: ref("github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.SdsContainer"), }, }, "podTemplate": { SchemaProps: spec.SchemaProps{ Description: "Configuration for the pods that will be created.", - Ref: ref("github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.Pod"), + Ref: ref("github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.Pod"), }, }, "service": { SchemaProps: spec.SchemaProps{ Description: "Configuration for the Kubernetes Service that exposes the Envoy proxy over the network.", - Ref: ref("github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.Service"), + Ref: ref("github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.Service"), }, }, "serviceAccount": { SchemaProps: spec.SchemaProps{ Description: "Configuration for the Kubernetes ServiceAccount used by the Envoy pod.", - Ref: ref("github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.ServiceAccount"), + Ref: ref("github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.ServiceAccount"), }, }, "istio": { SchemaProps: spec.SchemaProps{ Description: "Configuration for the Istio integration.", - Ref: ref("github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.IstioIntegration"), + Ref: ref("github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.IstioIntegration"), }, }, "stats": { SchemaProps: spec.SchemaProps{ Description: "Configuration for the stats server.", - Ref: ref("github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.StatsConfig"), + Ref: ref("github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.StatsConfig"), }, }, "aiExtension": { SchemaProps: spec.SchemaProps{ Description: "Configuration for the AI extension.", - Ref: ref("github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.AiExtension"), + Ref: ref("github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.AiExtension"), }, }, "floatingUserId": { @@ -1315,7 +1315,7 @@ func schema_projects_gateway2_api_v1alpha1_KubernetesProxyConfig(ref common.Refe }, }, Dependencies: []string{ - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.AiExtension", "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.EnvoyContainer", "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.IstioIntegration", "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.Pod", "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.ProxyDeployment", "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.SdsContainer", "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.Service", "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.ServiceAccount", "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.StatsConfig"}, + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.AiExtension", "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.EnvoyContainer", "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.IstioIntegration", "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.Pod", "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.ProxyDeployment", "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.SdsContainer", "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.Service", "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.ServiceAccount", "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.StatsConfig"}, } } @@ -1348,20 +1348,20 @@ func schema_projects_gateway2_api_v1alpha1_ListenerPolicy(ref common.ReferenceCa "spec": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.ListenerPolicySpec"), + Ref: ref("github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.ListenerPolicySpec"), }, }, "status": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.PolicyStatus"), + Ref: ref("github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.PolicyStatus"), }, }, }, }, }, Dependencies: []string{ - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.ListenerPolicySpec", "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.PolicyStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.ListenerPolicySpec", "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.PolicyStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } @@ -1398,7 +1398,7 @@ func schema_projects_gateway2_api_v1alpha1_ListenerPolicyList(ref common.Referen Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.ListenerPolicy"), + Ref: ref("github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.ListenerPolicy"), }, }, }, @@ -1409,7 +1409,7 @@ func schema_projects_gateway2_api_v1alpha1_ListenerPolicyList(ref common.Referen }, }, Dependencies: []string{ - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.ListenerPolicy", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.ListenerPolicy", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, } } @@ -1422,7 +1422,7 @@ func schema_projects_gateway2_api_v1alpha1_ListenerPolicySpec(ref common.Referen "targetRef": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.LocalPolicyTargetReference"), + Ref: ref("github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.LocalPolicyTargetReference"), }, }, "perConnectionBufferLimitBytes": { @@ -1435,7 +1435,7 @@ func schema_projects_gateway2_api_v1alpha1_ListenerPolicySpec(ref common.Referen }, }, Dependencies: []string{ - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.LocalPolicyTargetReference"}, + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.LocalPolicyTargetReference"}, } } @@ -1575,7 +1575,7 @@ func schema_projects_gateway2_api_v1alpha1_Pod(ref common.ReferenceCallback) com "gracefulShutdown": { SchemaProps: spec.SchemaProps{ Description: "If specified, the pod's graceful shutdown spec.", - Ref: ref("github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.GracefulShutdownSpec"), + Ref: ref("github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.GracefulShutdownSpec"), }, }, "terminationGracePeriodSeconds": { @@ -1601,7 +1601,7 @@ func schema_projects_gateway2_api_v1alpha1_Pod(ref common.ReferenceCallback) com }, }, Dependencies: []string{ - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.GracefulShutdownSpec", "k8s.io/api/core/v1.Affinity", "k8s.io/api/core/v1.LocalObjectReference", "k8s.io/api/core/v1.PodSecurityContext", "k8s.io/api/core/v1.Probe", "k8s.io/api/core/v1.Toleration"}, + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.GracefulShutdownSpec", "k8s.io/api/core/v1.Affinity", "k8s.io/api/core/v1.LocalObjectReference", "k8s.io/api/core/v1.PodSecurityContext", "k8s.io/api/core/v1.Probe", "k8s.io/api/core/v1.Toleration"}, } } @@ -1691,7 +1691,7 @@ func schema_projects_gateway2_api_v1alpha1_PolicyStatus(ref common.ReferenceCall Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.PolicyAncestorStatus"), + Ref: ref("github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.PolicyAncestorStatus"), }, }, }, @@ -1702,7 +1702,7 @@ func schema_projects_gateway2_api_v1alpha1_PolicyStatus(ref common.ReferenceCall }, }, Dependencies: []string{ - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.PolicyAncestorStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.Condition"}, + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.PolicyAncestorStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.Condition"}, } } @@ -1755,20 +1755,20 @@ func schema_projects_gateway2_api_v1alpha1_RoutePolicy(ref common.ReferenceCallb "spec": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.RoutePolicySpec"), + Ref: ref("github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.RoutePolicySpec"), }, }, "status": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.PolicyStatus"), + Ref: ref("github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.PolicyStatus"), }, }, }, }, }, Dependencies: []string{ - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.PolicyStatus", "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.RoutePolicySpec", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.PolicyStatus", "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.RoutePolicySpec", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } @@ -1805,7 +1805,7 @@ func schema_projects_gateway2_api_v1alpha1_RoutePolicyList(ref common.ReferenceC Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.RoutePolicy"), + Ref: ref("github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.RoutePolicy"), }, }, }, @@ -1816,7 +1816,7 @@ func schema_projects_gateway2_api_v1alpha1_RoutePolicyList(ref common.ReferenceC }, }, Dependencies: []string{ - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.RoutePolicy", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.RoutePolicy", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, } } @@ -1829,7 +1829,7 @@ func schema_projects_gateway2_api_v1alpha1_RoutePolicySpec(ref common.ReferenceC "targetRef": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.LocalPolicyTargetReference"), + Ref: ref("github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.LocalPolicyTargetReference"), }, }, "timeout": { @@ -1842,7 +1842,7 @@ func schema_projects_gateway2_api_v1alpha1_RoutePolicySpec(ref common.ReferenceC }, }, Dependencies: []string{ - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.LocalPolicyTargetReference"}, + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.LocalPolicyTargetReference"}, } } @@ -1876,7 +1876,7 @@ func schema_projects_gateway2_api_v1alpha1_SdsContainer(ref common.ReferenceCall "image": { SchemaProps: spec.SchemaProps{ Description: "The SDS container image. See https://kubernetes.io/docs/concepts/containers/images for details.", - Ref: ref("github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.Image"), + Ref: ref("github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.Image"), }, }, "securityContext": { @@ -1894,14 +1894,14 @@ func schema_projects_gateway2_api_v1alpha1_SdsContainer(ref common.ReferenceCall "bootstrap": { SchemaProps: spec.SchemaProps{ Description: "Initial SDS container configuration.", - Ref: ref("github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.SdsBootstrap"), + Ref: ref("github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.SdsBootstrap"), }, }, }, }, }, Dependencies: []string{ - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.Image", "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.SdsBootstrap", "k8s.io/api/core/v1.ResourceRequirements", "k8s.io/api/core/v1.SecurityContext"}, + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.Image", "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.SdsBootstrap", "k8s.io/api/core/v1.ResourceRequirements", "k8s.io/api/core/v1.SecurityContext"}, } } @@ -2032,7 +2032,7 @@ func schema_projects_gateway2_api_v1alpha1_StaticUpstream(ref common.ReferenceCa Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.Host"), + Ref: ref("github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.Host"), }, }, }, @@ -2042,7 +2042,7 @@ func schema_projects_gateway2_api_v1alpha1_StaticUpstream(ref common.ReferenceCa }, }, Dependencies: []string{ - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.Host"}, + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.Host"}, } } @@ -2116,20 +2116,20 @@ func schema_projects_gateway2_api_v1alpha1_Upstream(ref common.ReferenceCallback "spec": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.UpstreamSpec"), + Ref: ref("github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.UpstreamSpec"), }, }, "status": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.UpstreamStatus"), + Ref: ref("github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.UpstreamStatus"), }, }, }, }, }, Dependencies: []string{ - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.UpstreamSpec", "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.UpstreamStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.UpstreamSpec", "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.UpstreamStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } @@ -2166,7 +2166,7 @@ func schema_projects_gateway2_api_v1alpha1_UpstreamList(ref common.ReferenceCall Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.Upstream"), + Ref: ref("github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.Upstream"), }, }, }, @@ -2177,7 +2177,7 @@ func schema_projects_gateway2_api_v1alpha1_UpstreamList(ref common.ReferenceCall }, }, Dependencies: []string{ - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.Upstream", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.Upstream", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, } } @@ -2189,19 +2189,19 @@ func schema_projects_gateway2_api_v1alpha1_UpstreamSpec(ref common.ReferenceCall Properties: map[string]spec.Schema{ "aws": { SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.AwsUpstream"), + Ref: ref("github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.AwsUpstream"), }, }, "static": { SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.StaticUpstream"), + Ref: ref("github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.StaticUpstream"), }, }, }, }, }, Dependencies: []string{ - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.AwsUpstream", "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1.StaticUpstream"}, + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.AwsUpstream", "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1.StaticUpstream"}, } } diff --git a/projects/gateway2/plugins/stages.go b/projects/gateway2/plugins/stages.go index dad73362d54..85f334723a0 100644 --- a/projects/gateway2/plugins/stages.go +++ b/projects/gateway2/plugins/stages.go @@ -9,8 +9,8 @@ import ( envoy_config_listener_v3 "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3" envoyhttp "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/http_connection_manager/v3" "github.com/golang/protobuf/proto" - "github.com/solo-io/gloo/projects/gateway2/filters" - "github.com/solo-io/gloo/projects/gateway2/utils" + "github.com/kgateway-dev/kgateway/projects/gateway2/filters" + "github.com/kgateway-dev/kgateway/projects/gateway2/utils" "google.golang.org/protobuf/types/known/anypb" ) diff --git a/projects/gateway2/ports/ports_test.go b/projects/gateway2/ports/ports_test.go index 7f9787e24ca..8d22f372c70 100644 --- a/projects/gateway2/ports/ports_test.go +++ b/projects/gateway2/ports/ports_test.go @@ -4,7 +4,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/solo-io/gloo/projects/gateway2/ports" + "github.com/kgateway-dev/kgateway/projects/gateway2/ports" ) var _ = Describe("Ports", func() { diff --git a/projects/gateway2/proxy_syncer/cla.go b/projects/gateway2/proxy_syncer/cla.go index 6977ae68acb..c6a41c5e761 100644 --- a/projects/gateway2/proxy_syncer/cla.go +++ b/projects/gateway2/proxy_syncer/cla.go @@ -5,8 +5,8 @@ import ( envoy_config_core_v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" envoy_config_endpoint_v3 "github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3" - "github.com/solo-io/gloo/projects/gateway2/ir" - "github.com/solo-io/gloo/projects/gateway2/utils/krtutil" + "github.com/kgateway-dev/kgateway/projects/gateway2/ir" + "github.com/kgateway-dev/kgateway/projects/gateway2/utils/krtutil" "go.uber.org/zap" "istio.io/istio/pkg/kube/krt" ) diff --git a/projects/gateway2/proxy_syncer/cla_test.go b/projects/gateway2/proxy_syncer/cla_test.go index 09260921517..2e01311b5a2 100644 --- a/projects/gateway2/proxy_syncer/cla_test.go +++ b/projects/gateway2/proxy_syncer/cla_test.go @@ -5,9 +5,9 @@ import ( corev3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" endpointv3 "github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3" + "github.com/kgateway-dev/kgateway/projects/gateway2/endpoints" + "github.com/kgateway-dev/kgateway/projects/gateway2/ir" "github.com/onsi/gomega" - "github.com/solo-io/gloo/projects/gateway2/endpoints" - "github.com/solo-io/gloo/projects/gateway2/ir" corev1 "k8s.io/api/core/v1" ) diff --git a/projects/gateway2/proxy_syncer/perclient.go b/projects/gateway2/proxy_syncer/perclient.go index 135cc9ac79d..c6cdc7f6f6e 100644 --- a/projects/gateway2/proxy_syncer/perclient.go +++ b/projects/gateway2/proxy_syncer/perclient.go @@ -5,8 +5,8 @@ import ( envoycachetypes "github.com/envoyproxy/go-control-plane/pkg/cache/types" envoycache "github.com/envoyproxy/go-control-plane/pkg/cache/v3" - "github.com/solo-io/gloo/projects/gateway2/ir" - "github.com/solo-io/gloo/projects/gateway2/utils/krtutil" + "github.com/kgateway-dev/kgateway/projects/gateway2/ir" + "github.com/kgateway-dev/kgateway/projects/gateway2/utils/krtutil" "go.uber.org/zap" "istio.io/istio/pkg/kube/krt" ) diff --git a/projects/gateway2/proxy_syncer/proxy_syncer.go b/projects/gateway2/proxy_syncer/proxy_syncer.go index 89885ca0be0..afd704cf566 100644 --- a/projects/gateway2/proxy_syncer/proxy_syncer.go +++ b/projects/gateway2/proxy_syncer/proxy_syncer.go @@ -19,19 +19,19 @@ import ( envoycache "github.com/envoyproxy/go-control-plane/pkg/cache/v3" "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - extensions "github.com/solo-io/gloo/projects/gateway2/extensions2" - "github.com/solo-io/gloo/projects/gateway2/extensions2/common" - extensionsplug "github.com/solo-io/gloo/projects/gateway2/extensions2/plugin" - "github.com/solo-io/gloo/projects/gateway2/ir" - "github.com/solo-io/gloo/projects/gateway2/krtcollections" - "github.com/solo-io/gloo/projects/gateway2/reports" - "github.com/solo-io/gloo/projects/gateway2/translator" - "github.com/solo-io/gloo/projects/gateway2/translator/irtranslator" - "github.com/solo-io/gloo/projects/gateway2/utils" - ggv2utils "github.com/solo-io/gloo/projects/gateway2/utils" - "github.com/solo-io/gloo/projects/gateway2/utils/krtutil" - "github.com/solo-io/gloo/projects/gateway2/wellknown" - "github.com/solo-io/gloo/projects/gateway2/xds" + extensions "github.com/kgateway-dev/kgateway/projects/gateway2/extensions2" + "github.com/kgateway-dev/kgateway/projects/gateway2/extensions2/common" + extensionsplug "github.com/kgateway-dev/kgateway/projects/gateway2/extensions2/plugin" + "github.com/kgateway-dev/kgateway/projects/gateway2/ir" + "github.com/kgateway-dev/kgateway/projects/gateway2/krtcollections" + "github.com/kgateway-dev/kgateway/projects/gateway2/reports" + "github.com/kgateway-dev/kgateway/projects/gateway2/translator" + "github.com/kgateway-dev/kgateway/projects/gateway2/translator/irtranslator" + "github.com/kgateway-dev/kgateway/projects/gateway2/utils" + ggv2utils "github.com/kgateway-dev/kgateway/projects/gateway2/utils" + "github.com/kgateway-dev/kgateway/projects/gateway2/utils/krtutil" + "github.com/kgateway-dev/kgateway/projects/gateway2/wellknown" + "github.com/kgateway-dev/kgateway/projects/gateway2/xds" "github.com/solo-io/go-utils/contextutils" "google.golang.org/protobuf/proto" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/projects/gateway2/proxy_syncer/proxy_syncer_test.go b/projects/gateway2/proxy_syncer/proxy_syncer_test.go index ee039600659..cec00c2c385 100644 --- a/projects/gateway2/proxy_syncer/proxy_syncer_test.go +++ b/projects/gateway2/proxy_syncer/proxy_syncer_test.go @@ -6,7 +6,7 @@ import ( "k8s.io/utils/ptr" gwv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/solo-io/gloo/projects/gateway2/wellknown" + "github.com/kgateway-dev/kgateway/projects/gateway2/wellknown" ) func TestIsGatewayStatusEqual(t *testing.T) { diff --git a/projects/gateway2/proxy_syncer/upstreams.go b/projects/gateway2/proxy_syncer/upstreams.go index 7d8378c208f..35a0cc708c8 100644 --- a/projects/gateway2/proxy_syncer/upstreams.go +++ b/projects/gateway2/proxy_syncer/upstreams.go @@ -5,10 +5,10 @@ import ( "fmt" envoy_config_cluster_v3 "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3" - "github.com/solo-io/gloo/projects/gateway2/ir" - "github.com/solo-io/gloo/projects/gateway2/translator/irtranslator" - ggv2utils "github.com/solo-io/gloo/projects/gateway2/utils" - "github.com/solo-io/gloo/projects/gateway2/utils/krtutil" + "github.com/kgateway-dev/kgateway/projects/gateway2/ir" + "github.com/kgateway-dev/kgateway/projects/gateway2/translator/irtranslator" + ggv2utils "github.com/kgateway-dev/kgateway/projects/gateway2/utils" + "github.com/kgateway-dev/kgateway/projects/gateway2/utils/krtutil" "github.com/solo-io/go-utils/contextutils" "go.uber.org/zap" "istio.io/istio/pkg/kube/krt" diff --git a/projects/gateway2/proxy_syncer/xdswrapper.go b/projects/gateway2/proxy_syncer/xdswrapper.go index 8f5d7700da6..fbd1b4ed963 100644 --- a/projects/gateway2/proxy_syncer/xdswrapper.go +++ b/projects/gateway2/proxy_syncer/xdswrapper.go @@ -7,7 +7,7 @@ import ( udpaannontations "github.com/cncf/xds/go/udpa/annotations" envoycachetypes "github.com/envoyproxy/go-control-plane/pkg/cache/types" envoycache "github.com/envoyproxy/go-control-plane/pkg/cache/v3" - "github.com/solo-io/gloo/pkg/utils/envutils" + "github.com/kgateway-dev/kgateway/pkg/utils/envutils" "istio.io/istio/pkg/kube/krt" diff --git a/projects/gateway2/proxy_syncer/xdswrapper_test.go b/projects/gateway2/proxy_syncer/xdswrapper_test.go index 427f90b865a..8fb8aa0b30f 100644 --- a/projects/gateway2/proxy_syncer/xdswrapper_test.go +++ b/projects/gateway2/proxy_syncer/xdswrapper_test.go @@ -8,8 +8,8 @@ import ( envoyauth "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3" envoycachetypes "github.com/envoyproxy/go-control-plane/pkg/cache/types" envoycache "github.com/envoyproxy/go-control-plane/pkg/cache/v3" + . "github.com/kgateway-dev/kgateway/projects/gateway2/proxy_syncer" "github.com/onsi/gomega" - . "github.com/solo-io/gloo/projects/gateway2/proxy_syncer" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/anypb" ) diff --git a/projects/gateway2/query/backendmap.go b/projects/gateway2/query/backendmap.go index a2aa52405fc..6673408b09b 100644 --- a/projects/gateway2/query/backendmap.go +++ b/projects/gateway2/query/backendmap.go @@ -1,7 +1,7 @@ package query import ( - "github.com/solo-io/gloo/projects/gateway2/ir" + "github.com/kgateway-dev/kgateway/projects/gateway2/ir" ) // BackendMap is a generic type used to manage mappings of backends for Gateway API configurations. diff --git a/projects/gateway2/query/httproute.go b/projects/gateway2/query/httproute.go index 33c35a3f65e..7caa16ac490 100644 --- a/projects/gateway2/query/httproute.go +++ b/projects/gateway2/query/httproute.go @@ -15,8 +15,8 @@ import ( gwv1 "sigs.k8s.io/gateway-api/apis/v1" gwv1a2 "sigs.k8s.io/gateway-api/apis/v1alpha2" - "github.com/solo-io/gloo/projects/gateway2/ir" - "github.com/solo-io/gloo/projects/gateway2/wellknown" + "github.com/kgateway-dev/kgateway/projects/gateway2/ir" + "github.com/kgateway-dev/kgateway/projects/gateway2/wellknown" ) // TODO (danehans): Rename this file to route.go since it supports different route types. diff --git a/projects/gateway2/query/indexers.go b/projects/gateway2/query/indexers.go index 83d7cfb8fb5..08077a3fbf0 100644 --- a/projects/gateway2/query/indexers.go +++ b/projects/gateway2/query/indexers.go @@ -9,7 +9,7 @@ import ( gwv1a2 "sigs.k8s.io/gateway-api/apis/v1alpha2" gwv1b1 "sigs.k8s.io/gateway-api/apis/v1beta1" - "github.com/solo-io/gloo/projects/gateway2/wellknown" + "github.com/kgateway-dev/kgateway/projects/gateway2/wellknown" ) const ( diff --git a/projects/gateway2/query/mocks/mock_queries.go b/projects/gateway2/query/mocks/mock_queries.go index 5b2ef752ea2..88c8a75ef8a 100644 --- a/projects/gateway2/query/mocks/mock_queries.go +++ b/projects/gateway2/query/mocks/mock_queries.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/solo-io/gloo/projects/gateway2/query (interfaces: GatewayQueries) +// Source: github.com/kgateway-dev/kgateway/projects/gateway2/query (interfaces: GatewayQueries) // Package mocks is a generated GoMock package. package mocks @@ -9,8 +9,8 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - ir "github.com/solo-io/gloo/projects/gateway2/ir" - query "github.com/solo-io/gloo/projects/gateway2/query" + ir "github.com/kgateway-dev/kgateway/projects/gateway2/ir" + query "github.com/kgateway-dev/kgateway/projects/gateway2/query" krt "istio.io/istio/pkg/kube/krt" schema "k8s.io/apimachinery/pkg/runtime/schema" v1 "sigs.k8s.io/gateway-api/apis/v1" diff --git a/projects/gateway2/query/query.go b/projects/gateway2/query/query.go index d7973ca4149..0093392ccb6 100644 --- a/projects/gateway2/query/query.go +++ b/projects/gateway2/query/query.go @@ -15,9 +15,9 @@ import ( gwv1 "sigs.k8s.io/gateway-api/apis/v1" apiv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" - "github.com/solo-io/gloo/projects/gateway2/ir" - "github.com/solo-io/gloo/projects/gateway2/krtcollections" - "github.com/solo-io/gloo/projects/gateway2/wellknown" + "github.com/kgateway-dev/kgateway/projects/gateway2/ir" + "github.com/kgateway-dev/kgateway/projects/gateway2/krtcollections" + "github.com/kgateway-dev/kgateway/projects/gateway2/wellknown" ) var ( diff --git a/projects/gateway2/query/query_test.go b/projects/gateway2/query/query_test.go index 9a653a491cd..61acad03587 100644 --- a/projects/gateway2/query/query_test.go +++ b/projects/gateway2/query/query_test.go @@ -4,15 +4,15 @@ import ( "context" "time" - "github.com/solo-io/gloo/pkg/schemes" + "github.com/kgateway-dev/kgateway/pkg/schemes" "istio.io/istio/pkg/kube/krt" "istio.io/istio/pkg/kube/krt/krttest" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - extensionsplug "github.com/solo-io/gloo/projects/gateway2/extensions2/plugin" - "github.com/solo-io/gloo/projects/gateway2/ir" + extensionsplug "github.com/kgateway-dev/kgateway/projects/gateway2/extensions2/plugin" + "github.com/kgateway-dev/kgateway/projects/gateway2/ir" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" @@ -26,13 +26,13 @@ import ( gwv1a2 "sigs.k8s.io/gateway-api/apis/v1alpha2" apiv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" - "github.com/solo-io/gloo/projects/gateway2/krtcollections" - "github.com/solo-io/gloo/projects/gateway2/query" - "github.com/solo-io/gloo/projects/gateway2/utils/krtutil" - "github.com/solo-io/gloo/projects/gateway2/wellknown" + "github.com/kgateway-dev/kgateway/projects/gateway2/krtcollections" + "github.com/kgateway-dev/kgateway/projects/gateway2/query" + "github.com/kgateway-dev/kgateway/projects/gateway2/utils/krtutil" + "github.com/kgateway-dev/kgateway/projects/gateway2/wellknown" ) -//go:generate go run github.com/golang/mock/mockgen -destination mocks/mock_queries.go -package mocks github.com/solo-io/gloo/projects/gateway2/query GatewayQueries +//go:generate go run github.com/golang/mock/mockgen -destination mocks/mock_queries.go -package mocks github.com/kgateway-dev/kgateway/projects/gateway2/query GatewayQueries var _ = Describe("Query", func() { var ( diff --git a/projects/gateway2/query/utils.go b/projects/gateway2/query/utils.go index bb02541e5af..2ff3a12dc70 100644 --- a/projects/gateway2/query/utils.go +++ b/projects/gateway2/query/utils.go @@ -3,8 +3,8 @@ package query import ( "errors" - "github.com/solo-io/gloo/projects/gateway2/krtcollections" - "github.com/solo-io/gloo/projects/gateway2/reports" + "github.com/kgateway-dev/kgateway/projects/gateway2/krtcollections" + "github.com/kgateway-dev/kgateway/projects/gateway2/reports" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" gwv1 "sigs.k8s.io/gateway-api/apis/v1" diff --git a/projects/gateway2/reports/reporter_test.go b/projects/gateway2/reports/reporter_test.go index c24e5ef2487..162f758c72c 100644 --- a/projects/gateway2/reports/reporter_test.go +++ b/projects/gateway2/reports/reporter_test.go @@ -13,7 +13,7 @@ import ( gwv1 "sigs.k8s.io/gateway-api/apis/v1" gwv1a2 "sigs.k8s.io/gateway-api/apis/v1alpha2" - "github.com/solo-io/gloo/projects/gateway2/reports" + "github.com/kgateway-dev/kgateway/projects/gateway2/reports" ) var _ = Describe("Reporting Infrastructure", func() { diff --git a/projects/gateway2/setup/controlplane.go b/projects/gateway2/setup/controlplane.go index c88e4a5a402..4aae0431b7f 100644 --- a/projects/gateway2/setup/controlplane.go +++ b/projects/gateway2/setup/controlplane.go @@ -13,7 +13,7 @@ import ( xdsserver "github.com/envoyproxy/go-control-plane/pkg/server/v3" grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware" grpc_zap "github.com/grpc-ecosystem/go-grpc-middleware/logging/zap" - "github.com/solo-io/gloo/projects/gateway2/xds" + "github.com/kgateway-dev/kgateway/projects/gateway2/xds" "github.com/solo-io/go-utils/contextutils" "go.uber.org/zap" "google.golang.org/grpc" diff --git a/projects/gateway2/setup/ggv2setup.go b/projects/gateway2/setup/ggv2setup.go index e30b5365097..8e3716ca7d7 100644 --- a/projects/gateway2/setup/ggv2setup.go +++ b/projects/gateway2/setup/ggv2setup.go @@ -8,15 +8,15 @@ import ( envoycache "github.com/envoyproxy/go-control-plane/pkg/cache/v3" xdsserver "github.com/envoyproxy/go-control-plane/pkg/server/v3" "github.com/go-logr/zapr" - "github.com/solo-io/gloo/pkg/utils/envutils" - "github.com/solo-io/gloo/pkg/utils/kubeutils" - "github.com/solo-io/gloo/pkg/utils/namespaces" - "github.com/solo-io/gloo/pkg/version" - "github.com/solo-io/gloo/projects/gateway2/admin" - "github.com/solo-io/gloo/projects/gateway2/controller" - extensionsplug "github.com/solo-io/gloo/projects/gateway2/extensions2/plugin" - "github.com/solo-io/gloo/projects/gateway2/krtcollections" - "github.com/solo-io/gloo/projects/gateway2/utils/krtutil" + "github.com/kgateway-dev/kgateway/pkg/utils/envutils" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/pkg/utils/namespaces" + "github.com/kgateway-dev/kgateway/pkg/version" + "github.com/kgateway-dev/kgateway/projects/gateway2/admin" + "github.com/kgateway-dev/kgateway/projects/gateway2/controller" + extensionsplug "github.com/kgateway-dev/kgateway/projects/gateway2/extensions2/plugin" + "github.com/kgateway-dev/kgateway/projects/gateway2/krtcollections" + "github.com/kgateway-dev/kgateway/projects/gateway2/utils/krtutil" "github.com/solo-io/go-utils/contextutils" "go.uber.org/zap" "go.uber.org/zap/zapcore" diff --git a/projects/gateway2/setup/ggv2setup_test.go b/projects/gateway2/setup/ggv2setup_test.go index 98005f0ce3d..049249ed0a9 100644 --- a/projects/gateway2/setup/ggv2setup_test.go +++ b/projects/gateway2/setup/ggv2setup_test.go @@ -30,10 +30,10 @@ import ( discovery_v3 "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3" "github.com/go-logr/zapr" - "github.com/solo-io/gloo/projects/gateway2/controller" - "github.com/solo-io/gloo/projects/gateway2/krtcollections" - "github.com/solo-io/gloo/projects/gateway2/proxy_syncer" - ggv2setup "github.com/solo-io/gloo/projects/gateway2/setup" + "github.com/kgateway-dev/kgateway/projects/gateway2/controller" + "github.com/kgateway-dev/kgateway/projects/gateway2/krtcollections" + "github.com/kgateway-dev/kgateway/projects/gateway2/proxy_syncer" + ggv2setup "github.com/kgateway-dev/kgateway/projects/gateway2/setup" "github.com/solo-io/go-utils/contextutils" "go.uber.org/zap" "go.uber.org/zap/zapcore" diff --git a/projects/gateway2/translator/backendref/types.go b/projects/gateway2/translator/backendref/types.go index eea2e0ed68b..ed4f4011b76 100644 --- a/projects/gateway2/translator/backendref/types.go +++ b/projects/gateway2/translator/backendref/types.go @@ -3,7 +3,7 @@ package backendref import ( "fmt" - "github.com/solo-io/gloo/projects/gateway2/wellknown" + "github.com/kgateway-dev/kgateway/projects/gateway2/wellknown" gwv1 "sigs.k8s.io/gateway-api/apis/v1" ) diff --git a/projects/gateway2/translator/gateway/gateway_translator.go b/projects/gateway2/translator/gateway/gateway_translator.go index c6def4b0d6e..9d7689fbe3e 100644 --- a/projects/gateway2/translator/gateway/gateway_translator.go +++ b/projects/gateway2/translator/gateway/gateway_translator.go @@ -3,15 +3,15 @@ package gateway import ( "context" - extensionsplug "github.com/solo-io/gloo/projects/gateway2/extensions2/plugin" - "github.com/solo-io/gloo/projects/gateway2/ir" - "github.com/solo-io/gloo/projects/gateway2/utils" + extensionsplug "github.com/kgateway-dev/kgateway/projects/gateway2/extensions2/plugin" + "github.com/kgateway-dev/kgateway/projects/gateway2/ir" + "github.com/kgateway-dev/kgateway/projects/gateway2/utils" "github.com/solo-io/go-utils/contextutils" "istio.io/istio/pkg/kube/krt" - "github.com/solo-io/gloo/projects/gateway2/query" - "github.com/solo-io/gloo/projects/gateway2/reports" - "github.com/solo-io/gloo/projects/gateway2/translator/listener" + "github.com/kgateway-dev/kgateway/projects/gateway2/query" + "github.com/kgateway-dev/kgateway/projects/gateway2/reports" + "github.com/kgateway-dev/kgateway/projects/gateway2/translator/listener" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" gwv1 "sigs.k8s.io/gateway-api/apis/v1" ) diff --git a/projects/gateway2/translator/gateway/gateway_translator_test.go b/projects/gateway2/translator/gateway/gateway_translator_test.go index 8e7d6e090c7..c51769d4b51 100644 --- a/projects/gateway2/translator/gateway/gateway_translator_test.go +++ b/projects/gateway2/translator/gateway/gateway_translator_test.go @@ -14,7 +14,7 @@ import ( gwv1 "sigs.k8s.io/gateway-api/apis/v1" gwv1a2 "sigs.k8s.io/gateway-api/apis/v1alpha2" - "github.com/solo-io/gloo/projects/gateway2/reports" + "github.com/kgateway-dev/kgateway/projects/gateway2/reports" ) type translatorTestCase struct { diff --git a/projects/gateway2/translator/gateway/testtest_test.go b/projects/gateway2/translator/gateway/testtest_test.go index 38b367402af..9235feeda7c 100644 --- a/projects/gateway2/translator/gateway/testtest_test.go +++ b/projects/gateway2/translator/gateway/testtest_test.go @@ -17,7 +17,7 @@ import ( "k8s.io/apimachinery/pkg/watch" gwv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/solo-io/gloo/projects/gateway2/utils/krtutil" + "github.com/kgateway-dev/kgateway/projects/gateway2/utils/krtutil" "istio.io/istio/pkg/kube/kclient/clienttest" ) diff --git a/projects/gateway2/translator/gateway/testutils/test_file_loader.go b/projects/gateway2/translator/gateway/testutils/test_file_loader.go index c33afaf9b0b..e3efdafb669 100644 --- a/projects/gateway2/translator/gateway/testutils/test_file_loader.go +++ b/projects/gateway2/translator/gateway/testutils/test_file_loader.go @@ -9,13 +9,13 @@ import ( "path/filepath" "strings" - "github.com/solo-io/gloo/pkg/schemes" + "github.com/kgateway-dev/kgateway/pkg/schemes" "github.com/golang/protobuf/proto" + "github.com/kgateway-dev/kgateway/pkg/utils/protoutils" + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1" + "github.com/kgateway-dev/kgateway/projects/gateway2/translator/irtranslator" "github.com/rotisserie/eris" - "github.com/solo-io/gloo/pkg/utils/protoutils" - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1" - "github.com/solo-io/gloo/projects/gateway2/translator/irtranslator" "github.com/ghodss/yaml" "github.com/pkg/errors" diff --git a/projects/gateway2/translator/gateway/translator_case_test.go b/projects/gateway2/translator/gateway/translator_case_test.go index 289cf177fa6..30c6740c35c 100644 --- a/projects/gateway2/translator/gateway/translator_case_test.go +++ b/projects/gateway2/translator/gateway/translator_case_test.go @@ -21,18 +21,18 @@ import ( "k8s.io/apimachinery/pkg/types" gwv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1" - "github.com/solo-io/gloo/projects/gateway2/extensions2/common" - extensionsplug "github.com/solo-io/gloo/projects/gateway2/extensions2/plugin" - "github.com/solo-io/gloo/projects/gateway2/extensions2/registry" - "github.com/solo-io/gloo/projects/gateway2/ir" - "github.com/solo-io/gloo/projects/gateway2/krtcollections" - "github.com/solo-io/gloo/projects/gateway2/pkg/client/clientset/versioned/fake" - "github.com/solo-io/gloo/projects/gateway2/reports" - "github.com/solo-io/gloo/projects/gateway2/translator" - "github.com/solo-io/gloo/projects/gateway2/translator/gateway/testutils" - "github.com/solo-io/gloo/projects/gateway2/translator/irtranslator" - "github.com/solo-io/gloo/projects/gateway2/utils/krtutil" + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1" + "github.com/kgateway-dev/kgateway/projects/gateway2/extensions2/common" + extensionsplug "github.com/kgateway-dev/kgateway/projects/gateway2/extensions2/plugin" + "github.com/kgateway-dev/kgateway/projects/gateway2/extensions2/registry" + "github.com/kgateway-dev/kgateway/projects/gateway2/ir" + "github.com/kgateway-dev/kgateway/projects/gateway2/krtcollections" + "github.com/kgateway-dev/kgateway/projects/gateway2/pkg/client/clientset/versioned/fake" + "github.com/kgateway-dev/kgateway/projects/gateway2/reports" + "github.com/kgateway-dev/kgateway/projects/gateway2/translator" + "github.com/kgateway-dev/kgateway/projects/gateway2/translator/gateway/testutils" + "github.com/kgateway-dev/kgateway/projects/gateway2/translator/irtranslator" + "github.com/kgateway-dev/kgateway/projects/gateway2/utils/krtutil" "istio.io/istio/pkg/kube/kclient/clienttest" "istio.io/istio/pkg/kube/krt" ) diff --git a/projects/gateway2/translator/httproute/delegation.go b/projects/gateway2/translator/httproute/delegation.go index a3d58c81550..9575c723e30 100644 --- a/projects/gateway2/translator/httproute/delegation.go +++ b/projects/gateway2/translator/httproute/delegation.go @@ -12,11 +12,11 @@ import ( "k8s.io/utils/ptr" gwv1 "sigs.k8s.io/gateway-api/apis/v1" + "github.com/kgateway-dev/kgateway/projects/gateway2/ir" + "github.com/kgateway-dev/kgateway/projects/gateway2/query" + "github.com/kgateway-dev/kgateway/projects/gateway2/reports" + "github.com/kgateway-dev/kgateway/projects/gateway2/wellknown" "github.com/rotisserie/eris" - "github.com/solo-io/gloo/projects/gateway2/ir" - "github.com/solo-io/gloo/projects/gateway2/query" - "github.com/solo-io/gloo/projects/gateway2/reports" - "github.com/solo-io/gloo/projects/gateway2/wellknown" "github.com/solo-io/go-utils/contextutils" ) diff --git a/projects/gateway2/translator/httproute/delegation_helpers.go b/projects/gateway2/translator/httproute/delegation_helpers.go index 47cbcd9f546..86bc648a3bc 100644 --- a/projects/gateway2/translator/httproute/delegation_helpers.go +++ b/projects/gateway2/translator/httproute/delegation_helpers.go @@ -6,9 +6,9 @@ import ( "slices" "strings" - "github.com/solo-io/gloo/projects/gateway2/ir" - "github.com/solo-io/gloo/projects/gateway2/query" - "github.com/solo-io/gloo/projects/gateway2/wellknown" + "github.com/kgateway-dev/kgateway/projects/gateway2/ir" + "github.com/kgateway-dev/kgateway/projects/gateway2/query" + "github.com/kgateway-dev/kgateway/projects/gateway2/wellknown" "k8s.io/apimachinery/pkg/types" "k8s.io/utils/ptr" gwv1 "sigs.k8s.io/gateway-api/apis/v1" diff --git a/projects/gateway2/translator/httproute/delegation_test.go b/projects/gateway2/translator/httproute/delegation_test.go index eca648ad9b0..d5688d344eb 100644 --- a/projects/gateway2/translator/httproute/delegation_test.go +++ b/projects/gateway2/translator/httproute/delegation_test.go @@ -3,7 +3,7 @@ package httproute import ( "testing" - "github.com/solo-io/gloo/projects/gateway2/wellknown" + "github.com/kgateway-dev/kgateway/projects/gateway2/wellknown" "github.com/stretchr/testify/assert" "k8s.io/apimachinery/pkg/types" "k8s.io/utils/ptr" diff --git a/projects/gateway2/translator/httproute/gateway_http_route_translator.go b/projects/gateway2/translator/httproute/gateway_http_route_translator.go index ab16bf1afca..45f4cc422a8 100644 --- a/projects/gateway2/translator/httproute/gateway_http_route_translator.go +++ b/projects/gateway2/translator/httproute/gateway_http_route_translator.go @@ -4,16 +4,16 @@ import ( "container/list" "context" + "github.com/kgateway-dev/kgateway/projects/gateway2/ir" "github.com/rotisserie/eris" - "github.com/solo-io/gloo/projects/gateway2/ir" "github.com/solo-io/go-utils/contextutils" "go.uber.org/zap" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/sets" gwv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/solo-io/gloo/projects/gateway2/query" - "github.com/solo-io/gloo/projects/gateway2/reports" + "github.com/kgateway-dev/kgateway/projects/gateway2/query" + "github.com/kgateway-dev/kgateway/projects/gateway2/reports" ) var ( diff --git a/projects/gateway2/translator/httproute/translate_httproute_test.go b/projects/gateway2/translator/httproute/translate_httproute_test.go index a4204efdc32..b23ab0b1fec 100644 --- a/projects/gateway2/translator/httproute/translate_httproute_test.go +++ b/projects/gateway2/translator/httproute/translate_httproute_test.go @@ -13,11 +13,11 @@ import ( "k8s.io/utils/ptr" gwv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/solo-io/gloo/projects/gateway2/ir" - "github.com/solo-io/gloo/projects/gateway2/query" - "github.com/solo-io/gloo/projects/gateway2/reports" - "github.com/solo-io/gloo/projects/gateway2/translator/httproute" - "github.com/solo-io/gloo/projects/gateway2/wellknown" + "github.com/kgateway-dev/kgateway/projects/gateway2/ir" + "github.com/kgateway-dev/kgateway/projects/gateway2/query" + "github.com/kgateway-dev/kgateway/projects/gateway2/reports" + "github.com/kgateway-dev/kgateway/projects/gateway2/translator/httproute" + "github.com/kgateway-dev/kgateway/projects/gateway2/wellknown" ) var _ = Describe("GatewayHttpRouteTranslator", func() { diff --git a/projects/gateway2/translator/irtranslator/fc.go b/projects/gateway2/translator/irtranslator/fc.go index 6afee7b1271..d332b6820d5 100644 --- a/projects/gateway2/translator/irtranslator/fc.go +++ b/projects/gateway2/translator/irtranslator/fc.go @@ -17,10 +17,10 @@ import ( "google.golang.org/protobuf/types/known/wrapperspb" envoy_tls_inspector "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/listener/tls_inspector/v3" - "github.com/solo-io/gloo/projects/gateway2/ir" - "github.com/solo-io/gloo/projects/gateway2/plugins" - "github.com/solo-io/gloo/projects/gateway2/reports" - "github.com/solo-io/gloo/projects/gateway2/utils" + "github.com/kgateway-dev/kgateway/projects/gateway2/ir" + "github.com/kgateway-dev/kgateway/projects/gateway2/plugins" + "github.com/kgateway-dev/kgateway/projects/gateway2/reports" + "github.com/kgateway-dev/kgateway/projects/gateway2/utils" "github.com/solo-io/go-utils/contextutils" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/anypb" diff --git a/projects/gateway2/translator/irtranslator/gateway.go b/projects/gateway2/translator/irtranslator/gateway.go index 05889994b99..00bfb37b832 100644 --- a/projects/gateway2/translator/irtranslator/gateway.go +++ b/projects/gateway2/translator/irtranslator/gateway.go @@ -4,9 +4,9 @@ import ( envoy_config_cluster_v3 "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3" envoy_config_listener_v3 "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3" envoy_config_route_v3 "github.com/envoyproxy/go-control-plane/envoy/config/route/v3" - extensionsplug "github.com/solo-io/gloo/projects/gateway2/extensions2/plugin" - "github.com/solo-io/gloo/projects/gateway2/ir" - "github.com/solo-io/gloo/projects/gateway2/reports" + extensionsplug "github.com/kgateway-dev/kgateway/projects/gateway2/extensions2/plugin" + "github.com/kgateway-dev/kgateway/projects/gateway2/ir" + "github.com/kgateway-dev/kgateway/projects/gateway2/reports" "golang.org/x/net/context" "k8s.io/apimachinery/pkg/runtime/schema" ) diff --git a/projects/gateway2/translator/irtranslator/route.go b/projects/gateway2/translator/irtranslator/route.go index 0850559556b..dfdcddc2564 100644 --- a/projects/gateway2/translator/irtranslator/route.go +++ b/projects/gateway2/translator/irtranslator/route.go @@ -9,11 +9,11 @@ import ( envoy_config_route_v3 "github.com/envoyproxy/go-control-plane/envoy/config/route/v3" envoy_type_matcher_v3 "github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3" - "github.com/solo-io/gloo/pkg/utils/regexutils" - "github.com/solo-io/gloo/projects/gateway2/ir" - "github.com/solo-io/gloo/projects/gateway2/reports" - "github.com/solo-io/gloo/projects/gateway2/translator/routeutils" - "github.com/solo-io/gloo/projects/gateway2/utils" + "github.com/kgateway-dev/kgateway/pkg/utils/regexutils" + "github.com/kgateway-dev/kgateway/projects/gateway2/ir" + "github.com/kgateway-dev/kgateway/projects/gateway2/reports" + "github.com/kgateway-dev/kgateway/projects/gateway2/translator/routeutils" + "github.com/kgateway-dev/kgateway/projects/gateway2/utils" "github.com/solo-io/go-utils/contextutils" "go.uber.org/zap" wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" diff --git a/projects/gateway2/translator/irtranslator/translator_unit_test.go b/projects/gateway2/translator/irtranslator/translator_unit_test.go index 697ae0aefd3..c8520daf66f 100644 --- a/projects/gateway2/translator/irtranslator/translator_unit_test.go +++ b/projects/gateway2/translator/irtranslator/translator_unit_test.go @@ -12,15 +12,15 @@ package irtranslator_test // core "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" -// v1 "github.com/solo-io/gloo/projects/controller/pkg/api/v1" -// solokubev1 "github.com/solo-io/gloo/projects/gateway/pkg/api/v1/kube/apis/gateway.solo.io/v1" -// gwquery "github.com/solo-io/gloo/projects/gateway2/query" -// . "github.com/solo-io/gloo/projects/gateway2/translator" -// httplisquery "github.com/solo-io/gloo/projects/gateway2/translator/plugins/httplisteneroptions/query" -// lisquery "github.com/solo-io/gloo/projects/gateway2/translator/plugins/listeneroptions/query" -// rtoptquery "github.com/solo-io/gloo/projects/gateway2/translator/plugins/routeoptions/query" -// vhoptquery "github.com/solo-io/gloo/projects/gateway2/translator/plugins/virtualhostoptions/query" -// "github.com/solo-io/gloo/projects/gateway2/translator/testutils" +// v1 "github.com/kgateway-dev/kgateway/projects/controller/pkg/api/v1" +// solokubev1 "github.com/kgateway-dev/kgateway/projects/gateway/pkg/api/v1/kube/apis/gateway.solo.io/v1" +// gwquery "github.com/kgateway-dev/kgateway/projects/gateway2/query" +// . "github.com/kgateway-dev/kgateway/projects/gateway2/translator" +// httplisquery "github.com/kgateway-dev/kgateway/projects/gateway2/translator/plugins/httplisteneroptions/query" +// lisquery "github.com/kgateway-dev/kgateway/projects/gateway2/translator/plugins/listeneroptions/query" +// rtoptquery "github.com/kgateway-dev/kgateway/projects/gateway2/translator/plugins/routeoptions/query" +// vhoptquery "github.com/kgateway-dev/kgateway/projects/gateway2/translator/plugins/virtualhostoptions/query" +// "github.com/kgateway-dev/kgateway/projects/gateway2/translator/testutils" // ) // func CompareProxy2(expectedFile string, actualProxy *v1.Proxy) (string, error) { diff --git a/projects/gateway2/translator/irtranslator/upstream.go b/projects/gateway2/translator/irtranslator/upstream.go index 8a590535bfe..a7a340169d3 100644 --- a/projects/gateway2/translator/irtranslator/upstream.go +++ b/projects/gateway2/translator/irtranslator/upstream.go @@ -10,8 +10,8 @@ import ( "google.golang.org/protobuf/types/known/durationpb" "istio.io/istio/pkg/kube/krt" - extensionsplug "github.com/solo-io/gloo/projects/gateway2/extensions2/plugin" - "github.com/solo-io/gloo/projects/gateway2/ir" + extensionsplug "github.com/kgateway-dev/kgateway/projects/gateway2/extensions2/plugin" + "github.com/kgateway-dev/kgateway/projects/gateway2/ir" "k8s.io/apimachinery/pkg/runtime/schema" ) diff --git a/projects/gateway2/translator/listener/gateway_listener_translator.go b/projects/gateway2/translator/listener/gateway_listener_translator.go index ac59c09a08d..d74052aedf3 100644 --- a/projects/gateway2/translator/listener/gateway_listener_translator.go +++ b/projects/gateway2/translator/listener/gateway_listener_translator.go @@ -16,15 +16,15 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" gwv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/solo-io/gloo/projects/gateway2/ir" - "github.com/solo-io/gloo/projects/gateway2/krtcollections" - "github.com/solo-io/gloo/projects/gateway2/ports" - "github.com/solo-io/gloo/projects/gateway2/query" - "github.com/solo-io/gloo/projects/gateway2/reports" - route "github.com/solo-io/gloo/projects/gateway2/translator/httproute" - "github.com/solo-io/gloo/projects/gateway2/translator/routeutils" - "github.com/solo-io/gloo/projects/gateway2/translator/sslutils" - "github.com/solo-io/gloo/projects/gateway2/utils" + "github.com/kgateway-dev/kgateway/projects/gateway2/ir" + "github.com/kgateway-dev/kgateway/projects/gateway2/krtcollections" + "github.com/kgateway-dev/kgateway/projects/gateway2/ports" + "github.com/kgateway-dev/kgateway/projects/gateway2/query" + "github.com/kgateway-dev/kgateway/projects/gateway2/reports" + route "github.com/kgateway-dev/kgateway/projects/gateway2/translator/httproute" + "github.com/kgateway-dev/kgateway/projects/gateway2/translator/routeutils" + "github.com/kgateway-dev/kgateway/projects/gateway2/translator/sslutils" + "github.com/kgateway-dev/kgateway/projects/gateway2/utils" corev1 "k8s.io/api/core/v1" ) diff --git a/projects/gateway2/translator/listener/gateway_listener_translator_test.go b/projects/gateway2/translator/listener/gateway_listener_translator_test.go index e79266566fc..58d172b4eda 100644 --- a/projects/gateway2/translator/listener/gateway_listener_translator_test.go +++ b/projects/gateway2/translator/listener/gateway_listener_translator_test.go @@ -13,12 +13,12 @@ import ( gwv1 "sigs.k8s.io/gateway-api/apis/v1" gwv1a2 "sigs.k8s.io/gateway-api/apis/v1alpha2" - "github.com/solo-io/gloo/projects/gateway2/ir" - "github.com/solo-io/gloo/projects/gateway2/query" - "github.com/solo-io/gloo/projects/gateway2/query/mocks" - "github.com/solo-io/gloo/projects/gateway2/reports" - "github.com/solo-io/gloo/projects/gateway2/translator/listener" - "github.com/solo-io/gloo/projects/gateway2/wellknown" + "github.com/kgateway-dev/kgateway/projects/gateway2/ir" + "github.com/kgateway-dev/kgateway/projects/gateway2/query" + "github.com/kgateway-dev/kgateway/projects/gateway2/query/mocks" + "github.com/kgateway-dev/kgateway/projects/gateway2/reports" + "github.com/kgateway-dev/kgateway/projects/gateway2/translator/listener" + "github.com/kgateway-dev/kgateway/projects/gateway2/wellknown" ) var ( diff --git a/projects/gateway2/translator/listener/validation.go b/projects/gateway2/translator/listener/validation.go index 0137e2a2c02..349622e3f04 100644 --- a/projects/gateway2/translator/listener/validation.go +++ b/projects/gateway2/translator/listener/validation.go @@ -3,9 +3,9 @@ package listener import ( "slices" - "github.com/solo-io/gloo/projects/gateway2/ir" - "github.com/solo-io/gloo/projects/gateway2/reports" - "github.com/solo-io/gloo/projects/gateway2/wellknown" + "github.com/kgateway-dev/kgateway/projects/gateway2/ir" + "github.com/kgateway-dev/kgateway/projects/gateway2/reports" + "github.com/kgateway-dev/kgateway/projects/gateway2/wellknown" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" gwv1 "sigs.k8s.io/gateway-api/apis/v1" ) diff --git a/projects/gateway2/translator/listener/validation_test.go b/projects/gateway2/translator/listener/validation_test.go index b533ef728e8..e7e753eab3b 100644 --- a/projects/gateway2/translator/listener/validation_test.go +++ b/projects/gateway2/translator/listener/validation_test.go @@ -5,8 +5,8 @@ import ( . "github.com/onsi/gomega" - "github.com/solo-io/gloo/projects/gateway2/ir" - "github.com/solo-io/gloo/projects/gateway2/reports" + "github.com/kgateway-dev/kgateway/projects/gateway2/ir" + "github.com/kgateway-dev/kgateway/projects/gateway2/reports" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/projects/gateway2/translator/routeutils/sortable_route.go b/projects/gateway2/translator/routeutils/sortable_route.go index 8b14c6f37ad..f5c5938055a 100644 --- a/projects/gateway2/translator/routeutils/sortable_route.go +++ b/projects/gateway2/translator/routeutils/sortable_route.go @@ -1,7 +1,7 @@ package routeutils import ( - "github.com/solo-io/gloo/projects/gateway2/ir" + "github.com/kgateway-dev/kgateway/projects/gateway2/ir" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/utils/ptr" diff --git a/projects/gateway2/translator/routeutils/sortable_route_test.go b/projects/gateway2/translator/routeutils/sortable_route_test.go index 634db28e6a6..ad8d2a2c4f4 100644 --- a/projects/gateway2/translator/routeutils/sortable_route_test.go +++ b/projects/gateway2/translator/routeutils/sortable_route_test.go @@ -1,9 +1,9 @@ package routeutils import ( + "github.com/kgateway-dev/kgateway/projects/gateway2/ir" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/solo-io/gloo/projects/gateway2/ir" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/utils/ptr" gwv1 "sigs.k8s.io/gateway-api/apis/v1" diff --git a/projects/gateway2/translator/translator.go b/projects/gateway2/translator/translator.go index 4d36f36ebb9..5c24e14e4ce 100644 --- a/projects/gateway2/translator/translator.go +++ b/projects/gateway2/translator/translator.go @@ -10,16 +10,16 @@ import ( "istio.io/istio/pkg/kube/krt" envoy_config_endpoint_v3 "github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3" - "github.com/solo-io/gloo/projects/gateway2/endpoints" - "github.com/solo-io/gloo/projects/gateway2/extensions2/common" - extensionsplug "github.com/solo-io/gloo/projects/gateway2/extensions2/plugin" - "github.com/solo-io/gloo/projects/gateway2/ir" - "github.com/solo-io/gloo/projects/gateway2/krtcollections" - "github.com/solo-io/gloo/projects/gateway2/query" - "github.com/solo-io/gloo/projects/gateway2/reports" - gwtranslator "github.com/solo-io/gloo/projects/gateway2/translator/gateway" - "github.com/solo-io/gloo/projects/gateway2/translator/irtranslator" - "github.com/solo-io/gloo/projects/gateway2/utils" + "github.com/kgateway-dev/kgateway/projects/gateway2/endpoints" + "github.com/kgateway-dev/kgateway/projects/gateway2/extensions2/common" + extensionsplug "github.com/kgateway-dev/kgateway/projects/gateway2/extensions2/plugin" + "github.com/kgateway-dev/kgateway/projects/gateway2/ir" + "github.com/kgateway-dev/kgateway/projects/gateway2/krtcollections" + "github.com/kgateway-dev/kgateway/projects/gateway2/query" + "github.com/kgateway-dev/kgateway/projects/gateway2/reports" + gwtranslator "github.com/kgateway-dev/kgateway/projects/gateway2/translator/gateway" + "github.com/kgateway-dev/kgateway/projects/gateway2/translator/irtranslator" + "github.com/kgateway-dev/kgateway/projects/gateway2/utils" "github.com/solo-io/go-utils/contextutils" "sigs.k8s.io/controller-runtime/pkg/client" gwv1 "sigs.k8s.io/gateway-api/apis/v1" diff --git a/projects/gateway2/utils/queue_test.go b/projects/gateway2/utils/queue_test.go index 80c6d35fb9c..5177717faaa 100644 --- a/projects/gateway2/utils/queue_test.go +++ b/projects/gateway2/utils/queue_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" + . "github.com/kgateway-dev/kgateway/projects/gateway2/utils" . "github.com/onsi/gomega" - . "github.com/solo-io/gloo/projects/gateway2/utils" ) type testType struct { diff --git a/projects/gateway2/xds/utils.go b/projects/gateway2/xds/utils.go index 7f39311c11a..ebc6462a939 100644 --- a/projects/gateway2/xds/utils.go +++ b/projects/gateway2/xds/utils.go @@ -4,7 +4,7 @@ import ( "strings" envoy_config_core_v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" - "github.com/solo-io/gloo/projects/gateway2/wellknown" + "github.com/kgateway-dev/kgateway/projects/gateway2/wellknown" "github.com/solo-io/solo-kit/pkg/api/v1/control-plane/cache" ) diff --git a/projects/sds/cmd/main.go b/projects/sds/cmd/main.go index 632e5c04c92..21c16868ef4 100644 --- a/projects/sds/cmd/main.go +++ b/projects/sds/cmd/main.go @@ -1,7 +1,7 @@ package main import ( - "github.com/solo-io/gloo/projects/sds/pkg/run" + "github.com/kgateway-dev/kgateway/projects/sds/pkg/run" ) func main() { diff --git a/projects/sds/pkg/run/run.go b/projects/sds/pkg/run/run.go index 918b389ff41..15ce22e0d2a 100644 --- a/projects/sds/pkg/run/run.go +++ b/projects/sds/pkg/run/run.go @@ -10,7 +10,7 @@ import ( "github.com/fsnotify/fsnotify" "go.uber.org/zap" - "github.com/solo-io/gloo/projects/sds/pkg/server" + "github.com/kgateway-dev/kgateway/projects/sds/pkg/server" "github.com/solo-io/go-utils/contextutils" ) diff --git a/projects/sds/pkg/run/run_e2e_test.go b/projects/sds/pkg/run/run_e2e_test.go index b28a891def0..28d087707e9 100644 --- a/projects/sds/pkg/run/run_e2e_test.go +++ b/projects/sds/pkg/run/run_e2e_test.go @@ -8,9 +8,9 @@ import ( envoy_service_discovery_v3 "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3" envoy_service_secret_v3 "github.com/envoyproxy/go-control-plane/envoy/service/secret/v3" - "github.com/solo-io/gloo/projects/sds/pkg/run" - "github.com/solo-io/gloo/projects/sds/pkg/server" - "github.com/solo-io/gloo/projects/sds/pkg/testutils" + "github.com/kgateway-dev/kgateway/projects/sds/pkg/run" + "github.com/kgateway-dev/kgateway/projects/sds/pkg/server" + "github.com/kgateway-dev/kgateway/projects/sds/pkg/testutils" "github.com/spf13/afero" "google.golang.org/grpc" diff --git a/projects/sds/pkg/run/run_main.go b/projects/sds/pkg/run/run_main.go index b9fa30a642c..d4b43f45efd 100644 --- a/projects/sds/pkg/run/run_main.go +++ b/projects/sds/pkg/run/run_main.go @@ -10,8 +10,8 @@ import ( "go.uber.org/zap" corev1 "k8s.io/api/core/v1" - "github.com/solo-io/gloo/pkg/version" - "github.com/solo-io/gloo/projects/sds/pkg/server" + "github.com/kgateway-dev/kgateway/pkg/version" + "github.com/kgateway-dev/kgateway/projects/sds/pkg/server" "github.com/solo-io/go-utils/contextutils" "github.com/solo-io/go-utils/stats" ) diff --git a/projects/sds/pkg/server/server_test.go b/projects/sds/pkg/server/server_test.go index 6b7e624e91c..c4dfe8fd962 100644 --- a/projects/sds/pkg/server/server_test.go +++ b/projects/sds/pkg/server/server_test.go @@ -8,10 +8,10 @@ import ( envoy_service_discovery_v3 "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3" envoy_service_secret_v3 "github.com/envoyproxy/go-control-plane/envoy/service/secret/v3" + "github.com/kgateway-dev/kgateway/projects/sds/pkg/server" + "github.com/kgateway-dev/kgateway/projects/sds/pkg/testutils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/solo-io/gloo/projects/sds/pkg/server" - "github.com/solo-io/gloo/projects/sds/pkg/testutils" "github.com/spf13/afero" "google.golang.org/grpc" ) diff --git a/test/aws_credentials/aws_credentials_suite_test.go b/test/aws_credentials/aws_credentials_suite_test.go index e387f191aed..3823d108d11 100644 --- a/test/aws_credentials/aws_credentials_suite_test.go +++ b/test/aws_credentials/aws_credentials_suite_test.go @@ -5,7 +5,7 @@ package aws_credentials import ( "testing" - testhelpers "github.com/solo-io/gloo/test/testutils" + testhelpers "github.com/kgateway-dev/kgateway/test/testutils" . "github.com/onsi/ginkgo/v2" "github.com/solo-io/solo-kit/test/helpers" diff --git a/test/aws_credentials/ec2_test.go b/test/aws_credentials/ec2_test.go index 1888f7fe76a..83e6f3bf17a 100644 --- a/test/aws_credentials/ec2_test.go +++ b/test/aws_credentials/ec2_test.go @@ -5,24 +5,24 @@ package aws_credentials import ( "context" - "github.com/solo-io/gloo/test/testutils" + "github.com/kgateway-dev/kgateway/test/testutils" "github.com/solo-io/solo-kit/pkg/api/v1/clients/memory" "github.com/aws/aws-sdk-go/aws/credentials" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/plugins/aws/ec2" "github.com/rotisserie/eris" - "github.com/solo-io/gloo/projects/gloo/pkg/plugins/aws/ec2" "github.com/solo-io/solo-kit/pkg/api/v1/clients" "github.com/solo-io/solo-kit/pkg/api/v1/clients/factory" ec2api "github.com/aws/aws-sdk-go/service/ec2" - glooec2 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/options/aws/ec2" + glooec2 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/options/aws/ec2" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - v1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1" + v1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" ) var _ = Describe("", func() { diff --git a/test/debugprint/debug_print_resource.go b/test/debugprint/debug_print_resource.go index 5c976b5b06f..71c65c1dfc4 100644 --- a/test/debugprint/debug_print_resource.go +++ b/test/debugprint/debug_print_resource.go @@ -8,8 +8,8 @@ import ( "strings" "github.com/golang/protobuf/proto" + "github.com/kgateway-dev/kgateway/pkg/utils/protoutils" "github.com/onsi/ginkgo/v2" - "github.com/solo-io/gloo/pkg/utils/protoutils" "github.com/solo-io/solo-kit/pkg/api/v1/clients/kube/crd" "github.com/solo-io/solo-kit/pkg/api/v1/resources" "sigs.k8s.io/yaml" diff --git a/test/e2e/aggregate_listener_test.go b/test/e2e/aggregate_listener_test.go index cefe002aa7d..b62aa34439c 100644 --- a/test/e2e/aggregate_listener_test.go +++ b/test/e2e/aggregate_listener_test.go @@ -5,22 +5,22 @@ package e2e_test import ( "net/http" - "github.com/solo-io/gloo/test/gomega/matchers" - "github.com/solo-io/gloo/test/testutils" + "github.com/kgateway-dev/kgateway/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/test/testutils" - "github.com/solo-io/gloo/test/e2e" + "github.com/kgateway-dev/kgateway/test/e2e" "github.com/golang/protobuf/ptypes/duration" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/core/selectors" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/core/selectors" "github.com/golang/protobuf/ptypes/wrappers" + v1 "github.com/kgateway-dev/kgateway/projects/gateway/pkg/api/v1" + gatewaydefaults "github.com/kgateway-dev/kgateway/projects/gateway/pkg/defaults" + gloov1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/ssl" + gloohelpers "github.com/kgateway-dev/kgateway/test/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - v1 "github.com/solo-io/gloo/projects/gateway/pkg/api/v1" - gatewaydefaults "github.com/solo-io/gloo/projects/gateway/pkg/defaults" - gloov1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/ssl" - gloohelpers "github.com/solo-io/gloo/test/helpers" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" ) diff --git a/test/e2e/aws_ec2_test.go b/test/e2e/aws_ec2_test.go index 18ac3cb23ac..a1728a18e04 100644 --- a/test/e2e/aws_ec2_test.go +++ b/test/e2e/aws_ec2_test.go @@ -10,20 +10,20 @@ import ( "os" "strings" - "github.com/solo-io/gloo/test/services/envoy" + "github.com/kgateway-dev/kgateway/test/services/envoy" - "github.com/solo-io/gloo/test/testutils" + "github.com/kgateway-dev/kgateway/test/testutils" - "github.com/solo-io/gloo/test/helpers" + "github.com/kgateway-dev/kgateway/test/helpers" "github.com/solo-io/solo-kit/pkg/api/v1/resources" "github.com/aws/aws-sdk-go/aws/credentials" + gloov1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" + glooec2 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/options/aws/ec2" + "github.com/kgateway-dev/kgateway/test/services" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/rotisserie/eris" - gloov1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1" - glooec2 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/options/aws/ec2" - "github.com/solo-io/gloo/test/services" "github.com/solo-io/solo-kit/pkg/api/v1/clients" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" ) diff --git a/test/e2e/aws_test.go b/test/e2e/aws_test.go index c83dd0c0238..5c9da164756 100644 --- a/test/e2e/aws_test.go +++ b/test/e2e/aws_test.go @@ -13,9 +13,9 @@ import ( "os" "time" - "github.com/solo-io/gloo/test/testutils" + "github.com/kgateway-dev/kgateway/test/testutils" - "github.com/solo-io/gloo/test/services/envoy" + "github.com/kgateway-dev/kgateway/test/services/envoy" errors "github.com/rotisserie/eris" @@ -23,29 +23,29 @@ import ( "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/sts" "github.com/form3tech-oss/jwt-go" - aws2 "github.com/solo-io/gloo/projects/gloo/pkg/api/external/envoy/extensions/aws" - "github.com/solo-io/gloo/test/helpers" + aws2 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/external/envoy/extensions/aws" + "github.com/kgateway-dev/kgateway/test/helpers" "google.golang.org/protobuf/types/known/wrapperspb" + testmatchers "github.com/kgateway-dev/kgateway/test/gomega/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - testmatchers "github.com/solo-io/gloo/test/gomega/matchers" "github.com/solo-io/solo-kit/pkg/api/v1/clients" "github.com/solo-io/solo-kit/pkg/api/v1/resources" - "github.com/solo-io/gloo/test/services" + "github.com/kgateway-dev/kgateway/test/services" - gw1 "github.com/solo-io/gloo/projects/gateway/pkg/api/v1" - gwdefaults "github.com/solo-io/gloo/projects/gateway/pkg/defaults" - gloov1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1" - "github.com/solo-io/gloo/projects/gloo/pkg/defaults" + gw1 "github.com/kgateway-dev/kgateway/projects/gateway/pkg/api/v1" + gwdefaults "github.com/kgateway-dev/kgateway/projects/gateway/pkg/defaults" + gloov1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/defaults" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/core/matchers" - aws_plugin "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/options/aws" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/options/hcm" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/options/transformation" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/core/matchers" + aws_plugin "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/options/aws" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/options/hcm" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/options/transformation" "github.com/aws/aws-sdk-go/aws/credentials" ) diff --git a/test/e2e/buffer_test.go b/test/e2e/buffer_test.go index 8dec5af4014..73239d189c0 100644 --- a/test/e2e/buffer_test.go +++ b/test/e2e/buffer_test.go @@ -6,20 +6,20 @@ import ( "net/http" "time" - "github.com/solo-io/gloo/test/testutils" + "github.com/kgateway-dev/kgateway/test/testutils" - "github.com/solo-io/gloo/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/test/gomega/matchers" "github.com/golang/protobuf/ptypes/wrappers" - "github.com/solo-io/gloo/test/e2e" - "github.com/solo-io/gloo/test/helpers" + "github.com/kgateway-dev/kgateway/test/e2e" + "github.com/kgateway-dev/kgateway/test/helpers" + gatewayv1 "github.com/kgateway-dev/kgateway/projects/gateway/pkg/api/v1" + gatewaydefaults "github.com/kgateway-dev/kgateway/projects/gateway/pkg/defaults" + buffer "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/external/envoy/extensions/filters/http/buffer/v3" + gloov1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - gatewayv1 "github.com/solo-io/gloo/projects/gateway/pkg/api/v1" - gatewaydefaults "github.com/solo-io/gloo/projects/gateway/pkg/defaults" - buffer "github.com/solo-io/gloo/projects/gloo/pkg/api/external/envoy/extensions/filters/http/buffer/v3" - gloov1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1" ) var _ = Describe("buffer", func() { diff --git a/test/e2e/connection_limit_test.go b/test/e2e/connection_limit_test.go index 6a89066f6ce..31852d67fe8 100644 --- a/test/e2e/connection_limit_test.go +++ b/test/e2e/connection_limit_test.go @@ -6,15 +6,15 @@ import ( "sync" "time" - v1 "github.com/solo-io/gloo/projects/gateway/pkg/api/v1" - gatewaydefaults "github.com/solo-io/gloo/projects/gateway/pkg/defaults" - gloov1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/options/connection_limit" - fault "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/options/faultinjection" - "github.com/solo-io/gloo/test/e2e" - "github.com/solo-io/gloo/test/gomega/matchers" - gloohelpers "github.com/solo-io/gloo/test/helpers" - "github.com/solo-io/gloo/test/testutils" + v1 "github.com/kgateway-dev/kgateway/projects/gateway/pkg/api/v1" + gatewaydefaults "github.com/kgateway-dev/kgateway/projects/gateway/pkg/defaults" + gloov1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/options/connection_limit" + fault "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/options/faultinjection" + "github.com/kgateway-dev/kgateway/test/e2e" + "github.com/kgateway-dev/kgateway/test/gomega/matchers" + gloohelpers "github.com/kgateway-dev/kgateway/test/helpers" + "github.com/kgateway-dev/kgateway/test/testutils" "github.com/solo-io/solo-kit/pkg/utils/prototime" "google.golang.org/protobuf/types/known/wrapperspb" @@ -95,7 +95,7 @@ var _ = Describe("Connection Limit", func() { // [error][envoy_bug] [external/envoy/source/common/http/conn_manager_impl.cc:527] envoy bug failure: !local_close_reason.empty(). Details: Local Close Reason was not set! // This has been fixed in envoy v1.27.0 but since we still use v1.26.x, this issue intermittently occurs. // Since this bug doesn't affect the functionally of the ConnectionLimit filter (requests still do not cross the limit), we're adding FlakeAttempts until we move to a version of envoy with this fix. - // More info can be found here : https://github.com/solo-io/gloo/issues/8531 + // More info can be found here : https://github.com/kgateway-dev/kgateway/issues/8531 It("Should drop connections after limit is reached", FlakeAttempts(5), func() { var wg sync.WaitGroup httpClient := testutils.DefaultClientBuilder().WithTimeout(time.Second * 10).Build() diff --git a/test/e2e/consul_test.go b/test/e2e/consul_test.go index e05208f1453..a15bd53a9c9 100644 --- a/test/e2e/consul_test.go +++ b/test/e2e/consul_test.go @@ -7,29 +7,29 @@ import ( "errors" "time" - "github.com/solo-io/gloo/test/ginkgo/decorators" + "github.com/kgateway-dev/kgateway/test/ginkgo/decorators" "github.com/golang/protobuf/ptypes/duration" - v1 "github.com/solo-io/gloo/projects/gateway/pkg/api/v1" - "github.com/solo-io/gloo/test/e2e" - "github.com/solo-io/gloo/test/gomega/matchers" + v1 "github.com/kgateway-dev/kgateway/projects/gateway/pkg/api/v1" + "github.com/kgateway-dev/kgateway/test/e2e" + "github.com/kgateway-dev/kgateway/test/gomega/matchers" - "github.com/solo-io/gloo/test/testutils" + "github.com/kgateway-dev/kgateway/test/testutils" - consulplugin "github.com/solo-io/gloo/projects/gloo/pkg/plugins/consul" + consulplugin "github.com/kgateway-dev/kgateway/projects/gloo/pkg/plugins/consul" - "github.com/solo-io/gloo/test/helpers" + "github.com/kgateway-dev/kgateway/test/helpers" "google.golang.org/protobuf/types/known/wrapperspb" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/hashicorp/consul/api" - gloov1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1" - consulapi "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/options/consul" - "github.com/solo-io/gloo/projects/gloo/pkg/upstreams/consul" - "github.com/solo-io/gloo/test/services" - "github.com/solo-io/gloo/test/v1helpers" + gloov1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" + consulapi "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/options/consul" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/upstreams/consul" + "github.com/kgateway-dev/kgateway/test/services" + "github.com/kgateway-dev/kgateway/test/v1helpers" ) var _ = Describe("Consul e2e", decorators.Consul, func() { diff --git a/test/e2e/cors_test.go b/test/e2e/cors_test.go index 44111e7d532..960dc97ac13 100644 --- a/test/e2e/cors_test.go +++ b/test/e2e/cors_test.go @@ -6,19 +6,19 @@ import ( "net/http" "strings" - "github.com/solo-io/gloo/test/testutils" + "github.com/kgateway-dev/kgateway/test/testutils" - "github.com/solo-io/gloo/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/test/gomega/matchers" + gatewayv1 "github.com/kgateway-dev/kgateway/projects/gateway/pkg/api/v1" + "github.com/kgateway-dev/kgateway/test/e2e" + gloohelpers "github.com/kgateway-dev/kgateway/test/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - gatewayv1 "github.com/solo-io/gloo/projects/gateway/pkg/api/v1" - "github.com/solo-io/gloo/test/e2e" - gloohelpers "github.com/solo-io/gloo/test/helpers" "github.com/envoyproxy/go-control-plane/pkg/wellknown" - gloov1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/options/cors" + gloov1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/options/cors" ) const ( diff --git a/test/e2e/csrf_test.go b/test/e2e/csrf_test.go index 480aa2de93b..4cf1937d6df 100644 --- a/test/e2e/csrf_test.go +++ b/test/e2e/csrf_test.go @@ -7,27 +7,27 @@ import ( "net/http" "time" - "github.com/solo-io/gloo/test/services/envoy" - "github.com/solo-io/gloo/test/testutils" + "github.com/kgateway-dev/kgateway/test/services/envoy" + "github.com/kgateway-dev/kgateway/test/testutils" - "github.com/solo-io/gloo/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/test/gomega/matchers" "github.com/golang/protobuf/ptypes/wrappers" - "github.com/solo-io/gloo/test/e2e" - "github.com/solo-io/gloo/test/helpers" + "github.com/kgateway-dev/kgateway/test/e2e" + "github.com/kgateway-dev/kgateway/test/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + gatewayv1 "github.com/kgateway-dev/kgateway/projects/gateway/pkg/api/v1" + gatewaydefaults "github.com/kgateway-dev/kgateway/projects/gateway/pkg/defaults" + gloo_config_core "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/external/envoy/config/core/v3" + csrf "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/external/envoy/extensions/filters/http/csrf/v3" + gloo_type_matcher "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/external/envoy/type/matcher/v3" + glootype "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/external/envoy/type/v3" + gloov1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/defaults" "github.com/onsi/gomega/types" - gatewayv1 "github.com/solo-io/gloo/projects/gateway/pkg/api/v1" - gatewaydefaults "github.com/solo-io/gloo/projects/gateway/pkg/defaults" - gloo_config_core "github.com/solo-io/gloo/projects/gloo/pkg/api/external/envoy/config/core/v3" - csrf "github.com/solo-io/gloo/projects/gloo/pkg/api/external/envoy/extensions/filters/http/csrf/v3" - gloo_type_matcher "github.com/solo-io/gloo/projects/gloo/pkg/api/external/envoy/type/matcher/v3" - glootype "github.com/solo-io/gloo/projects/gloo/pkg/api/external/envoy/type/v3" - gloov1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1" - "github.com/solo-io/gloo/projects/gloo/pkg/defaults" ) const ( diff --git a/test/e2e/custom_auth_test.go b/test/e2e/custom_auth_test.go index 061d0605a4c..2e97fef0923 100644 --- a/test/e2e/custom_auth_test.go +++ b/test/e2e/custom_auth_test.go @@ -8,23 +8,23 @@ import ( "net" "net/http" - "github.com/solo-io/gloo/test/services/envoy" + "github.com/kgateway-dev/kgateway/test/services/envoy" - "github.com/solo-io/gloo/test/helpers" + "github.com/kgateway-dev/kgateway/test/helpers" "github.com/solo-io/solo-kit/pkg/api/v1/resources" pb "github.com/envoyproxy/go-control-plane/envoy/service/auth/v3" "github.com/gogo/googleapis/google/rpc" "github.com/golang/protobuf/ptypes/wrappers" + gloov1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/core/matchers" + v1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/enterprise/options/extauth/v1" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/options/static" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/defaults" + "github.com/kgateway-dev/kgateway/test/services" + "github.com/kgateway-dev/kgateway/test/v1helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - gloov1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/core/matchers" - v1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/enterprise/options/extauth/v1" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/options/static" - "github.com/solo-io/gloo/projects/gloo/pkg/defaults" - "github.com/solo-io/gloo/test/services" - "github.com/solo-io/gloo/test/v1helpers" "github.com/solo-io/solo-kit/pkg/api/v1/clients" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" "google.golang.org/genproto/googleapis/rpc/status" diff --git a/test/e2e/dns_test.go b/test/e2e/dns_test.go index 7b119250396..3452875d4be 100644 --- a/test/e2e/dns_test.go +++ b/test/e2e/dns_test.go @@ -8,10 +8,10 @@ import ( "google.golang.org/protobuf/types/known/durationpb" "github.com/golang/protobuf/ptypes/wrappers" + gloov1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/test/e2e" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - gloov1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1" - "github.com/solo-io/gloo/test/e2e" ) var _ = Describe("DNS E2E Test", func() { diff --git a/test/e2e/dynamic_forward_proxy_test.go b/test/e2e/dynamic_forward_proxy_test.go index 7dccdfbfbd0..e4020ee4c40 100644 --- a/test/e2e/dynamic_forward_proxy_test.go +++ b/test/e2e/dynamic_forward_proxy_test.go @@ -3,25 +3,25 @@ package e2e_test import ( - "github.com/solo-io/gloo/test/testutils" + "github.com/kgateway-dev/kgateway/test/testutils" - "github.com/solo-io/gloo/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/test/gomega/matchers" - defaults2 "github.com/solo-io/gloo/projects/gateway/pkg/defaults" + defaults2 "github.com/kgateway-dev/kgateway/projects/gateway/pkg/defaults" "net/http" - "github.com/solo-io/gloo/test/e2e" - "github.com/solo-io/gloo/test/helpers" + "github.com/kgateway-dev/kgateway/test/e2e" + "github.com/kgateway-dev/kgateway/test/helpers" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/options/dynamic_forward_proxy" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/options/dynamic_forward_proxy" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/options/transformation" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/options/transformation" + gatewayv1 "github.com/kgateway-dev/kgateway/projects/gateway/pkg/api/v1" + gloov1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" . "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" ) var _ = Describe("dynamic forward proxy", func() { diff --git a/test/e2e/e2e_suite_test.go b/test/e2e/e2e_suite_test.go index 61635138086..b1ba6518b68 100644 --- a/test/e2e/e2e_suite_test.go +++ b/test/e2e/e2e_suite_test.go @@ -5,25 +5,25 @@ package e2e_test import ( "testing" - "github.com/solo-io/gloo/test/services/envoy" + "github.com/kgateway-dev/kgateway/test/services/envoy" - "github.com/solo-io/gloo/test/ginkgo/labels" + "github.com/kgateway-dev/kgateway/test/ginkgo/labels" - "github.com/solo-io/gloo/test/e2e" + "github.com/kgateway-dev/kgateway/test/e2e" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "go.uber.org/zap/zapcore" - "github.com/solo-io/gloo/test/services" + "github.com/kgateway-dev/kgateway/test/services" "github.com/solo-io/go-utils/contextutils" "github.com/solo-io/solo-kit/test/helpers" - "github.com/solo-io/gloo/projects/gloo/pkg/defaults" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/defaults" ) func TestE2e(t *testing.T) { - // https://github.com/solo-io/gloo/issues/7147 + // https://github.com/kgateway-dev/kgateway/issues/7147 // We ought to add goroutine leak validation to these tests // See the attached issue for context around why this is valuable and previous attempts to incorporate it diff --git a/test/e2e/example_test.go b/test/e2e/example_test.go index 1fbaa8746ed..4b59508e79f 100644 --- a/test/e2e/example_test.go +++ b/test/e2e/example_test.go @@ -6,16 +6,16 @@ import ( "fmt" "net/http" - "github.com/solo-io/gloo/test/testutils" + "github.com/kgateway-dev/kgateway/test/testutils" - "github.com/solo-io/gloo/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/test/gomega/matchers" + v1 "github.com/kgateway-dev/kgateway/projects/gateway/pkg/api/v1" + "github.com/kgateway-dev/kgateway/test/e2e" + "github.com/kgateway-dev/kgateway/test/helpers" + "github.com/kgateway-dev/kgateway/test/v1helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - v1 "github.com/solo-io/gloo/projects/gateway/pkg/api/v1" - "github.com/solo-io/gloo/test/e2e" - "github.com/solo-io/gloo/test/helpers" - "github.com/solo-io/gloo/test/v1helpers" ) var _ = Describe("Example E2E Test For Developers", Label(), func() { diff --git a/test/e2e/fault_injection_test.go b/test/e2e/fault_injection_test.go index 5a4a93a5d6d..1f565774224 100644 --- a/test/e2e/fault_injection_test.go +++ b/test/e2e/fault_injection_test.go @@ -6,17 +6,17 @@ import ( "net/http" "time" - "github.com/solo-io/gloo/test/testutils" + "github.com/kgateway-dev/kgateway/test/testutils" - "github.com/solo-io/gloo/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/test/gomega/matchers" - "github.com/solo-io/gloo/test/e2e" + "github.com/kgateway-dev/kgateway/test/e2e" + v1 "github.com/kgateway-dev/kgateway/projects/gateway/pkg/api/v1" + gloov1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" + fault "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/options/faultinjection" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - v1 "github.com/solo-io/gloo/projects/gateway/pkg/api/v1" - gloov1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1" - fault "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/options/faultinjection" "github.com/solo-io/solo-kit/pkg/utils/prototime" ) diff --git a/test/e2e/gateway_test.go b/test/e2e/gateway_test.go index 712a32e9e06..46ca55df35e 100644 --- a/test/e2e/gateway_test.go +++ b/test/e2e/gateway_test.go @@ -8,27 +8,27 @@ import ( "net/http" "time" - "github.com/solo-io/gloo/test/services/envoy" + "github.com/kgateway-dev/kgateway/test/services/envoy" "github.com/rotisserie/eris" "google.golang.org/protobuf/types/known/wrapperspb" "github.com/golang/protobuf/ptypes/wrappers" + "github.com/kgateway-dev/kgateway/pkg/utils/statsutils/metrics" + gatewayv1 "github.com/kgateway-dev/kgateway/projects/gateway/pkg/api/v1" + gatewaydefaults "github.com/kgateway-dev/kgateway/projects/gateway/pkg/defaults" + v3 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/external/envoy/config/core/v3" + gloov1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/core/matchers" + extauthv1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/enterprise/options/extauth/v1" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/ssl" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/defaults" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/translator" + gloohelpers "github.com/kgateway-dev/kgateway/test/helpers" + "github.com/kgateway-dev/kgateway/test/services" + "github.com/kgateway-dev/kgateway/test/v1helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/solo-io/gloo/pkg/utils/statsutils/metrics" - gatewayv1 "github.com/solo-io/gloo/projects/gateway/pkg/api/v1" - gatewaydefaults "github.com/solo-io/gloo/projects/gateway/pkg/defaults" - v3 "github.com/solo-io/gloo/projects/gloo/pkg/api/external/envoy/config/core/v3" - gloov1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/core/matchers" - extauthv1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/enterprise/options/extauth/v1" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/ssl" - "github.com/solo-io/gloo/projects/gloo/pkg/defaults" - "github.com/solo-io/gloo/projects/gloo/pkg/translator" - gloohelpers "github.com/solo-io/gloo/test/helpers" - "github.com/solo-io/gloo/test/services" - "github.com/solo-io/gloo/test/v1helpers" "github.com/solo-io/solo-kit/pkg/api/v1/clients" "github.com/solo-io/solo-kit/pkg/api/v1/resources" "github.com/solo-io/solo-kit/pkg/api/v1/resources/common/kubernetes" diff --git a/test/e2e/grpc_discovery_test.go b/test/e2e/grpc_discovery_test.go index f6b6b9b80bb..d6154bbab3b 100644 --- a/test/e2e/grpc_discovery_test.go +++ b/test/e2e/grpc_discovery_test.go @@ -5,26 +5,26 @@ package e2e_test import ( "context" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/core/matchers" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/options/grpc" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/core/matchers" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/options/grpc" - v1 "github.com/solo-io/gloo/projects/gateway/pkg/api/v1" + v1 "github.com/kgateway-dev/kgateway/projects/gateway/pkg/api/v1" - "github.com/solo-io/gloo/test/testutils" + "github.com/kgateway-dev/kgateway/test/testutils" - "github.com/solo-io/gloo/test/e2e" + "github.com/kgateway-dev/kgateway/test/e2e" - testmatchers "github.com/solo-io/gloo/test/gomega/matchers" + testmatchers "github.com/kgateway-dev/kgateway/test/gomega/matchers" "github.com/golang/protobuf/ptypes/wrappers" + "github.com/kgateway-dev/kgateway/test/services" + "github.com/kgateway-dev/kgateway/test/v1helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gstruct" - "github.com/solo-io/gloo/test/services" - "github.com/solo-io/gloo/test/v1helpers" - gatewayv1 "github.com/solo-io/gloo/projects/gateway/pkg/api/v1" - gloov1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1" + gatewayv1 "github.com/kgateway-dev/kgateway/projects/gateway/pkg/api/v1" + gloov1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" ) var _ = Describe("GRPC to JSON Transcoding Plugin - Discovery", func() { @@ -50,7 +50,7 @@ var _ = Describe("GRPC to JSON Transcoding Plugin - Discovery", func() { }) testContext.SetRunSettings(&gloov1.Settings{ Gloo: &gloov1.GlooOptions{ - // https://github.com/solo-io/gloo/issues/7577 + // https://github.com/kgateway-dev/kgateway/issues/7577 RemoveUnusedFilters: &wrappers.BoolValue{Value: false}, }, Discovery: &gloov1.Settings_DiscoveryOptions{ diff --git a/test/e2e/grpc_json_test.go b/test/e2e/grpc_json_test.go index e3580f087b2..c2dcab3b2f7 100644 --- a/test/e2e/grpc_json_test.go +++ b/test/e2e/grpc_json_test.go @@ -10,30 +10,30 @@ import ( "net/http" "os" - "github.com/solo-io/gloo/test/services/envoy" + "github.com/kgateway-dev/kgateway/test/services/envoy" - "github.com/solo-io/gloo/test/helpers" + "github.com/kgateway-dev/kgateway/test/helpers" "github.com/solo-io/solo-kit/pkg/api/v1/resources" "github.com/onsi/gomega/format" "github.com/golang/protobuf/ptypes/wrappers" + gatewayv1 "github.com/kgateway-dev/kgateway/projects/gateway/pkg/api/v1" + gwdefaults "github.com/kgateway-dev/kgateway/projects/gateway/pkg/defaults" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/core/matchers" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/options" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/options/grpc_json" + "github.com/kgateway-dev/kgateway/test/services" + "github.com/kgateway-dev/kgateway/test/v1helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gstruct" - gatewayv1 "github.com/solo-io/gloo/projects/gateway/pkg/api/v1" - gwdefaults "github.com/solo-io/gloo/projects/gateway/pkg/defaults" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/core/matchers" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/options" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/options/grpc_json" - "github.com/solo-io/gloo/test/services" - "github.com/solo-io/gloo/test/v1helpers" "github.com/solo-io/solo-kit/pkg/api/v1/clients" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" - gloov1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1" - "github.com/solo-io/gloo/projects/gloo/pkg/defaults" - testmatchers "github.com/solo-io/gloo/test/gomega/matchers" + gloov1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/defaults" + testmatchers "github.com/kgateway-dev/kgateway/test/gomega/matchers" ) var _ = Describe("GRPC to JSON Transcoding Plugin - Envoy API", func() { @@ -60,7 +60,7 @@ var _ = Describe("GRPC to JSON Transcoding Plugin - Envoy API", func() { }, Settings: &gloov1.Settings{ Gloo: &gloov1.GlooOptions{ - // https://github.com/solo-io/gloo/issues/8374 + // https://github.com/kgateway-dev/kgateway/issues/8374 RemoveUnusedFilters: &wrappers.BoolValue{Value: false}, }, }, diff --git a/test/e2e/grpc_plugin_test.go b/test/e2e/grpc_plugin_test.go index cbf080c06ee..f98ebc36f8a 100644 --- a/test/e2e/grpc_plugin_test.go +++ b/test/e2e/grpc_plugin_test.go @@ -11,31 +11,31 @@ import ( "net/http" "os" - "github.com/solo-io/gloo/test/services/envoy" + "github.com/kgateway-dev/kgateway/test/services/envoy" - "github.com/solo-io/gloo/test/e2e" + "github.com/kgateway-dev/kgateway/test/e2e" "github.com/solo-io/solo-kit/pkg/api/v1/resources" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/options" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/options" "github.com/golang/protobuf/ptypes/wrappers" - gatewayv1 "github.com/solo-io/gloo/projects/gateway/pkg/api/v1" - gwdefaults "github.com/solo-io/gloo/projects/gateway/pkg/defaults" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/core/matchers" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/options/grpc" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/options/transformation" - "github.com/solo-io/gloo/test/helpers" - "github.com/solo-io/gloo/test/services" - "github.com/solo-io/gloo/test/v1helpers" + gatewayv1 "github.com/kgateway-dev/kgateway/projects/gateway/pkg/api/v1" + gwdefaults "github.com/kgateway-dev/kgateway/projects/gateway/pkg/defaults" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/core/matchers" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/options/grpc" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/options/transformation" + "github.com/kgateway-dev/kgateway/test/helpers" + "github.com/kgateway-dev/kgateway/test/services" + "github.com/kgateway-dev/kgateway/test/v1helpers" "github.com/solo-io/solo-kit/pkg/api/v1/clients" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - gloov1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1" - "github.com/solo-io/gloo/projects/gloo/pkg/defaults" + gloov1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/defaults" ) var _ = Describe("GRPC to JSON Transcoding Plugin - Gloo API", func() { @@ -63,7 +63,7 @@ var _ = Describe("GRPC to JSON Transcoding Plugin - Gloo API", func() { }, Settings: &gloov1.Settings{ Gloo: &gloov1.GlooOptions{ - // https://github.com/solo-io/gloo/issues/8374 + // https://github.com/kgateway-dev/kgateway/issues/8374 RemoveUnusedFilters: &wrappers.BoolValue{Value: false}, }, Discovery: &gloov1.Settings_DiscoveryOptions{ diff --git a/test/e2e/gzip_test.go b/test/e2e/gzip_test.go index 4586b686e69..44fbd94e0e5 100644 --- a/test/e2e/gzip_test.go +++ b/test/e2e/gzip_test.go @@ -3,22 +3,22 @@ package e2e_test import ( - "github.com/solo-io/gloo/test/gomega/matchers" - "github.com/solo-io/gloo/test/gomega/transforms" - "github.com/solo-io/gloo/test/testutils" + "github.com/kgateway-dev/kgateway/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/test/gomega/transforms" + "github.com/kgateway-dev/kgateway/test/testutils" "net/http" - v1 "github.com/solo-io/gloo/projects/gateway/pkg/api/v1" - gatewaydefaults "github.com/solo-io/gloo/projects/gateway/pkg/defaults" + v1 "github.com/kgateway-dev/kgateway/projects/gateway/pkg/api/v1" + gatewaydefaults "github.com/kgateway-dev/kgateway/projects/gateway/pkg/defaults" - "github.com/solo-io/gloo/test/e2e" + "github.com/kgateway-dev/kgateway/test/e2e" "github.com/golang/protobuf/ptypes/wrappers" + gloogzip "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/external/envoy/config/filter/http/gzip/v2" + gloov1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - gloogzip "github.com/solo-io/gloo/projects/gloo/pkg/api/external/envoy/config/filter/http/gzip/v2" - gloov1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1" ) var _ = Describe("gzip", func() { diff --git a/test/e2e/happypath_test.go b/test/e2e/happypath_test.go index 282ad8aa7f5..84785017502 100644 --- a/test/e2e/happypath_test.go +++ b/test/e2e/happypath_test.go @@ -10,28 +10,28 @@ import ( "net/http" "time" - "github.com/solo-io/gloo/test/services/envoy" + "github.com/kgateway-dev/kgateway/test/services/envoy" "github.com/solo-io/solo-kit/pkg/api/v1/resources" "google.golang.org/protobuf/types/known/wrapperspb" envoy_config_core_v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" "github.com/golang/protobuf/ptypes/wrappers" + gatewaydefaults "github.com/kgateway-dev/kgateway/projects/gateway/pkg/defaults" + gloov1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/core/matchers" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/options/healthcheck" + routerV1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/options/router" + static_plugin_gloo "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/options/static" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/options/stats" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/ssl" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/defaults" + testhelpers "github.com/kgateway-dev/kgateway/test/helpers" + "github.com/kgateway-dev/kgateway/test/services" + "github.com/kgateway-dev/kgateway/test/v1helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" errors "github.com/rotisserie/eris" - gatewaydefaults "github.com/solo-io/gloo/projects/gateway/pkg/defaults" - gloov1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/core/matchers" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/options/healthcheck" - routerV1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/options/router" - static_plugin_gloo "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/options/static" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/options/stats" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/ssl" - "github.com/solo-io/gloo/projects/gloo/pkg/defaults" - testhelpers "github.com/solo-io/gloo/test/helpers" - "github.com/solo-io/gloo/test/services" - "github.com/solo-io/gloo/test/v1helpers" "github.com/solo-io/solo-kit/pkg/api/v1/clients" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" ) diff --git a/test/e2e/header_validation_test.go b/test/e2e/header_validation_test.go index 35786214360..118c96aa9fe 100644 --- a/test/e2e/header_validation_test.go +++ b/test/e2e/header_validation_test.go @@ -5,16 +5,16 @@ package e2e_test import ( "net/http" - "github.com/solo-io/gloo/test/testutils" + "github.com/kgateway-dev/kgateway/test/testutils" - "github.com/solo-io/gloo/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/test/gomega/matchers" + gatewayv1 "github.com/kgateway-dev/kgateway/projects/gateway/pkg/api/v1" + gloov1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" + header_validation "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/options/header_validation" + "github.com/kgateway-dev/kgateway/test/e2e" . "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" - header_validation "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/options/header_validation" - "github.com/solo-io/gloo/test/e2e" ) var _ = Describe("Header Validation", Label(), func() { diff --git a/test/e2e/headers_test.go b/test/e2e/headers_test.go index 8713f22d849..c66b3593048 100644 --- a/test/e2e/headers_test.go +++ b/test/e2e/headers_test.go @@ -16,21 +16,21 @@ import ( . "github.com/onsi/gomega" "github.com/golang/protobuf/ptypes/wrappers" - "github.com/solo-io/gloo/pkg/utils/api_conversion" - v1 "github.com/solo-io/gloo/projects/gateway/pkg/api/v1" - "github.com/solo-io/gloo/projects/gateway/pkg/defaults" - envoytrace_gloo "github.com/solo-io/gloo/projects/gloo/pkg/api/external/envoy/config/trace/v3" - gloov1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/options/hcm" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/options/headers" - static_plugin_gloo "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/options/static" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/options/tracing" - "github.com/solo-io/gloo/test/e2e" - testmatchers "github.com/solo-io/gloo/test/gomega/matchers" - "github.com/solo-io/gloo/test/helpers" - "github.com/solo-io/gloo/test/services/envoy" - "github.com/solo-io/gloo/test/testutils" - "github.com/solo-io/gloo/test/v1helpers" + "github.com/kgateway-dev/kgateway/pkg/utils/api_conversion" + v1 "github.com/kgateway-dev/kgateway/projects/gateway/pkg/api/v1" + "github.com/kgateway-dev/kgateway/projects/gateway/pkg/defaults" + envoytrace_gloo "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/external/envoy/config/trace/v3" + gloov1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/options/hcm" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/options/headers" + static_plugin_gloo "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/options/static" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/options/tracing" + "github.com/kgateway-dev/kgateway/test/e2e" + testmatchers "github.com/kgateway-dev/kgateway/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/test/helpers" + "github.com/kgateway-dev/kgateway/test/services/envoy" + "github.com/kgateway-dev/kgateway/test/testutils" + "github.com/kgateway-dev/kgateway/test/v1helpers" envoycore_sk "github.com/solo-io/solo-kit/pkg/api/external/envoy/api/v2/core" "github.com/solo-io/solo-kit/pkg/api/v1/clients" "github.com/solo-io/solo-kit/pkg/api/v1/resources" diff --git a/test/e2e/health_checks_test.go b/test/e2e/health_checks_test.go index 0b9f768a44b..e3b23360468 100644 --- a/test/e2e/health_checks_test.go +++ b/test/e2e/health_checks_test.go @@ -11,16 +11,16 @@ import ( "regexp" "time" - "github.com/solo-io/gloo/test/services/envoy" + "github.com/kgateway-dev/kgateway/test/services/envoy" - gatewayv1 "github.com/solo-io/gloo/projects/gateway/pkg/api/v1" + gatewayv1 "github.com/kgateway-dev/kgateway/projects/gateway/pkg/api/v1" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" - "github.com/solo-io/gloo/test/testutils" + "github.com/kgateway-dev/kgateway/test/testutils" - v3 "github.com/solo-io/gloo/projects/gloo/pkg/api/external/envoy/config/core/v3" + v3 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/external/envoy/config/core/v3" - "github.com/solo-io/gloo/test/helpers" + "github.com/kgateway-dev/kgateway/test/helpers" "github.com/solo-io/solo-kit/pkg/api/v1/resources" "github.com/golang/protobuf/ptypes/wrappers" @@ -28,17 +28,17 @@ import ( envoy_config_cluster_v3 "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3" envoy_config_core_v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" "github.com/golang/protobuf/ptypes/duration" + "github.com/kgateway-dev/kgateway/pkg/utils/api_conversion" + gwdefaults "github.com/kgateway-dev/kgateway/projects/gateway/pkg/defaults" + gloov1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/core/matchers" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/translator" + . "github.com/kgateway-dev/kgateway/test/gomega" + "github.com/kgateway-dev/kgateway/test/services" + "github.com/kgateway-dev/kgateway/test/v1helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gstruct" - "github.com/solo-io/gloo/pkg/utils/api_conversion" - gwdefaults "github.com/solo-io/gloo/projects/gateway/pkg/defaults" - gloov1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/core/matchers" - "github.com/solo-io/gloo/projects/gloo/pkg/translator" - . "github.com/solo-io/gloo/test/gomega" - "github.com/solo-io/gloo/test/services" - "github.com/solo-io/gloo/test/v1helpers" "github.com/solo-io/solo-kit/pkg/api/v1/clients" ) @@ -72,7 +72,7 @@ var _ = Describe("Health Checks", func() { }, Settings: &gloov1.Settings{ Gloo: &gloov1.GlooOptions{ - // https://github.com/solo-io/gloo/issues/7577 + // https://github.com/kgateway-dev/kgateway/issues/7577 RemoveUnusedFilters: &wrappers.BoolValue{Value: false}, }, Discovery: &gloov1.Settings_DiscoveryOptions{ diff --git a/test/e2e/http_tunneling_test.go b/test/e2e/http_tunneling_test.go index 626c1137ce4..24e51adbf56 100644 --- a/test/e2e/http_tunneling_test.go +++ b/test/e2e/http_tunneling_test.go @@ -19,29 +19,29 @@ import ( "syscall" "time" - "github.com/solo-io/gloo/test/services/envoy" + "github.com/kgateway-dev/kgateway/test/services/envoy" - "github.com/solo-io/gloo/test/testutils" + "github.com/kgateway-dev/kgateway/test/testutils" - testmatchers "github.com/solo-io/gloo/test/gomega/matchers" + testmatchers "github.com/kgateway-dev/kgateway/test/gomega/matchers" - "github.com/solo-io/gloo/test/v1helpers" + "github.com/kgateway-dev/kgateway/test/v1helpers" "github.com/golang/protobuf/ptypes/wrappers" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/core/matchers" - static_plugin_gloo "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/options/static" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/core/matchers" + static_plugin_gloo "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/options/static" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" - gatewayv1 "github.com/solo-io/gloo/projects/gateway/pkg/api/v1" - gatewaydefaults "github.com/solo-io/gloo/projects/gateway/pkg/defaults" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/ssl" - testhelpers "github.com/solo-io/gloo/test/helpers" + gatewayv1 "github.com/kgateway-dev/kgateway/projects/gateway/pkg/api/v1" + gatewaydefaults "github.com/kgateway-dev/kgateway/projects/gateway/pkg/defaults" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/ssl" + testhelpers "github.com/kgateway-dev/kgateway/test/helpers" + gloov1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/test/services" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - gloov1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1" - "github.com/solo-io/gloo/test/services" "github.com/solo-io/solo-kit/pkg/api/v1/clients" ) diff --git a/test/e2e/hybrid_test.go b/test/e2e/hybrid_test.go index dcd03fdc161..c8045e6c8ec 100644 --- a/test/e2e/hybrid_test.go +++ b/test/e2e/hybrid_test.go @@ -12,23 +12,23 @@ import ( "math/rand" - "github.com/solo-io/gloo/test/gomega/matchers" - gloohelpers "github.com/solo-io/gloo/test/helpers" - "github.com/solo-io/gloo/test/testutils" + "github.com/kgateway-dev/kgateway/test/gomega/matchers" + gloohelpers "github.com/kgateway-dev/kgateway/test/helpers" + "github.com/kgateway-dev/kgateway/test/testutils" "github.com/solo-io/solo-kit/pkg/api/v1/clients" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" "github.com/golang/protobuf/ptypes/wrappers" + v1 "github.com/kgateway-dev/kgateway/projects/gateway/pkg/api/v1" + gatewaydefaults "github.com/kgateway-dev/kgateway/projects/gateway/pkg/defaults" + v3 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/external/envoy/config/core/v3" + gloov1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/options/headers" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/options/proxy_protocol" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/ssl" + "github.com/kgateway-dev/kgateway/test/e2e" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - v1 "github.com/solo-io/gloo/projects/gateway/pkg/api/v1" - gatewaydefaults "github.com/solo-io/gloo/projects/gateway/pkg/defaults" - v3 "github.com/solo-io/gloo/projects/gloo/pkg/api/external/envoy/config/core/v3" - gloov1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/options/headers" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/options/proxy_protocol" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/ssl" - "github.com/solo-io/gloo/test/e2e" ) type ClientConnectionProperties struct { @@ -420,7 +420,7 @@ var _ = Describe("Hybrid Gateway", func() { // for the next 2 entries, no filter chain match is recorded // because the filter chain translator aborts translation if there // are no network filters (ie. virtual hosts) - // https://github.com/solo-io/gloo/blob/d3879f282da00dc0cb6c8c9366a87b48ca1a382b/projects/gloo/pkg/translator/filter_chain.go#L94-L96 + // https://github.com/kgateway-dev/kgateway/blob/d3879f282da00dc0cb6c8c9366a87b48ca1a382b/projects/gloo/pkg/translator/filter_chain.go#L94-L96 // so even though the ip matches, we expect the request to fail // similar to the above test. // there is a workaround for this: by setting SniDomains to '*.', a diff --git a/test/e2e/loadbalancer_plugin_test.go b/test/e2e/loadbalancer_plugin_test.go index ff78ca3f580..c2966034afb 100644 --- a/test/e2e/loadbalancer_plugin_test.go +++ b/test/e2e/loadbalancer_plugin_test.go @@ -3,17 +3,17 @@ package e2e_test import ( - "github.com/solo-io/gloo/test/gomega/matchers" - "github.com/solo-io/gloo/test/testutils" + "github.com/kgateway-dev/kgateway/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/test/testutils" envoy_admin_v3 "github.com/envoyproxy/go-control-plane/envoy/admin/v3" envoy_config_cluster_v3 "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3" + v1 "github.com/kgateway-dev/kgateway/projects/gateway/pkg/api/v1" + glooV1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/test/e2e" + "github.com/kgateway-dev/kgateway/test/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - v1 "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/test/e2e" - "github.com/solo-io/gloo/test/helpers" ) // setupLBPluginTest sets up a test context with a virtual service that uses the provided load balancer config diff --git a/test/e2e/local_ratelimit_test.go b/test/e2e/local_ratelimit_test.go index 07779eb02fb..e1fd282ff52 100644 --- a/test/e2e/local_ratelimit_test.go +++ b/test/e2e/local_ratelimit_test.go @@ -6,16 +6,16 @@ import ( "fmt" "net/http" - v1 "github.com/solo-io/gloo/projects/gateway/pkg/api/v1" - gatewaydefaults "github.com/solo-io/gloo/projects/gateway/pkg/defaults" - gloov1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1" - gloo_matchers "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/core/matchers" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/enterprise/options/ratelimit" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/options/local_ratelimit" - local_ratelimit_plugin "github.com/solo-io/gloo/projects/gloo/pkg/plugins/local_ratelimit" - "github.com/solo-io/gloo/test/e2e" - "github.com/solo-io/gloo/test/gomega/matchers" - "github.com/solo-io/gloo/test/testutils" + v1 "github.com/kgateway-dev/kgateway/projects/gateway/pkg/api/v1" + gatewaydefaults "github.com/kgateway-dev/kgateway/projects/gateway/pkg/defaults" + gloov1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" + gloo_matchers "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/core/matchers" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/enterprise/options/ratelimit" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/options/local_ratelimit" + local_ratelimit_plugin "github.com/kgateway-dev/kgateway/projects/gloo/pkg/plugins/local_ratelimit" + "github.com/kgateway-dev/kgateway/test/e2e" + "github.com/kgateway-dev/kgateway/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/test/testutils" "google.golang.org/protobuf/types/known/durationpb" "google.golang.org/protobuf/types/known/wrapperspb" @@ -141,7 +141,7 @@ var _ = Describe("Local Rate Limit", func() { // [error][envoy_bug] [external/envoy/source/common/http/conn_manager_impl.cc:527] envoy bug failure: !local_close_reason.empty(). Details: Local Close Reason was not set! // This has been fixed in envoy v1.27.0 but since we still use v1.26.gitx, this issue intermittently occurs. // Since this bug doesn't affect the functionally of the ConnectionLimit filter (requests still do not cross the limit), we're adding FlakeAttempts until we move to a version of envoy with this fix. - // More info can be found here : https://github.com/solo-io/gloo/issues/8531 + // More info can be found here : https://github.com/kgateway-dev/kgateway/issues/8531 It("Should rate limit at the l4 layer", FlakeAttempts(5), func() { expectNotRateLimited := func() { // We use a new client every time as TCP connections are cached and this needs to be avoided in order to test L4 rate limiting diff --git a/test/e2e/proxy_protocol_test.go b/test/e2e/proxy_protocol_test.go index ce508bf6dbb..0c52da4752b 100644 --- a/test/e2e/proxy_protocol_test.go +++ b/test/e2e/proxy_protocol_test.go @@ -5,19 +5,19 @@ package e2e_test import ( "net/http" - "github.com/solo-io/gloo/test/testutils" + "github.com/kgateway-dev/kgateway/test/testutils" - testmatchers "github.com/solo-io/gloo/test/gomega/matchers" + testmatchers "github.com/kgateway-dev/kgateway/test/gomega/matchers" "github.com/golang/protobuf/ptypes/wrappers" + gatewayv1 "github.com/kgateway-dev/kgateway/projects/gateway/pkg/api/v1" + gatewaydefaults "github.com/kgateway-dev/kgateway/projects/gateway/pkg/defaults" + gloov1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/ssl" + "github.com/kgateway-dev/kgateway/test/e2e" + gloohelpers "github.com/kgateway-dev/kgateway/test/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - gatewayv1 "github.com/solo-io/gloo/projects/gateway/pkg/api/v1" - gatewaydefaults "github.com/solo-io/gloo/projects/gateway/pkg/defaults" - gloov1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/ssl" - "github.com/solo-io/gloo/test/e2e" - gloohelpers "github.com/solo-io/gloo/test/helpers" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" ) diff --git a/test/e2e/ratelimit_test.go b/test/e2e/ratelimit_test.go index f5a7ae7a089..a664994351e 100644 --- a/test/e2e/ratelimit_test.go +++ b/test/e2e/ratelimit_test.go @@ -10,9 +10,9 @@ import ( "strings" "time" - "github.com/solo-io/gloo/test/services/envoy" + "github.com/kgateway-dev/kgateway/test/services/envoy" - "github.com/solo-io/gloo/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/test/gomega/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -20,13 +20,13 @@ import ( pb "github.com/envoyproxy/go-control-plane/envoy/service/ratelimit/v3" structpb "github.com/golang/protobuf/ptypes/struct" "github.com/golang/protobuf/ptypes/wrappers" - gloov1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/enterprise/options/ratelimit" - gloov1static "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/options/static" - "github.com/solo-io/gloo/projects/gloo/pkg/defaults" - "github.com/solo-io/gloo/test/helpers" - "github.com/solo-io/gloo/test/services" - "github.com/solo-io/gloo/test/v1helpers" + gloov1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/enterprise/options/ratelimit" + gloov1static "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/options/static" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/defaults" + "github.com/kgateway-dev/kgateway/test/helpers" + "github.com/kgateway-dev/kgateway/test/services" + "github.com/kgateway-dev/kgateway/test/v1helpers" "github.com/solo-io/go-utils/contextutils" rltypes "github.com/solo-io/solo-apis/pkg/api/ratelimit.solo.io/v1alpha1" "github.com/solo-io/solo-kit/pkg/api/v1/clients" diff --git a/test/e2e/route_transformation_test.go b/test/e2e/route_transformation_test.go index 3d2d6d0168a..1aad19481e9 100644 --- a/test/e2e/route_transformation_test.go +++ b/test/e2e/route_transformation_test.go @@ -6,23 +6,23 @@ import ( "encoding/json" "net/http" - "github.com/solo-io/gloo/test/testutils" + "github.com/kgateway-dev/kgateway/test/testutils" "google.golang.org/protobuf/types/known/wrapperspb" "github.com/golang/protobuf/ptypes/wrappers" + v1 "github.com/kgateway-dev/kgateway/projects/gateway/pkg/api/v1" + "github.com/kgateway-dev/kgateway/test/e2e" + testmatchers "github.com/kgateway-dev/kgateway/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/test/gomega/transforms" + "github.com/kgateway-dev/kgateway/test/helpers" + "github.com/kgateway-dev/kgateway/test/v1helpers" "github.com/onsi/gomega/gstruct" - v1 "github.com/solo-io/gloo/projects/gateway/pkg/api/v1" - "github.com/solo-io/gloo/test/e2e" - testmatchers "github.com/solo-io/gloo/test/gomega/matchers" - "github.com/solo-io/gloo/test/gomega/transforms" - "github.com/solo-io/gloo/test/helpers" - "github.com/solo-io/gloo/test/v1helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - gloov1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/options/transformation" + gloov1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/options/transformation" ) var _ = Describe("Transformations", func() { diff --git a/test/e2e/staged_transformation_test.go b/test/e2e/staged_transformation_test.go index 65592924930..e8f91c5929d 100644 --- a/test/e2e/staged_transformation_test.go +++ b/test/e2e/staged_transformation_test.go @@ -6,35 +6,35 @@ import ( "encoding/base64" "encoding/json" - "github.com/solo-io/gloo/test/testutils" + "github.com/kgateway-dev/kgateway/test/testutils" "go.uber.org/zap/zapcore" "google.golang.org/protobuf/types/known/wrapperspb" structpb "github.com/golang/protobuf/ptypes/struct" "github.com/golang/protobuf/ptypes/wrappers" - v1 "github.com/solo-io/gloo/projects/gateway/pkg/api/v1" - extauthv1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/enterprise/options/extauth/v1" - gloov1static "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/options/static" - testmatchers "github.com/solo-io/gloo/test/gomega/matchers" - "github.com/solo-io/gloo/test/helpers" + v1 "github.com/kgateway-dev/kgateway/projects/gateway/pkg/api/v1" + extauthv1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/enterprise/options/extauth/v1" + gloov1static "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/options/static" + testmatchers "github.com/kgateway-dev/kgateway/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/test/helpers" "github.com/solo-io/solo-kit/pkg/api/v1/clients" "github.com/solo-io/solo-kit/pkg/api/v1/resources" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" "net/http" + "github.com/kgateway-dev/kgateway/test/e2e" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/solo-io/gloo/test/e2e" - gloov1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/core/matchers" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/options/transformation" + gloov1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/core/matchers" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/options/transformation" ) var _ = Describe("Staged Transformation", FlakeAttempts(3), func() { // We added the FlakeAttempts decorator to try to reduce the impact of the flakes outlined in: - // https://github.com/solo-io/gloo/issues/9292 + // https://github.com/kgateway-dev/kgateway/issues/9292 var ( testContext *e2e.TestContext diff --git a/test/e2e/tcp_stats_test.go b/test/e2e/tcp_stats_test.go index 2495ad538fd..7588d78b520 100644 --- a/test/e2e/tcp_stats_test.go +++ b/test/e2e/tcp_stats_test.go @@ -3,19 +3,19 @@ package e2e_test import ( - "github.com/solo-io/gloo/test/testutils" + "github.com/kgateway-dev/kgateway/test/testutils" - testmatchers "github.com/solo-io/gloo/test/gomega/matchers" + testmatchers "github.com/kgateway-dev/kgateway/test/gomega/matchers" "github.com/golang/protobuf/ptypes/wrappers" + gatewayv1 "github.com/kgateway-dev/kgateway/projects/gateway/pkg/api/v1" + gatewaydefaults "github.com/kgateway-dev/kgateway/projects/gateway/pkg/defaults" + gloov1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/ssl" + "github.com/kgateway-dev/kgateway/test/e2e" + gloohelpers "github.com/kgateway-dev/kgateway/test/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - gatewayv1 "github.com/solo-io/gloo/projects/gateway/pkg/api/v1" - gatewaydefaults "github.com/solo-io/gloo/projects/gateway/pkg/defaults" - gloov1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/ssl" - "github.com/solo-io/gloo/test/e2e" - gloohelpers "github.com/solo-io/gloo/test/helpers" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" ) diff --git a/test/e2e/test_context.go b/test/e2e/test_context.go index a5faf6796f4..402c2f14102 100644 --- a/test/e2e/test_context.go +++ b/test/e2e/test_context.go @@ -6,23 +6,23 @@ import ( "context" "fmt" - "github.com/solo-io/gloo/test/services/envoy" + "github.com/kgateway-dev/kgateway/test/services/envoy" - "github.com/solo-io/gloo/test/testutils" + "github.com/kgateway-dev/kgateway/test/testutils" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" "github.com/onsi/ginkgo/v2" + v1 "github.com/kgateway-dev/kgateway/projects/gateway/pkg/api/v1" + gatewaydefaults "github.com/kgateway-dev/kgateway/projects/gateway/pkg/defaults" + gloov1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/gloosnapshot" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/defaults" + "github.com/kgateway-dev/kgateway/test/helpers" + "github.com/kgateway-dev/kgateway/test/services" + "github.com/kgateway-dev/kgateway/test/v1helpers" . "github.com/onsi/gomega" - v1 "github.com/solo-io/gloo/projects/gateway/pkg/api/v1" - gatewaydefaults "github.com/solo-io/gloo/projects/gateway/pkg/defaults" - 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/projects/gloo/pkg/defaults" - "github.com/solo-io/gloo/test/helpers" - "github.com/solo-io/gloo/test/services" - "github.com/solo-io/gloo/test/v1helpers" "github.com/solo-io/solo-kit/pkg/api/v1/clients" "github.com/solo-io/solo-kit/pkg/api/v1/resources" ) diff --git a/test/e2e/tls_ocsp_test.go b/test/e2e/tls_ocsp_test.go index 6db7bccf61b..8fd43029f63 100644 --- a/test/e2e/tls_ocsp_test.go +++ b/test/e2e/tls_ocsp_test.go @@ -6,16 +6,16 @@ import ( "net/http" "time" + v1 "github.com/kgateway-dev/kgateway/projects/gateway/pkg/api/v1" + gatewaydefaults "github.com/kgateway-dev/kgateway/projects/gateway/pkg/defaults" + gloov1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/ssl" + "github.com/kgateway-dev/kgateway/test/e2e" + "github.com/kgateway-dev/kgateway/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/test/helpers" + "github.com/kgateway-dev/kgateway/test/testutils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - v1 "github.com/solo-io/gloo/projects/gateway/pkg/api/v1" - gatewaydefaults "github.com/solo-io/gloo/projects/gateway/pkg/defaults" - gloov1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/ssl" - "github.com/solo-io/gloo/test/e2e" - "github.com/solo-io/gloo/test/gomega/matchers" - "github.com/solo-io/gloo/test/helpers" - "github.com/solo-io/gloo/test/testutils" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" "golang.org/x/crypto/ocsp" ) diff --git a/test/e2e/vault_aws_test.go b/test/e2e/vault_aws_test.go index 28425b9bf80..b1e70fb7304 100644 --- a/test/e2e/vault_aws_test.go +++ b/test/e2e/vault_aws_test.go @@ -6,16 +6,16 @@ import ( "time" "github.com/aws/aws-sdk-go/aws/credentials" + gloov1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" + v1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/enterprise/options/extauth/v1" + bootstrap "github.com/kgateway-dev/kgateway/projects/gloo/pkg/bootstrap/clients" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/bootstrap/clients/vault" + "github.com/kgateway-dev/kgateway/test/e2e" + "github.com/kgateway-dev/kgateway/test/ginkgo/decorators" + "github.com/kgateway-dev/kgateway/test/gomega/assertions" + "github.com/kgateway-dev/kgateway/test/testutils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - gloov1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1" - v1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/enterprise/options/extauth/v1" - bootstrap "github.com/solo-io/gloo/projects/gloo/pkg/bootstrap/clients" - "github.com/solo-io/gloo/projects/gloo/pkg/bootstrap/clients/vault" - "github.com/solo-io/gloo/test/e2e" - "github.com/solo-io/gloo/test/ginkgo/decorators" - "github.com/solo-io/gloo/test/gomega/assertions" - "github.com/solo-io/gloo/test/testutils" "github.com/solo-io/solo-kit/pkg/api/v1/clients" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" "go.opencensus.io/stats/view" diff --git a/test/e2e/vault_test.go b/test/e2e/vault_test.go index 42e04d6d9b3..91c9ffa3d5a 100644 --- a/test/e2e/vault_test.go +++ b/test/e2e/vault_test.go @@ -3,13 +3,13 @@ package e2e_test import ( - gloov1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1" - v1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/enterprise/options/extauth/v1" - bootstrap "github.com/solo-io/gloo/projects/gloo/pkg/bootstrap/clients" - "github.com/solo-io/gloo/projects/gloo/pkg/bootstrap/clients/vault" - "github.com/solo-io/gloo/test/e2e" - "github.com/solo-io/gloo/test/ginkgo/decorators" - "github.com/solo-io/gloo/test/services" + gloov1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" + v1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/enterprise/options/extauth/v1" + bootstrap "github.com/kgateway-dev/kgateway/projects/gloo/pkg/bootstrap/clients" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/bootstrap/clients/vault" + "github.com/kgateway-dev/kgateway/test/e2e" + "github.com/kgateway-dev/kgateway/test/ginkgo/decorators" + "github.com/kgateway-dev/kgateway/test/services" "github.com/solo-io/solo-kit/pkg/api/v1/clients" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" diff --git a/test/e2e/zipkin_test.go b/test/e2e/zipkin_test.go index 6360bac28ba..73be03b51f8 100644 --- a/test/e2e/zipkin_test.go +++ b/test/e2e/zipkin_test.go @@ -10,32 +10,32 @@ import ( "net/http" "time" - "github.com/solo-io/gloo/test/e2e" - "github.com/solo-io/gloo/test/services/envoy" + "github.com/kgateway-dev/kgateway/test/e2e" + "github.com/kgateway-dev/kgateway/test/services/envoy" - "github.com/solo-io/gloo/test/testutils" + "github.com/kgateway-dev/kgateway/test/testutils" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/gloosnapshot" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/options/hcm" - "github.com/solo-io/gloo/projects/gloo/pkg/translator" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/gloosnapshot" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/options/hcm" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/translator" "github.com/solo-io/solo-kit/pkg/api/v1/resources" - gatewayv1 "github.com/solo-io/gloo/projects/gateway/pkg/api/v1" - gatewaydefaults "github.com/solo-io/gloo/projects/gateway/pkg/defaults" - envoytrace_gloo "github.com/solo-io/gloo/projects/gloo/pkg/api/external/envoy/config/trace/v3" - gloov1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1" - static_plugin_gloo "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/options/static" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/options/tracing" - gloohelpers "github.com/solo-io/gloo/test/helpers" - "github.com/solo-io/gloo/test/v1helpers" + gatewayv1 "github.com/kgateway-dev/kgateway/projects/gateway/pkg/api/v1" + gatewaydefaults "github.com/kgateway-dev/kgateway/projects/gateway/pkg/defaults" + envoytrace_gloo "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/external/envoy/config/trace/v3" + gloov1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" + static_plugin_gloo "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/options/static" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/options/tracing" + gloohelpers "github.com/kgateway-dev/kgateway/test/helpers" + "github.com/kgateway-dev/kgateway/test/v1helpers" "github.com/solo-io/solo-kit/pkg/api/v1/clients" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" + . "github.com/kgateway-dev/kgateway/test/gomega" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/solo-io/gloo/test/gomega" - "github.com/solo-io/gloo/test/services" + "github.com/kgateway-dev/kgateway/test/services" ) const ( diff --git a/test/ginkgo/parallel/ports_test.go b/test/ginkgo/parallel/ports_test.go index f898579b6c8..54db29593ff 100644 --- a/test/ginkgo/parallel/ports_test.go +++ b/test/ginkgo/parallel/ports_test.go @@ -6,10 +6,10 @@ import ( "net" "github.com/avast/retry-go" + "github.com/kgateway-dev/kgateway/test/ginkgo/parallel" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/rotisserie/eris" - "github.com/solo-io/gloo/test/ginkgo/parallel" ) var _ = Describe("Ports", func() { diff --git a/test/gomega/assertions/goroutines.go b/test/gomega/assertions/goroutines.go index acd376c2487..a97d9bebd88 100644 --- a/test/gomega/assertions/goroutines.go +++ b/test/gomega/assertions/goroutines.go @@ -5,10 +5,10 @@ package assertions import ( "time" + "github.com/kgateway-dev/kgateway/test/helpers" . "github.com/onsi/gomega" "github.com/onsi/gomega/gleak" "github.com/onsi/gomega/types" - "github.com/solo-io/gloo/test/helpers" ) // GoRoutineMonitor is a helper for monitoring goroutine leaks in tests diff --git a/test/gomega/assertions/goroutines_test.go b/test/gomega/assertions/goroutines_test.go index da43de225b3..8d5c062643c 100644 --- a/test/gomega/assertions/goroutines_test.go +++ b/test/gomega/assertions/goroutines_test.go @@ -5,11 +5,11 @@ package assertions_test import ( "context" + "github.com/kgateway-dev/kgateway/test/gomega/assertions" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gleak" "github.com/onsi/gomega/types" - "github.com/solo-io/gloo/test/gomega/assertions" ) var _ = Describe("GoRoutineMonitor", func() { @@ -41,7 +41,7 @@ var _ = Describe("GoRoutineMonitor", func() { monitor.ExpectNoLeaks(&assertions.ExpectNoLeaksArgs{ AllowedRoutines: []types.GomegaMatcher{ - gleak.IgnoringInBacktrace("github.com/solo-io/gloo/test/gomega/assertions_test.init"), + gleak.IgnoringInBacktrace("github.com/kgateway-dev/kgateway/test/gomega/assertions_test.init"), }, }) diff --git a/test/gomega/assertions/logging.go b/test/gomega/assertions/logging.go index a23a6989fb6..44645bd6d01 100644 --- a/test/gomega/assertions/logging.go +++ b/test/gomega/assertions/logging.go @@ -6,11 +6,11 @@ import ( "fmt" "net/http" - "github.com/solo-io/gloo/test/testutils" + "github.com/kgateway-dev/kgateway/test/testutils" + "github.com/kgateway-dev/kgateway/test/gomega/matchers" . "github.com/onsi/gomega" "github.com/onsi/gomega/types" - "github.com/solo-io/gloo/test/gomega/matchers" "github.com/solo-io/go-utils/stats" "go.uber.org/zap/zapcore" ) diff --git a/test/gomega/assertions/stats.go b/test/gomega/assertions/stats.go index fdad7dbe6e1..232fefe653f 100644 --- a/test/gomega/assertions/stats.go +++ b/test/gomega/assertions/stats.go @@ -14,14 +14,14 @@ import ( "k8s.io/utils/pointer" - "github.com/solo-io/gloo/projects/gloo/pkg/defaults" - "github.com/solo-io/gloo/test/gomega/matchers" - "github.com/solo-io/gloo/test/gomega/transforms" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/defaults" + "github.com/kgateway-dev/kgateway/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/test/gomega/transforms" + "github.com/kgateway-dev/kgateway/pkg/cliutil" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/types" - "github.com/solo-io/gloo/pkg/cliutil" "github.com/solo-io/go-utils/stats" ) diff --git a/test/gomega/matchers/benchmark.go b/test/gomega/matchers/benchmark.go index 3034dd6259c..0480e36b19f 100644 --- a/test/gomega/matchers/benchmark.go +++ b/test/gomega/matchers/benchmark.go @@ -5,7 +5,7 @@ package matchers import ( "time" - "github.com/solo-io/gloo/test/gomega/transforms" + "github.com/kgateway-dev/kgateway/test/gomega/transforms" "github.com/onsi/gomega" "github.com/onsi/gomega/types" diff --git a/test/gomega/matchers/benchmark_test.go b/test/gomega/matchers/benchmark_test.go index bf07d4f140b..827af985b5d 100644 --- a/test/gomega/matchers/benchmark_test.go +++ b/test/gomega/matchers/benchmark_test.go @@ -6,9 +6,9 @@ import ( "math/rand" "time" + "github.com/kgateway-dev/kgateway/test/gomega/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/solo-io/gloo/test/gomega/matchers" ) var _ = Describe("Benchmark", func() { diff --git a/test/gomega/matchers/contain_headers.go b/test/gomega/matchers/contain_headers.go index 63f7e37d516..96f6b35bac5 100644 --- a/test/gomega/matchers/contain_headers.go +++ b/test/gomega/matchers/contain_headers.go @@ -6,10 +6,10 @@ import ( "net/http" "net/textproto" + "github.com/kgateway-dev/kgateway/test/gomega/transforms" "github.com/onsi/gomega" "github.com/onsi/gomega/gstruct" "github.com/onsi/gomega/types" - "github.com/solo-io/gloo/test/gomega/transforms" ) // ContainHeaders produces a matcher that will only match if all provided headers diff --git a/test/gomega/matchers/contain_headers_test.go b/test/gomega/matchers/contain_headers_test.go index 7373c907e02..2c584f61353 100644 --- a/test/gomega/matchers/contain_headers_test.go +++ b/test/gomega/matchers/contain_headers_test.go @@ -5,9 +5,9 @@ package matchers_test import ( "net/http" + "github.com/kgateway-dev/kgateway/test/gomega/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/solo-io/gloo/test/gomega/matchers" ) var _ = Describe("ContainHeaders", func() { diff --git a/test/gomega/matchers/contain_map_elements_test.go b/test/gomega/matchers/contain_map_elements_test.go index 8063fd7792a..07350df9be9 100644 --- a/test/gomega/matchers/contain_map_elements_test.go +++ b/test/gomega/matchers/contain_map_elements_test.go @@ -3,9 +3,9 @@ package matchers_test import ( + "github.com/kgateway-dev/kgateway/test/gomega/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/solo-io/gloo/test/gomega/matchers" ) var _ = Describe("ContainMapElements", func() { diff --git a/test/gomega/matchers/contain_substrings_test.go b/test/gomega/matchers/contain_substrings_test.go index d4ce7619cda..72b76e324cc 100644 --- a/test/gomega/matchers/contain_substrings_test.go +++ b/test/gomega/matchers/contain_substrings_test.go @@ -3,9 +3,9 @@ package matchers_test import ( + "github.com/kgateway-dev/kgateway/test/gomega/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/solo-io/gloo/test/gomega/matchers" ) var _ = Describe("ContainSubstrings", func() { diff --git a/test/gomega/matchers/custom_resource_test.go b/test/gomega/matchers/custom_resource_test.go index 6e277965f39..e72960f7c43 100644 --- a/test/gomega/matchers/custom_resource_test.go +++ b/test/gomega/matchers/custom_resource_test.go @@ -3,12 +3,12 @@ package matchers_test import ( + v1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" + gloov1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/kube/apis/gloo.solo.io/v1" + "github.com/kgateway-dev/kgateway/test/gomega/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gstruct" - v1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1" - gloov1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/kube/apis/gloo.solo.io/v1" - "github.com/solo-io/gloo/test/gomega/matchers" crdv1 "github.com/solo-io/solo-kit/pkg/api/v1/clients/kube/crd/solo.io/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/test/gomega/matchers/json_contains_test.go b/test/gomega/matchers/json_contains_test.go index 7da29688ea2..e3f4de54597 100644 --- a/test/gomega/matchers/json_contains_test.go +++ b/test/gomega/matchers/json_contains_test.go @@ -3,9 +3,9 @@ package matchers_test import ( + "github.com/kgateway-dev/kgateway/test/gomega/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/solo-io/gloo/test/gomega/matchers" ) var _ = Describe("JSON", func() { diff --git a/test/gomega/transforms/benchmark.go b/test/gomega/transforms/benchmark.go index 4e21ef3ce1b..681b573c172 100644 --- a/test/gomega/transforms/benchmark.go +++ b/test/gomega/transforms/benchmark.go @@ -6,7 +6,7 @@ import ( "sort" "time" - "github.com/solo-io/gloo/test/helpers" + "github.com/kgateway-dev/kgateway/test/helpers" ) // WithPercentile returns a function that extracts the value at the given percentile from a slice of durations diff --git a/test/gomega/transforms/curl.go b/test/gomega/transforms/curl.go index 38c9040bc33..cdb328f5b71 100644 --- a/test/gomega/transforms/curl.go +++ b/test/gomega/transforms/curl.go @@ -9,7 +9,7 @@ import ( "strconv" "strings" - "github.com/solo-io/gloo/pkg/utils/kubeutils/kubectl" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils/kubectl" ) const ( diff --git a/test/gomega/transforms/curl_test.go b/test/gomega/transforms/curl_test.go index a6ea1cf73cb..48ac709356a 100644 --- a/test/gomega/transforms/curl_test.go +++ b/test/gomega/transforms/curl_test.go @@ -6,11 +6,11 @@ import ( "fmt" "net/http" - "github.com/solo-io/gloo/pkg/utils/kubeutils/kubectl" - "github.com/solo-io/gloo/test/gomega/transforms" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils/kubectl" + "github.com/kgateway-dev/kgateway/test/gomega/transforms" + "github.com/kgateway-dev/kgateway/test/gomega/matchers" "github.com/onsi/gomega/gstruct" - "github.com/solo-io/gloo/test/gomega/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/test/helpers/benchmark.go b/test/helpers/benchmark.go index cfc9259773b..104731591ec 100644 --- a/test/helpers/benchmark.go +++ b/test/helpers/benchmark.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/solo-io/gloo/test/testutils" + "github.com/kgateway-dev/kgateway/test/testutils" "github.com/onsi/gomega/types" ) diff --git a/test/helpers/certs.go b/test/helpers/certs.go index e837a7d359c..188b40571a4 100644 --- a/test/helpers/certs.go +++ b/test/helpers/certs.go @@ -21,7 +21,7 @@ import ( "sync" "time" - v1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1" + v1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" corev1 "k8s.io/api/core/v1" diff --git a/test/helpers/debug.go b/test/helpers/debug.go index 50c284f2709..220165ff797 100644 --- a/test/helpers/debug.go +++ b/test/helpers/debug.go @@ -23,7 +23,7 @@ import ( // If your tests fail for other reasons, and this leak detector is running, there may be Goroutines that // were not cleaned up by the test due to the failure. // -// NOTE TO DEVS: We would like to extend the usage of this across more test suites: https://github.com/solo-io/gloo/issues/7147 +// NOTE TO DEVS: We would like to extend the usage of this across more test suites: https://github.com/kgateway-dev/kgateway/issues/7147 func DeferredGoroutineLeakDetector(t *testing.T) func(...goleak.Option) { leakOptions := []goleak.Option{ goleak.IgnoreCurrent(), diff --git a/test/helpers/default_gateways.go b/test/helpers/default_gateways.go index 583fdd5346d..3f8ad9451fd 100644 --- a/test/helpers/default_gateways.go +++ b/test/helpers/default_gateways.go @@ -3,8 +3,8 @@ package helpers import ( - v1 "github.com/solo-io/gloo/projects/gateway/pkg/api/v1" - "github.com/solo-io/gloo/projects/gateway/pkg/defaults" + v1 "github.com/kgateway-dev/kgateway/projects/gateway/pkg/api/v1" + "github.com/kgateway-dev/kgateway/projects/gateway/pkg/defaults" "github.com/solo-io/solo-kit/pkg/api/v1/clients" ) diff --git a/test/helpers/endpoints.go b/test/helpers/endpoints.go index 67568acfd0f..23b77ed0948 100644 --- a/test/helpers/endpoints.go +++ b/test/helpers/endpoints.go @@ -2,7 +2,7 @@ package helpers -import v1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1" +import v1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" // EndpointBuilder contains options for building Endpoints to be included in scaled Snapshots // there are no options currently configurable for the endpointBuilder diff --git a/test/helpers/glooctl_debug_dump.go b/test/helpers/glooctl_debug_dump.go index 6d4af769b38..707e850d702 100644 --- a/test/helpers/glooctl_debug_dump.go +++ b/test/helpers/glooctl_debug_dump.go @@ -6,7 +6,7 @@ import ( "fmt" "os" - "github.com/solo-io/gloo/pkg/cliutil" + "github.com/kgateway-dev/kgateway/pkg/cliutil" "github.com/solo-io/go-utils/testutils" ) diff --git a/test/helpers/kube_dump.go b/test/helpers/kube_dump.go index 14f139fe551..0436e7fa763 100644 --- a/test/helpers/kube_dump.go +++ b/test/helpers/kube_dump.go @@ -16,13 +16,13 @@ import ( "github.com/hashicorp/go-multierror" "github.com/onsi/ginkgo/v2" - "github.com/solo-io/gloo/pkg/cliutil/install" - "github.com/solo-io/gloo/pkg/utils/envoyutils/admincli" - glooAdminCli "github.com/solo-io/gloo/pkg/utils/glooadminutils/admincli" - "github.com/solo-io/gloo/pkg/utils/kubeutils/kubectl" - "github.com/solo-io/gloo/pkg/utils/kubeutils/portforward" - "github.com/solo-io/gloo/pkg/utils/requestutils/curl" - "github.com/solo-io/gloo/projects/gateway2/admin" + "github.com/kgateway-dev/kgateway/pkg/cliutil/install" + "github.com/kgateway-dev/kgateway/pkg/utils/envoyutils/admincli" + glooAdminCli "github.com/kgateway-dev/kgateway/pkg/utils/glooadminutils/admincli" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils/kubectl" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils/portforward" + "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" + "github.com/kgateway-dev/kgateway/projects/gateway2/admin" "github.com/solo-io/go-utils/threadsafe" ) diff --git a/test/helpers/resource_clientset.go b/test/helpers/resource_clientset.go index a90a3321fd1..be7609768d7 100644 --- a/test/helpers/resource_clientset.go +++ b/test/helpers/resource_clientset.go @@ -3,10 +3,10 @@ package helpers import ( - gatewayv1 "github.com/solo-io/gloo/projects/gateway/pkg/api/v1" - externalrl "github.com/solo-io/gloo/projects/gloo/pkg/api/external/solo/ratelimit" - gloov1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1" - extauthv1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/enterprise/options/extauth/v1" + gatewayv1 "github.com/kgateway-dev/kgateway/projects/gateway/pkg/api/v1" + externalrl "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/external/solo/ratelimit" + gloov1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" + extauthv1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/enterprise/options/extauth/v1" ) type ResourceClientSet interface { diff --git a/test/helpers/resources.go b/test/helpers/resources.go index b86047ab2a4..3b58a3c61e2 100644 --- a/test/helpers/resources.go +++ b/test/helpers/resources.go @@ -5,10 +5,10 @@ package helpers import ( "time" + "github.com/kgateway-dev/kgateway/pkg/utils/statusutils" "github.com/onsi/gomega/types" - "github.com/solo-io/gloo/pkg/utils/statusutils" - "github.com/solo-io/gloo/projects/gloo/pkg/defaults" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/defaults" "github.com/onsi/gomega" "github.com/onsi/gomega/gstruct" diff --git a/test/helpers/route_tables.go b/test/helpers/route_tables.go index 94906cccf10..24a0dcaf01d 100644 --- a/test/helpers/route_tables.go +++ b/test/helpers/route_tables.go @@ -4,7 +4,7 @@ package helpers import ( "github.com/golang/protobuf/proto" - v1 "github.com/solo-io/gloo/projects/gateway/pkg/api/v1" + v1 "github.com/kgateway-dev/kgateway/projects/gateway/pkg/api/v1" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" ) diff --git a/test/helpers/routes.go b/test/helpers/routes.go index e791c4a6e7f..10bef6d68b8 100644 --- a/test/helpers/routes.go +++ b/test/helpers/routes.go @@ -4,9 +4,9 @@ package helpers import ( "github.com/golang/protobuf/proto" - 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/core/matchers" + gatewayv1 "github.com/kgateway-dev/kgateway/projects/gateway/pkg/api/v1" + gloov1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/core/matchers" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" ) diff --git a/test/helpers/scaled_snapshots.go b/test/helpers/scaled_snapshots.go index 67ed03382ed..110d9c557fa 100644 --- a/test/helpers/scaled_snapshots.go +++ b/test/helpers/scaled_snapshots.go @@ -5,18 +5,18 @@ package helpers import ( "fmt" - v12 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/enterprise/options/extauth/v1" + v12 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/enterprise/options/extauth/v1" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/gloosnapshot" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/gloosnapshot" - "github.com/solo-io/gloo/projects/gloo/pkg/defaults" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/defaults" "github.com/golang/protobuf/ptypes/wrappers" - v3 "github.com/solo-io/gloo/projects/gloo/pkg/api/external/envoy/config/core/v3" - v1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/core/matchers" - v1static "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/options/static" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/ssl" + v3 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/external/envoy/config/core/v3" + v1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/core/matchers" + v1static "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/options/static" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/ssl" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" ) diff --git a/test/helpers/scaled_snapshots_test.go b/test/helpers/scaled_snapshots_test.go index 6d7a485b511..318ad593258 100644 --- a/test/helpers/scaled_snapshots_test.go +++ b/test/helpers/scaled_snapshots_test.go @@ -3,11 +3,11 @@ package helpers_test import ( + v1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/gloosnapshot" + "github.com/kgateway-dev/kgateway/test/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - v1 "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/solo-kit/pkg/api/v1/resources/core" ) diff --git a/test/helpers/secrets.go b/test/helpers/secrets.go index de4af379752..47df8e5bc73 100644 --- a/test/helpers/secrets.go +++ b/test/helpers/secrets.go @@ -2,7 +2,7 @@ package helpers -import v1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1" +import v1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" // SecretBuilder contains options for building Secrets to be included in scaled Snapshots // there are no options currently configurable for the SecretBuilder diff --git a/test/helpers/snapshot_writer.go b/test/helpers/snapshot_writer.go index 704cdfefa1b..ff266e55a60 100644 --- a/test/helpers/snapshot_writer.go +++ b/test/helpers/snapshot_writer.go @@ -5,11 +5,11 @@ package helpers import ( "time" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/defaults" "github.com/onsi/ginkgo/v2" - "github.com/solo-io/gloo/projects/gloo/pkg/defaults" "github.com/avast/retry-go" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/gloosnapshot" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/gloosnapshot" "github.com/solo-io/solo-kit/pkg/api/v1/clients" "github.com/solo-io/solo-kit/pkg/errors" ) diff --git a/test/helpers/upstreams.go b/test/helpers/upstreams.go index cbb4792f346..486856ae753 100644 --- a/test/helpers/upstreams.go +++ b/test/helpers/upstreams.go @@ -5,9 +5,9 @@ package helpers import ( "fmt" - "github.com/solo-io/gloo/projects/gloo/pkg/api/external/envoy/api/v2/core" - v1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/ssl" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/external/envoy/api/v2/core" + v1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/ssl" ) // UpstreamBuilder contains options for building Upstreams to be included in scaled Snapshots diff --git a/test/helpers/upstreams_test.go b/test/helpers/upstreams_test.go index 87f00b72827..cb68689d01e 100644 --- a/test/helpers/upstreams_test.go +++ b/test/helpers/upstreams_test.go @@ -3,9 +3,9 @@ package helpers_test import ( + "github.com/kgateway-dev/kgateway/test/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/solo-io/gloo/test/helpers" ) var _ = Describe("UpstreamBuilder", func() { diff --git a/test/helpers/util.go b/test/helpers/util.go index ef23dcafe96..7f44ddf2628 100644 --- a/test/helpers/util.go +++ b/test/helpers/util.go @@ -8,8 +8,8 @@ import ( "math" "time" + "github.com/kgateway-dev/kgateway/test/gomega" . "github.com/onsi/gomega" - "github.com/solo-io/gloo/test/gomega" "github.com/solo-io/solo-kit/pkg/api/v1/clients" "github.com/solo-io/solo-kit/pkg/api/v1/resources" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" @@ -26,7 +26,7 @@ func PatchResource(ctx context.Context, resourceRef *core.ResourceRef, mutator f // The mutator method must return the full object that will be persisted, any side effects from the mutator will be ignored func PatchResourceWithOffset(offset int, ctx context.Context, resourceRef *core.ResourceRef, mutator func(resource resources.Resource) resources.Resource, client clients.ResourceClient) error { // There is a potential bug in our resource writing implementation that leads to test flakes - // https://github.com/solo-io/gloo/issues/7044 + // https://github.com/kgateway-dev/kgateway/issues/7044 // This is a temporary solution to ensure that tests do not flake var patchErr error diff --git a/test/helpers/util_test.go b/test/helpers/util_test.go index c996f50d531..afb602eb671 100644 --- a/test/helpers/util_test.go +++ b/test/helpers/util_test.go @@ -5,10 +5,10 @@ package helpers_test import ( "time" + "github.com/kgateway-dev/kgateway/test/gomega" + "github.com/kgateway-dev/kgateway/test/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/solo-io/gloo/test/gomega" - "github.com/solo-io/gloo/test/helpers" ) var _ = Describe("PercentileIndex", func() { diff --git a/test/helpers/virtual_services.go b/test/helpers/virtual_services.go index 0bd90609d25..6c11286ac0b 100644 --- a/test/helpers/virtual_services.go +++ b/test/helpers/virtual_services.go @@ -6,11 +6,11 @@ import ( "errors" "github.com/golang/protobuf/proto" + v1 "github.com/kgateway-dev/kgateway/projects/gateway/pkg/api/v1" + gloov1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/core/matchers" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/ssl" "github.com/onsi/ginkgo/v2" - v1 "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/core/matchers" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/ssl" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" ) diff --git a/test/helpers/virtual_services_test.go b/test/helpers/virtual_services_test.go index 73a9f57455d..a8a3850c2d7 100644 --- a/test/helpers/virtual_services_test.go +++ b/test/helpers/virtual_services_test.go @@ -5,14 +5,14 @@ package helpers_test import ( "hash" + gatewayv1 "github.com/kgateway-dev/kgateway/projects/gateway/pkg/api/v1" + gloov1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/options/cors" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/ssl" + "github.com/kgateway-dev/kgateway/test/gomega/assertions" + "github.com/kgateway-dev/kgateway/test/helpers" . "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/options/cors" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/ssl" - "github.com/solo-io/gloo/test/gomega/assertions" - "github.com/solo-io/gloo/test/helpers" "github.com/solo-io/solo-kit/test/matchers" ) diff --git a/test/kube2e/gateway/gateway_suite_test.go b/test/kube2e/gateway/gateway_suite_test.go index 54c004a02a8..5b7629a34bc 100644 --- a/test/kube2e/gateway/gateway_suite_test.go +++ b/test/kube2e/gateway/gateway_suite_test.go @@ -9,23 +9,23 @@ import ( "testing" "time" - "github.com/solo-io/gloo/test/kubernetes/testutils/cluster" + "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/cluster" "github.com/solo-io/skv2/codegen/util" - kubetestclients "github.com/solo-io/gloo/test/kubernetes/testutils/clients" + kubetestclients "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/clients" - "github.com/solo-io/gloo/pkg/utils/kubeutils/kubectl" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils/kubectl" - kubeutils2 "github.com/solo-io/gloo/test/testutils" + kubeutils2 "github.com/kgateway-dev/kgateway/test/testutils" - gatewaydefaults "github.com/solo-io/gloo/projects/gateway/pkg/defaults" + gatewaydefaults "github.com/kgateway-dev/kgateway/projects/gateway/pkg/defaults" - gloodefaults "github.com/solo-io/gloo/projects/gloo/pkg/defaults" + gloodefaults "github.com/kgateway-dev/kgateway/projects/gloo/pkg/defaults" - "github.com/solo-io/gloo/test/helpers" - "github.com/solo-io/gloo/test/kube2e" - "github.com/solo-io/gloo/test/kube2e/helper" - testruntime "github.com/solo-io/gloo/test/kubernetes/testutils/runtime" + "github.com/kgateway-dev/kgateway/test/helpers" + "github.com/kgateway-dev/kgateway/test/kube2e" + "github.com/kgateway-dev/kgateway/test/kube2e/helper" + testruntime "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/runtime" skhelpers "github.com/solo-io/solo-kit/test/helpers" . "github.com/onsi/ginkgo/v2" diff --git a/test/kube2e/gateway/gateway_test.go b/test/kube2e/gateway/gateway_test.go index 8f66fe5d3c4..4357e5e524e 100644 --- a/test/kube2e/gateway/gateway_test.go +++ b/test/kube2e/gateway/gateway_test.go @@ -8,21 +8,21 @@ import ( "os" "time" - "github.com/solo-io/gloo/pkg/utils/kubeutils" - "github.com/solo-io/gloo/pkg/utils/kubeutils/portforward" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils/portforward" - testmatchers "github.com/solo-io/gloo/test/gomega/matchers" + testmatchers "github.com/kgateway-dev/kgateway/test/gomega/matchers" "github.com/google/uuid" - "github.com/solo-io/gloo/projects/gloo/pkg/api/compress" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/compress" gloo_matchers "github.com/solo-io/solo-kit/test/matchers" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/gloosnapshot" - "github.com/solo-io/gloo/projects/gloo/pkg/utils" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/gloosnapshot" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/utils" - "github.com/solo-io/gloo/projects/gloo/pkg/api/grpc/debug" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/grpc/debug" "google.golang.org/grpc" "github.com/solo-io/solo-kit/pkg/api/v1/resources" @@ -31,25 +31,25 @@ import ( "github.com/golang/protobuf/ptypes/empty" "github.com/golang/protobuf/ptypes/wrappers" + gatewayv1 "github.com/kgateway-dev/kgateway/projects/gateway/pkg/api/v1" + "github.com/kgateway-dev/kgateway/projects/gateway/pkg/defaults" + gloov1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/core/matchers" + gloov1plugins "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/options" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/options/cors" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/options/headers" + glootransformation "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/options/transformation" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/ssl" + defaults2 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/defaults" + kubernetesplugin "github.com/kgateway-dev/kgateway/projects/gloo/pkg/plugins/kubernetes" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/plugins/linkerd" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/translator" + "github.com/kgateway-dev/kgateway/test/helpers" + "github.com/kgateway-dev/kgateway/test/kube2e" + "github.com/kgateway-dev/kgateway/test/kube2e/helper" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/rotisserie/eris" - gatewayv1 "github.com/solo-io/gloo/projects/gateway/pkg/api/v1" - "github.com/solo-io/gloo/projects/gateway/pkg/defaults" - gloov1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/core/matchers" - gloov1plugins "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/options" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/options/cors" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/options/headers" - glootransformation "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/options/transformation" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/ssl" - defaults2 "github.com/solo-io/gloo/projects/gloo/pkg/defaults" - kubernetesplugin "github.com/solo-io/gloo/projects/gloo/pkg/plugins/kubernetes" - "github.com/solo-io/gloo/projects/gloo/pkg/plugins/linkerd" - "github.com/solo-io/gloo/projects/gloo/pkg/translator" - "github.com/solo-io/gloo/test/helpers" - "github.com/solo-io/gloo/test/kube2e" - "github.com/solo-io/gloo/test/kube2e/helper" "github.com/solo-io/solo-kit/pkg/api/v1/clients" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" appsv1 "k8s.io/api/apps/v1" @@ -129,7 +129,7 @@ var _ = Describe("Kube2e: gateway", func() { } // demand that a created gateway _has_ a status. This test is "good enough", as, prior to an orphaned gateway fix, - // https://github.com/solo-io/gloo/pull/5790, free-floating gateways would never be assigned a status at all (nil) + // https://github.com/kgateway-dev/kgateway/pull/5790, free-floating gateways would never be assigned a status at all (nil) Eventually(func() *core.NamespacedStatuses { gw, err := resourceClientset.GatewayClient().Read(testHelper.InstallNamespace, defaults.GatewayProxyName, clients.ReadOpts{Ctx: ctx}) if err != nil { diff --git a/test/kube2e/gateway/robustness_test.go b/test/kube2e/gateway/robustness_test.go index 98cbfc37d4c..5164d34743b 100644 --- a/test/kube2e/gateway/robustness_test.go +++ b/test/kube2e/gateway/robustness_test.go @@ -13,32 +13,32 @@ import ( "github.com/google/uuid" - "github.com/solo-io/gloo/projects/gateway/pkg/defaults" + "github.com/kgateway-dev/kgateway/projects/gateway/pkg/defaults" "github.com/solo-io/solo-kit/pkg/api/v1/resources" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/gloosnapshot" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/gloosnapshot" - gloostatusutils "github.com/solo-io/gloo/pkg/utils/statusutils" + gloostatusutils "github.com/kgateway-dev/kgateway/pkg/utils/statusutils" "github.com/rotisserie/eris" - "github.com/solo-io/gloo/projects/gateway/pkg/services/k8sadmission" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/core/matchers" - "github.com/solo-io/gloo/test/helpers" - "github.com/solo-io/gloo/test/kube2e" + "github.com/kgateway-dev/kgateway/projects/gateway/pkg/services/k8sadmission" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/core/matchers" + "github.com/kgateway-dev/kgateway/test/helpers" + "github.com/kgateway-dev/kgateway/test/kube2e" testutils "github.com/solo-io/k8s-utils/testutils/kube" - "github.com/solo-io/gloo/test/kube2e/helper" + "github.com/kgateway-dev/kgateway/test/kube2e/helper" "github.com/solo-io/solo-kit/pkg/api/v1/clients" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" "k8s.io/apimachinery/pkg/labels" + gatewayv1 "github.com/kgateway-dev/kgateway/projects/gateway/pkg/api/v1" + gloov1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" . "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" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -49,7 +49,7 @@ import ( var _ = Describe("Robustness tests", func() { // These tests are used to validate our Endpoint Discovery Service (EDS) functionality - // Historically, we had an EDS Test Suite (https://github.com/solo-io/gloo/tree/197272444efae0e6649c798997d6efa94bb7a8d9/test/kube2e/eds) + // Historically, we had an EDS Test Suite (https://github.com/kgateway-dev/kgateway/tree/197272444efae0e6649c798997d6efa94bb7a8d9/test/kube2e/eds) // however, those tests often flaked, and the purpose of those tests was to validate what these // tests already do: that endpoints are updated and sent to Envoy successfully. // Therefore, we opted to collapse that Test Suite into this file. If in the future there are a larger set diff --git a/test/kube2e/gloo/bootstrap_clients_test.go b/test/kube2e/gloo/bootstrap_clients_test.go index b522435f48f..d4365f4ee39 100644 --- a/test/kube2e/gloo/bootstrap_clients_test.go +++ b/test/kube2e/gloo/bootstrap_clients_test.go @@ -8,9 +8,9 @@ import ( "strings" "time" - "github.com/solo-io/gloo/pkg/bootstrap/leaderelector/kube" - "github.com/solo-io/gloo/test/kube2e/helper" - kubetestclients "github.com/solo-io/gloo/test/kubernetes/testutils/clients" + "github.com/kgateway-dev/kgateway/pkg/bootstrap/leaderelector/kube" + "github.com/kgateway-dev/kgateway/test/kube2e/helper" + kubetestclients "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/clients" "github.com/onsi/gomega/gstruct" "github.com/solo-io/solo-kit/pkg/api/v1/clients/factory" @@ -22,22 +22,22 @@ import ( corev1 "k8s.io/api/core/v1" "github.com/hashicorp/consul/api" - gatewaydefaults "github.com/solo-io/gloo/projects/gateway/pkg/defaults" - v1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1" - vault_client "github.com/solo-io/gloo/projects/gloo/pkg/bootstrap/clients/vault" - "github.com/solo-io/gloo/test/helpers" - "github.com/solo-io/gloo/test/services" + gatewaydefaults "github.com/kgateway-dev/kgateway/projects/gateway/pkg/defaults" + v1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" + vault_client "github.com/kgateway-dev/kgateway/projects/gloo/pkg/bootstrap/clients/vault" + "github.com/kgateway-dev/kgateway/test/helpers" + "github.com/kgateway-dev/kgateway/test/services" skclients "github.com/solo-io/solo-kit/pkg/api/v1/clients" corecache "github.com/solo-io/solo-kit/pkg/api/v1/clients/kube/cache" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" clientsv1 "k8s.io/client-go/kubernetes/typed/apps/v1" + . "github.com/kgateway-dev/kgateway/test/gomega" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/solo-io/gloo/test/gomega" vaultapi "github.com/hashicorp/vault/api" - "github.com/solo-io/gloo/projects/gloo/pkg/bootstrap/clients" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/bootstrap/clients" "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" ) diff --git a/test/kube2e/gloo/eds_test.go b/test/kube2e/gloo/eds_test.go index 409cd9a4b98..2055f61c082 100644 --- a/test/kube2e/gloo/eds_test.go +++ b/test/kube2e/gloo/eds_test.go @@ -6,14 +6,14 @@ import ( "os/exec" "github.com/google/uuid" + gatewayv1 "github.com/kgateway-dev/kgateway/projects/gateway/pkg/api/v1" + gloov1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/gloosnapshot" + "github.com/kgateway-dev/kgateway/test/helpers" + "github.com/kgateway-dev/kgateway/test/kube2e" + "github.com/kgateway-dev/kgateway/test/kube2e/helper" . "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/gloo/test/kube2e/helper" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" "github.com/solo-io/solo-kit/pkg/api/v1/clients" @@ -87,7 +87,7 @@ var _ = Describe("EDS", func() { kube2e.UpdateRestEdsSetting(ctx, false, testHelper.InstallNamespace) }) - // This test is inspired by the issue here: https://github.com/solo-io/gloo/issues/8968 + // This test is inspired by the issue here: https://github.com/kgateway-dev/kgateway/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 diff --git a/test/kube2e/gloo/generated_kube_types_test.go b/test/kube2e/gloo/generated_kube_types_test.go index 3baca27fb67..37221e562df 100644 --- a/test/kube2e/gloo/generated_kube_types_test.go +++ b/test/kube2e/gloo/generated_kube_types_test.go @@ -3,21 +3,21 @@ package gloo_test import ( + kubetestclients "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/clients" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - kubetestclients "github.com/solo-io/gloo/test/kubernetes/testutils/clients" "github.com/solo-io/solo-kit/pkg/api/v1/clients" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - gatewayv1 "github.com/solo-io/gloo/projects/gateway/pkg/api/v1" - gatewayv1kubetypes "github.com/solo-io/gloo/projects/gateway/pkg/api/v1/kube/apis/gateway.solo.io/v1" - gatewayv1kube "github.com/solo-io/gloo/projects/gateway/pkg/api/v1/kube/client/clientset/versioned/typed/gateway.solo.io/v1" - gloov1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/core/matchers" - gloov1kubetypes "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/kube/apis/gloo.solo.io/v1" - gloov1kube "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/kube/client/clientset/versioned/typed/gloo.solo.io/v1" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/options/static" + gatewayv1 "github.com/kgateway-dev/kgateway/projects/gateway/pkg/api/v1" + gatewayv1kubetypes "github.com/kgateway-dev/kgateway/projects/gateway/pkg/api/v1/kube/apis/gateway.solo.io/v1" + gatewayv1kube "github.com/kgateway-dev/kgateway/projects/gateway/pkg/api/v1/kube/client/clientset/versioned/typed/gateway.solo.io/v1" + gloov1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/core/matchers" + gloov1kubetypes "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/kube/apis/gloo.solo.io/v1" + gloov1kube "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/kube/client/clientset/versioned/typed/gloo.solo.io/v1" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/options/static" ) // Tests generated code in projects/gateway/pkg/api/v1/kube diff --git a/test/kube2e/gloo/gloo_resources_test.go b/test/kube2e/gloo/gloo_resources_test.go index c863a2d8d17..328b9c900e4 100644 --- a/test/kube2e/gloo/gloo_resources_test.go +++ b/test/kube2e/gloo/gloo_resources_test.go @@ -16,16 +16,16 @@ import ( "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" "github.com/solo-io/solo-kit/test/matchers" - gatewayv1 "github.com/solo-io/gloo/projects/gateway/pkg/api/v1" - "github.com/solo-io/gloo/projects/gateway/pkg/defaults" - 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/projects/gloo/pkg/api/v1/ssl" - "github.com/solo-io/gloo/projects/gloo/pkg/plugins/kubernetes" - "github.com/solo-io/gloo/projects/gloo/pkg/plugins/kubernetes/serviceconverter" - "github.com/solo-io/gloo/test/helpers" - "github.com/solo-io/gloo/test/kube2e" - "github.com/solo-io/gloo/test/kube2e/helper" + gatewayv1 "github.com/kgateway-dev/kgateway/projects/gateway/pkg/api/v1" + "github.com/kgateway-dev/kgateway/projects/gateway/pkg/defaults" + gloov1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/gloosnapshot" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/ssl" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/plugins/kubernetes" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/plugins/kubernetes/serviceconverter" + "github.com/kgateway-dev/kgateway/test/helpers" + "github.com/kgateway-dev/kgateway/test/kube2e" + "github.com/kgateway-dev/kgateway/test/kube2e/helper" ) var _ = Describe("GlooResourcesTest", func() { diff --git a/test/kube2e/gloo/gloo_suite_test.go b/test/kube2e/gloo/gloo_suite_test.go index 4864a46ba5e..da09acfbe6e 100644 --- a/test/kube2e/gloo/gloo_suite_test.go +++ b/test/kube2e/gloo/gloo_suite_test.go @@ -9,24 +9,24 @@ import ( "testing" "time" - "github.com/solo-io/gloo/test/kubernetes/testutils/cluster" + "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/cluster" "github.com/solo-io/skv2/codegen/util" - "github.com/solo-io/gloo/pkg/utils/kubeutils/kubectl" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils/kubectl" "github.com/avast/retry-go" "sigs.k8s.io/controller-runtime/pkg/log/zap" - "github.com/solo-io/gloo/test/services/envoy" + "github.com/kgateway-dev/kgateway/test/services/envoy" - "github.com/solo-io/gloo/test/services" + "github.com/kgateway-dev/kgateway/test/services" - "github.com/solo-io/gloo/projects/gloo/pkg/defaults" - "github.com/solo-io/gloo/test/helpers" - "github.com/solo-io/gloo/test/kube2e" - "github.com/solo-io/gloo/test/kube2e/helper" - testruntime "github.com/solo-io/gloo/test/kubernetes/testutils/runtime" - glootestutils "github.com/solo-io/gloo/test/testutils" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/defaults" + "github.com/kgateway-dev/kgateway/test/helpers" + "github.com/kgateway-dev/kgateway/test/kube2e" + "github.com/kgateway-dev/kgateway/test/kube2e/helper" + testruntime "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/runtime" + glootestutils "github.com/kgateway-dev/kgateway/test/testutils" "github.com/solo-io/go-utils/testutils" . "github.com/onsi/ginkgo/v2" diff --git a/test/kube2e/gloo/happypath_test.go b/test/kube2e/gloo/happypath_test.go index 29e37811998..082036a761f 100644 --- a/test/kube2e/gloo/happypath_test.go +++ b/test/kube2e/gloo/happypath_test.go @@ -7,19 +7,19 @@ import ( "net" "strings" - kubetestclients "github.com/solo-io/gloo/test/kubernetes/testutils/clients" + kubetestclients "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/clients" - "github.com/solo-io/gloo/test/services/envoy" + "github.com/kgateway-dev/kgateway/test/services/envoy" corev1 "k8s.io/api/core/v1" "github.com/golang/protobuf/ptypes/wrappers" + gatewaydefaults "github.com/kgateway-dev/kgateway/projects/gateway/pkg/defaults" + gloov1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" + testhelpers "github.com/kgateway-dev/kgateway/test/helpers" + "github.com/kgateway-dev/kgateway/test/services" + "github.com/kgateway-dev/kgateway/test/v1helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - gatewaydefaults "github.com/solo-io/gloo/projects/gateway/pkg/defaults" - gloov1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1" - testhelpers "github.com/solo-io/gloo/test/helpers" - "github.com/solo-io/gloo/test/services" - "github.com/solo-io/gloo/test/v1helpers" "github.com/solo-io/solo-kit/pkg/api/v1/clients" "github.com/solo-io/solo-kit/pkg/api/v1/resources" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" diff --git a/test/kube2e/gloo/kubernetes_test.go b/test/kube2e/gloo/kubernetes_test.go index 938441a2364..182934825f5 100644 --- a/test/kube2e/gloo/kubernetes_test.go +++ b/test/kube2e/gloo/kubernetes_test.go @@ -11,12 +11,12 @@ import ( "github.com/solo-io/solo-kit/test/helpers" + v1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" + kubepluginapi "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/options/kubernetes" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/discovery" + kubeplugin "github.com/kgateway-dev/kgateway/projects/gloo/pkg/plugins/kubernetes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - v1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1" - kubepluginapi "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/options/kubernetes" - "github.com/solo-io/gloo/projects/gloo/pkg/discovery" - kubeplugin "github.com/solo-io/gloo/projects/gloo/pkg/plugins/kubernetes" "github.com/solo-io/solo-kit/pkg/api/v1/clients" kubecache "github.com/solo-io/solo-kit/pkg/api/v1/clients/kube/cache" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" diff --git a/test/kube2e/gloo/setup_syncer_test.go b/test/kube2e/gloo/setup_syncer_test.go index 40b041c3bb6..2163241db09 100644 --- a/test/kube2e/gloo/setup_syncer_test.go +++ b/test/kube2e/gloo/setup_syncer_test.go @@ -8,27 +8,27 @@ import ( "sync" "time" - "github.com/solo-io/gloo/pkg/utils/kubeutils" - "github.com/solo-io/gloo/pkg/utils/kubeutils/portforward" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils/portforward" - "github.com/solo-io/gloo/pkg/utils/settingsutil" + "github.com/kgateway-dev/kgateway/pkg/utils/settingsutil" - "github.com/solo-io/gloo/pkg/bootstrap/leaderelector" - "github.com/solo-io/gloo/pkg/bootstrap/leaderelector/singlereplica" - "github.com/solo-io/gloo/pkg/utils/setuputils" - "github.com/solo-io/gloo/projects/gloo/pkg/bootstrap" - "github.com/solo-io/gloo/projects/gloo/pkg/syncer/setup" - "github.com/solo-io/gloo/projects/gloo/pkg/xds" + "github.com/kgateway-dev/kgateway/pkg/bootstrap/leaderelector" + "github.com/kgateway-dev/kgateway/pkg/bootstrap/leaderelector/singlereplica" + "github.com/kgateway-dev/kgateway/pkg/utils/setuputils" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/bootstrap" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/syncer/setup" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/xds" - "github.com/solo-io/gloo/projects/gloo/pkg/defaults" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/defaults" "github.com/solo-io/solo-kit/pkg/api/v1/clients" "github.com/golang/protobuf/ptypes/wrappers" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/grpc/validation" + v1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/test/kube2e" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/solo-io/gloo/projects/gloo/pkg/api/grpc/validation" - v1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1" - "github.com/solo-io/gloo/test/kube2e" "github.com/solo-io/solo-kit/pkg/api/v1/clients/kube" "github.com/solo-io/solo-kit/pkg/api/v1/clients/memory" "github.com/solo-io/solo-kit/pkg/utils/prototime" diff --git a/test/kube2e/gloo/snapshot_writer_test.go b/test/kube2e/gloo/snapshot_writer_test.go index 5979f2d9e0e..c03b7cca31c 100644 --- a/test/kube2e/gloo/snapshot_writer_test.go +++ b/test/kube2e/gloo/snapshot_writer_test.go @@ -4,17 +4,17 @@ package gloo_test import ( "github.com/google/uuid" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/gloosnapshot" + "github.com/kgateway-dev/kgateway/test/kube2e" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/gloosnapshot" - "github.com/solo-io/gloo/test/kube2e" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" - 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/test/helpers" + gatewayv1 "github.com/kgateway-dev/kgateway/projects/gateway/pkg/api/v1" + gloov1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/test/helpers" - "github.com/solo-io/gloo/test/kube2e/helper" + "github.com/kgateway-dev/kgateway/test/kube2e/helper" "github.com/solo-io/solo-kit/pkg/api/v1/clients" ) diff --git a/test/kube2e/helper/curl.go b/test/kube2e/helper/curl.go index 0b97d0e6b83..147140d3b80 100644 --- a/test/kube2e/helper/curl.go +++ b/test/kube2e/helper/curl.go @@ -11,18 +11,18 @@ import ( "strings" "time" - "github.com/solo-io/gloo/pkg/utils/kubeutils/kubectl" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils/kubectl" - "github.com/solo-io/gloo/pkg/utils/requestutils/curl" + "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega/types" + "github.com/kgateway-dev/kgateway/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/test/gomega/transforms" + "github.com/kgateway-dev/kgateway/test/helpers" . "github.com/onsi/gomega" "github.com/pkg/errors" - "github.com/solo-io/gloo/test/gomega/matchers" - "github.com/solo-io/gloo/test/gomega/transforms" - "github.com/solo-io/gloo/test/helpers" "github.com/solo-io/go-utils/log" ) diff --git a/test/kube2e/helper/curl_test.go b/test/kube2e/helper/curl_test.go index 730497f89f6..f00b1bdd554 100644 --- a/test/kube2e/helper/curl_test.go +++ b/test/kube2e/helper/curl_test.go @@ -5,8 +5,8 @@ package helper_test import ( "time" - "github.com/solo-io/gloo/test/kube2e/helper" - . "github.com/solo-io/gloo/test/kube2e/helper" + "github.com/kgateway-dev/kgateway/test/kube2e/helper" + . "github.com/kgateway-dev/kgateway/test/kube2e/helper" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/test/kube2e/helper/install.go b/test/kube2e/helper/install.go index 2978d82ead9..238866adfe9 100644 --- a/test/kube2e/helper/install.go +++ b/test/kube2e/helper/install.go @@ -16,8 +16,8 @@ import ( "github.com/spf13/afero" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils/kubectl" "github.com/rotisserie/eris" - "github.com/solo-io/gloo/pkg/utils/kubeutils/kubectl" "github.com/solo-io/go-utils/log" "github.com/solo-io/go-utils/testutils/exec" "github.com/solo-io/k8s-utils/testutils/kube" diff --git a/test/kube2e/helper/test_container.go b/test/kube2e/helper/test_container.go index ff1ee92e71a..06c009e50d0 100644 --- a/test/kube2e/helper/test_container.go +++ b/test/kube2e/helper/test_container.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "github.com/solo-io/gloo/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" "github.com/pkg/errors" "github.com/solo-io/go-utils/log" diff --git a/test/kube2e/helper/test_container_test.go b/test/kube2e/helper/test_container_test.go index dc23b72fb9b..2735e8e0592 100644 --- a/test/kube2e/helper/test_container_test.go +++ b/test/kube2e/helper/test_container_test.go @@ -8,7 +8,7 @@ import ( "os" "time" - . "github.com/solo-io/gloo/test/kube2e/helper" + . "github.com/kgateway-dev/kgateway/test/kube2e/helper" "github.com/solo-io/go-utils/log" "github.com/solo-io/go-utils/testutils" diff --git a/test/kube2e/resource_clientset.go b/test/kube2e/resource_clientset.go index 03a76ee8f37..f156e7bb6ea 100644 --- a/test/kube2e/resource_clientset.go +++ b/test/kube2e/resource_clientset.go @@ -5,7 +5,7 @@ package kube2e import ( "context" - "github.com/solo-io/gloo/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" "github.com/solo-io/solo-kit/pkg/api/external/kubernetes/service" "github.com/solo-io/solo-kit/pkg/api/v1/clients/factory" @@ -17,12 +17,12 @@ import ( gwclient "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned" gatewayclient "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned/typed/apis/v1" - gatewayv1 "github.com/solo-io/gloo/projects/gateway/pkg/api/v1" - kubeconverters "github.com/solo-io/gloo/projects/gloo/pkg/api/converters/kube" - externalrl "github.com/solo-io/gloo/projects/gloo/pkg/api/external/solo/ratelimit" - gloov1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1" - extauthv1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/enterprise/options/extauth/v1" - "github.com/solo-io/gloo/test/helpers" + gatewayv1 "github.com/kgateway-dev/kgateway/projects/gateway/pkg/api/v1" + kubeconverters "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/converters/kube" + externalrl "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/external/solo/ratelimit" + gloov1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" + extauthv1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/enterprise/options/extauth/v1" + "github.com/kgateway-dev/kgateway/test/helpers" ) var _ helpers.ResourceClientSet = new(KubeResourceClientSet) @@ -271,7 +271,7 @@ func NewKubeResourceClientSet(ctx context.Context, cfg *rest.Config) (*KubeResou resourceClientSet.settingsClient = settingsClient // Artifact - // Mirror kube setup from: https://github.com/solo-io/gloo/blob/dc96c0cd0e4d93457e77a848d69a0d652488a92e/projects/gloo/pkg/bootstrap/utils.go#L216 + // Mirror kube setup from: https://github.com/kgateway-dev/kgateway/blob/dc96c0cd0e4d93457e77a848d69a0d652488a92e/projects/gloo/pkg/bootstrap/utils.go#L216 artifactClientFactory := &factory.KubeConfigMapClientFactory{ Clientset: kubeClient, Cache: kubeCoreCache, @@ -287,7 +287,7 @@ func NewKubeResourceClientSet(ctx context.Context, cfg *rest.Config) (*KubeResou resourceClientSet.artifactClient = artifactClient // Secret - // Mirror kube setup from: https://github.com/solo-io/gloo/blob/dc96c0cd0e4d93457e77a848d69a0d652488a92e/projects/gloo/pkg/bootstrap/utils.go#L170 + // Mirror kube setup from: https://github.com/kgateway-dev/kgateway/blob/dc96c0cd0e4d93457e77a848d69a0d652488a92e/projects/gloo/pkg/bootstrap/utils.go#L170 secretClientFactory := &factory.KubeSecretClientFactory{ Clientset: kubeClient, Cache: kubeCoreCache, diff --git a/test/kube2e/upgrade/upgrade_data_validation_test.go b/test/kube2e/upgrade/upgrade_data_validation_test.go index 5dfa440bdea..662d3f91b29 100644 --- a/test/kube2e/upgrade/upgrade_data_validation_test.go +++ b/test/kube2e/upgrade/upgrade_data_validation_test.go @@ -5,7 +5,7 @@ package upgrade_test import ( "time" - "github.com/solo-io/gloo/test/kube2e/helper" + "github.com/kgateway-dev/kgateway/test/kube2e/helper" ) // this package follows the current strategy in enterprise upgrade tests of using curl to test validity of traffic routing. diff --git a/test/kube2e/upgrade/upgrade_suite_test.go b/test/kube2e/upgrade/upgrade_suite_test.go index 86a8a5c079a..f7d191af085 100644 --- a/test/kube2e/upgrade/upgrade_suite_test.go +++ b/test/kube2e/upgrade/upgrade_suite_test.go @@ -8,16 +8,16 @@ import ( "path/filepath" "testing" - "github.com/solo-io/gloo/pkg/utils/helmutils" + "github.com/kgateway-dev/kgateway/pkg/utils/helmutils" + "github.com/kgateway-dev/kgateway/test/kube2e" + "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/helper" . "github.com/onsi/gomega" - "github.com/solo-io/gloo/test/kube2e" - "github.com/solo-io/gloo/test/kubernetes/testutils/helper" "github.com/solo-io/go-utils/versionutils" "github.com/solo-io/skv2/codegen/util" + "github.com/kgateway-dev/kgateway/test/helpers" . "github.com/onsi/ginkgo/v2" - "github.com/solo-io/gloo/test/helpers" skhelpers "github.com/solo-io/solo-kit/test/helpers" ) diff --git a/test/kube2e/upgrade/upgrade_test.go b/test/kube2e/upgrade/upgrade_test.go index 6204ff81f81..df77673fe1f 100644 --- a/test/kube2e/upgrade/upgrade_test.go +++ b/test/kube2e/upgrade/upgrade_test.go @@ -13,24 +13,24 @@ import ( "strings" "time" - "github.com/solo-io/gloo/pkg/cliutil" - "github.com/solo-io/gloo/pkg/utils/helmutils" + "github.com/kgateway-dev/kgateway/pkg/cliutil" + "github.com/kgateway-dev/kgateway/pkg/utils/helmutils" "github.com/solo-io/skv2/codegen/util" - kubetestclients "github.com/solo-io/gloo/test/kubernetes/testutils/clients" + kubetestclients "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/clients" - "github.com/solo-io/gloo/projects/gloo/cli/pkg/helpers" + "github.com/kgateway-dev/kgateway/projects/gloo/cli/pkg/helpers" exec_utils "github.com/solo-io/go-utils/testutils/exec" "github.com/solo-io/solo-kit/pkg/api/v1/clients" corev1 "k8s.io/api/core/v1" "k8s.io/client-go/kubernetes" + "github.com/kgateway-dev/kgateway/projects/gloo/cli/pkg/cmd/version" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/defaults" + "github.com/kgateway-dev/kgateway/test/kube2e" + "github.com/kgateway-dev/kgateway/test/kube2e/helper" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/solo-io/gloo/projects/gloo/cli/pkg/cmd/version" - "github.com/solo-io/gloo/projects/gloo/pkg/defaults" - "github.com/solo-io/gloo/test/kube2e" - "github.com/solo-io/gloo/test/kube2e/helper" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -332,7 +332,7 @@ func upgradeCrds(crdDir string) { } func upgradeGloo(testHelper *helper.SoloTestHelper, chartUri string, targetReleasedVersion string, crdDir string, strictValidation bool, additionalArgs []string) { - // With the fix for custom readiness probe : https://github.com/solo-io/gloo/pull/8831 + // With the fix for custom readiness probe : https://github.com/kgateway-dev/kgateway/pull/8831 // The resource rollout job is not longer in a post hook and the job ttl has changed from 60 to 300 // As a consequence the job is not automatically cleaned as part of the hook deletion policy // or within the time between installing gloo and upgrading it in the test. diff --git a/test/kube2e/util.go b/test/kube2e/util.go index 11cdf4439b3..53d3a58b15c 100644 --- a/test/kube2e/util.go +++ b/test/kube2e/util.go @@ -10,19 +10,19 @@ import ( "time" "github.com/golang/protobuf/ptypes/wrappers" + "github.com/kgateway-dev/kgateway/pkg/utils/fsutils" + "github.com/kgateway-dev/kgateway/projects/gloo/cli/pkg/cmd/check" + "github.com/kgateway-dev/kgateway/projects/gloo/cli/pkg/cmd/options" + clienthelpers "github.com/kgateway-dev/kgateway/projects/gloo/cli/pkg/helpers" + "github.com/kgateway-dev/kgateway/projects/gloo/cli/pkg/printers" + v1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/test/gomega/assertions" + "github.com/kgateway-dev/kgateway/test/kube2e/helper" + newhelper "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/helper" + "github.com/kgateway-dev/kgateway/test/testutils" "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" errors "github.com/rotisserie/eris" - "github.com/solo-io/gloo/pkg/utils/fsutils" - "github.com/solo-io/gloo/projects/gloo/cli/pkg/cmd/check" - "github.com/solo-io/gloo/projects/gloo/cli/pkg/cmd/options" - clienthelpers "github.com/solo-io/gloo/projects/gloo/cli/pkg/helpers" - "github.com/solo-io/gloo/projects/gloo/cli/pkg/printers" - v1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1" - "github.com/solo-io/gloo/test/gomega/assertions" - "github.com/solo-io/gloo/test/kube2e/helper" - newhelper "github.com/solo-io/gloo/test/kubernetes/testutils/helper" - "github.com/solo-io/gloo/test/testutils" "github.com/solo-io/go-utils/stats" "github.com/solo-io/solo-kit/pkg/api/v1/clients" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" @@ -161,7 +161,7 @@ func ToFile(content string) string { return fname } -// https://github.com/solo-io/gloo/issues/4043#issuecomment-772706604 +// https://github.com/kgateway-dev/kgateway/issues/4043#issuecomment-772706604 // We should move tests away from using the testserver, and instead depend on EphemeralContainers. // The default response changed in later kube versions, which caused this value to change. // Ideally the test utilities used by Gloo are maintained in the Gloo repo, so I opted to move diff --git a/test/kubernetes/e2e/defaults/defaults.go b/test/kubernetes/e2e/defaults/defaults.go index fbe9ace5021..f9b20514da8 100644 --- a/test/kubernetes/e2e/defaults/defaults.go +++ b/test/kubernetes/e2e/defaults/defaults.go @@ -8,7 +8,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/solo-io/gloo/pkg/utils/kubeutils/kubectl" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils/kubectl" "github.com/solo-io/skv2/codegen/util" ) diff --git a/test/kubernetes/e2e/example/info_logging_test.go b/test/kubernetes/e2e/example/info_logging_test.go index 2c3f27902f7..3e640ffe5ae 100644 --- a/test/kubernetes/e2e/example/info_logging_test.go +++ b/test/kubernetes/e2e/example/info_logging_test.go @@ -11,15 +11,15 @@ import ( "testing" "time" - "github.com/solo-io/gloo/pkg/utils/envutils" - "github.com/solo-io/gloo/test/testutils" + "github.com/kgateway-dev/kgateway/pkg/utils/envutils" + "github.com/kgateway-dev/kgateway/test/testutils" "github.com/solo-io/skv2/codegen/util" "github.com/stretchr/testify/suite" - "github.com/solo-io/gloo/test/kubernetes/e2e" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/example" - "github.com/solo-io/gloo/test/kubernetes/testutils/gloogateway" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/example" + "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/gloogateway" ) // TestInstallationWithInfoLogLevel is the function which executes a series of tests against a given installation diff --git a/test/kubernetes/e2e/features/admin_server/suite.go b/test/kubernetes/e2e/features/admin_server/suite.go index fc1fabd209e..3501159b9bd 100644 --- a/test/kubernetes/e2e/features/admin_server/suite.go +++ b/test/kubernetes/e2e/features/admin_server/suite.go @@ -5,13 +5,13 @@ package admin_server import ( "context" - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1" - v1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1" + v1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" - "github.com/solo-io/gloo/projects/gloo/pkg/defaults" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/defaults" - "github.com/solo-io/gloo/pkg/utils/kubeutils" - "github.com/solo-io/gloo/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" "github.com/stretchr/testify/suite" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/test/kubernetes/e2e/features/basicrouting/edge_suite.go b/test/kubernetes/e2e/features/basicrouting/edge_suite.go index e3e23a90c12..5af6af38608 100644 --- a/test/kubernetes/e2e/features/basicrouting/edge_suite.go +++ b/test/kubernetes/e2e/features/basicrouting/edge_suite.go @@ -6,16 +6,16 @@ import ( "context" "net/http" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils/kubectl" + "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" + gatewaydefaults "github.com/kgateway-dev/kgateway/projects/gateway/pkg/defaults" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/defaults" + testmatchers "github.com/kgateway-dev/kgateway/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + testdefaults "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/defaults" + ossvalidation "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/validation" "github.com/onsi/gomega" - "github.com/solo-io/gloo/pkg/utils/kubeutils" - "github.com/solo-io/gloo/pkg/utils/kubeutils/kubectl" - "github.com/solo-io/gloo/pkg/utils/requestutils/curl" - gatewaydefaults "github.com/solo-io/gloo/projects/gateway/pkg/defaults" - "github.com/solo-io/gloo/projects/gloo/pkg/defaults" - testmatchers "github.com/solo-io/gloo/test/gomega/matchers" - "github.com/solo-io/gloo/test/kubernetes/e2e" - testdefaults "github.com/solo-io/gloo/test/kubernetes/e2e/defaults" - ossvalidation "github.com/solo-io/gloo/test/kubernetes/e2e/features/validation" "github.com/solo-io/solo-kit/pkg/api/v1/clients" "github.com/solo-io/solo-kit/pkg/api/v1/resources" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" diff --git a/test/kubernetes/e2e/features/client_tls/suite.go b/test/kubernetes/e2e/features/client_tls/suite.go index 6cf840bf1ec..cf9d07ca1c2 100644 --- a/test/kubernetes/e2e/features/client_tls/suite.go +++ b/test/kubernetes/e2e/features/client_tls/suite.go @@ -6,15 +6,15 @@ import ( "context" "time" - "github.com/solo-io/gloo/projects/gateway/pkg/defaults" - "github.com/solo-io/gloo/test/gomega/matchers" - testdefaults "github.com/solo-io/gloo/test/kubernetes/e2e/defaults" + "github.com/kgateway-dev/kgateway/projects/gateway/pkg/defaults" + "github.com/kgateway-dev/kgateway/test/gomega/matchers" + testdefaults "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/defaults" "github.com/stretchr/testify/suite" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/solo-io/gloo/pkg/utils/kubeutils" - "github.com/solo-io/gloo/pkg/utils/requestutils/curl" - "github.com/solo-io/gloo/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" ) var _ e2e.NewSuiteFunc = NewTestingSuite diff --git a/test/kubernetes/e2e/features/client_tls/types.go b/test/kubernetes/e2e/features/client_tls/types.go index 78cab169482..502f5eb04c7 100644 --- a/test/kubernetes/e2e/features/client_tls/types.go +++ b/test/kubernetes/e2e/features/client_tls/types.go @@ -6,9 +6,9 @@ import ( "net/http" "path/filepath" + kubev1 "github.com/kgateway-dev/kgateway/projects/gateway/pkg/api/v1/kube/apis/gateway.solo.io/v1" + "github.com/kgateway-dev/kgateway/test/gomega/matchers" "github.com/onsi/gomega" - kubev1 "github.com/solo-io/gloo/projects/gateway/pkg/api/v1/kube/apis/gateway.solo.io/v1" - "github.com/solo-io/gloo/test/gomega/matchers" "github.com/solo-io/skv2/codegen/util" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" diff --git a/test/kubernetes/e2e/features/crd_categories/suite.go b/test/kubernetes/e2e/features/crd_categories/suite.go index 220af1e7388..49491a97896 100644 --- a/test/kubernetes/e2e/features/crd_categories/suite.go +++ b/test/kubernetes/e2e/features/crd_categories/suite.go @@ -8,8 +8,8 @@ import ( "io" "strings" - "github.com/solo-io/gloo/test/kubernetes/e2e" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/helm" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/helm" "github.com/stretchr/testify/suite" ) diff --git a/test/kubernetes/e2e/features/deployer/istio_integration_suite.go b/test/kubernetes/e2e/features/deployer/istio_integration_suite.go index 9f79de4ae7b..1209e04c9c8 100644 --- a/test/kubernetes/e2e/features/deployer/istio_integration_suite.go +++ b/test/kubernetes/e2e/features/deployer/istio_integration_suite.go @@ -6,16 +6,16 @@ import ( "context" "time" - testdefaults "github.com/solo-io/gloo/test/kubernetes/e2e/defaults" + testdefaults "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/defaults" "sigs.k8s.io/controller-runtime/pkg/client" "github.com/onsi/gomega" "github.com/stretchr/testify/suite" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/solo-io/gloo/projects/gloo/cli/pkg/cmd/istio" - "github.com/solo-io/gloo/test/gomega/matchers" - "github.com/solo-io/gloo/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/projects/gloo/cli/pkg/cmd/istio" + "github.com/kgateway-dev/kgateway/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" ) var _ e2e.NewSuiteFunc = NewIstioIntegrationTestingSuite diff --git a/test/kubernetes/e2e/features/deployer/minimal_default_gatewayparameters_suite.go b/test/kubernetes/e2e/features/deployer/minimal_default_gatewayparameters_suite.go index fdb25748495..042ede641d7 100644 --- a/test/kubernetes/e2e/features/deployer/minimal_default_gatewayparameters_suite.go +++ b/test/kubernetes/e2e/features/deployer/minimal_default_gatewayparameters_suite.go @@ -5,13 +5,13 @@ package deployer import ( "context" - testdefaults "github.com/solo-io/gloo/test/kubernetes/e2e/defaults" + testdefaults "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/defaults" "sigs.k8s.io/controller-runtime/pkg/client" "github.com/stretchr/testify/suite" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/solo-io/gloo/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" ) var _ e2e.NewSuiteFunc = NewMinimalDefaultGatewayParametersTestingSuite diff --git a/test/kubernetes/e2e/features/deployer/suite.go b/test/kubernetes/e2e/features/deployer/suite.go index 30a3e71687a..1de5e4d5af9 100644 --- a/test/kubernetes/e2e/features/deployer/suite.go +++ b/test/kubernetes/e2e/features/deployer/suite.go @@ -19,14 +19,14 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" gwv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/solo-io/gloo/pkg/utils/envoyutils/admincli" - "github.com/solo-io/gloo/pkg/utils/kubeutils" - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1" - "github.com/solo-io/gloo/projects/gateway2/wellknown" - "github.com/solo-io/gloo/projects/gloo/pkg/syncer/setup" - "github.com/solo-io/gloo/projects/gloo/pkg/utils" - "github.com/solo-io/gloo/test/kubernetes/e2e" - testdefaults "github.com/solo-io/gloo/test/kubernetes/e2e/defaults" + "github.com/kgateway-dev/kgateway/pkg/utils/envoyutils/admincli" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1" + "github.com/kgateway-dev/kgateway/projects/gateway2/wellknown" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/syncer/setup" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/utils" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + testdefaults "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/defaults" ) var _ e2e.NewSuiteFunc = NewTestingSuite diff --git a/test/kubernetes/e2e/features/deployer/types.go b/test/kubernetes/e2e/features/deployer/types.go index 5505938cab5..9774416e2ac 100644 --- a/test/kubernetes/e2e/features/deployer/types.go +++ b/test/kubernetes/e2e/features/deployer/types.go @@ -11,7 +11,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" gwapiv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1" + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1" ) var ( diff --git a/test/kubernetes/e2e/features/directresponse/suite.go b/test/kubernetes/e2e/features/directresponse/suite.go index 7ecee380816..9bcfe119fe5 100644 --- a/test/kubernetes/e2e/features/directresponse/suite.go +++ b/test/kubernetes/e2e/features/directresponse/suite.go @@ -12,13 +12,13 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" gwv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/solo-io/gloo/pkg/utils/kubeutils" - "github.com/solo-io/gloo/pkg/utils/requestutils/curl" - "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1" - "github.com/solo-io/gloo/test/gomega/matchers" - "github.com/solo-io/gloo/test/kubernetes/e2e" - "github.com/solo-io/gloo/test/kubernetes/e2e/defaults" - testdefaults "github.com/solo-io/gloo/test/kubernetes/e2e/defaults" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" + "github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1" + "github.com/kgateway-dev/kgateway/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/defaults" + testdefaults "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/defaults" ) type testingSuite struct { diff --git a/test/kubernetes/e2e/features/discovery_watchlabels/discovery_watchlabels_suite.go b/test/kubernetes/e2e/features/discovery_watchlabels/discovery_watchlabels_suite.go index fe926005b1b..f82d54374a4 100644 --- a/test/kubernetes/e2e/features/discovery_watchlabels/discovery_watchlabels_suite.go +++ b/test/kubernetes/e2e/features/discovery_watchlabels/discovery_watchlabels_suite.go @@ -7,12 +7,12 @@ import ( "github.com/onsi/gomega" - v1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/kube/apis/gloo.solo.io/v1" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/options" - "github.com/solo-io/gloo/projects/gloo/pkg/plugins/kubernetes" + v1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/kube/apis/gloo.solo.io/v1" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/options" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/plugins/kubernetes" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/solo-io/gloo/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" "github.com/solo-io/solo-kit/pkg/api/v1/clients" "github.com/solo-io/solo-kit/pkg/api/v1/resources" "github.com/stretchr/testify/suite" diff --git a/test/kubernetes/e2e/features/example/suite.go b/test/kubernetes/e2e/features/example/suite.go index 3c305911c08..9494e15596a 100644 --- a/test/kubernetes/e2e/features/example/suite.go +++ b/test/kubernetes/e2e/features/example/suite.go @@ -8,7 +8,7 @@ import ( . "github.com/onsi/gomega" "github.com/stretchr/testify/suite" - "github.com/solo-io/gloo/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" ) var _ e2e.NewSuiteFunc = NewTestingSuite diff --git a/test/kubernetes/e2e/features/glooctl/check.go b/test/kubernetes/e2e/features/glooctl/check.go index d1a6b5791cf..fa72a8eea60 100644 --- a/test/kubernetes/e2e/features/glooctl/check.go +++ b/test/kubernetes/e2e/features/glooctl/check.go @@ -74,8 +74,8 @@ var ( }, "route-tables": { // RouteTable CRs are not currently included in `glooctl check` - // https://github.com/solo-io/gloo/issues/4244 - // https://github.com/solo-io/gloo/issues/2780 + // https://github.com/kgateway-dev/kgateway/issues/4244 + // https://github.com/kgateway-dev/kgateway/issues/2780 include: gstruct.Ignore(), exclude: gstruct.Ignore(), readOnly: gstruct.Ignore(), diff --git a/test/kubernetes/e2e/features/glooctl/check_crds_suite.go b/test/kubernetes/e2e/features/glooctl/check_crds_suite.go index 55b97424d72..6869374bd71 100644 --- a/test/kubernetes/e2e/features/glooctl/check_crds_suite.go +++ b/test/kubernetes/e2e/features/glooctl/check_crds_suite.go @@ -5,7 +5,7 @@ package glooctl import ( "context" - "github.com/solo-io/gloo/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" "github.com/stretchr/testify/suite" ) diff --git a/test/kubernetes/e2e/features/glooctl/check_suite.go b/test/kubernetes/e2e/features/glooctl/check_suite.go index 774524d0bd9..b2f8a377853 100644 --- a/test/kubernetes/e2e/features/glooctl/check_suite.go +++ b/test/kubernetes/e2e/features/glooctl/check_suite.go @@ -8,8 +8,8 @@ import ( "os" "time" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" "github.com/onsi/gomega" - "github.com/solo-io/gloo/test/kubernetes/e2e" "github.com/stretchr/testify/suite" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) @@ -17,7 +17,7 @@ import ( var _ e2e.NewSuiteFunc = NewCheckSuite // checkSuite contains the set of tests to validate the behavior of `glooctl check` -// These tests attempt to mirror: https://github.com/solo-io/gloo/blob/v1.16.x/test/kube2e/glooctl/check_test.go +// These tests attempt to mirror: https://github.com/kgateway-dev/kgateway/blob/v1.16.x/test/kube2e/glooctl/check_test.go type checkSuite struct { suite.Suite diff --git a/test/kubernetes/e2e/features/glooctl/debug_suite.go b/test/kubernetes/e2e/features/glooctl/debug_suite.go index 4af9cf8763f..a3b86155615 100644 --- a/test/kubernetes/e2e/features/glooctl/debug_suite.go +++ b/test/kubernetes/e2e/features/glooctl/debug_suite.go @@ -7,14 +7,14 @@ import ( "os" "path/filepath" - "github.com/solo-io/gloo/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" "github.com/stretchr/testify/suite" ) var _ e2e.NewSuiteFunc = NewDebugSuite // debugSuite contains the set of tests to validate the behavior of `glooctl debug` -// These tests attempt to mirror: https://github.com/solo-io/gloo/blob/v1.16.x/test/kube2e/glooctl/debug_test.go +// These tests attempt to mirror: https://github.com/kgateway-dev/kgateway/blob/v1.16.x/test/kube2e/glooctl/debug_test.go type debugSuite struct { suite.Suite diff --git a/test/kubernetes/e2e/features/glooctl/get_proxy_suite.go b/test/kubernetes/e2e/features/glooctl/get_proxy_suite.go index 08ea3071fd3..41c68221351 100644 --- a/test/kubernetes/e2e/features/glooctl/get_proxy_suite.go +++ b/test/kubernetes/e2e/features/glooctl/get_proxy_suite.go @@ -12,13 +12,13 @@ import ( "github.com/avast/retry-go/v4" "github.com/ghodss/yaml" + gloov1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/kube/apis/gloo.solo.io/v1" + "github.com/kgateway-dev/kgateway/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/defaults" . "github.com/onsi/gomega" "github.com/onsi/gomega/gstruct" "github.com/onsi/gomega/types" - gloov1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/kube/apis/gloo.solo.io/v1" - "github.com/solo-io/gloo/test/gomega/matchers" - "github.com/solo-io/gloo/test/kubernetes/e2e" - "github.com/solo-io/gloo/test/kubernetes/e2e/defaults" "github.com/stretchr/testify/suite" ) diff --git a/test/kubernetes/e2e/features/glooctl/istio_inject_suite.go b/test/kubernetes/e2e/features/glooctl/istio_inject_suite.go index ee16f7e1b97..7c562ee693b 100644 --- a/test/kubernetes/e2e/features/glooctl/istio_inject_suite.go +++ b/test/kubernetes/e2e/features/glooctl/istio_inject_suite.go @@ -6,11 +6,11 @@ import ( "context" "fmt" + "github.com/kgateway-dev/kgateway/projects/gateway/pkg/defaults" + "github.com/kgateway-dev/kgateway/projects/gloo/cli/pkg/cmd/istio" + "github.com/kgateway-dev/kgateway/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" "github.com/onsi/gomega" - "github.com/solo-io/gloo/projects/gateway/pkg/defaults" - "github.com/solo-io/gloo/projects/gloo/cli/pkg/cmd/istio" - "github.com/solo-io/gloo/test/gomega/matchers" - "github.com/solo-io/gloo/test/kubernetes/e2e" "github.com/stretchr/testify/suite" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/test/kubernetes/e2e/features/glooctl/istio_uninject_suite.go b/test/kubernetes/e2e/features/glooctl/istio_uninject_suite.go index 5f91ceb7d7d..57eb93c7e65 100644 --- a/test/kubernetes/e2e/features/glooctl/istio_uninject_suite.go +++ b/test/kubernetes/e2e/features/glooctl/istio_uninject_suite.go @@ -6,11 +6,11 @@ import ( "context" "fmt" + "github.com/kgateway-dev/kgateway/projects/gateway/pkg/defaults" + "github.com/kgateway-dev/kgateway/projects/gloo/cli/pkg/cmd/istio" + "github.com/kgateway-dev/kgateway/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" "github.com/onsi/gomega" - "github.com/solo-io/gloo/projects/gateway/pkg/defaults" - "github.com/solo-io/gloo/projects/gloo/cli/pkg/cmd/istio" - "github.com/solo-io/gloo/test/gomega/matchers" - "github.com/solo-io/gloo/test/kubernetes/e2e" "github.com/stretchr/testify/suite" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/test/kubernetes/e2e/features/glooctl/types.go b/test/kubernetes/e2e/features/glooctl/types.go index 45b09e49509..a5f25da2346 100644 --- a/test/kubernetes/e2e/features/glooctl/types.go +++ b/test/kubernetes/e2e/features/glooctl/types.go @@ -5,8 +5,8 @@ package glooctl import ( "path/filepath" - gatewayv1 "github.com/solo-io/gloo/projects/gateway/pkg/api/v1/kube/apis/gateway.solo.io/v1" - gloov1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/kube/apis/gloo.solo.io/v1" + gatewayv1 "github.com/kgateway-dev/kgateway/projects/gateway/pkg/api/v1/kube/apis/gateway.solo.io/v1" + gloov1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/kube/apis/gloo.solo.io/v1" "github.com/solo-io/skv2/codegen/util" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" apiv1 "sigs.k8s.io/gateway-api/apis/v1" diff --git a/test/kubernetes/e2e/features/gloomtls/gloomtls_edge_suite.go b/test/kubernetes/e2e/features/gloomtls/gloomtls_edge_suite.go index b671a353198..3dbbc76b662 100644 --- a/test/kubernetes/e2e/features/gloomtls/gloomtls_edge_suite.go +++ b/test/kubernetes/e2e/features/gloomtls/gloomtls_edge_suite.go @@ -6,17 +6,17 @@ import ( "context" "time" + "github.com/kgateway-dev/kgateway/projects/gateway/pkg/defaults" + "github.com/kgateway-dev/kgateway/projects/gloo/cli/pkg/cmd/istio" + "github.com/kgateway-dev/kgateway/test/gomega/matchers" + testdefaults "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/defaults" "github.com/onsi/gomega" - "github.com/solo-io/gloo/projects/gateway/pkg/defaults" - "github.com/solo-io/gloo/projects/gloo/cli/pkg/cmd/istio" - "github.com/solo-io/gloo/test/gomega/matchers" - testdefaults "github.com/solo-io/gloo/test/kubernetes/e2e/defaults" "github.com/stretchr/testify/suite" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/solo-io/gloo/pkg/utils/kubeutils" - "github.com/solo-io/gloo/pkg/utils/requestutils/curl" - "github.com/solo-io/gloo/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" ) var _ e2e.NewSuiteFunc = NewGloomtlsEdgeGatewayApiTestingSuite diff --git a/test/kubernetes/e2e/features/gloomtls/types.go b/test/kubernetes/e2e/features/gloomtls/types.go index 743e2a7413f..5ef6eda3770 100644 --- a/test/kubernetes/e2e/features/gloomtls/types.go +++ b/test/kubernetes/e2e/features/gloomtls/types.go @@ -6,8 +6,8 @@ import ( "net/http" "path/filepath" + testmatchers "github.com/kgateway-dev/kgateway/test/gomega/matchers" . "github.com/onsi/gomega" - testmatchers "github.com/solo-io/gloo/test/gomega/matchers" "github.com/solo-io/skv2/codegen/util" ) diff --git a/test/kubernetes/e2e/features/headless_svc/generate/generate.go b/test/kubernetes/e2e/features/headless_svc/generate/generate.go index 9e3e97587b9..7b92498a34c 100644 --- a/test/kubernetes/e2e/features/headless_svc/generate/generate.go +++ b/test/kubernetes/e2e/features/headless_svc/generate/generate.go @@ -6,9 +6,9 @@ import ( "log" "path/filepath" - "github.com/solo-io/gloo/projects/gloo/pkg/defaults" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/headless_svc" - "github.com/solo-io/gloo/test/kubernetes/testutils/resources" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/defaults" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/headless_svc" + "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/resources" "github.com/solo-io/skv2/codegen/util" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/test/kubernetes/e2e/features/headless_svc/gloo_gateway_suite.go b/test/kubernetes/e2e/features/headless_svc/gloo_gateway_suite.go index b8f10f203d3..a9700532865 100644 --- a/test/kubernetes/e2e/features/headless_svc/gloo_gateway_suite.go +++ b/test/kubernetes/e2e/features/headless_svc/gloo_gateway_suite.go @@ -6,12 +6,12 @@ import ( "context" "path/filepath" - "github.com/solo-io/gloo/pkg/utils/kubeutils" - "github.com/solo-io/gloo/pkg/utils/requestutils/curl" - "github.com/solo-io/gloo/projects/gateway/pkg/defaults" - gloo_defaults "github.com/solo-io/gloo/projects/gloo/pkg/defaults" - "github.com/solo-io/gloo/test/kubernetes/e2e" - testutilsresources "github.com/solo-io/gloo/test/kubernetes/testutils/resources" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" + "github.com/kgateway-dev/kgateway/projects/gateway/pkg/defaults" + gloo_defaults "github.com/kgateway-dev/kgateway/projects/gloo/pkg/defaults" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + testutilsresources "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/resources" "github.com/solo-io/solo-kit/pkg/api/v1/resources" "github.com/solo-io/solo-kit/pkg/api/v1/clients" diff --git a/test/kubernetes/e2e/features/headless_svc/k8s_gw_suite.go b/test/kubernetes/e2e/features/headless_svc/k8s_gw_suite.go index 205122c48be..98b0dc8931d 100644 --- a/test/kubernetes/e2e/features/headless_svc/k8s_gw_suite.go +++ b/test/kubernetes/e2e/features/headless_svc/k8s_gw_suite.go @@ -10,10 +10,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/solo-io/gloo/pkg/utils/kubeutils" - "github.com/solo-io/gloo/pkg/utils/requestutils/curl" - "github.com/solo-io/gloo/test/kubernetes/e2e" - "github.com/solo-io/gloo/test/kubernetes/testutils/resources" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/resources" ) var _ e2e.NewSuiteFunc = NewK8sGatewayHeadlessSvcSuite diff --git a/test/kubernetes/e2e/features/headless_svc/resources.go b/test/kubernetes/e2e/features/headless_svc/resources.go index 0b38746eab5..2e4dfb3e8a5 100644 --- a/test/kubernetes/e2e/features/headless_svc/resources.go +++ b/test/kubernetes/e2e/features/headless_svc/resources.go @@ -18,8 +18,8 @@ import ( soloapis_kubernetes "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1/options/kubernetes" gloocore "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" - gloov1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1" - "github.com/solo-io/gloo/test/kubernetes/testutils/resources" + gloov1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/resources" ) const ( diff --git a/test/kubernetes/e2e/features/headless_svc/types.go b/test/kubernetes/e2e/features/headless_svc/types.go index 9bfa22ab8be..c89be643d2d 100644 --- a/test/kubernetes/e2e/features/headless_svc/types.go +++ b/test/kubernetes/e2e/features/headless_svc/types.go @@ -10,8 +10,8 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/solo-io/gloo/pkg/utils/kubeutils/kubectl" - testmatchers "github.com/solo-io/gloo/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils/kubectl" + testmatchers "github.com/kgateway-dev/kgateway/test/gomega/matchers" ) var ( diff --git a/test/kubernetes/e2e/features/helm/suite.go b/test/kubernetes/e2e/features/helm/suite.go index f57f87fc26d..4e567adc694 100644 --- a/test/kubernetes/e2e/features/helm/suite.go +++ b/test/kubernetes/e2e/features/helm/suite.go @@ -16,10 +16,10 @@ import ( "github.com/stretchr/testify/suite" v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" - "github.com/solo-io/gloo/pkg/utils/envoyutils/admincli" - "github.com/solo-io/gloo/test/kubernetes/e2e" - "github.com/solo-io/gloo/test/kubernetes/e2e/tests/base" - "github.com/solo-io/gloo/test/kubernetes/testutils/helper" + "github.com/kgateway-dev/kgateway/pkg/utils/envoyutils/admincli" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/tests/base" + "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/helper" "github.com/solo-io/skv2/codegen/util" "github.com/solo-io/solo-kit/pkg/code-generator/schemagen" ) diff --git a/test/kubernetes/e2e/features/helm/types.go b/test/kubernetes/e2e/features/helm/types.go index c93419ce227..a544e2ac354 100644 --- a/test/kubernetes/e2e/features/helm/types.go +++ b/test/kubernetes/e2e/features/helm/types.go @@ -5,7 +5,7 @@ package helm import ( "path/filepath" - "github.com/solo-io/gloo/test/kubernetes/e2e/tests/base" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/tests/base" "github.com/solo-io/skv2/codegen/util" ) diff --git a/test/kubernetes/e2e/features/helm_settings/suite.go b/test/kubernetes/e2e/features/helm_settings/suite.go index a6e4ae47c1d..cb96f9f76c1 100644 --- a/test/kubernetes/e2e/features/helm_settings/suite.go +++ b/test/kubernetes/e2e/features/helm_settings/suite.go @@ -14,7 +14,7 @@ import ( "text/template" - "github.com/solo-io/gloo/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" "github.com/solo-io/skv2/codegen/util" "github.com/stretchr/testify/suite" ) @@ -36,8 +36,8 @@ var _ e2e.NewSuiteFunc = NewTestingSuite // This solution may not be the best way to validate settings, but it // attempts to avoid re-running all the helm template tests against a live cluster // Reference PRs: -// - https://github.com/solo-io/gloo/pull/5957 (introduced) -// - https://github.com/solo-io/gloo/pull/9732 (migrated) +// - https://github.com/kgateway-dev/kgateway/pull/5957 (introduced) +// - https://github.com/kgateway-dev/kgateway/pull/9732 (migrated) type testingSuite struct { suite.Suite diff --git a/test/kubernetes/e2e/features/http_listener_options/http_lis_opt_suite.go b/test/kubernetes/e2e/features/http_listener_options/http_lis_opt_suite.go index 152cd2f4b58..02ccd7465c0 100644 --- a/test/kubernetes/e2e/features/http_listener_options/http_lis_opt_suite.go +++ b/test/kubernetes/e2e/features/http_listener_options/http_lis_opt_suite.go @@ -9,11 +9,11 @@ import ( "github.com/onsi/gomega" "github.com/stretchr/testify/suite" - "github.com/solo-io/gloo/pkg/utils/kubeutils" - "github.com/solo-io/gloo/pkg/utils/requestutils/curl" - "github.com/solo-io/gloo/test/gomega/matchers" - "github.com/solo-io/gloo/test/kubernetes/e2e" - testdefaults "github.com/solo-io/gloo/test/kubernetes/e2e/defaults" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" + "github.com/kgateway-dev/kgateway/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + testdefaults "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/defaults" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/test/kubernetes/e2e/features/istio/generate/generate.go b/test/kubernetes/e2e/features/istio/generate/generate.go index b47d64e1de2..bcb7bfb3352 100644 --- a/test/kubernetes/e2e/features/istio/generate/generate.go +++ b/test/kubernetes/e2e/features/istio/generate/generate.go @@ -7,9 +7,9 @@ import ( "log" "path/filepath" - "github.com/solo-io/gloo/projects/gloo/pkg/defaults" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/istio" - "github.com/solo-io/gloo/test/kubernetes/testutils/resources" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/defaults" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/istio" + "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/resources" "github.com/solo-io/skv2/codegen/util" ) diff --git a/test/kubernetes/e2e/features/istio/gloo_gateway_auto_mtls_suite.go b/test/kubernetes/e2e/features/istio/gloo_gateway_auto_mtls_suite.go index 470b782bd18..4cf902bc22c 100644 --- a/test/kubernetes/e2e/features/istio/gloo_gateway_auto_mtls_suite.go +++ b/test/kubernetes/e2e/features/istio/gloo_gateway_auto_mtls_suite.go @@ -8,12 +8,12 @@ import ( "path/filepath" "time" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" + "github.com/kgateway-dev/kgateway/projects/gateway/pkg/defaults" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/resources" "github.com/onsi/gomega" - "github.com/solo-io/gloo/pkg/utils/kubeutils" - "github.com/solo-io/gloo/pkg/utils/requestutils/curl" - "github.com/solo-io/gloo/projects/gateway/pkg/defaults" - "github.com/solo-io/gloo/test/kubernetes/e2e" - "github.com/solo-io/gloo/test/kubernetes/testutils/resources" "github.com/stretchr/testify/suite" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/test/kubernetes/e2e/features/istio/gloo_gateway_no_auto_mtls_suite.go b/test/kubernetes/e2e/features/istio/gloo_gateway_no_auto_mtls_suite.go index dc95807ee82..e3580190dcc 100644 --- a/test/kubernetes/e2e/features/istio/gloo_gateway_no_auto_mtls_suite.go +++ b/test/kubernetes/e2e/features/istio/gloo_gateway_no_auto_mtls_suite.go @@ -8,11 +8,11 @@ import ( "path/filepath" "time" - "github.com/solo-io/gloo/pkg/utils/kubeutils" - "github.com/solo-io/gloo/pkg/utils/requestutils/curl" - "github.com/solo-io/gloo/projects/gateway/pkg/defaults" - "github.com/solo-io/gloo/test/kubernetes/e2e" - "github.com/solo-io/gloo/test/kubernetes/testutils/resources" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" + "github.com/kgateway-dev/kgateway/projects/gateway/pkg/defaults" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/resources" "github.com/solo-io/go-utils/contextutils" "github.com/stretchr/testify/suite" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/test/kubernetes/e2e/features/istio/k8s_gateway_auto_mtls_suite.go b/test/kubernetes/e2e/features/istio/k8s_gateway_auto_mtls_suite.go index 4762e9acadd..311fbd916a6 100644 --- a/test/kubernetes/e2e/features/istio/k8s_gateway_auto_mtls_suite.go +++ b/test/kubernetes/e2e/features/istio/k8s_gateway_auto_mtls_suite.go @@ -9,9 +9,9 @@ import ( "github.com/stretchr/testify/suite" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/solo-io/gloo/pkg/utils/kubeutils" - "github.com/solo-io/gloo/pkg/utils/requestutils/curl" - "github.com/solo-io/gloo/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" ) var _ e2e.NewSuiteFunc = NewIstioAutoMtlsSuite diff --git a/test/kubernetes/e2e/features/istio/k8s_gateway_no_auto_mtls_suite.go b/test/kubernetes/e2e/features/istio/k8s_gateway_no_auto_mtls_suite.go index 25dd1c288ca..f44acdc1a0e 100644 --- a/test/kubernetes/e2e/features/istio/k8s_gateway_no_auto_mtls_suite.go +++ b/test/kubernetes/e2e/features/istio/k8s_gateway_no_auto_mtls_suite.go @@ -6,9 +6,9 @@ import ( "context" "time" - "github.com/solo-io/gloo/pkg/utils/kubeutils" - "github.com/solo-io/gloo/pkg/utils/requestutils/curl" - "github.com/solo-io/gloo/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" "github.com/stretchr/testify/suite" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/test/kubernetes/e2e/features/istio/resources.go b/test/kubernetes/e2e/features/istio/resources.go index 794008ad7c3..27c057add6f 100644 --- a/test/kubernetes/e2e/features/istio/resources.go +++ b/test/kubernetes/e2e/features/istio/resources.go @@ -6,12 +6,12 @@ import ( "fmt" "github.com/golang/protobuf/ptypes/wrappers" - "github.com/solo-io/gloo/projects/gloo/constants" + "github.com/kgateway-dev/kgateway/projects/gloo/constants" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" - gloov1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1" + gloov1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" v1 "github.com/solo-io/solo-apis/pkg/api/gateway.solo.io/v1" soloapis_gloov1 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1" "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1/core/matchers" diff --git a/test/kubernetes/e2e/features/istio/types.go b/test/kubernetes/e2e/features/istio/types.go index b30e9dfa413..6783a77ff99 100644 --- a/test/kubernetes/e2e/features/istio/types.go +++ b/test/kubernetes/e2e/features/istio/types.go @@ -6,14 +6,14 @@ import ( "net/http" "path/filepath" + testmatchers "github.com/kgateway-dev/kgateway/test/gomega/matchers" "github.com/onsi/gomega" - testmatchers "github.com/solo-io/gloo/test/gomega/matchers" "github.com/solo-io/skv2/codegen/util" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/solo-io/gloo/pkg/utils/kubeutils/kubectl" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils/kubectl" ) var ( diff --git a/test/kubernetes/e2e/features/listener_options/lis_opt_suite.go b/test/kubernetes/e2e/features/listener_options/lis_opt_suite.go index 089edbb72e9..a11e8da01fe 100644 --- a/test/kubernetes/e2e/features/listener_options/lis_opt_suite.go +++ b/test/kubernetes/e2e/features/listener_options/lis_opt_suite.go @@ -9,11 +9,11 @@ import ( "github.com/onsi/gomega" "github.com/stretchr/testify/suite" - "github.com/solo-io/gloo/pkg/utils/envoyutils/admincli" - "github.com/solo-io/gloo/pkg/utils/kubeutils" - "github.com/solo-io/gloo/pkg/utils/requestutils/curl" - "github.com/solo-io/gloo/test/kubernetes/e2e" - testdefaults "github.com/solo-io/gloo/test/kubernetes/e2e/defaults" + "github.com/kgateway-dev/kgateway/pkg/utils/envoyutils/admincli" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + testdefaults "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/defaults" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/test/kubernetes/e2e/features/listener_options/lis_opt_types.go b/test/kubernetes/e2e/features/listener_options/lis_opt_types.go index ed54f5d79cd..76e8e7f37c7 100644 --- a/test/kubernetes/e2e/features/listener_options/lis_opt_types.go +++ b/test/kubernetes/e2e/features/listener_options/lis_opt_types.go @@ -6,9 +6,9 @@ import ( "net/http" "path/filepath" + "github.com/kgateway-dev/kgateway/test/gomega/matchers" + e2edefaults "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/defaults" "github.com/onsi/gomega" - "github.com/solo-io/gloo/test/gomega/matchers" - e2edefaults "github.com/solo-io/gloo/test/kubernetes/e2e/defaults" "github.com/solo-io/skv2/codegen/util" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" diff --git a/test/kubernetes/e2e/features/metrics/suite.go b/test/kubernetes/e2e/features/metrics/suite.go index d66cb8c4823..8baaac12ed2 100644 --- a/test/kubernetes/e2e/features/metrics/suite.go +++ b/test/kubernetes/e2e/features/metrics/suite.go @@ -10,17 +10,17 @@ import ( "time" adminv3 "github.com/envoyproxy/go-control-plane/envoy/admin/v3" + "github.com/kgateway-dev/kgateway/pkg/utils/envoyutils/admincli" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" + gloov1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/translator" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/upstreams/kubernetes" + testmatchers "github.com/kgateway-dev/kgateway/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/defaults" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/tests/base" "github.com/onsi/gomega" - "github.com/solo-io/gloo/pkg/utils/envoyutils/admincli" - "github.com/solo-io/gloo/pkg/utils/kubeutils" - "github.com/solo-io/gloo/pkg/utils/requestutils/curl" - gloov1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1" - "github.com/solo-io/gloo/projects/gloo/pkg/translator" - "github.com/solo-io/gloo/projects/gloo/pkg/upstreams/kubernetes" - testmatchers "github.com/solo-io/gloo/test/gomega/matchers" - "github.com/solo-io/gloo/test/kubernetes/e2e" - "github.com/solo-io/gloo/test/kubernetes/e2e/defaults" - "github.com/solo-io/gloo/test/kubernetes/e2e/tests/base" "github.com/stretchr/testify/suite" ) diff --git a/test/kubernetes/e2e/features/metrics/types.go b/test/kubernetes/e2e/features/metrics/types.go index e0fbbeb67c8..cee3387495b 100644 --- a/test/kubernetes/e2e/features/metrics/types.go +++ b/test/kubernetes/e2e/features/metrics/types.go @@ -5,10 +5,10 @@ package metrics import ( "path/filepath" - gloov1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/options/kubernetes" - testdefaults "github.com/solo-io/gloo/test/kubernetes/e2e/defaults" - "github.com/solo-io/gloo/test/kubernetes/e2e/tests/base" + gloov1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/options/kubernetes" + testdefaults "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/defaults" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/tests/base" "github.com/solo-io/skv2/codegen/util" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" appsv1 "k8s.io/api/apps/v1" diff --git a/test/kubernetes/e2e/features/port_routing/edge_gateway_suite.go b/test/kubernetes/e2e/features/port_routing/edge_gateway_suite.go index 4e9737c935f..069d120cebb 100644 --- a/test/kubernetes/e2e/features/port_routing/edge_gateway_suite.go +++ b/test/kubernetes/e2e/features/port_routing/edge_gateway_suite.go @@ -5,13 +5,13 @@ package port_routing import ( "context" - "github.com/solo-io/gloo/projects/gateway/pkg/defaults" + "github.com/kgateway-dev/kgateway/projects/gateway/pkg/defaults" "github.com/stretchr/testify/suite" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/solo-io/gloo/pkg/utils/kubeutils" - "github.com/solo-io/gloo/pkg/utils/requestutils/curl" - "github.com/solo-io/gloo/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" ) // glooGatewayPortRoutingTestingSuite is the entire Suite of tests for the "PortRouting" cases diff --git a/test/kubernetes/e2e/features/port_routing/k8s_gateway_suite.go b/test/kubernetes/e2e/features/port_routing/k8s_gateway_suite.go index 7c075df4582..66e483b3efa 100644 --- a/test/kubernetes/e2e/features/port_routing/k8s_gateway_suite.go +++ b/test/kubernetes/e2e/features/port_routing/k8s_gateway_suite.go @@ -6,9 +6,9 @@ import ( "context" "time" - "github.com/solo-io/gloo/pkg/utils/kubeutils" - "github.com/solo-io/gloo/pkg/utils/requestutils/curl" - "github.com/solo-io/gloo/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" "github.com/stretchr/testify/suite" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/test/kubernetes/e2e/features/port_routing/types.go b/test/kubernetes/e2e/features/port_routing/types.go index ebe96e51c7d..ac9ca812158 100644 --- a/test/kubernetes/e2e/features/port_routing/types.go +++ b/test/kubernetes/e2e/features/port_routing/types.go @@ -6,15 +6,15 @@ import ( "net/http" "path/filepath" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils/kubectl" . "github.com/onsi/gomega" - "github.com/solo-io/gloo/pkg/utils/kubeutils/kubectl" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "github.com/solo-io/skv2/codegen/util" - testmatchers "github.com/solo-io/gloo/test/gomega/matchers" + testmatchers "github.com/kgateway-dev/kgateway/test/gomega/matchers" ) type testManifest struct { diff --git a/test/kubernetes/e2e/features/route_delegation/suite.go b/test/kubernetes/e2e/features/route_delegation/suite.go index a407cbd8397..d4e458aa31c 100644 --- a/test/kubernetes/e2e/features/route_delegation/suite.go +++ b/test/kubernetes/e2e/features/route_delegation/suite.go @@ -12,11 +12,11 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" gwv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/solo-io/gloo/pkg/utils/requestutils/curl" - testmatchers "github.com/solo-io/gloo/test/gomega/matchers" - "github.com/solo-io/gloo/test/kubernetes/e2e" - "github.com/solo-io/gloo/test/kubernetes/e2e/defaults" - "github.com/solo-io/gloo/test/kubernetes/testutils/gloogateway" + "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" + testmatchers "github.com/kgateway-dev/kgateway/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/defaults" + "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/gloogateway" ) var _ e2e.NewSuiteFunc = NewTestingSuite diff --git a/test/kubernetes/e2e/features/route_options/suite.go b/test/kubernetes/e2e/features/route_options/suite.go index 2d8c7e6f4ac..d1070b988e4 100644 --- a/test/kubernetes/e2e/features/route_options/suite.go +++ b/test/kubernetes/e2e/features/route_options/suite.go @@ -14,13 +14,13 @@ import ( "github.com/stretchr/testify/suite" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/solo-io/gloo/pkg/utils/kubeutils" - "github.com/solo-io/gloo/pkg/utils/requestutils/curl" - "github.com/solo-io/gloo/projects/gloo/pkg/defaults" - "github.com/solo-io/gloo/test/gomega/matchers" - "github.com/solo-io/gloo/test/helpers" - "github.com/solo-io/gloo/test/kubernetes/e2e" - testdefaults "github.com/solo-io/gloo/test/kubernetes/e2e/defaults" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/defaults" + "github.com/kgateway-dev/kgateway/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/test/helpers" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + testdefaults "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/defaults" ) var _ e2e.NewSuiteFunc = NewTestingSuite diff --git a/test/kubernetes/e2e/features/route_options/types.go b/test/kubernetes/e2e/features/route_options/types.go index 0028dcc7a41..2b8d5f6a70a 100644 --- a/test/kubernetes/e2e/features/route_options/types.go +++ b/test/kubernetes/e2e/features/route_options/types.go @@ -6,9 +6,9 @@ import ( "net/http" "path/filepath" + "github.com/kgateway-dev/kgateway/test/gomega/matchers" "github.com/onsi/gomega" "github.com/onsi/gomega/gstruct" - "github.com/solo-io/gloo/test/gomega/matchers" "github.com/solo-io/skv2/codegen/util" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" diff --git a/test/kubernetes/e2e/features/server_tls/suite.go b/test/kubernetes/e2e/features/server_tls/suite.go index 48778af47ae..52b09fccceb 100644 --- a/test/kubernetes/e2e/features/server_tls/suite.go +++ b/test/kubernetes/e2e/features/server_tls/suite.go @@ -6,18 +6,18 @@ import ( "context" "time" - gatewayv1 "github.com/solo-io/gloo/projects/gateway/pkg/api/v1" - "github.com/solo-io/gloo/projects/gateway/pkg/defaults" - "github.com/solo-io/gloo/test/gomega/matchers" - "github.com/solo-io/gloo/test/kube2e/helper" - testdefaults "github.com/solo-io/gloo/test/kubernetes/e2e/defaults" + gatewayv1 "github.com/kgateway-dev/kgateway/projects/gateway/pkg/api/v1" + "github.com/kgateway-dev/kgateway/projects/gateway/pkg/defaults" + "github.com/kgateway-dev/kgateway/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/test/kube2e/helper" + testdefaults "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/defaults" "github.com/stretchr/testify/suite" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" - "github.com/solo-io/gloo/pkg/utils/kubeutils" - "github.com/solo-io/gloo/pkg/utils/requestutils/curl" - "github.com/solo-io/gloo/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" ) var _ e2e.NewSuiteFunc = NewTestingSuite diff --git a/test/kubernetes/e2e/features/server_tls/types.go b/test/kubernetes/e2e/features/server_tls/types.go index 38a81a37e23..c39286beda4 100644 --- a/test/kubernetes/e2e/features/server_tls/types.go +++ b/test/kubernetes/e2e/features/server_tls/types.go @@ -7,9 +7,9 @@ import ( "os" "path/filepath" + kubev1 "github.com/kgateway-dev/kgateway/projects/gateway/pkg/api/v1/kube/apis/gateway.solo.io/v1" + "github.com/kgateway-dev/kgateway/test/gomega/matchers" "github.com/onsi/gomega" - kubev1 "github.com/solo-io/gloo/projects/gateway/pkg/api/v1/kube/apis/gateway.solo.io/v1" - "github.com/solo-io/gloo/test/gomega/matchers" "github.com/solo-io/skv2/codegen/util" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" diff --git a/test/kubernetes/e2e/features/services/httproute/suite.go b/test/kubernetes/e2e/features/services/httproute/suite.go index e70cb9efae1..0074f73e3b5 100644 --- a/test/kubernetes/e2e/features/services/httproute/suite.go +++ b/test/kubernetes/e2e/features/services/httproute/suite.go @@ -7,11 +7,11 @@ import ( "github.com/stretchr/testify/suite" - "github.com/solo-io/gloo/pkg/utils/kubeutils" - "github.com/solo-io/gloo/pkg/utils/requestutils/curl" - "github.com/solo-io/gloo/projects/gateway2/wellknown" - "github.com/solo-io/gloo/test/kubernetes/e2e" - "github.com/solo-io/gloo/test/kubernetes/e2e/defaults" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" + "github.com/kgateway-dev/kgateway/projects/gateway2/wellknown" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/defaults" ) // testingSuite is the entire Suite of tests for testing K8s Service-specific features/fixes diff --git a/test/kubernetes/e2e/features/services/httproute/types.go b/test/kubernetes/e2e/features/services/httproute/types.go index dabaaf26f43..3b6e0320694 100644 --- a/test/kubernetes/e2e/features/services/httproute/types.go +++ b/test/kubernetes/e2e/features/services/httproute/types.go @@ -6,12 +6,12 @@ import ( "net/http" "path/filepath" - testmatchers "github.com/solo-io/gloo/test/gomega/matchers" + testmatchers "github.com/kgateway-dev/kgateway/test/gomega/matchers" "github.com/solo-io/skv2/codegen/util" + "github.com/kgateway-dev/kgateway/projects/gateway2/crds" "github.com/onsi/gomega/gstruct" - "github.com/solo-io/gloo/projects/gateway2/crds" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/test/kubernetes/e2e/features/services/tcproute/suite.go b/test/kubernetes/e2e/features/services/tcproute/suite.go index a907340949b..a01b1758c8b 100644 --- a/test/kubernetes/e2e/features/services/tcproute/suite.go +++ b/test/kubernetes/e2e/features/services/tcproute/suite.go @@ -13,12 +13,12 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/solo-io/gloo/pkg/utils/kubeutils" - "github.com/solo-io/gloo/pkg/utils/kubeutils/kubectl" - "github.com/solo-io/gloo/pkg/utils/requestutils/curl" - "github.com/solo-io/gloo/test/gomega/matchers" - "github.com/solo-io/gloo/test/kubernetes/e2e" - "github.com/solo-io/gloo/test/kubernetes/e2e/defaults" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils/kubectl" + "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" + "github.com/kgateway-dev/kgateway/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/defaults" ) // testingSuite is the entire suite of tests for testing K8s Service-specific features/fixes diff --git a/test/kubernetes/e2e/features/services/tcproute/types.go b/test/kubernetes/e2e/features/services/tcproute/types.go index a0880e0a16d..b88b0fdf464 100644 --- a/test/kubernetes/e2e/features/services/tcproute/types.go +++ b/test/kubernetes/e2e/features/services/tcproute/types.go @@ -8,7 +8,7 @@ import ( "path/filepath" "time" - testmatchers "github.com/solo-io/gloo/test/gomega/matchers" + testmatchers "github.com/kgateway-dev/kgateway/test/gomega/matchers" "github.com/solo-io/skv2/codegen/util" diff --git a/test/kubernetes/e2e/features/tracing/suite.go b/test/kubernetes/e2e/features/tracing/suite.go index d7b67d90e3e..272d9cdf8c2 100644 --- a/test/kubernetes/e2e/features/tracing/suite.go +++ b/test/kubernetes/e2e/features/tracing/suite.go @@ -7,12 +7,12 @@ import ( "net/http" "time" - "github.com/solo-io/gloo/pkg/utils/kubeutils" - "github.com/solo-io/gloo/pkg/utils/requestutils/curl" - gloo_defaults "github.com/solo-io/gloo/projects/gloo/pkg/defaults" - "github.com/solo-io/gloo/test/gomega/matchers" - "github.com/solo-io/gloo/test/kubernetes/e2e" - testdefaults "github.com/solo-io/gloo/test/kubernetes/e2e/defaults" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" + gloo_defaults "github.com/kgateway-dev/kgateway/projects/gloo/pkg/defaults" + "github.com/kgateway-dev/kgateway/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + testdefaults "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/defaults" "github.com/solo-io/solo-kit/pkg/api/v1/clients" "github.com/solo-io/solo-kit/pkg/api/v1/resources" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" diff --git a/test/kubernetes/e2e/features/upgrade/suite.go b/test/kubernetes/e2e/features/upgrade/suite.go index 40265909b71..cc4e734d0ae 100644 --- a/test/kubernetes/e2e/features/upgrade/suite.go +++ b/test/kubernetes/e2e/features/upgrade/suite.go @@ -9,9 +9,9 @@ import ( "github.com/stretchr/testify/suite" - "github.com/solo-io/gloo/test/kubernetes/e2e" - "github.com/solo-io/gloo/test/kubernetes/e2e/tests/base" - "github.com/solo-io/gloo/test/kubernetes/testutils/helper" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/tests/base" + "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/helper" "github.com/solo-io/skv2/codegen/util" ) diff --git a/test/kubernetes/e2e/features/upstreams/suite.go b/test/kubernetes/e2e/features/upstreams/suite.go index 3c3b26788ff..aea6cdc5967 100644 --- a/test/kubernetes/e2e/features/upstreams/suite.go +++ b/test/kubernetes/e2e/features/upstreams/suite.go @@ -10,10 +10,10 @@ import ( "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" "github.com/stretchr/testify/suite" - "github.com/solo-io/gloo/pkg/utils/kubeutils" - "github.com/solo-io/gloo/pkg/utils/requestutils/curl" - "github.com/solo-io/gloo/projects/gloo/pkg/defaults" - "github.com/solo-io/gloo/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/defaults" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" ) var _ e2e.NewSuiteFunc = NewTestingSuite diff --git a/test/kubernetes/e2e/features/upstreams/types.go b/test/kubernetes/e2e/features/upstreams/types.go index 58ea9896255..43c6474d796 100644 --- a/test/kubernetes/e2e/features/upstreams/types.go +++ b/test/kubernetes/e2e/features/upstreams/types.go @@ -12,9 +12,9 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/solo-io/gloo/pkg/utils/kubeutils/kubectl" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils/kubectl" - testmatchers "github.com/solo-io/gloo/test/gomega/matchers" + testmatchers "github.com/kgateway-dev/kgateway/test/gomega/matchers" ) var ( diff --git a/test/kubernetes/e2e/features/validation/full_envoy_validation/suite.go b/test/kubernetes/e2e/features/validation/full_envoy_validation/suite.go index ea332402d4c..48a725a5256 100644 --- a/test/kubernetes/e2e/features/validation/full_envoy_validation/suite.go +++ b/test/kubernetes/e2e/features/validation/full_envoy_validation/suite.go @@ -6,9 +6,9 @@ import ( "context" "fmt" - "github.com/solo-io/gloo/test/kubernetes/e2e" - testdefaults "github.com/solo-io/gloo/test/kubernetes/e2e/defaults" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/validation" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + testdefaults "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/defaults" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/validation" "github.com/solo-io/solo-kit/pkg/api/v1/clients" "github.com/solo-io/solo-kit/pkg/api/v1/resources" "github.com/stretchr/testify/suite" diff --git a/test/kubernetes/e2e/features/validation/split_webhook/suite.go b/test/kubernetes/e2e/features/validation/split_webhook/suite.go index 5eb2dd86d65..f52d6c3e77f 100644 --- a/test/kubernetes/e2e/features/validation/split_webhook/suite.go +++ b/test/kubernetes/e2e/features/validation/split_webhook/suite.go @@ -9,10 +9,10 @@ import ( "strings" "time" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/validation" + "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/helper" "github.com/onsi/gomega" - "github.com/solo-io/gloo/test/kubernetes/e2e" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/validation" - "github.com/solo-io/gloo/test/kubernetes/testutils/helper" "github.com/solo-io/solo-kit/pkg/api/v1/clients" "github.com/solo-io/solo-kit/pkg/api/v1/resources" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/test/kubernetes/e2e/features/validation/transformation_validation_disabled/suite.go b/test/kubernetes/e2e/features/validation/transformation_validation_disabled/suite.go index ec66ea04ec2..8aa4da83fed 100644 --- a/test/kubernetes/e2e/features/validation/transformation_validation_disabled/suite.go +++ b/test/kubernetes/e2e/features/validation/transformation_validation_disabled/suite.go @@ -5,8 +5,8 @@ package transformation_validation_disabled import ( "context" - "github.com/solo-io/gloo/test/kubernetes/e2e" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/validation" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/validation" "github.com/stretchr/testify/suite" ) diff --git a/test/kubernetes/e2e/features/validation/types.go b/test/kubernetes/e2e/features/validation/types.go index 1d6926b4980..fb1f337e86e 100644 --- a/test/kubernetes/e2e/features/validation/types.go +++ b/test/kubernetes/e2e/features/validation/types.go @@ -6,8 +6,8 @@ import ( "net/http" "path/filepath" + testmatchers "github.com/kgateway-dev/kgateway/test/gomega/matchers" "github.com/onsi/gomega" - testmatchers "github.com/solo-io/gloo/test/gomega/matchers" "github.com/solo-io/skv2/codegen/util" ) diff --git a/test/kubernetes/e2e/features/validation/validation_allow_warnings/suite.go b/test/kubernetes/e2e/features/validation/validation_allow_warnings/suite.go index 7aa4cc2acfb..fab04710d04 100644 --- a/test/kubernetes/e2e/features/validation/validation_allow_warnings/suite.go +++ b/test/kubernetes/e2e/features/validation/validation_allow_warnings/suite.go @@ -5,10 +5,10 @@ package validation_allow_warnings import ( "context" - gloo_defaults "github.com/solo-io/gloo/projects/gloo/pkg/defaults" - "github.com/solo-io/gloo/test/kubernetes/e2e" - testdefaults "github.com/solo-io/gloo/test/kubernetes/e2e/defaults" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/validation" + gloo_defaults "github.com/kgateway-dev/kgateway/projects/gloo/pkg/defaults" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + testdefaults "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/defaults" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/validation" "github.com/solo-io/solo-kit/pkg/api/v1/clients" "github.com/solo-io/solo-kit/pkg/api/v1/resources" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" diff --git a/test/kubernetes/e2e/features/validation/validation_always_accept/suite.go b/test/kubernetes/e2e/features/validation/validation_always_accept/suite.go index b9112df5a4d..49f3d7e7767 100644 --- a/test/kubernetes/e2e/features/validation/validation_always_accept/suite.go +++ b/test/kubernetes/e2e/features/validation/validation_always_accept/suite.go @@ -7,15 +7,15 @@ import ( "net/http" "os" - "github.com/solo-io/gloo/pkg/utils/kubeutils" - "github.com/solo-io/gloo/pkg/utils/requestutils/curl" - "github.com/solo-io/gloo/projects/gateway/pkg/defaults" - gloo_defaults "github.com/solo-io/gloo/projects/gloo/pkg/defaults" - testmatchers "github.com/solo-io/gloo/test/gomega/matchers" - "github.com/solo-io/gloo/test/helpers" - "github.com/solo-io/gloo/test/kubernetes/e2e" - testdefaults "github.com/solo-io/gloo/test/kubernetes/e2e/defaults" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/validation" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" + "github.com/kgateway-dev/kgateway/projects/gateway/pkg/defaults" + gloo_defaults "github.com/kgateway-dev/kgateway/projects/gloo/pkg/defaults" + testmatchers "github.com/kgateway-dev/kgateway/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/test/helpers" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + testdefaults "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/defaults" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/validation" "github.com/solo-io/solo-kit/pkg/api/v1/clients" "github.com/solo-io/solo-kit/pkg/api/v1/resources" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" diff --git a/test/kubernetes/e2e/features/validation/validation_reject_invalid/suite.go b/test/kubernetes/e2e/features/validation/validation_reject_invalid/suite.go index 0fa0ec0cbab..cd6be7cf721 100644 --- a/test/kubernetes/e2e/features/validation/validation_reject_invalid/suite.go +++ b/test/kubernetes/e2e/features/validation/validation_reject_invalid/suite.go @@ -9,10 +9,10 @@ import ( "strings" "time" - gloo_defaults "github.com/solo-io/gloo/projects/gloo/pkg/defaults" - "github.com/solo-io/gloo/test/kubernetes/e2e" - testdefaults "github.com/solo-io/gloo/test/kubernetes/e2e/defaults" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/validation" + gloo_defaults "github.com/kgateway-dev/kgateway/projects/gloo/pkg/defaults" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + testdefaults "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/defaults" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/validation" "github.com/solo-io/solo-kit/pkg/api/v1/clients" "github.com/solo-io/solo-kit/pkg/api/v1/resources" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" diff --git a/test/kubernetes/e2e/features/validation/validation_strict_warnings/suite.go b/test/kubernetes/e2e/features/validation/validation_strict_warnings/suite.go index c01f74d92e6..28b0160de53 100644 --- a/test/kubernetes/e2e/features/validation/validation_strict_warnings/suite.go +++ b/test/kubernetes/e2e/features/validation/validation_strict_warnings/suite.go @@ -8,10 +8,10 @@ import ( "os" "time" - gloo_defaults "github.com/solo-io/gloo/projects/gloo/pkg/defaults" - "github.com/solo-io/gloo/test/kubernetes/e2e" - testdefaults "github.com/solo-io/gloo/test/kubernetes/e2e/defaults" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/validation" + gloo_defaults "github.com/kgateway-dev/kgateway/projects/gloo/pkg/defaults" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + testdefaults "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/defaults" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/validation" "github.com/solo-io/solo-kit/pkg/api/v1/clients" "github.com/solo-io/solo-kit/pkg/api/v1/resources" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" diff --git a/test/kubernetes/e2e/features/virtualhost_options/types.go b/test/kubernetes/e2e/features/virtualhost_options/types.go index 409dded846c..cd335cf02c2 100644 --- a/test/kubernetes/e2e/features/virtualhost_options/types.go +++ b/test/kubernetes/e2e/features/virtualhost_options/types.go @@ -6,10 +6,10 @@ import ( "net/http" "path/filepath" + "github.com/kgateway-dev/kgateway/test/gomega/matchers" + e2edefaults "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/defaults" "github.com/onsi/gomega" "github.com/onsi/gomega/gstruct" - "github.com/solo-io/gloo/test/gomega/matchers" - e2edefaults "github.com/solo-io/gloo/test/kubernetes/e2e/defaults" "github.com/solo-io/skv2/codegen/util" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" diff --git a/test/kubernetes/e2e/features/virtualhost_options/vhost_opt_suite.go b/test/kubernetes/e2e/features/virtualhost_options/vhost_opt_suite.go index 1b89e8dbe28..49c7d2a9ca0 100644 --- a/test/kubernetes/e2e/features/virtualhost_options/vhost_opt_suite.go +++ b/test/kubernetes/e2e/features/virtualhost_options/vhost_opt_suite.go @@ -10,13 +10,13 @@ import ( "github.com/onsi/gomega/gstruct" "github.com/stretchr/testify/suite" - "github.com/solo-io/gloo/pkg/utils/kubeutils" - "github.com/solo-io/gloo/pkg/utils/requestutils/curl" - "github.com/solo-io/gloo/projects/gloo/pkg/defaults" - "github.com/solo-io/gloo/test/gomega/matchers" - "github.com/solo-io/gloo/test/helpers" - "github.com/solo-io/gloo/test/kubernetes/e2e" - testdefaults "github.com/solo-io/gloo/test/kubernetes/e2e/defaults" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/defaults" + "github.com/kgateway-dev/kgateway/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/test/helpers" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + testdefaults "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/defaults" "github.com/solo-io/solo-kit/pkg/api/v1/clients" "github.com/solo-io/solo-kit/pkg/api/v1/resources" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" diff --git a/test/kubernetes/e2e/features/watch_namespace_selector/suite.go b/test/kubernetes/e2e/features/watch_namespace_selector/suite.go index b2657df81a1..dc830b035b2 100644 --- a/test/kubernetes/e2e/features/watch_namespace_selector/suite.go +++ b/test/kubernetes/e2e/features/watch_namespace_selector/suite.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/suite" - "github.com/solo-io/gloo/test/kubernetes/e2e" - "github.com/solo-io/gloo/test/kubernetes/e2e/tests/base" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/tests/base" ) var _ e2e.NewSuiteFunc = NewTestingSuite diff --git a/test/kubernetes/e2e/features/watch_namespace_selector/types.go b/test/kubernetes/e2e/features/watch_namespace_selector/types.go index 1ae11446279..fc7ac74eaea 100644 --- a/test/kubernetes/e2e/features/watch_namespace_selector/types.go +++ b/test/kubernetes/e2e/features/watch_namespace_selector/types.go @@ -5,13 +5,13 @@ package watch_namespace_selector import ( "path/filepath" - "github.com/solo-io/gloo/test/kubernetes/e2e/tests/base" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/tests/base" "github.com/solo-io/skv2/codegen/util" corev1 "k8s.io/api/core/v1" "sigs.k8s.io/controller-runtime/pkg/client" - gatewayv1 "github.com/solo-io/gloo/projects/gateway/pkg/api/v1/kube/apis/gateway.solo.io/v1" - e2edefaults "github.com/solo-io/gloo/test/kubernetes/e2e/defaults" + gatewayv1 "github.com/kgateway-dev/kgateway/projects/gateway/pkg/api/v1/kube/apis/gateway.solo.io/v1" + e2edefaults "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/defaults" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/test/kubernetes/e2e/features/zero_downtime_rollout/suite.go b/test/kubernetes/e2e/features/zero_downtime_rollout/suite.go index e5e4df6f04b..34d64a65206 100644 --- a/test/kubernetes/e2e/features/zero_downtime_rollout/suite.go +++ b/test/kubernetes/e2e/features/zero_downtime_rollout/suite.go @@ -10,12 +10,12 @@ import ( . "github.com/onsi/gomega" "github.com/stretchr/testify/suite" - "github.com/solo-io/gloo/pkg/utils/kubeutils" - "github.com/solo-io/gloo/pkg/utils/requestutils/curl" - testmatchers "github.com/solo-io/gloo/test/gomega/matchers" - "github.com/solo-io/gloo/test/kubernetes/e2e" - "github.com/solo-io/gloo/test/kubernetes/e2e/defaults" - "github.com/solo-io/gloo/test/kubernetes/e2e/tests/base" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" + testmatchers "github.com/kgateway-dev/kgateway/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/defaults" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/tests/base" ) type testingSuite struct { diff --git a/test/kubernetes/e2e/features/zero_downtime_rollout/types.go b/test/kubernetes/e2e/features/zero_downtime_rollout/types.go index b40aafa3f67..88873f593f0 100644 --- a/test/kubernetes/e2e/features/zero_downtime_rollout/types.go +++ b/test/kubernetes/e2e/features/zero_downtime_rollout/types.go @@ -5,8 +5,8 @@ package zero_downtime_rollout import ( "path/filepath" - "github.com/solo-io/gloo/test/kubernetes/e2e/defaults" - "github.com/solo-io/gloo/test/kubernetes/e2e/tests/base" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/defaults" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/tests/base" "sigs.k8s.io/controller-runtime/pkg/client" "github.com/solo-io/skv2/codegen/util" diff --git a/test/kubernetes/e2e/test.go b/test/kubernetes/e2e/test.go index 05a3a08c4b8..b632396b773 100644 --- a/test/kubernetes/e2e/test.go +++ b/test/kubernetes/e2e/test.go @@ -13,14 +13,14 @@ import ( "testing" "time" - "github.com/solo-io/gloo/test/helpers" - "github.com/solo-io/gloo/test/kubernetes/testutils/actions" - "github.com/solo-io/gloo/test/kubernetes/testutils/assertions" - "github.com/solo-io/gloo/test/kubernetes/testutils/cluster" - "github.com/solo-io/gloo/test/kubernetes/testutils/gloogateway" - "github.com/solo-io/gloo/test/kubernetes/testutils/helper" - testruntime "github.com/solo-io/gloo/test/kubernetes/testutils/runtime" - "github.com/solo-io/gloo/test/testutils" + "github.com/kgateway-dev/kgateway/test/helpers" + "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/actions" + "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/assertions" + "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/cluster" + "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/gloogateway" + "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/helper" + testruntime "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/runtime" + "github.com/kgateway-dev/kgateway/test/testutils" ) // MustTestHelper returns the SoloTestHelper used for e2e tests diff --git a/test/kubernetes/e2e/tests/automtls_istio_edge_api_test.go b/test/kubernetes/e2e/tests/automtls_istio_edge_api_test.go index ac54aebb5c0..aa24cf456c4 100644 --- a/test/kubernetes/e2e/tests/automtls_istio_edge_api_test.go +++ b/test/kubernetes/e2e/tests/automtls_istio_edge_api_test.go @@ -8,12 +8,12 @@ import ( "testing" "time" - "github.com/solo-io/gloo/pkg/utils/envutils" - "github.com/solo-io/gloo/test/testutils" + "github.com/kgateway-dev/kgateway/pkg/utils/envutils" + "github.com/kgateway-dev/kgateway/test/testutils" - "github.com/solo-io/gloo/test/kubernetes/e2e" - . "github.com/solo-io/gloo/test/kubernetes/e2e/tests" - "github.com/solo-io/gloo/test/kubernetes/testutils/gloogateway" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + . "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/tests" + "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/gloogateway" ) // TestAutomtlsIstioEdgeApisGateway is the function which executes a series of tests against a given installation where diff --git a/test/kubernetes/e2e/tests/automtls_istio_edge_api_tests.go b/test/kubernetes/e2e/tests/automtls_istio_edge_api_tests.go index c272e730410..d4eacd4d3dd 100644 --- a/test/kubernetes/e2e/tests/automtls_istio_edge_api_tests.go +++ b/test/kubernetes/e2e/tests/automtls_istio_edge_api_tests.go @@ -3,10 +3,10 @@ package tests import ( - "github.com/solo-io/gloo/test/kubernetes/e2e" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/headless_svc" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/istio" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/port_routing" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/headless_svc" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/istio" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/port_routing" ) func AutomtlsIstioEdgeApiSuiteRunner() e2e.SuiteRunner { diff --git a/test/kubernetes/e2e/tests/automtls_istio_test.go b/test/kubernetes/e2e/tests/automtls_istio_test.go index 63529fa8d7e..cddc9435bf5 100644 --- a/test/kubernetes/e2e/tests/automtls_istio_test.go +++ b/test/kubernetes/e2e/tests/automtls_istio_test.go @@ -8,11 +8,11 @@ import ( "testing" "time" - "github.com/solo-io/gloo/pkg/utils/envutils" - "github.com/solo-io/gloo/test/kubernetes/e2e" - . "github.com/solo-io/gloo/test/kubernetes/e2e/tests" - "github.com/solo-io/gloo/test/kubernetes/testutils/gloogateway" - "github.com/solo-io/gloo/test/testutils" + "github.com/kgateway-dev/kgateway/pkg/utils/envutils" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + . "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/tests" + "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/gloogateway" + "github.com/kgateway-dev/kgateway/test/testutils" ) // TestK8sGatewayIstioAutoMtls is the function which executes a series of tests against a given installation diff --git a/test/kubernetes/e2e/tests/automtls_istio_tests.go b/test/kubernetes/e2e/tests/automtls_istio_tests.go index f62d378d8ff..684940abac6 100644 --- a/test/kubernetes/e2e/tests/automtls_istio_tests.go +++ b/test/kubernetes/e2e/tests/automtls_istio_tests.go @@ -3,10 +3,10 @@ package tests import ( - "github.com/solo-io/gloo/test/kubernetes/e2e" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/headless_svc" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/istio" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/port_routing" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/headless_svc" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/istio" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/port_routing" ) func AutomtlsIstioSuiteRunner() e2e.SuiteRunner { diff --git a/test/kubernetes/e2e/tests/base/base_suite.go b/test/kubernetes/e2e/tests/base/base_suite.go index 8eeb3f5fab1..25c07695a2a 100644 --- a/test/kubernetes/e2e/tests/base/base_suite.go +++ b/test/kubernetes/e2e/tests/base/base_suite.go @@ -8,9 +8,9 @@ import ( "slices" "time" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/helper" "github.com/onsi/gomega" - "github.com/solo-io/gloo/test/kubernetes/e2e" - "github.com/solo-io/gloo/test/kubernetes/testutils/helper" "github.com/stretchr/testify/suite" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/test/kubernetes/e2e/tests/disabled_transformation_validation_test.go b/test/kubernetes/e2e/tests/disabled_transformation_validation_test.go index 0e1566ac0a4..f1813defbb8 100644 --- a/test/kubernetes/e2e/tests/disabled_transformation_validation_test.go +++ b/test/kubernetes/e2e/tests/disabled_transformation_validation_test.go @@ -8,11 +8,11 @@ import ( "testing" "time" - "github.com/solo-io/gloo/pkg/utils/envutils" - "github.com/solo-io/gloo/test/kubernetes/e2e" - . "github.com/solo-io/gloo/test/kubernetes/e2e/tests" - "github.com/solo-io/gloo/test/kubernetes/testutils/gloogateway" - "github.com/solo-io/gloo/test/testutils" + "github.com/kgateway-dev/kgateway/pkg/utils/envutils" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + . "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/tests" + "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/gloogateway" + "github.com/kgateway-dev/kgateway/test/testutils" ) // TestTransformationValidationDisabled is the function which executes a series of tests against a given diff --git a/test/kubernetes/e2e/tests/disabled_transformation_validation_tests.go b/test/kubernetes/e2e/tests/disabled_transformation_validation_tests.go index f0e223c7bc2..16df3dfa6aa 100644 --- a/test/kubernetes/e2e/tests/disabled_transformation_validation_tests.go +++ b/test/kubernetes/e2e/tests/disabled_transformation_validation_tests.go @@ -3,8 +3,8 @@ package tests import ( - "github.com/solo-io/gloo/test/kubernetes/e2e" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/validation/transformation_validation_disabled" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/validation/transformation_validation_disabled" ) func DisableTransformationValidationSuiteRunner() e2e.SuiteRunner { diff --git a/test/kubernetes/e2e/tests/discovery_watchlabels_test.go b/test/kubernetes/e2e/tests/discovery_watchlabels_test.go index 224381042bb..330d471f658 100644 --- a/test/kubernetes/e2e/tests/discovery_watchlabels_test.go +++ b/test/kubernetes/e2e/tests/discovery_watchlabels_test.go @@ -9,11 +9,11 @@ import ( "testing" "time" - "github.com/solo-io/gloo/pkg/utils/envutils" - "github.com/solo-io/gloo/test/kubernetes/e2e" - . "github.com/solo-io/gloo/test/kubernetes/e2e/tests" - "github.com/solo-io/gloo/test/kubernetes/testutils/gloogateway" - "github.com/solo-io/gloo/test/testutils" + "github.com/kgateway-dev/kgateway/pkg/utils/envutils" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + . "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/tests" + "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/gloogateway" + "github.com/kgateway-dev/kgateway/test/testutils" "github.com/solo-io/skv2/codegen/util" ) diff --git a/test/kubernetes/e2e/tests/discovery_watchlabels_tests.go b/test/kubernetes/e2e/tests/discovery_watchlabels_tests.go index 1d34ccef9c0..53e2b64cf69 100644 --- a/test/kubernetes/e2e/tests/discovery_watchlabels_tests.go +++ b/test/kubernetes/e2e/tests/discovery_watchlabels_tests.go @@ -3,8 +3,8 @@ package tests import ( - "github.com/solo-io/gloo/test/kubernetes/e2e" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/discovery_watchlabels" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/discovery_watchlabels" ) func DiscoveryWatchlabelsSuiteRunner() e2e.SuiteRunner { diff --git a/test/kubernetes/e2e/tests/edge_gw_test.go b/test/kubernetes/e2e/tests/edge_gw_test.go index 7bcc98c8c01..9d162f742b2 100644 --- a/test/kubernetes/e2e/tests/edge_gw_test.go +++ b/test/kubernetes/e2e/tests/edge_gw_test.go @@ -8,11 +8,11 @@ import ( "testing" "time" - "github.com/solo-io/gloo/pkg/utils/envutils" - "github.com/solo-io/gloo/test/kubernetes/e2e" - . "github.com/solo-io/gloo/test/kubernetes/e2e/tests" - "github.com/solo-io/gloo/test/kubernetes/testutils/gloogateway" - "github.com/solo-io/gloo/test/testutils" + "github.com/kgateway-dev/kgateway/pkg/utils/envutils" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + . "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/tests" + "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/gloogateway" + "github.com/kgateway-dev/kgateway/test/testutils" ) // TestGlooGatewayEdgeGateway is the function which executes a series of tests against a given installation where diff --git a/test/kubernetes/e2e/tests/edge_gw_tests.go b/test/kubernetes/e2e/tests/edge_gw_tests.go index 5c29200128d..cdf074422ab 100644 --- a/test/kubernetes/e2e/tests/edge_gw_tests.go +++ b/test/kubernetes/e2e/tests/edge_gw_tests.go @@ -3,15 +3,15 @@ package tests import ( - "github.com/solo-io/gloo/test/kubernetes/e2e" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/admin_server" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/basicrouting" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/client_tls" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/headless_svc" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/port_routing" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/tracing" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/validation/validation_allow_warnings" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/validation/validation_reject_invalid" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/admin_server" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/basicrouting" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/client_tls" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/headless_svc" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/port_routing" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/tracing" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/validation/validation_allow_warnings" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/validation/validation_reject_invalid" ) func EdgeGwSuiteRunner() e2e.SuiteRunner { diff --git a/test/kubernetes/e2e/tests/full_envoy_validation_test.go b/test/kubernetes/e2e/tests/full_envoy_validation_test.go index c79963f14f1..b8901ca4c85 100644 --- a/test/kubernetes/e2e/tests/full_envoy_validation_test.go +++ b/test/kubernetes/e2e/tests/full_envoy_validation_test.go @@ -8,11 +8,11 @@ import ( "testing" "time" - "github.com/solo-io/gloo/pkg/utils/envutils" - "github.com/solo-io/gloo/test/kubernetes/e2e" - . "github.com/solo-io/gloo/test/kubernetes/e2e/tests" - "github.com/solo-io/gloo/test/kubernetes/testutils/gloogateway" - "github.com/solo-io/gloo/test/testutils" + "github.com/kgateway-dev/kgateway/pkg/utils/envutils" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + . "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/tests" + "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/gloogateway" + "github.com/kgateway-dev/kgateway/test/testutils" ) // TestFullEnvoyValidation is the function which executes a series of tests against a given diff --git a/test/kubernetes/e2e/tests/full_envoy_validation_tests.go b/test/kubernetes/e2e/tests/full_envoy_validation_tests.go index dd53c0b2096..9f33b5794b1 100644 --- a/test/kubernetes/e2e/tests/full_envoy_validation_tests.go +++ b/test/kubernetes/e2e/tests/full_envoy_validation_tests.go @@ -3,9 +3,9 @@ package tests import ( - "github.com/solo-io/gloo/test/kubernetes/e2e" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/basicrouting" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/validation/full_envoy_validation" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/basicrouting" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/validation/full_envoy_validation" ) func FullEnvoyValidationSuiteRunner() e2e.SuiteRunner { diff --git a/test/kubernetes/e2e/tests/glooctl_edge_gw_test.go b/test/kubernetes/e2e/tests/glooctl_edge_gw_test.go index b0b93c7b1d7..8660dc22f62 100644 --- a/test/kubernetes/e2e/tests/glooctl_edge_gw_test.go +++ b/test/kubernetes/e2e/tests/glooctl_edge_gw_test.go @@ -8,11 +8,11 @@ import ( "testing" "time" - "github.com/solo-io/gloo/pkg/utils/envutils" - "github.com/solo-io/gloo/test/kubernetes/e2e" - . "github.com/solo-io/gloo/test/kubernetes/e2e/tests" - "github.com/solo-io/gloo/test/kubernetes/testutils/gloogateway" - "github.com/solo-io/gloo/test/testutils" + "github.com/kgateway-dev/kgateway/pkg/utils/envutils" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + . "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/tests" + "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/gloogateway" + "github.com/kgateway-dev/kgateway/test/testutils" ) // TestGlooctlGlooGatewayEdgeGateway is the function which executes a series of glooctl tests against a given diff --git a/test/kubernetes/e2e/tests/glooctl_edge_gw_tests.go b/test/kubernetes/e2e/tests/glooctl_edge_gw_tests.go index 82fb1419a44..c0261090476 100644 --- a/test/kubernetes/e2e/tests/glooctl_edge_gw_tests.go +++ b/test/kubernetes/e2e/tests/glooctl_edge_gw_tests.go @@ -3,8 +3,8 @@ package tests import ( - "github.com/solo-io/gloo/test/kubernetes/e2e" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/glooctl" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/glooctl" ) func GlooctlEdgeGwSuiteRunner() e2e.SuiteRunner { diff --git a/test/kubernetes/e2e/tests/glooctl_istio_inject_test.go b/test/kubernetes/e2e/tests/glooctl_istio_inject_test.go index de31b447e31..28b8e9ce63c 100644 --- a/test/kubernetes/e2e/tests/glooctl_istio_inject_test.go +++ b/test/kubernetes/e2e/tests/glooctl_istio_inject_test.go @@ -8,11 +8,11 @@ import ( "testing" "time" - "github.com/solo-io/gloo/pkg/utils/envutils" - "github.com/solo-io/gloo/test/kubernetes/e2e" - . "github.com/solo-io/gloo/test/kubernetes/e2e/tests" - "github.com/solo-io/gloo/test/kubernetes/testutils/gloogateway" - "github.com/solo-io/gloo/test/testutils" + "github.com/kgateway-dev/kgateway/pkg/utils/envutils" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + . "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/tests" + "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/gloogateway" + "github.com/kgateway-dev/kgateway/test/testutils" ) // TestGlooctlIstioInjectEdgeApiGateway is the function which executes a series of tests against a given installation where diff --git a/test/kubernetes/e2e/tests/glooctl_istio_inject_tests.go b/test/kubernetes/e2e/tests/glooctl_istio_inject_tests.go index 3e8a8c75c28..fd8525f281d 100644 --- a/test/kubernetes/e2e/tests/glooctl_istio_inject_tests.go +++ b/test/kubernetes/e2e/tests/glooctl_istio_inject_tests.go @@ -3,9 +3,9 @@ package tests import ( - "github.com/solo-io/gloo/test/kubernetes/e2e" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/glooctl" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/istio" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/glooctl" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/istio" ) func GlooctlIstioInjectSuiteRunner() e2e.SuiteRunner { diff --git a/test/kubernetes/e2e/tests/glooctl_k8s_gw_test.go b/test/kubernetes/e2e/tests/glooctl_k8s_gw_test.go index 8b452862625..ce557ce557c 100644 --- a/test/kubernetes/e2e/tests/glooctl_k8s_gw_test.go +++ b/test/kubernetes/e2e/tests/glooctl_k8s_gw_test.go @@ -8,11 +8,11 @@ import ( "testing" "time" - "github.com/solo-io/gloo/pkg/utils/envutils" - "github.com/solo-io/gloo/test/kubernetes/e2e" - . "github.com/solo-io/gloo/test/kubernetes/e2e/tests" - "github.com/solo-io/gloo/test/kubernetes/testutils/gloogateway" - "github.com/solo-io/gloo/test/testutils" + "github.com/kgateway-dev/kgateway/pkg/utils/envutils" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + . "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/tests" + "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/gloogateway" + "github.com/kgateway-dev/kgateway/test/testutils" ) // TestGlooctlK8sGateway is the function which executes a series of glooctl tests against a given installation with diff --git a/test/kubernetes/e2e/tests/glooctl_k8s_gw_tests.go b/test/kubernetes/e2e/tests/glooctl_k8s_gw_tests.go index 8e5227bbb07..08a37d9de32 100644 --- a/test/kubernetes/e2e/tests/glooctl_k8s_gw_tests.go +++ b/test/kubernetes/e2e/tests/glooctl_k8s_gw_tests.go @@ -3,8 +3,8 @@ package tests import ( - "github.com/solo-io/gloo/test/kubernetes/e2e" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/glooctl" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/glooctl" ) func GlooctlKubeGatewaySuiteRunner() e2e.SuiteRunner { diff --git a/test/kubernetes/e2e/tests/gloomtls_edge_api_test.go b/test/kubernetes/e2e/tests/gloomtls_edge_api_test.go index 9c192041192..6da00c6e6e1 100644 --- a/test/kubernetes/e2e/tests/gloomtls_edge_api_test.go +++ b/test/kubernetes/e2e/tests/gloomtls_edge_api_test.go @@ -8,11 +8,11 @@ import ( "testing" "time" - "github.com/solo-io/gloo/pkg/utils/envutils" - "github.com/solo-io/gloo/test/kubernetes/e2e" - . "github.com/solo-io/gloo/test/kubernetes/e2e/tests" - "github.com/solo-io/gloo/test/kubernetes/testutils/gloogateway" - "github.com/solo-io/gloo/test/testutils" + "github.com/kgateway-dev/kgateway/pkg/utils/envutils" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + . "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/tests" + "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/gloogateway" + "github.com/kgateway-dev/kgateway/test/testutils" ) // TestGloomtlsGatewayEdgeGateway is the function which executes a series of tests against a given installation where diff --git a/test/kubernetes/e2e/tests/gloomtls_edge_api_tests.go b/test/kubernetes/e2e/tests/gloomtls_edge_api_tests.go index 17b22e577ca..ee17625edb8 100644 --- a/test/kubernetes/e2e/tests/gloomtls_edge_api_tests.go +++ b/test/kubernetes/e2e/tests/gloomtls_edge_api_tests.go @@ -3,8 +3,8 @@ package tests import ( - "github.com/solo-io/gloo/test/kubernetes/e2e" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/gloomtls" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/gloomtls" ) func GloomtlsEdgeGwSuiteRunner() e2e.SuiteRunner { diff --git a/test/kubernetes/e2e/tests/helm_test.go b/test/kubernetes/e2e/tests/helm_test.go index 69d8e8007f4..1fd1fab7b95 100644 --- a/test/kubernetes/e2e/tests/helm_test.go +++ b/test/kubernetes/e2e/tests/helm_test.go @@ -8,11 +8,11 @@ import ( "testing" "time" - "github.com/solo-io/gloo/pkg/utils/envutils" - "github.com/solo-io/gloo/test/kubernetes/e2e" - . "github.com/solo-io/gloo/test/kubernetes/e2e/tests" - "github.com/solo-io/gloo/test/kubernetes/testutils/gloogateway" - "github.com/solo-io/gloo/test/testutils" + "github.com/kgateway-dev/kgateway/pkg/utils/envutils" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + . "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/tests" + "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/gloogateway" + "github.com/kgateway-dev/kgateway/test/testutils" ) // TestHelm is the function which executes a series of helm tests diff --git a/test/kubernetes/e2e/tests/helm_tests.go b/test/kubernetes/e2e/tests/helm_tests.go index 4b7494b7b7b..e950d1fe78e 100644 --- a/test/kubernetes/e2e/tests/helm_tests.go +++ b/test/kubernetes/e2e/tests/helm_tests.go @@ -3,9 +3,9 @@ package tests import ( - "github.com/solo-io/gloo/test/kubernetes/e2e" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/helm" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/helm_settings" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/helm" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/helm_settings" ) func HelmSuiteRunner() e2e.SuiteRunner { diff --git a/test/kubernetes/e2e/tests/istio_edge_api_test.go b/test/kubernetes/e2e/tests/istio_edge_api_test.go index 0ed781c6bfa..417deb52197 100644 --- a/test/kubernetes/e2e/tests/istio_edge_api_test.go +++ b/test/kubernetes/e2e/tests/istio_edge_api_test.go @@ -8,11 +8,11 @@ import ( "testing" "time" - "github.com/solo-io/gloo/pkg/utils/envutils" - "github.com/solo-io/gloo/test/kubernetes/e2e" - . "github.com/solo-io/gloo/test/kubernetes/e2e/tests" - "github.com/solo-io/gloo/test/kubernetes/testutils/gloogateway" - "github.com/solo-io/gloo/test/testutils" + "github.com/kgateway-dev/kgateway/pkg/utils/envutils" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + . "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/tests" + "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/gloogateway" + "github.com/kgateway-dev/kgateway/test/testutils" ) // TestIstioEdgeApiGateway is the function which executes a series of tests against a given installation where diff --git a/test/kubernetes/e2e/tests/istio_edge_api_tests.go b/test/kubernetes/e2e/tests/istio_edge_api_tests.go index f086b6d0808..567ea74e683 100644 --- a/test/kubernetes/e2e/tests/istio_edge_api_tests.go +++ b/test/kubernetes/e2e/tests/istio_edge_api_tests.go @@ -3,10 +3,10 @@ package tests import ( - "github.com/solo-io/gloo/test/kubernetes/e2e" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/headless_svc" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/istio" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/port_routing" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/headless_svc" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/istio" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/port_routing" ) func IstioEdgeApiSuiteRunner() e2e.SuiteRunner { diff --git a/test/kubernetes/e2e/tests/istio_regression_test.go b/test/kubernetes/e2e/tests/istio_regression_test.go index ffe35c26b21..be73505cd23 100644 --- a/test/kubernetes/e2e/tests/istio_regression_test.go +++ b/test/kubernetes/e2e/tests/istio_regression_test.go @@ -8,11 +8,11 @@ import ( "testing" "time" - "github.com/solo-io/gloo/pkg/utils/envutils" - "github.com/solo-io/gloo/test/kubernetes/e2e" - . "github.com/solo-io/gloo/test/kubernetes/e2e/tests" - "github.com/solo-io/gloo/test/kubernetes/testutils/gloogateway" - "github.com/solo-io/gloo/test/testutils" + "github.com/kgateway-dev/kgateway/pkg/utils/envutils" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + . "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/tests" + "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/gloogateway" + "github.com/kgateway-dev/kgateway/test/testutils" ) // TestIstioRegression is the function which executes a series of tests against a given installation where diff --git a/test/kubernetes/e2e/tests/istio_regression_tests.go b/test/kubernetes/e2e/tests/istio_regression_tests.go index a4025034a16..9e09cbf82f6 100644 --- a/test/kubernetes/e2e/tests/istio_regression_tests.go +++ b/test/kubernetes/e2e/tests/istio_regression_tests.go @@ -3,10 +3,10 @@ package tests import ( - "github.com/solo-io/gloo/test/kubernetes/e2e" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/headless_svc" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/istio" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/port_routing" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/headless_svc" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/istio" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/port_routing" ) func IstioRegressionSuiteRunner() e2e.SuiteRunner { diff --git a/test/kubernetes/e2e/tests/k8s_gw_aws_test.go b/test/kubernetes/e2e/tests/k8s_gw_aws_test.go index 507d5b4c493..b111b175561 100644 --- a/test/kubernetes/e2e/tests/k8s_gw_aws_test.go +++ b/test/kubernetes/e2e/tests/k8s_gw_aws_test.go @@ -8,11 +8,11 @@ import ( "testing" "time" - "github.com/solo-io/gloo/pkg/utils/envutils" - "github.com/solo-io/gloo/test/kubernetes/e2e" - . "github.com/solo-io/gloo/test/kubernetes/e2e/tests" - "github.com/solo-io/gloo/test/kubernetes/testutils/gloogateway" - "github.com/solo-io/gloo/test/testutils" + "github.com/kgateway-dev/kgateway/pkg/utils/envutils" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + . "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/tests" + "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/gloogateway" + "github.com/kgateway-dev/kgateway/test/testutils" ) // TestK8sGatewayAws is the function which executes a series of tests against a given installation diff --git a/test/kubernetes/e2e/tests/k8s_gw_aws_tests.go b/test/kubernetes/e2e/tests/k8s_gw_aws_tests.go index 713ab9d0675..6b2b27d1184 100644 --- a/test/kubernetes/e2e/tests/k8s_gw_aws_tests.go +++ b/test/kubernetes/e2e/tests/k8s_gw_aws_tests.go @@ -3,8 +3,8 @@ package tests import ( - "github.com/solo-io/gloo/test/kubernetes/e2e" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/deployer" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/deployer" ) func KubeGatewayAwsSuiteRunner() e2e.SuiteRunner { diff --git a/test/kubernetes/e2e/tests/k8s_gw_istio_test.go b/test/kubernetes/e2e/tests/k8s_gw_istio_test.go index 07d03b2affc..c459b611068 100644 --- a/test/kubernetes/e2e/tests/k8s_gw_istio_test.go +++ b/test/kubernetes/e2e/tests/k8s_gw_istio_test.go @@ -8,11 +8,11 @@ import ( "testing" "time" - "github.com/solo-io/gloo/pkg/utils/envutils" - "github.com/solo-io/gloo/test/kubernetes/e2e" - . "github.com/solo-io/gloo/test/kubernetes/e2e/tests" - "github.com/solo-io/gloo/test/kubernetes/testutils/gloogateway" - "github.com/solo-io/gloo/test/testutils" + "github.com/kgateway-dev/kgateway/pkg/utils/envutils" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + . "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/tests" + "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/gloogateway" + "github.com/kgateway-dev/kgateway/test/testutils" ) // TestK8sGatewayIstio is the function which executes a series of tests against a given installation diff --git a/test/kubernetes/e2e/tests/k8s_gw_istio_tests.go b/test/kubernetes/e2e/tests/k8s_gw_istio_tests.go index 0542b709f2a..dab2ec8fb4d 100644 --- a/test/kubernetes/e2e/tests/k8s_gw_istio_tests.go +++ b/test/kubernetes/e2e/tests/k8s_gw_istio_tests.go @@ -3,11 +3,11 @@ package tests import ( - "github.com/solo-io/gloo/test/kubernetes/e2e" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/deployer" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/headless_svc" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/istio" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/port_routing" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/deployer" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/headless_svc" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/istio" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/port_routing" ) func IstioSuiteRunner() e2e.SuiteRunner { diff --git a/test/kubernetes/e2e/tests/k8s_gw_minimal_default_gatewayparameters_test.go b/test/kubernetes/e2e/tests/k8s_gw_minimal_default_gatewayparameters_test.go index 239feddee7b..865a091200b 100644 --- a/test/kubernetes/e2e/tests/k8s_gw_minimal_default_gatewayparameters_test.go +++ b/test/kubernetes/e2e/tests/k8s_gw_minimal_default_gatewayparameters_test.go @@ -8,11 +8,11 @@ import ( "testing" "time" - "github.com/solo-io/gloo/pkg/utils/envutils" - "github.com/solo-io/gloo/test/kubernetes/e2e" - . "github.com/solo-io/gloo/test/kubernetes/e2e/tests" - "github.com/solo-io/gloo/test/kubernetes/testutils/gloogateway" - "github.com/solo-io/gloo/test/testutils" + "github.com/kgateway-dev/kgateway/pkg/utils/envutils" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + . "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/tests" + "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/gloogateway" + "github.com/kgateway-dev/kgateway/test/testutils" ) // TestK8sGatewayMinimalDefaultGatewayParameters is the function which executes a series of tests against a given installation diff --git a/test/kubernetes/e2e/tests/k8s_gw_minimal_default_gatewayparameters_tests.go b/test/kubernetes/e2e/tests/k8s_gw_minimal_default_gatewayparameters_tests.go index 93ee1c25ca7..fe8d05b7b5c 100644 --- a/test/kubernetes/e2e/tests/k8s_gw_minimal_default_gatewayparameters_tests.go +++ b/test/kubernetes/e2e/tests/k8s_gw_minimal_default_gatewayparameters_tests.go @@ -3,8 +3,8 @@ package tests import ( - "github.com/solo-io/gloo/test/kubernetes/e2e" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/deployer" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/deployer" ) func KubeGatewayMinimalDefaultGatewayParametersSuiteRunner() e2e.SuiteRunner { diff --git a/test/kubernetes/e2e/tests/k8s_gw_no_validation_test.go b/test/kubernetes/e2e/tests/k8s_gw_no_validation_test.go index 52540067df2..c0546361ce1 100644 --- a/test/kubernetes/e2e/tests/k8s_gw_no_validation_test.go +++ b/test/kubernetes/e2e/tests/k8s_gw_no_validation_test.go @@ -8,11 +8,11 @@ import ( "testing" "time" - "github.com/solo-io/gloo/pkg/utils/envutils" - "github.com/solo-io/gloo/test/kubernetes/e2e" - . "github.com/solo-io/gloo/test/kubernetes/e2e/tests" - "github.com/solo-io/gloo/test/kubernetes/testutils/gloogateway" - "github.com/solo-io/gloo/test/testutils" + "github.com/kgateway-dev/kgateway/pkg/utils/envutils" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + . "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/tests" + "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/gloogateway" + "github.com/kgateway-dev/kgateway/test/testutils" ) // TestK8sGatewayNoValidation executes tests against a K8s Gateway gloo install with validation disabled diff --git a/test/kubernetes/e2e/tests/k8s_gw_no_validation_tests.go b/test/kubernetes/e2e/tests/k8s_gw_no_validation_tests.go index 54cc1999c03..4d1bf6be1fe 100644 --- a/test/kubernetes/e2e/tests/k8s_gw_no_validation_tests.go +++ b/test/kubernetes/e2e/tests/k8s_gw_no_validation_tests.go @@ -3,11 +3,11 @@ package tests import ( - "github.com/solo-io/gloo/test/kubernetes/e2e" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/listener_options" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/port_routing" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/route_options" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/virtualhost_options" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/listener_options" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/port_routing" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/route_options" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/virtualhost_options" ) func KubeGatewayNoValidationSuiteRunner() e2e.SuiteRunner { diff --git a/test/kubernetes/e2e/tests/k8s_gw_test.go b/test/kubernetes/e2e/tests/k8s_gw_test.go index 2094ec703f1..24860a580f8 100644 --- a/test/kubernetes/e2e/tests/k8s_gw_test.go +++ b/test/kubernetes/e2e/tests/k8s_gw_test.go @@ -8,11 +8,11 @@ import ( "testing" "time" - "github.com/solo-io/gloo/pkg/utils/envutils" - "github.com/solo-io/gloo/test/kubernetes/e2e" - . "github.com/solo-io/gloo/test/kubernetes/e2e/tests" - "github.com/solo-io/gloo/test/kubernetes/testutils/gloogateway" - "github.com/solo-io/gloo/test/testutils" + "github.com/kgateway-dev/kgateway/pkg/utils/envutils" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + . "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/tests" + "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/gloogateway" + "github.com/kgateway-dev/kgateway/test/testutils" ) // TestK8sGateway is the function which executes a series of tests against a given installation diff --git a/test/kubernetes/e2e/tests/k8s_gw_tests.go b/test/kubernetes/e2e/tests/k8s_gw_tests.go index 036d2d34868..1afd51c451a 100644 --- a/test/kubernetes/e2e/tests/k8s_gw_tests.go +++ b/test/kubernetes/e2e/tests/k8s_gw_tests.go @@ -3,22 +3,22 @@ package tests import ( - "github.com/solo-io/gloo/test/kubernetes/e2e" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/admin_server" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/crd_categories" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/deployer" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/directresponse" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/headless_svc" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/http_listener_options" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/listener_options" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/metrics" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/port_routing" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/route_delegation" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/route_options" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/services/httproute" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/services/tcproute" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/upstreams" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/virtualhost_options" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/admin_server" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/crd_categories" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/deployer" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/directresponse" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/headless_svc" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/http_listener_options" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/listener_options" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/metrics" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/port_routing" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/route_delegation" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/route_options" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/services/httproute" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/services/tcproute" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/upstreams" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/virtualhost_options" ) func KubeGatewaySuiteRunner() e2e.SuiteRunner { diff --git a/test/kubernetes/e2e/tests/revision_istio_edge_gw_test.go b/test/kubernetes/e2e/tests/revision_istio_edge_gw_test.go index 469860331dd..9d8e974be5a 100644 --- a/test/kubernetes/e2e/tests/revision_istio_edge_gw_test.go +++ b/test/kubernetes/e2e/tests/revision_istio_edge_gw_test.go @@ -8,11 +8,11 @@ import ( "testing" "time" - "github.com/solo-io/gloo/pkg/utils/envutils" - "github.com/solo-io/gloo/test/kubernetes/e2e" - . "github.com/solo-io/gloo/test/kubernetes/e2e/tests" - "github.com/solo-io/gloo/test/kubernetes/testutils/gloogateway" - "github.com/solo-io/gloo/test/testutils" + "github.com/kgateway-dev/kgateway/pkg/utils/envutils" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + . "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/tests" + "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/gloogateway" + "github.com/kgateway-dev/kgateway/test/testutils" ) // TestRevisionIstioRegression is the function which executes a series of tests against a given installation where diff --git a/test/kubernetes/e2e/tests/revision_istio_edge_gw_tests.go b/test/kubernetes/e2e/tests/revision_istio_edge_gw_tests.go index 7b1085f9beb..cfe8c05c6fc 100644 --- a/test/kubernetes/e2e/tests/revision_istio_edge_gw_tests.go +++ b/test/kubernetes/e2e/tests/revision_istio_edge_gw_tests.go @@ -3,8 +3,8 @@ package tests import ( - "github.com/solo-io/gloo/test/kubernetes/e2e" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/istio" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/istio" ) func RevisionIstioEdgeGatewaySuiteRunner() e2e.SuiteRunner { diff --git a/test/kubernetes/e2e/tests/revision_istio_k8s_gw_test.go b/test/kubernetes/e2e/tests/revision_istio_k8s_gw_test.go index e4964fede4e..95023036e21 100644 --- a/test/kubernetes/e2e/tests/revision_istio_k8s_gw_test.go +++ b/test/kubernetes/e2e/tests/revision_istio_k8s_gw_test.go @@ -8,11 +8,11 @@ import ( "testing" "time" - "github.com/solo-io/gloo/pkg/utils/envutils" - "github.com/solo-io/gloo/test/kubernetes/e2e" - . "github.com/solo-io/gloo/test/kubernetes/e2e/tests" - "github.com/solo-io/gloo/test/kubernetes/testutils/gloogateway" - "github.com/solo-io/gloo/test/testutils" + "github.com/kgateway-dev/kgateway/pkg/utils/envutils" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + . "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/tests" + "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/gloogateway" + "github.com/kgateway-dev/kgateway/test/testutils" ) // TestK8sGatewayIstioRevision is the function which executes a series of tests against a given installation with diff --git a/test/kubernetes/e2e/tests/revision_istio_k8s_gw_tests.go b/test/kubernetes/e2e/tests/revision_istio_k8s_gw_tests.go index 70a1367fde4..7206a6b5e1a 100644 --- a/test/kubernetes/e2e/tests/revision_istio_k8s_gw_tests.go +++ b/test/kubernetes/e2e/tests/revision_istio_k8s_gw_tests.go @@ -3,8 +3,8 @@ package tests import ( - "github.com/solo-io/gloo/test/kubernetes/e2e" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/istio" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/istio" ) func RevisionIstioK8sGatewaySuiteRunner() e2e.SuiteRunner { diff --git a/test/kubernetes/e2e/tests/upgrade_test.go b/test/kubernetes/e2e/tests/upgrade_test.go index e230e6dfad7..814656e665b 100644 --- a/test/kubernetes/e2e/tests/upgrade_test.go +++ b/test/kubernetes/e2e/tests/upgrade_test.go @@ -9,10 +9,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/solo-io/gloo/test/kubernetes/e2e" - . "github.com/solo-io/gloo/test/kubernetes/e2e/tests" - "github.com/solo-io/gloo/test/kubernetes/testutils/gloogateway" - "github.com/solo-io/gloo/test/kubernetes/testutils/helper" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + . "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/tests" + "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/gloogateway" + "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/helper" ) // The upgrade tests delegate the installs, upgrades and deletions to each individual test within the suite diff --git a/test/kubernetes/e2e/tests/upgrade_tests.go b/test/kubernetes/e2e/tests/upgrade_tests.go index 3d5df5b2b60..23e2bd57f33 100644 --- a/test/kubernetes/e2e/tests/upgrade_tests.go +++ b/test/kubernetes/e2e/tests/upgrade_tests.go @@ -3,8 +3,8 @@ package tests import ( - "github.com/solo-io/gloo/test/kubernetes/e2e" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/upgrade" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/upgrade" ) func UpgradeSuiteRunner() e2e.SuiteRunner { diff --git a/test/kubernetes/e2e/tests/validation_always_accept_test.go b/test/kubernetes/e2e/tests/validation_always_accept_test.go index 4544179ea6e..b3ed779b328 100644 --- a/test/kubernetes/e2e/tests/validation_always_accept_test.go +++ b/test/kubernetes/e2e/tests/validation_always_accept_test.go @@ -8,11 +8,11 @@ import ( "testing" "time" - "github.com/solo-io/gloo/pkg/utils/envutils" - "github.com/solo-io/gloo/test/kubernetes/e2e" - . "github.com/solo-io/gloo/test/kubernetes/e2e/tests" - "github.com/solo-io/gloo/test/kubernetes/testutils/gloogateway" - "github.com/solo-io/gloo/test/testutils" + "github.com/kgateway-dev/kgateway/pkg/utils/envutils" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + . "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/tests" + "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/gloogateway" + "github.com/kgateway-dev/kgateway/test/testutils" ) // TestValidationAlwaysAccept is the function which executes a series of tests against a given diff --git a/test/kubernetes/e2e/tests/validation_always_accept_tests.go b/test/kubernetes/e2e/tests/validation_always_accept_tests.go index d1cb7775c8c..824dc836561 100644 --- a/test/kubernetes/e2e/tests/validation_always_accept_tests.go +++ b/test/kubernetes/e2e/tests/validation_always_accept_tests.go @@ -3,10 +3,10 @@ package tests import ( - "github.com/solo-io/gloo/test/kubernetes/e2e" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/server_tls" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/validation/validation_allow_warnings" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/validation/validation_always_accept" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/server_tls" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/validation/validation_allow_warnings" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/validation/validation_always_accept" ) func ValidationAlwaysAcceptSuiteRunner() e2e.SuiteRunner { diff --git a/test/kubernetes/e2e/tests/validation_strict_test.go b/test/kubernetes/e2e/tests/validation_strict_test.go index 5a2d25a27e0..b58115875ed 100644 --- a/test/kubernetes/e2e/tests/validation_strict_test.go +++ b/test/kubernetes/e2e/tests/validation_strict_test.go @@ -8,11 +8,11 @@ import ( "testing" "time" - "github.com/solo-io/gloo/pkg/utils/envutils" - "github.com/solo-io/gloo/test/kubernetes/e2e" - . "github.com/solo-io/gloo/test/kubernetes/e2e/tests" - "github.com/solo-io/gloo/test/kubernetes/testutils/gloogateway" - "github.com/solo-io/gloo/test/testutils" + "github.com/kgateway-dev/kgateway/pkg/utils/envutils" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + . "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/tests" + "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/gloogateway" + "github.com/kgateway-dev/kgateway/test/testutils" ) // TestValidationStrict is the function which executes a series of tests against a given diff --git a/test/kubernetes/e2e/tests/validation_strict_tests.go b/test/kubernetes/e2e/tests/validation_strict_tests.go index db1df458e48..95573fd2ab2 100644 --- a/test/kubernetes/e2e/tests/validation_strict_tests.go +++ b/test/kubernetes/e2e/tests/validation_strict_tests.go @@ -3,10 +3,10 @@ package tests import ( - "github.com/solo-io/gloo/test/kubernetes/e2e" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/validation/split_webhook" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/validation/validation_reject_invalid" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/validation/validation_strict_warnings" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/validation/split_webhook" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/validation/validation_reject_invalid" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/validation/validation_strict_warnings" ) // ValidationStrictSuiteRunnerAll is used to run all the validation tests, including ones that depend on the helm chart/values/helpers diff --git a/test/kubernetes/e2e/tests/watch_namespace_selector_test.go b/test/kubernetes/e2e/tests/watch_namespace_selector_test.go index f63022dec66..790a74b8df0 100644 --- a/test/kubernetes/e2e/tests/watch_namespace_selector_test.go +++ b/test/kubernetes/e2e/tests/watch_namespace_selector_test.go @@ -8,11 +8,11 @@ import ( "testing" "time" - "github.com/solo-io/gloo/pkg/utils/envutils" - "github.com/solo-io/gloo/test/kubernetes/e2e" - . "github.com/solo-io/gloo/test/kubernetes/e2e/tests" - "github.com/solo-io/gloo/test/kubernetes/testutils/gloogateway" - "github.com/solo-io/gloo/test/testutils" + "github.com/kgateway-dev/kgateway/pkg/utils/envutils" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + . "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/tests" + "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/gloogateway" + "github.com/kgateway-dev/kgateway/test/testutils" ) func TestWatchNamespaceSelector(t *testing.T) { diff --git a/test/kubernetes/e2e/tests/watch_namespace_selector_tests.go b/test/kubernetes/e2e/tests/watch_namespace_selector_tests.go index 16b8eb9da87..80c9d805f12 100644 --- a/test/kubernetes/e2e/tests/watch_namespace_selector_tests.go +++ b/test/kubernetes/e2e/tests/watch_namespace_selector_tests.go @@ -3,8 +3,8 @@ package tests import ( - "github.com/solo-io/gloo/test/kubernetes/e2e" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/watch_namespace_selector" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/watch_namespace_selector" ) func WatchNamespaceSelectorSuiteRunner() e2e.SuiteRunner { diff --git a/test/kubernetes/e2e/tests/zero_downtime_test.go b/test/kubernetes/e2e/tests/zero_downtime_test.go index 5b13d0f1c3e..da86972c2f6 100644 --- a/test/kubernetes/e2e/tests/zero_downtime_test.go +++ b/test/kubernetes/e2e/tests/zero_downtime_test.go @@ -8,11 +8,11 @@ import ( "testing" "time" - "github.com/solo-io/gloo/pkg/utils/envutils" - "github.com/solo-io/gloo/test/kubernetes/e2e" - . "github.com/solo-io/gloo/test/kubernetes/e2e/tests" - "github.com/solo-io/gloo/test/kubernetes/testutils/gloogateway" - "github.com/solo-io/gloo/test/testutils" + "github.com/kgateway-dev/kgateway/pkg/utils/envutils" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + . "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/tests" + "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/gloogateway" + "github.com/kgateway-dev/kgateway/test/testutils" ) func TestZeroDowntimeRollout(t *testing.T) { diff --git a/test/kubernetes/e2e/tests/zero_downtime_tests.go b/test/kubernetes/e2e/tests/zero_downtime_tests.go index 198388ce836..6cd681ac9f5 100644 --- a/test/kubernetes/e2e/tests/zero_downtime_tests.go +++ b/test/kubernetes/e2e/tests/zero_downtime_tests.go @@ -3,8 +3,8 @@ package tests import ( - "github.com/solo-io/gloo/test/kubernetes/e2e" - "github.com/solo-io/gloo/test/kubernetes/e2e/features/zero_downtime_rollout" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/zero_downtime_rollout" ) func ZeroDowntimeRolloutSuiteRunner() e2e.SuiteRunner { diff --git a/test/kubernetes/testutils/actions/provider.go b/test/kubernetes/testutils/actions/provider.go index a4e674e1a80..f068647f82a 100644 --- a/test/kubernetes/testutils/actions/provider.go +++ b/test/kubernetes/testutils/actions/provider.go @@ -3,11 +3,11 @@ package actions import ( - "github.com/solo-io/gloo/pkg/utils/helmutils" - "github.com/solo-io/gloo/pkg/utils/kubeutils/kubectl" - "github.com/solo-io/gloo/projects/gloo/cli/pkg/testutils" - "github.com/solo-io/gloo/test/kubernetes/testutils/cluster" - "github.com/solo-io/gloo/test/kubernetes/testutils/gloogateway" + "github.com/kgateway-dev/kgateway/pkg/utils/helmutils" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils/kubectl" + "github.com/kgateway-dev/kgateway/projects/gloo/cli/pkg/testutils" + "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/cluster" + "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/gloogateway" ) // Provider is the entity that creates actions. diff --git a/test/kubernetes/testutils/assertions/curl.go b/test/kubernetes/testutils/assertions/curl.go index 4416af238f2..4fad81e0033 100644 --- a/test/kubernetes/testutils/assertions/curl.go +++ b/test/kubernetes/testutils/assertions/curl.go @@ -13,13 +13,13 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/solo-io/gloo/pkg/utils/kubeutils" - "github.com/solo-io/gloo/pkg/utils/kubeutils/kubectl" - "github.com/solo-io/gloo/pkg/utils/requestutils/curl" - "github.com/solo-io/gloo/test/gomega/matchers" - "github.com/solo-io/gloo/test/gomega/transforms" - "github.com/solo-io/gloo/test/kube2e/helper" - e2edefaults "github.com/solo-io/gloo/test/kubernetes/e2e/defaults" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils/kubectl" + "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" + "github.com/kgateway-dev/kgateway/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/test/gomega/transforms" + "github.com/kgateway-dev/kgateway/test/kube2e/helper" + e2edefaults "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/defaults" ) const ( diff --git a/test/kubernetes/testutils/assertions/deployments.go b/test/kubernetes/testutils/assertions/deployments.go index 919a3b8334d..4016a582d28 100644 --- a/test/kubernetes/testutils/assertions/deployments.go +++ b/test/kubernetes/testutils/assertions/deployments.go @@ -6,8 +6,8 @@ import ( "context" "time" - "github.com/solo-io/gloo/pkg/utils/kubeutils" - "github.com/solo-io/gloo/test/gomega/assertions" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/test/gomega/assertions" "github.com/solo-io/go-utils/stats" diff --git a/test/kubernetes/testutils/assertions/envoy.go b/test/kubernetes/testutils/assertions/envoy.go index 50c88062eef..38d3941df0b 100644 --- a/test/kubernetes/testutils/assertions/envoy.go +++ b/test/kubernetes/testutils/assertions/envoy.go @@ -11,10 +11,10 @@ import ( . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/solo-io/gloo/pkg/utils/envoyutils/admincli" - "github.com/solo-io/gloo/pkg/utils/kubeutils/portforward" - "github.com/solo-io/gloo/pkg/utils/requestutils/curl" - "github.com/solo-io/gloo/projects/gloo/pkg/defaults" + "github.com/kgateway-dev/kgateway/pkg/utils/envoyutils/admincli" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils/portforward" + "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/defaults" ) func (p *Provider) AssertEnvoyAdminApi( @@ -35,7 +35,7 @@ func (p *Provider) AssertEnvoyAdminApi( portForwarder.WaitForStop() }() - // the port-forward returns before it completely starts up (https://github.com/solo-io/gloo/issues/9353), + // the port-forward returns before it completely starts up (https://github.com/kgateway-dev/kgateway/issues/9353), // so as a workaround we try to keep dialing the address until it succeeds p.Gomega.Eventually(func(g Gomega) { _, err = net.Dial("tcp", portForwarder.Address()) diff --git a/test/kubernetes/testutils/assertions/gloo.go b/test/kubernetes/testutils/assertions/gloo.go index 63694dbb0b1..53dbc2995db 100644 --- a/test/kubernetes/testutils/assertions/gloo.go +++ b/test/kubernetes/testutils/assertions/gloo.go @@ -8,13 +8,13 @@ import ( "net" "time" + "github.com/kgateway-dev/kgateway/pkg/utils/glooadminutils/admincli" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils/portforward" + "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" + "github.com/kgateway-dev/kgateway/projects/gateway2/admin" "github.com/onsi/gomega" . "github.com/onsi/gomega" "github.com/onsi/gomega/types" - "github.com/solo-io/gloo/pkg/utils/glooadminutils/admincli" - "github.com/solo-io/gloo/pkg/utils/kubeutils/portforward" - "github.com/solo-io/gloo/pkg/utils/requestutils/curl" - "github.com/solo-io/gloo/projects/gateway2/admin" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" ) @@ -37,7 +37,7 @@ func (p *Provider) AssertGlooAdminApi( portForwarder.WaitForStop() }() - // the port-forward returns before it completely starts up (https://github.com/solo-io/gloo/issues/9353), + // the port-forward returns before it completely starts up (https://github.com/kgateway-dev/kgateway/issues/9353), // so as a workaround we try to keep dialing the address until it succeeds p.Gomega.Eventually(func(g Gomega) { _, err = net.Dial("tcp", portForwarder.Address()) diff --git a/test/kubernetes/testutils/assertions/glooctl.go b/test/kubernetes/testutils/assertions/glooctl.go index f7e8369d461..753c329a8bc 100644 --- a/test/kubernetes/testutils/assertions/glooctl.go +++ b/test/kubernetes/testutils/assertions/glooctl.go @@ -9,10 +9,10 @@ import ( . "github.com/onsi/gomega" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" - "github.com/solo-io/gloo/projects/gloo/cli/pkg/cmd/check" - "github.com/solo-io/gloo/projects/gloo/cli/pkg/cmd/options" - "github.com/solo-io/gloo/projects/gloo/cli/pkg/cmd/version" - "github.com/solo-io/gloo/projects/gloo/cli/pkg/printers" + "github.com/kgateway-dev/kgateway/projects/gloo/cli/pkg/cmd/check" + "github.com/kgateway-dev/kgateway/projects/gloo/cli/pkg/cmd/options" + "github.com/kgateway-dev/kgateway/projects/gloo/cli/pkg/cmd/version" + "github.com/kgateway-dev/kgateway/projects/gloo/cli/pkg/printers" ) // EventuallyCheckResourcesOk asserts that `glooctl check` eventually responds Ok diff --git a/test/kubernetes/testutils/assertions/objects.go b/test/kubernetes/testutils/assertions/objects.go index cd835785049..92ad0f6a705 100644 --- a/test/kubernetes/testutils/assertions/objects.go +++ b/test/kubernetes/testutils/assertions/objects.go @@ -10,8 +10,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "github.com/kgateway-dev/kgateway/test/helpers" . "github.com/onsi/gomega" - "github.com/solo-io/gloo/test/helpers" "github.com/solo-io/solo-kit/pkg/errors" apierrors "k8s.io/apimachinery/pkg/api/errors" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/test/kubernetes/testutils/assertions/pods.go b/test/kubernetes/testutils/assertions/pods.go index 323e3ad892d..dc6dfd76a6d 100644 --- a/test/kubernetes/testutils/assertions/pods.go +++ b/test/kubernetes/testutils/assertions/pods.go @@ -7,10 +7,10 @@ import ( "fmt" "time" + "github.com/kgateway-dev/kgateway/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/test/kube2e/helper" "github.com/onsi/gomega" "github.com/onsi/gomega/types" - "github.com/solo-io/gloo/test/gomega/matchers" - "github.com/solo-io/gloo/test/kube2e/helper" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/test/kubernetes/testutils/assertions/provider.go b/test/kubernetes/testutils/assertions/provider.go index 19c5c01b5a9..6707c2b0ba4 100644 --- a/test/kubernetes/testutils/assertions/provider.go +++ b/test/kubernetes/testutils/assertions/provider.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/solo-io/gloo/test/kubernetes/testutils/cluster" - "github.com/solo-io/gloo/test/kubernetes/testutils/gloogateway" + "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/cluster" + "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/gloogateway" ) // Provider is the entity that provides methods which assert behaviors of a Kubernetes Cluster diff --git a/test/kubernetes/testutils/assertions/resources.go b/test/kubernetes/testutils/assertions/resources.go index b217e8de87c..77ec328afc9 100644 --- a/test/kubernetes/testutils/assertions/resources.go +++ b/test/kubernetes/testutils/assertions/resources.go @@ -6,10 +6,10 @@ import ( "context" "time" + "github.com/kgateway-dev/kgateway/test/helpers" + "github.com/kgateway-dev/kgateway/test/kube2e/helper" "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega" - "github.com/solo-io/gloo/test/helpers" - "github.com/solo-io/gloo/test/kube2e/helper" ) func (p *Provider) EventuallyResourceExists(getter helpers.ResourceGetter, timeout ...time.Duration) { diff --git a/test/kubernetes/testutils/assertions/status.go b/test/kubernetes/testutils/assertions/status.go index 445674a0115..7cf44757a3c 100644 --- a/test/kubernetes/testutils/assertions/status.go +++ b/test/kubernetes/testutils/assertions/status.go @@ -7,13 +7,13 @@ import ( "fmt" "time" + "github.com/kgateway-dev/kgateway/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/test/helpers" + "github.com/kgateway-dev/kgateway/test/kube2e/helper" "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega" "github.com/onsi/gomega/gstruct" errors "github.com/rotisserie/eris" - "github.com/solo-io/gloo/test/gomega/matchers" - "github.com/solo-io/gloo/test/helpers" - "github.com/solo-io/gloo/test/kube2e/helper" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/test/kubernetes/testutils/clients/clients.go b/test/kubernetes/testutils/clients/clients.go index e712460498f..32b79c99f77 100644 --- a/test/kubernetes/testutils/clients/clients.go +++ b/test/kubernetes/testutils/clients/clients.go @@ -3,7 +3,7 @@ package clients import ( - "github.com/solo-io/gloo/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" "k8s.io/client-go/kubernetes" ) diff --git a/test/kubernetes/testutils/clients/rest_config.go b/test/kubernetes/testutils/clients/rest_config.go index 8dd14c30f58..844a883b0d6 100644 --- a/test/kubernetes/testutils/clients/rest_config.go +++ b/test/kubernetes/testutils/clients/rest_config.go @@ -5,7 +5,7 @@ package clients import ( "k8s.io/client-go/rest" - "github.com/solo-io/gloo/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" ) // MustRestConfig returns MustRestConfigWithContext with an empty Kubernetes Context diff --git a/test/kubernetes/testutils/cluster/context.go b/test/kubernetes/testutils/cluster/context.go index 12ddfb8d803..0bda142127a 100644 --- a/test/kubernetes/testutils/cluster/context.go +++ b/test/kubernetes/testutils/cluster/context.go @@ -7,7 +7,7 @@ import ( "k8s.io/client-go/rest" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/solo-io/gloo/pkg/utils/kubeutils/kubectl" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils/kubectl" ) // Context contains the metadata about a Kubernetes cluster diff --git a/test/kubernetes/testutils/cluster/istio.go b/test/kubernetes/testutils/cluster/istio.go index 7a5eb85aac8..884520bb69f 100644 --- a/test/kubernetes/testutils/cluster/istio.go +++ b/test/kubernetes/testutils/cluster/istio.go @@ -11,9 +11,9 @@ import ( "path/filepath" "runtime" + glooruntime "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/runtime" + "github.com/kgateway-dev/kgateway/test/testutils" "github.com/rotisserie/eris" - glooruntime "github.com/solo-io/gloo/test/kubernetes/testutils/runtime" - "github.com/solo-io/gloo/test/testutils" "github.com/solo-io/go-utils/contextutils" ) diff --git a/test/kubernetes/testutils/cluster/kind.go b/test/kubernetes/testutils/cluster/kind.go index 5c587f94e0f..845787051e3 100644 --- a/test/kubernetes/testutils/cluster/kind.go +++ b/test/kubernetes/testutils/cluster/kind.go @@ -6,7 +6,7 @@ import ( "fmt" "os" - "github.com/solo-io/gloo/pkg/schemes" + "github.com/kgateway-dev/kgateway/pkg/schemes" "k8s.io/apimachinery/pkg/runtime" @@ -15,8 +15,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" - "github.com/solo-io/gloo/pkg/utils/kubeutils" - "github.com/solo-io/gloo/pkg/utils/kubeutils/kubectl" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils/kubectl" ) // MustKindContext returns the Context for a KinD cluster with the given name diff --git a/test/kubernetes/testutils/gloogateway/clients.go b/test/kubernetes/testutils/gloogateway/clients.go index 2822f338596..0cff2b94fae 100644 --- a/test/kubernetes/testutils/gloogateway/clients.go +++ b/test/kubernetes/testutils/gloogateway/clients.go @@ -5,11 +5,11 @@ package gloogateway import ( "context" - v1alpha1 "github.com/solo-io/gloo/projects/gloo/pkg/api/external/solo/ratelimit" - v1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1" + v1alpha1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/external/solo/ratelimit" + v1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" - gatewayv1 "github.com/solo-io/gloo/projects/gateway/pkg/api/v1" - "github.com/solo-io/gloo/test/kubernetes/testutils/cluster" + gatewayv1 "github.com/kgateway-dev/kgateway/projects/gateway/pkg/api/v1" + "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/cluster" "github.com/solo-io/solo-kit/pkg/api/external/kubernetes/service" "github.com/solo-io/solo-kit/pkg/api/v1/clients/factory" diff --git a/test/kubernetes/testutils/gloogateway/context.go b/test/kubernetes/testutils/gloogateway/context.go index 4b7ee1b5243..251c8139f87 100644 --- a/test/kubernetes/testutils/gloogateway/context.go +++ b/test/kubernetes/testutils/gloogateway/context.go @@ -3,8 +3,8 @@ package gloogateway import ( + "github.com/kgateway-dev/kgateway/test/testutils" "github.com/rotisserie/eris" - "github.com/solo-io/gloo/test/testutils" ) // Context contains the set of properties for a given installation of Gloo Gateway diff --git a/test/kubernetes/testutils/helper/install.go b/test/kubernetes/testutils/helper/install.go index 1958dd8ded8..30c50062140 100644 --- a/test/kubernetes/testutils/helper/install.go +++ b/test/kubernetes/testutils/helper/install.go @@ -17,10 +17,10 @@ import ( "github.com/pkg/errors" "github.com/spf13/afero" + "github.com/kgateway-dev/kgateway/pkg/utils/fsutils" + "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils/kubectl" + test_runtime "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/runtime" "github.com/rotisserie/eris" - "github.com/solo-io/gloo/pkg/utils/fsutils" - "github.com/solo-io/gloo/pkg/utils/kubeutils/kubectl" - test_runtime "github.com/solo-io/gloo/test/kubernetes/testutils/runtime" "github.com/solo-io/go-utils/log" "github.com/solo-io/go-utils/testutils/exec" ) diff --git a/test/kubernetes/testutils/helper/util.go b/test/kubernetes/testutils/helper/util.go index c069e310964..d3d2f89d4d5 100644 --- a/test/kubernetes/testutils/helper/util.go +++ b/test/kubernetes/testutils/helper/util.go @@ -12,10 +12,10 @@ import ( "time" "github.com/google/go-github/v32/github" + "github.com/kgateway-dev/kgateway/test/testutils" + "github.com/kgateway-dev/kgateway/test/testutils/version" . "github.com/onsi/gomega" errors "github.com/rotisserie/eris" - "github.com/solo-io/gloo/test/testutils" - "github.com/solo-io/gloo/test/testutils/version" "github.com/solo-io/go-utils/changelogutils" "github.com/solo-io/go-utils/githubutils" "github.com/solo-io/go-utils/versionutils" diff --git a/test/kubernetes/testutils/runtime/context.go b/test/kubernetes/testutils/runtime/context.go index 07e6d4a10db..0fb9607507d 100644 --- a/test/kubernetes/testutils/runtime/context.go +++ b/test/kubernetes/testutils/runtime/context.go @@ -5,9 +5,9 @@ package runtime import ( "os" - "github.com/solo-io/gloo/pkg/utils/envutils" + "github.com/kgateway-dev/kgateway/pkg/utils/envutils" - "github.com/solo-io/gloo/test/testutils" + "github.com/kgateway-dev/kgateway/test/testutils" ) // Context contains the set of properties that are defined at runtime by whoever is invoking tests. diff --git a/test/kubernetes/testutils/runtime/output.go b/test/kubernetes/testutils/runtime/output.go index 18eb0d7484b..b193cf57aa0 100644 --- a/test/kubernetes/testutils/runtime/output.go +++ b/test/kubernetes/testutils/runtime/output.go @@ -5,7 +5,7 @@ package runtime import ( "path/filepath" - "github.com/solo-io/gloo/test/testutils" + "github.com/kgateway-dev/kgateway/test/testutils" ) // PathToBugReport returns the absolute path to the directory where the bug_report will be stored diff --git a/test/mocks/gloo/validation_client.go b/test/mocks/gloo/validation_client.go index 20c9267c172..7e35972d9d6 100644 --- a/test/mocks/gloo/validation_client.go +++ b/test/mocks/gloo/validation_client.go @@ -1,7 +1,7 @@ //go:build ignore // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/solo-io/gloo/projects/gloo/pkg/api/grpc/validation (interfaces: GlooValidationServiceClient) +// Source: github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/grpc/validation (interfaces: GlooValidationServiceClient) // Package mock_validation is a generated GoMock package. package mock_validation @@ -11,7 +11,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - validation "github.com/solo-io/gloo/projects/gloo/pkg/api/grpc/validation" + validation "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/grpc/validation" grpc "google.golang.org/grpc" ) diff --git a/test/mocks/mocks.go b/test/mocks/mocks.go index e23fa346834..9fdea0e1502 100644 --- a/test/mocks/mocks.go +++ b/test/mocks/mocks.go @@ -4,4 +4,4 @@ package mocks //go:generate go run github.com/golang/mock/mockgen -destination ./cache/corecache.go github.com/solo-io/solo-kit/pkg/api/v1/clients/kube/cache KubeCoreCache //go:generate go run github.com/golang/mock/mockgen -destination ./kubernetes/kubeinterface.go k8s.io/client-go/kubernetes Interface -//go:generate go run github.com/golang/mock/mockgen -destination ./gloo/validation_client.go github.com/solo-io/gloo/projects/gloo/pkg/api/grpc/validation GlooValidationServiceClient +//go:generate go run github.com/golang/mock/mockgen -destination ./gloo/validation_client.go github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/grpc/validation GlooValidationServiceClient diff --git a/test/samples/route_tables.go b/test/samples/route_tables.go index 614944ba609..33e27849393 100644 --- a/test/samples/route_tables.go +++ b/test/samples/route_tables.go @@ -5,10 +5,10 @@ package samples import ( "fmt" - v1 "github.com/solo-io/gloo/projects/gateway/pkg/api/v1" - "github.com/solo-io/gloo/projects/gateway/pkg/defaults" - gloov1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/core/matchers" + v1 "github.com/kgateway-dev/kgateway/projects/gateway/pkg/api/v1" + "github.com/kgateway-dev/kgateway/projects/gateway/pkg/defaults" + gloov1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/core/matchers" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" ) diff --git a/test/samples/sample_gloo_api_snapshot.go b/test/samples/sample_gloo_api_snapshot.go index 93b3b25f5d4..2d9f51c6dc4 100644 --- a/test/samples/sample_gloo_api_snapshot.go +++ b/test/samples/sample_gloo_api_snapshot.go @@ -4,16 +4,16 @@ package samples import ( "github.com/golang/protobuf/ptypes/wrappers" - gwv1 "github.com/solo-io/gloo/projects/gateway/pkg/api/v1" - "github.com/solo-io/gloo/projects/gateway/pkg/defaults" - gloov1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1" - v1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/core/matchers" - v1snap "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/gloosnapshot" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/options/hcm" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/options/static" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/ssl" - gloohelpers "github.com/solo-io/gloo/test/helpers" + gwv1 "github.com/kgateway-dev/kgateway/projects/gateway/pkg/api/v1" + "github.com/kgateway-dev/kgateway/projects/gateway/pkg/defaults" + gloov1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" + v1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/core/matchers" + v1snap "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/gloosnapshot" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/options/hcm" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/options/static" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/ssl" + gloohelpers "github.com/kgateway-dev/kgateway/test/helpers" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" ) diff --git a/test/services/consul.go b/test/services/consul.go index bf2603ab4a9..899e725c45b 100644 --- a/test/services/consul.go +++ b/test/services/consul.go @@ -18,8 +18,8 @@ import ( "github.com/hashicorp/consul/api" - "github.com/solo-io/gloo/test/services/utils" - "github.com/solo-io/gloo/test/testutils" + "github.com/kgateway-dev/kgateway/test/services/utils" + "github.com/kgateway-dev/kgateway/test/testutils" ) type ConsulFactory struct { diff --git a/test/services/docker.go b/test/services/docker.go index bcdd6d4c98e..3c10f64f910 100644 --- a/test/services/docker.go +++ b/test/services/docker.go @@ -8,7 +8,7 @@ import ( "os/exec" "time" - "github.com/solo-io/gloo/test/testutils" + "github.com/kgateway-dev/kgateway/test/testutils" "github.com/avast/retry-go" diff --git a/test/services/envoy/factory.go b/test/services/envoy/factory.go index f48d1dbe22a..9c1dff9ad06 100644 --- a/test/services/envoy/factory.go +++ b/test/services/envoy/factory.go @@ -13,16 +13,16 @@ import ( "strings" "text/template" - "github.com/solo-io/gloo/test/services" + "github.com/kgateway-dev/kgateway/test/services" "go.uber.org/zap/zapcore" - "github.com/solo-io/gloo/projects/gloo/pkg/defaults" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/defaults" + "github.com/kgateway-dev/kgateway/test/services/utils" + "github.com/kgateway-dev/kgateway/test/testutils" + "github.com/kgateway-dev/kgateway/test/testutils/version" "github.com/onsi/ginkgo/v2" errors "github.com/rotisserie/eris" - "github.com/solo-io/gloo/test/services/utils" - "github.com/solo-io/gloo/test/testutils" - "github.com/solo-io/gloo/test/testutils/version" "github.com/solo-io/skv2/codegen/util" ) diff --git a/test/services/envoy/instance.go b/test/services/envoy/instance.go index b9d884a1c80..dc0d45c4e17 100644 --- a/test/services/envoy/instance.go +++ b/test/services/envoy/instance.go @@ -12,10 +12,10 @@ import ( "github.com/solo-io/go-utils/threadsafe" - "github.com/solo-io/gloo/pkg/utils/envoyutils/admincli" - "github.com/solo-io/gloo/pkg/utils/requestutils/curl" + "github.com/kgateway-dev/kgateway/pkg/utils/envoyutils/admincli" + "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" - "github.com/solo-io/gloo/test/services" + "github.com/kgateway-dev/kgateway/test/services" "sync" "text/template" diff --git a/test/services/envoy/ports.go b/test/services/envoy/ports.go index ef11b745303..aeed0ff0140 100644 --- a/test/services/envoy/ports.go +++ b/test/services/envoy/ports.go @@ -3,9 +3,9 @@ package envoy import ( - "github.com/solo-io/gloo/projects/gloo/pkg/defaults" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/defaults" - "github.com/solo-io/gloo/test/ginkgo/parallel" + "github.com/kgateway-dev/kgateway/test/ginkgo/parallel" ) var ( diff --git a/test/services/gloo.go b/test/services/gloo.go index 43c6ff8e86e..5fc3f3d1123 100644 --- a/test/services/gloo.go +++ b/test/services/gloo.go @@ -6,11 +6,11 @@ import ( "context" "fmt" - v1alpha1 "github.com/solo-io/gloo/projects/gloo/pkg/api/external/solo/ratelimit" - extauthv1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/enterprise/options/extauth/v1" - graphqlv1beta1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/enterprise/options/graphql/v1beta1" - "github.com/solo-io/gloo/projects/gloo/pkg/bootstrap/clients/vault" - "github.com/solo-io/gloo/projects/gloo/pkg/xds" + v1alpha1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/external/solo/ratelimit" + extauthv1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/enterprise/options/extauth/v1" + graphqlv1beta1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/enterprise/options/graphql/v1beta1" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/bootstrap/clients/vault" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/xds" "net" "net/http" @@ -19,7 +19,7 @@ import ( "github.com/hashicorp/consul/api" - "github.com/solo-io/gloo/test/ginkgo/parallel" + "github.com/kgateway-dev/kgateway/test/ginkgo/parallel" "github.com/golang/protobuf/proto" @@ -30,19 +30,19 @@ import ( "github.com/golang/protobuf/ptypes/wrappers" - "github.com/solo-io/gloo/pkg/bootstrap/leaderelector/singlereplica" + "github.com/kgateway-dev/kgateway/pkg/bootstrap/leaderelector/singlereplica" - "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/gloosnapshot" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/gloosnapshot" - "github.com/solo-io/gloo/pkg/utils/settingsutil" + "github.com/kgateway-dev/kgateway/pkg/utils/settingsutil" - "github.com/solo-io/gloo/pkg/utils/statusutils" + "github.com/kgateway-dev/kgateway/pkg/utils/statusutils" - "github.com/solo-io/gloo/projects/gloo/pkg/syncer/setup" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/syncer/setup" - "github.com/solo-io/gloo/projects/gateway/pkg/translator" + "github.com/kgateway-dev/kgateway/projects/gateway/pkg/translator" - "github.com/solo-io/gloo/projects/gloo/pkg/upstreams/consul" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/upstreams/consul" "github.com/solo-io/solo-kit/pkg/api/external/kubernetes/service" "github.com/solo-io/solo-kit/pkg/api/v1/clients/kube/cache" @@ -56,9 +56,9 @@ import ( "github.com/solo-io/solo-kit/pkg/api/v1/clients/factory" "github.com/solo-io/solo-kit/pkg/api/v1/clients/memory" - 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/bootstrap" + gatewayv1 "github.com/kgateway-dev/kgateway/projects/gateway/pkg/api/v1" + gloov1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/bootstrap" "google.golang.org/grpc" grpc_zap "github.com/grpc-ecosystem/go-grpc-middleware/logging/zap" @@ -67,11 +67,11 @@ import ( grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware" grpc_ctxtags "github.com/grpc-ecosystem/go-grpc-middleware/tags" + fds_syncer "github.com/kgateway-dev/kgateway/projects/discovery/pkg/fds/syncer" + uds_syncer "github.com/kgateway-dev/kgateway/projects/discovery/pkg/uds/syncer" + "github.com/kgateway-dev/kgateway/projects/gloo/pkg/defaults" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - fds_syncer "github.com/solo-io/gloo/projects/discovery/pkg/fds/syncer" - uds_syncer "github.com/solo-io/gloo/projects/discovery/pkg/uds/syncer" - "github.com/solo-io/gloo/projects/gloo/pkg/defaults" "k8s.io/client-go/kubernetes" ) @@ -211,7 +211,7 @@ func constructTestSettings(runOptions *RunOptions) *gloov1.Settings { Gateway: &gloov1.GatewayOptions{ Validation: &gloov1.GatewayOptions_ValidationOptions{ // To validate transformations, we call out to an Envoy binary running in validate mode - // https://github.com/solo-io/gloo/blob/01d04751f72c168e304977c4f67fdbcbf30232a9/projects/gloo/pkg/bootstrap/bootstrap_validation.go#L28 + // https://github.com/kgateway-dev/kgateway/blob/01d04751f72c168e304977c4f67fdbcbf30232a9/projects/gloo/pkg/bootstrap/bootstrap_validation.go#L28 // This binary is present in our CI/CD pipeline. But when running locally it is not, so we fallback to the Upstream Envoy binary // which doesn't have the custom Solo.io types registered with the deserializer. Therefore, when running locally tests will fail, // and the logs will contain: diff --git a/test/services/logging.go b/test/services/logging.go index 7079fc6a04f..eceaadd4e16 100644 --- a/test/services/logging.go +++ b/test/services/logging.go @@ -10,9 +10,9 @@ import ( "k8s.io/apimachinery/pkg/util/sets" + "github.com/kgateway-dev/kgateway/test/testutils" "github.com/onsi/gomega" errors "github.com/rotisserie/eris" - "github.com/solo-io/gloo/test/testutils" "go.uber.org/zap" "go.uber.org/zap/zapcore" ) diff --git a/test/services/logging_test.go b/test/services/logging_test.go index 526ce8cddd2..26b58bbe48a 100644 --- a/test/services/logging_test.go +++ b/test/services/logging_test.go @@ -3,9 +3,9 @@ package services_test import ( + "github.com/kgateway-dev/kgateway/test/services" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/solo-io/gloo/test/services" "go.uber.org/zap/zapcore" ) diff --git a/test/services/utils/download.go b/test/services/utils/download.go index 17488c716bc..f922c63d899 100644 --- a/test/services/utils/download.go +++ b/test/services/utils/download.go @@ -14,7 +14,7 @@ import ( "github.com/onsi/ginkgo/v2" - "github.com/solo-io/gloo/test/testutils" + "github.com/kgateway-dev/kgateway/test/testutils" ) // ExecLookPathWrapper is a wrapper around exec.LookPath so it can be mocked in tests. diff --git a/test/services/utils/download_test.go b/test/services/utils/download_test.go index 9db13c2449b..c53a676c69b 100644 --- a/test/services/utils/download_test.go +++ b/test/services/utils/download_test.go @@ -11,8 +11,8 @@ import ( "runtime" "testing" - "github.com/solo-io/gloo/test/services/utils" - "github.com/solo-io/gloo/test/testutils" + "github.com/kgateway-dev/kgateway/test/services/utils" + "github.com/kgateway-dev/kgateway/test/testutils" "github.com/stretchr/testify/assert" ) diff --git a/test/services/vault.go b/test/services/vault.go index 81f61b3a817..ba2c5151e07 100644 --- a/test/services/vault.go +++ b/test/services/vault.go @@ -15,12 +15,12 @@ import ( errors "github.com/rotisserie/eris" + "github.com/kgateway-dev/kgateway/test/services/utils" + "github.com/kgateway-dev/kgateway/test/testutils" "github.com/onsi/gomega" - "github.com/solo-io/gloo/test/services/utils" - "github.com/solo-io/gloo/test/testutils" "github.com/solo-io/solo-kit/pkg/utils/protoutils" - v1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1" + v1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega/gexec" diff --git a/test/testutils/env.go b/test/testutils/env.go index 7e7020e35dc..e86d53830b0 100644 --- a/test/testutils/env.go +++ b/test/testutils/env.go @@ -3,7 +3,7 @@ package testutils import ( - "github.com/solo-io/gloo/pkg/utils/envutils" + "github.com/kgateway-dev/kgateway/pkg/utils/envutils" ) const ( diff --git a/test/testutils/helm_values.go b/test/testutils/helm_values.go index f42807a40da..f719718368e 100644 --- a/test/testutils/helm_values.go +++ b/test/testutils/helm_values.go @@ -6,8 +6,8 @@ import ( "encoding/json" "path" - "github.com/solo-io/gloo/install/helm/gloo/generate" - "github.com/solo-io/gloo/pkg/utils/helmutils" + "github.com/kgateway-dev/kgateway/install/helm/gloo/generate" + "github.com/kgateway-dev/kgateway/pkg/utils/helmutils" "helm.sh/helm/v3/pkg/strvals" "knative.dev/pkg/test/helpers" k8syamlutil "sigs.k8s.io/yaml" diff --git a/test/testutils/http_client_test.go b/test/testutils/http_client_test.go index 909d23fb9f0..4f9f6bafda5 100644 --- a/test/testutils/http_client_test.go +++ b/test/testutils/http_client_test.go @@ -6,11 +6,11 @@ import ( "net/http" "time" + "github.com/kgateway-dev/kgateway/test/gomega/assertions" + gloohelpers "github.com/kgateway-dev/kgateway/test/helpers" + "github.com/kgateway-dev/kgateway/test/testutils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/solo-io/gloo/test/gomega/assertions" - gloohelpers "github.com/solo-io/gloo/test/helpers" - "github.com/solo-io/gloo/test/testutils" ) var _ = Describe("HttpClientBuilder", func() { diff --git a/test/testutils/http_request_test.go b/test/testutils/http_request_test.go index 015e190ba77..debf0d981f1 100644 --- a/test/testutils/http_request_test.go +++ b/test/testutils/http_request_test.go @@ -3,9 +3,9 @@ package testutils_test import ( + "github.com/kgateway-dev/kgateway/test/gomega/assertions" + "github.com/kgateway-dev/kgateway/test/testutils" . "github.com/onsi/ginkgo/v2" - "github.com/solo-io/gloo/test/gomega/assertions" - "github.com/solo-io/gloo/test/testutils" ) var _ = Describe("HttpRequestBuilder", func() { diff --git a/test/testutils/version/changelog_test.go b/test/testutils/version/changelog_test.go index dc9f6ccd417..2b54d93e471 100644 --- a/test/testutils/version/changelog_test.go +++ b/test/testutils/version/changelog_test.go @@ -5,9 +5,9 @@ package version_test import ( "fmt" + "github.com/kgateway-dev/kgateway/test/testutils/version" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/solo-io/gloo/test/testutils/version" _ "k8s.io/client-go/plugin/pkg/client/auth/gcp" ) diff --git a/test/v1helpers/ssl_proxy.go b/test/v1helpers/ssl_proxy.go index 87043d29882..f03a76bc00a 100644 --- a/test/v1helpers/ssl_proxy.go +++ b/test/v1helpers/ssl_proxy.go @@ -13,7 +13,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/solo-io/gloo/test/helpers" + "github.com/kgateway-dev/kgateway/test/helpers" ) func StartSslProxy(ctx context.Context, port uint32) uint32 { diff --git a/test/v1helpers/test_grpc_service/testgrpcservice.go b/test/v1helpers/test_grpc_service/testgrpcservice.go index c91ace7771e..e3af5b40520 100644 --- a/test/v1helpers/test_grpc_service/testgrpcservice.go +++ b/test/v1helpers/test_grpc_service/testgrpcservice.go @@ -11,7 +11,7 @@ import ( "github.com/onsi/ginkgo/v2" - glootest "github.com/solo-io/gloo/test/v1helpers/test_grpc_service/glootest/protos" + glootest "github.com/kgateway-dev/kgateway/test/v1helpers/test_grpc_service/glootest/protos" "github.com/solo-io/go-utils/healthchecker" "google.golang.org/grpc" "google.golang.org/grpc/health" diff --git a/test/v1helpers/test_upstream.go b/test/v1helpers/test_upstream.go index f34da2d51be..dbe8be3b8de 100644 --- a/test/v1helpers/test_upstream.go +++ b/test/v1helpers/test_upstream.go @@ -16,18 +16,18 @@ import ( "strconv" "time" - "github.com/solo-io/gloo/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/test/gomega/matchers" "github.com/golang/protobuf/ptypes/wrappers" "github.com/golang/protobuf/proto" + gloov1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1" + static_plugin_gloo "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/options/static" + "github.com/kgateway-dev/kgateway/test/helpers" + testgrpcservice "github.com/kgateway-dev/kgateway/test/v1helpers/test_grpc_service" "github.com/mccutchen/go-httpbin/v2/httpbin" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - gloov1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1" - static_plugin_gloo "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/options/static" - "github.com/solo-io/gloo/test/helpers" - testgrpcservice "github.com/solo-io/gloo/test/v1helpers/test_grpc_service" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" "google.golang.org/grpc" "google.golang.org/grpc/credentials"