Skip to content

Replace contour-authserver in e2e with gRPC server running in test suite #7597

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Draft
tsaarni wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Replace contour-authserver in e2e with gRPC server running in test suite #7597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 1 addition & 58 deletions test/e2e/deployment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,11 +111,6 @@ type Deployment struct {
RateLimitDeployment *apps_v1.Deployment
RateLimitService *core_v1.Service
RateLimitExtensionService *contour_v1alpha1.ExtensionService

// Global External Authorization deployment.
GlobalExtAuthDeployment *apps_v1.Deployment
GlobalExtAuthService *core_v1.Service
GlobalExtAuthExtensionService *contour_v1alpha1.ExtensionService
}

// UnmarshalResources unmarshals resources from rendered Contour manifest in
Expand Down Expand Up @@ -237,35 +232,7 @@ func (d *Deployment) UnmarshalResources() error {
return err
}

// Global external auth
globalExtAuthExamplePath := filepath.Join(filepath.Dir(thisFile), "..", "..", "examples", "global-external-auth")
globalExtAuthServerDeploymentFile := filepath.Join(globalExtAuthExamplePath, "01-authserver.yaml")
globalExtAuthExtSvcFile := filepath.Join(globalExtAuthExamplePath, "02-globalextauth-extsvc.yaml")

rGlobalExtAuthDeploymentFile, err := os.Open(globalExtAuthServerDeploymentFile)
if err != nil {
return err
}
defer rGlobalExtAuthDeploymentFile.Close()
decoder = apimachinery_util_yaml.NewYAMLToJSONDecoder(rGlobalExtAuthDeploymentFile)
d.GlobalExtAuthDeployment = new(apps_v1.Deployment)
if err := decoder.Decode(d.GlobalExtAuthDeployment); err != nil {
return err
}
d.GlobalExtAuthService = new(core_v1.Service)
if err := decoder.Decode(d.GlobalExtAuthService); err != nil {
return err
}

rGlobalExtAuthExtSvcFile, err := os.Open(globalExtAuthExtSvcFile)
if err != nil {
return err
}
defer rGlobalExtAuthExtSvcFile.Close()
decoder = apimachinery_util_yaml.NewYAMLToJSONDecoder(rGlobalExtAuthExtSvcFile)
d.GlobalExtAuthExtensionService = new(contour_v1alpha1.ExtensionService)

return decoder.Decode(d.GlobalExtAuthExtensionService)
return nil
}

// Common case of updating object if exists, create otherwise.
Expand Down Expand Up @@ -428,30 +395,6 @@ func (d *Deployment) EnsureRateLimitResources(namespace, configContents string)
return d.ensureResource(extSvc, new(contour_v1alpha1.ExtensionService))
}

func (d *Deployment) EnsureGlobalExternalAuthResources(namespace string) error {
setNamespace := d.Namespace.Name
if len(namespace) > 0 {
setNamespace = namespace
}

deployment := d.GlobalExtAuthDeployment.DeepCopy()
deployment.Namespace = setNamespace
if err := d.ensureResource(deployment, new(apps_v1.Deployment)); err != nil {
return err
}

service := d.GlobalExtAuthService.DeepCopy()
service.Namespace = setNamespace
if err := d.ensureResource(service, new(core_v1.Service)); err != nil {
return err
}

extSvc := d.GlobalExtAuthExtensionService.DeepCopy()
extSvc.Namespace = setNamespace

return d.ensureResource(extSvc, new(contour_v1alpha1.ExtensionService))
}

// Convenience method for deploying the pieces of the deployment needed for
// testing Contour running locally, out of cluster.
// Includes:
Expand Down
Loading
Loading