Skip to content

Commit

Permalink
fixing tests
Browse files Browse the repository at this point in the history 
Signed-off-by: Aaron Choo <[email protected]>
  • Loading branch information
@aabchoo
aabchoo committed Jan 21, 2025
1 parent fa08f56 commit b5e9b08
Show file tree
Hide file tree
Showing 2 changed files with 65 additions and 32 deletions.
2 changes: 1 addition & 1 deletion internal/controller/ai_service_backend_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ func Test_AiServiceBackendIndexFunc(t *testing.T) {

require.NoError(t, c.List(context.Background(), &aiServiceBackend,
client.MatchingFields{k8sClientIndexBackendSecurityPolicyToReferencingAIServiceBackend: "some-backend-security-policy-2.ns"}))
require.Len(t, aiServiceBackend.Items, 0)
require.Empty(t, aiServiceBackend.Items)

require.NoError(t, c.List(context.Background(), &aiServiceBackend,
client.MatchingFields{k8sClientIndexBackendSecurityPolicyToReferencingAIServiceBackend: "some-backend-security-policy-3.ns"}))
Expand Down
95 changes: 64 additions & 31 deletions internal/controller/sink_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"log/slog"
"os"
"testing"
"time"

"github.com/go-logr/logr"
"github.com/stretchr/testify/require"
Expand Down Expand Up @@ -375,7 +376,7 @@ func TestConfigSink_SyncExtprocDeployment(t *testing.T) {
kube := fake2.NewClientset()

eventChan := make(chan ConfigSinkEvent)
s := newConfigSink(fakeClient, kube, logr.Discard(), eventChan, "defaultExtProcImage")
s := newConfigSink(fakeClient, kube, logr.Discard(), eventChan, "envoyproxy/ai-gateway-extproc:foo")
err := fakeClient.Create(context.Background(), &corev1.Secret{ObjectMeta: metav1.ObjectMeta{Name: "some-secret-policy"}})
require.NoError(t, err)

Expand All @@ -399,7 +400,7 @@ func TestConfigSink_SyncExtprocDeployment(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{Name: "apple", Namespace: "ns"},
Spec: aigv1a1.AIServiceBackendSpec{
APISchema: aigv1a1.VersionedAPISchema{
Schema: aigv1a1.APISchemaAWSBedrock,
Name: aigv1a1.APISchemaAWSBedrock,
},
BackendRef: gwapiv1.BackendObjectReference{Name: "some-backend1", Namespace: ptr.To[gwapiv1.Namespace]("ns")},
BackendSecurityPolicyRef: &gwapiv1.LocalObjectReference{Name: "some-backend-security-policy-1"},
Expand Down Expand Up @@ -439,7 +440,7 @@ func TestConfigSink_SyncExtprocDeployment(t *testing.T) {
},
},
},
APISchema: aigv1a1.VersionedAPISchema{Schema: aigv1a1.APISchemaOpenAI, Version: "v123"},
APISchema: aigv1a1.VersionedAPISchema{Name: aigv1a1.APISchemaOpenAI, Version: "v123"},
Rules: []aigv1a1.AIGatewayRouteRule{
{
BackendRefs: []aigv1a1.AIGatewayRouteRuleBackendRef{
Expand All @@ -463,33 +464,65 @@ func TestConfigSink_SyncExtprocDeployment(t *testing.T) {
err = fakeClient.Create(context.Background(), aiGatewayRoute, &client.CreateOptions{})
require.NoError(t, err)

err = s.syncExtProcDeployment(context.Background(), aiGatewayRoute)
require.NoError(t, err)
t.Run("create", func(t *testing.T) {
err = s.syncExtProcDeployment(context.Background(), aiGatewayRoute)
require.NoError(t, err)

extProcDeployment, err := s.kube.AppsV1().Deployments("ns").Get(context.Background(), extProcName(aiGatewayRoute), metav1.GetOptions{})
require.NoError(t, err)
require.NotNil(t, extProcDeployment)
require.Equal(t, extProcName(aiGatewayRoute), extProcDeployment.Name)
require.Equal(t, int32(123), *extProcDeployment.Spec.Replicas)
require.Equal(t, ownerReferenceForAIGatewayRoute(aiGatewayRoute), extProcDeployment.OwnerReferences)
require.Equal(t, corev1.ResourceRequirements{
Limits: corev1.ResourceList{
corev1.ResourceCPU: resource.MustParse("200m"),
corev1.ResourceMemory: resource.MustParse("100Mi"),
},
}, extProcDeployment.Spec.Template.Spec.Containers[0].Resources)
service, err := s.kube.CoreV1().Services("ns").Get(context.Background(), extProcName(aiGatewayRoute), metav1.GetOptions{})
require.NoError(t, err)
require.Equal(t, extProcName(aiGatewayRoute), service.Name)

// Update fields in resource again
// Doing it again should not fail and update the deployment.
aiGatewayRoute.Spec.FilterConfig.ExternalProcess.Replicas = ptr.To[int32](456)
require.NoError(t, s.syncExtProcDeployment(context.Background(), aiGatewayRoute))
// Check the deployment is updated.
extProcDeployment, err = s.kube.AppsV1().Deployments("ns").Get(context.Background(), extProcName(aiGatewayRoute), metav1.GetOptions{})
require.NoError(t, err)
require.Equal(t, int32(456), *extProcDeployment.Spec.Replicas)
resourceLimits := &corev1.ResourceRequirements{
Limits: corev1.ResourceList{
corev1.ResourceCPU: resource.MustParse("200m"),
corev1.ResourceMemory: resource.MustParse("100Mi"),
},
}
require.Eventually(t, func() bool {
extProcDeployment, err := s.kube.AppsV1().Deployments("ns").Get(context.Background(), extProcName(aiGatewayRoute), metav1.GetOptions{})
if err != nil {
t.Logf("failed to get deployment %s: %v", extProcName(aiGatewayRoute), err)
return false
}
require.Equal(t, "envoyproxy/ai-gateway-extproc:foo", extProcDeployment.Spec.Template.Spec.Containers[0].Image)
require.Len(t, extProcDeployment.OwnerReferences, 1)
require.Equal(t, "myroute", extProcDeployment.OwnerReferences[0].Name)
require.Equal(t, "AIGatewayRoute", extProcDeployment.OwnerReferences[0].Kind)
require.Equal(t, int32(123), *extProcDeployment.Spec.Replicas)
require.Equal(t, resourceLimits, &extProcDeployment.Spec.Template.Spec.Containers[0].Resources)
return true
}, 30*time.Second, 200*time.Millisecond)

service, err := s.kube.CoreV1().Services("ns").Get(context.Background(), extProcName(aiGatewayRoute), metav1.GetOptions{})
require.NoError(t, err)
require.Equal(t, extProcName(aiGatewayRoute), service.Name)
})

t.Run("update", func(t *testing.T) {
// Update fields in resource again
// Doing it again should not fail and update the deployment.
newResourceLimits := &corev1.ResourceRequirements{
Limits: corev1.ResourceList{
corev1.ResourceCPU: resource.MustParse("300m"),
corev1.ResourceMemory: resource.MustParse("32Mi"),
},
}
aiGatewayRoute.Spec.FilterConfig.ExternalProcess.Resources = newResourceLimits
aiGatewayRoute.Spec.FilterConfig.ExternalProcess.Replicas = ptr.To[int32](456)

require.NoError(t, s.syncExtProcDeployment(context.Background(), aiGatewayRoute))
// Check the deployment is updated.
require.Eventually(t, func() bool {
extProcDeployment, err := s.kube.AppsV1().Deployments("ns").Get(context.Background(), extProcName(aiGatewayRoute), metav1.GetOptions{})
if err != nil {
t.Logf("failed to get deployment %s: %v", extProcName(aiGatewayRoute), err)
return false
}
require.Equal(t, "envoyproxy/ai-gateway-extproc:foo", extProcDeployment.Spec.Template.Spec.Containers[0].Image)
require.Len(t, extProcDeployment.OwnerReferences, 1)
require.Equal(t, "myroute", extProcDeployment.OwnerReferences[0].Name)
require.Equal(t, "AIGatewayRoute", extProcDeployment.OwnerReferences[0].Kind)
require.Equal(t, int32(456), *extProcDeployment.Spec.Replicas)
require.Equal(t, newResourceLimits, &extProcDeployment.Spec.Template.Spec.Containers[0].Resources)
return true
}, 30*time.Second, 200*time.Millisecond)
})
}

func TestConfigSink_MountBackendSecurityPolicySecrets(t *testing.T) {
Expand Down Expand Up @@ -541,7 +574,7 @@ func TestConfigSink_MountBackendSecurityPolicySecrets(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{Name: "apple", Namespace: "ns"},
Spec: aigv1a1.AIServiceBackendSpec{
APISchema: aigv1a1.VersionedAPISchema{
Schema: aigv1a1.APISchemaAWSBedrock,
Name: aigv1a1.APISchemaAWSBedrock,
},
BackendRef: gwapiv1.BackendObjectReference{Name: "some-backend1", Namespace: ptr.To[gwapiv1.Namespace]("ns")},
BackendSecurityPolicyRef: &gwapiv1.LocalObjectReference{Name: "some-other-backend-security-policy-1"},
Expand Down Expand Up @@ -611,7 +644,7 @@ func TestConfigSink_MountBackendSecurityPolicySecrets(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{Name: "apple", Namespace: "ns"},
Spec: aigv1a1.AIServiceBackendSpec{
APISchema: aigv1a1.VersionedAPISchema{
Schema: aigv1a1.APISchemaAWSBedrock,
Name: aigv1a1.APISchemaAWSBedrock,
},
BackendRef: gwapiv1.BackendObjectReference{Name: "some-backend1", Namespace: ptr.To[gwapiv1.Namespace]("ns")},
BackendSecurityPolicyRef: &gwapiv1.LocalObjectReference{Name: "some-other-backend-security-policy-2"},
Expand Down

0 comments on commit b5e9b08

Please sign in to comment.