Skip to content

Refactor GCE test code #193

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

Merged
k8s-ci-robot merged 3 commits into from
Sep 19, 2024
Merged

Refactor GCE test code #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
29800a7
Refactor test to use generated template resources.
sawsa307 Sep 16, 2024
0c2e90c
Move functions in gce_extensions.go.
sawsa307 Sep 16, 2024
222ca0b
Move test variables as const and var.
sawsa307 Sep 17, 2024
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
52 changes: 52 additions & 0 deletions pkg/i2gw/providers/gce/gateway_converter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,17 @@ limitations under the License.
package gce

import (
gkegatewayv1 "github.com/GoogleCloudPlatform/gke-gateway-api/apis/networking/v1"
"github.com/kubernetes-sigs/ingress2gateway/pkg/i2gw"
"github.com/kubernetes-sigs/ingress2gateway/pkg/i2gw/intermediate"
"github.com/kubernetes-sigs/ingress2gateway/pkg/i2gw/notifications"
"github.com/kubernetes-sigs/ingress2gateway/pkg/i2gw/providers/common"
"github.com/kubernetes-sigs/ingress2gateway/pkg/i2gw/providers/gce/extensions"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/validation/field"
gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
gatewayv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2"
)

type irToGatewayResourcesConverter struct{}
Expand All @@ -38,3 +45,48 @@ func (c *irToGatewayResourcesConverter) irToGateway(ir intermediate.IR) (i2gw.Ga
buildGceServiceExtensions(ir, &gatewayResources)
return gatewayResources, nil
}

func buildGceServiceExtensions(ir intermediate.IR, gatewayResources *i2gw.GatewayResources) {
for svcKey, serviceIR := range ir.Services {
bePolicy := addBackendPolicyIfConfigured(svcKey, serviceIR)
if bePolicy == nil {
continue
}
obj, err := i2gw.CastToUnstructured(bePolicy)
if err != nil {
notify(notifications.ErrorNotification, "Failed to cast GCPBackendPolicy to unstructured", bePolicy)
continue
}
gatewayResources.GatewayExtensions = append(gatewayResources.GatewayExtensions, *obj)
}
}

func addBackendPolicyIfConfigured(serviceNamespacedName types.NamespacedName, serviceIR intermediate.ProviderSpecificServiceIR) *gkegatewayv1.GCPBackendPolicy {
if serviceIR.Gce == nil {
return nil
}
backendPolicy := gkegatewayv1.GCPBackendPolicy{
ObjectMeta: metav1.ObjectMeta{
Namespace: serviceNamespacedName.Namespace,
Name: serviceNamespacedName.Name,
},
Spec: gkegatewayv1.GCPBackendPolicySpec{
Default: &gkegatewayv1.GCPBackendPolicyConfig{},
TargetRef: gatewayv1alpha2.NamespacedPolicyTargetReference{
Group: "",
Kind: "Service",
Name: gatewayv1.ObjectName(serviceNamespacedName.Name),
},
},
}
backendPolicy.SetGroupVersionKind(GCPBackendPolicyGVK)

if serviceIR.Gce.SessionAffinity != nil {
backendPolicy.Spec.Default.SessionAffinity = extensions.BuildBackendPolicySessionAffinityConfig(serviceIR)
}
if serviceIR.Gce.SecurityPolicy != nil {
backendPolicy.Spec.Default.SecurityPolicy = extensions.BuildBackendPolicySecurityPolicyConfig(serviceIR)
}

return &backendPolicy
}
82 changes: 44 additions & 38 deletions pkg/i2gw/providers/gce/gateway_converter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,33 +35,27 @@ import (
"sigs.k8s.io/gateway-api/apis/v1alpha2"
)

func Test_irToGateway(t *testing.T) {
testNamespace := "default"
testHost := "test.mydomain.com"
testServiceName := "test-service"
testGatewayName := "test-gateway"
testHTTPRouteName := "test-http-route"

gPathPrefix := gatewayv1.PathMatchPathPrefix
saTypeClientIP := "CLIENT_IP"
testCookieTTLSec := int64(10)
saTypeCookie := "GENERATED_COOKIE"
testSecurityPolicy := "test-security-policy"
const (
testGatewayName = "test-gateway"
testHTTPRouteName = "test-http-route"
testSaBackendPolicyName = testServiceName
)

testGateway := gatewayv1.Gateway{
var (
testGateway = gatewayv1.Gateway{
ObjectMeta: metav1.ObjectMeta{Name: testGatewayName, Namespace: testNamespace},
Spec: gatewayv1.GatewaySpec{
GatewayClassName: gceL7GlobalExternalManagedGatewayClass,
Listeners: []gatewayv1.Listener{{
Name: "test-mydomain-com-http",
Port: 80,
Protocol: gatewayv1.HTTPProtocolType,
Hostname: ptrTo(gatewayv1.Hostname(testHost)),
Hostname: common.PtrTo(gatewayv1.Hostname(testHost)),
}},
},
}

testHTTPRoute := gatewayv1.HTTPRoute{
testHTTPRoute = gatewayv1.HTTPRoute{
ObjectMeta: metav1.ObjectMeta{Name: testHTTPRouteName, Namespace: testNamespace},
Spec: gatewayv1.HTTPRouteSpec{
CommonRouteSpec: gatewayv1.CommonRouteSpec{
Expand All @@ -75,8 +69,8 @@ func Test_irToGateway(t *testing.T) {
Matches: []gatewayv1.HTTPRouteMatch{
{
Path: &gatewayv1.HTTPPathMatch{
Type: &gPathPrefix,
Value: ptrTo("/"),
Type: common.PtrTo(gPathPrefix),
Value: common.PtrTo("/"),
},
},
},
Expand All @@ -85,7 +79,7 @@ func Test_irToGateway(t *testing.T) {
BackendRef: gatewayv1.BackendRef{
BackendObjectReference: gatewayv1.BackendObjectReference{
Name: gatewayv1.ObjectName(testServiceName),
Port: ptrTo(gatewayv1.PortNumber(80)),
Port: common.PtrTo(gatewayv1.PortNumber(80)),
},
},
},
Expand All @@ -95,17 +89,20 @@ func Test_irToGateway(t *testing.T) {
},
}

testSaBackendPolicyName := testServiceName
testSaGCPBackendPolicyCookie := gkegatewayv1.GCPBackendPolicy{
testSaGCPBackendPolicyCookie = gkegatewayv1.GCPBackendPolicy{
TypeMeta: metav1.TypeMeta{
APIVersion: "networking.gke.io/v1",
Kind: "GCPBackendPolicy",
},
ObjectMeta: metav1.ObjectMeta{
Namespace: testNamespace,
Name: testSaBackendPolicyName,
},
Spec: gkegatewayv1.GCPBackendPolicySpec{
Default: &gkegatewayv1.GCPBackendPolicyConfig{
SessionAffinity: &gkegatewayv1.SessionAffinityConfig{
Type: ptrTo("GENERATED_COOKIE"),
CookieTTLSec: &testCookieTTLSec,
Type: common.PtrTo("GENERATED_COOKIE"),
CookieTTLSec: common.PtrTo(testCookieTTLSec),
},
},
TargetRef: v1alpha2.NamespacedPolicyTargetReference{
Expand All @@ -115,21 +112,20 @@ func Test_irToGateway(t *testing.T) {
},
},
}
testSaGCPBackendPolicyCookie.SetGroupVersionKind(GCPBackendPolicyGVK)
testSaGCPBackendPolicyCookieUnstructured, err := i2gw.CastToUnstructured(&testSaGCPBackendPolicyCookie)
if err != nil {
t.Errorf("Failed to generate unstructured GCP Backend Policy with Cookie-based session affinity feature: %v", err)
}

testSaGCPBackendPolicyClientIP := gkegatewayv1.GCPBackendPolicy{
testSaGCPBackendPolicyClientIP = gkegatewayv1.GCPBackendPolicy{
TypeMeta: metav1.TypeMeta{
APIVersion: "networking.gke.io/v1",
Kind: "GCPBackendPolicy",
},
ObjectMeta: metav1.ObjectMeta{
Namespace: testNamespace,
Name: testSaBackendPolicyName,
},
Spec: gkegatewayv1.GCPBackendPolicySpec{
Default: &gkegatewayv1.GCPBackendPolicyConfig{
SessionAffinity: &gkegatewayv1.SessionAffinityConfig{
Type: ptrTo("CLIENT_IP"),
Type: common.PtrTo("CLIENT_IP"),
},
},
TargetRef: v1alpha2.NamespacedPolicyTargetReference{
Expand All @@ -139,20 +135,19 @@ func Test_irToGateway(t *testing.T) {
},
},
}
testSaGCPBackendPolicyClientIP.SetGroupVersionKind(GCPBackendPolicyGVK)
testSaGCPBackendPolicyClientIPUnstructured, err := i2gw.CastToUnstructured(&testSaGCPBackendPolicyClientIP)
if err != nil {
t.Errorf("Failed to generate unstructured GCP Backend Policy with ClientIP-based session affinity feature: %v", err)
}

testSpGCPBackendPolicy := gkegatewayv1.GCPBackendPolicy{
testSpGCPBackendPolicy = gkegatewayv1.GCPBackendPolicy{
TypeMeta: metav1.TypeMeta{
APIVersion: "networking.gke.io/v1",
Kind: "GCPBackendPolicy",
},
ObjectMeta: metav1.ObjectMeta{
Namespace: testNamespace,
Name: testSaBackendPolicyName,
},
Spec: gkegatewayv1.GCPBackendPolicySpec{
Default: &gkegatewayv1.GCPBackendPolicyConfig{
SecurityPolicy: &testSecurityPolicy,
SecurityPolicy: common.PtrTo(testSecurityPolicy),
},
TargetRef: v1alpha2.NamespacedPolicyTargetReference{
Group: "",
Expand All @@ -161,11 +156,22 @@ func Test_irToGateway(t *testing.T) {
},
},
}
testSpGCPBackendPolicy.SetGroupVersionKind(GCPBackendPolicyGVK)
)

func Test_irToGateway(t *testing.T) {
testSaGCPBackendPolicyCookieUnstructured, err := i2gw.CastToUnstructured(&testSaGCPBackendPolicyCookie)
if err != nil {
t.Errorf("Failed to generate unstructured GCP Backend Policy with Cookie-based session affinity feature: %v", err)
}
testSaGCPBackendPolicyClientIPUnstructured, err := i2gw.CastToUnstructured(&testSaGCPBackendPolicyClientIP)
if err != nil {
t.Errorf("Failed to generate unstructured GCP Backend Policy with ClientIP-based session affinity feature: %v", err)
}
testSpGCPBackendPolicyUnstructured, err := i2gw.CastToUnstructured(&testSpGCPBackendPolicy)
if err != nil {
t.Errorf("Failed to generate unstructured GCP Backend Policy with Security Policy feature: %v", err)
}

testCases := []struct {
name string
ir intermediate.IR
Expand Down Expand Up @@ -226,7 +232,7 @@ func Test_irToGateway(t *testing.T) {
Gce: &intermediate.GceServiceIR{
SessionAffinity: &intermediate.SessionAffinityConfig{
AffinityType: saTypeCookie,
CookieTTLSec: &testCookieTTLSec,
CookieTTLSec: common.PtrTo(testCookieTTLSec),
},
},
},
Expand Down
Loading