Custom scaling triggers

Makefile

@@ -172,4 +172,4 @@ ifndef HAS_MOCKGEN
 endif
 ifndef HAS_CONTROLLER_GEN
 	go install sigs.k8s.io/controller-tools/cmd/[email protected]
-endif
+endif

charts/radix-operator/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: radix-operator
-version: 1.34.1
-appVersion: 1.54.1
+version: 1.35.0
+appVersion: 1.55.0
 kubeVersion: ">=1.24.0"
 description: Radix Operator
 keywords:

charts/radix-operator/templates/radixdnsalias.yaml

@@ -53,7 +53,7 @@ spec:
             properties:
               appName:
                 description: Name of the application the DNS alias used in.
-                maxLength: 253
+                maxLength: 50
                 minLength: 1
                 pattern: ^(([a-z0-9][-a-z0-9]*)?[a-z0-9])?$
                 type: string

go.mod

@@ -15,6 +15,7 @@ require (
 	github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.70.0
 	github.com/prometheus-operator/prometheus-operator/pkg/client v0.70.0
 	github.com/prometheus/client_golang v1.19.0
+	github.com/robfig/cron/v3 v3.0.1
 	github.com/rs/zerolog v1.32.0
 	github.com/spf13/cobra v1.8.0
 	github.com/spf13/viper v1.18.2

go.sum

@@ -120,6 +120,8 @@ github.com/prometheus/common v0.53.0 h1:U2pL9w9nmJwJDa4qqLQ3ZaePJ6ZTwt7cMD3AG3+a
 github.com/prometheus/common v0.53.0/go.mod h1:BrxBKv3FWBIGXw89Mg1AeBq7FSyRzXWI3l3e7W3RN5U=
 github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo=
 github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo=
+github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
+github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
 github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
 github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
 github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=

pkg/apis/deployment/deployment.go

@@ -401,6 +401,11 @@ func (deploy *Deployment) garbageCollectComponentsNoLongerInSpec(ctx context.Con
 		return err
 	}
 
+	err = deploy.garbageCollectTriggerAuthsNoLongerInSpec(ctx)
+	if err != nil {
+		return err
+	}
+
 	err = deploy.garbageCollectServicesNoLongerInSpec(ctx)
 	if err != nil {
 		return err

pkg/apis/deployment/environmentvariables_test.go

@@ -63,7 +63,7 @@ func Test_GetEnvironmentVariables(t *testing.T) {
 	envName := "dev"
 	componentName := "any-component"
 	testEnv := setupTestEnv(t)
-	defer teardownTest()
+	defer TeardownTest()
 
 	t.Run("Get env vars", func(t *testing.T) {
 		rd := testEnv.applyRdComponent(t, appName, envName, componentName, func(componentBuilder utils.DeployComponentBuilder) {
@@ -94,7 +94,7 @@ func Test_getEnvironmentVariablesForRadixOperator(t *testing.T) {
 	envName := "dev"
 	componentName := "any-component"
 	testEnv := setupTestEnv(t)
-	defer teardownTest()
+	defer TeardownTest()
 
 	rd := testEnv.applyRdComponent(t, appName, envName, componentName, func(componentBuilder utils.DeployComponentBuilder) {
 		componentBuilder.WithEnvironmentVariables(map[string]string{
@@ -134,7 +134,7 @@ func Test_RemoveFromConfigMapEnvVarsNotExistingInRadixDeployment(t *testing.T) {
 	namespace := utils.GetEnvironmentNamespace(appName, env)
 	componentName := "any-component"
 	testEnv := setupTestEnv(t)
-	defer teardownTest()
+	defer TeardownTest()
 	t.Run("Remove obsolete env-vars from config-maps", func(t *testing.T) {
 		//goland:noinspection GoUnhandledErrorResult
 		_, err := testEnv.kubeUtil.CreateConfigMap(context.Background(), namespace, &corev1.ConfigMap{ObjectMeta: metav1.ObjectMeta{Name: kube.GetEnvVarsConfigMapName(componentName)}, Data: map[string]string{
@@ -426,7 +426,7 @@ func (testEnv *testEnvProps) applyRdComponent(t *testing.T, appName string, envN
 		WithEmptyStatus().
 		WithComponents(componentBuilder)
 
-	rd, err := applyDeploymentWithSync(testEnv.testUtil, testEnv.kubeclient, testEnv.kubeUtil, testEnv.radixclient, testEnv.kedaClient, testEnv.prometheusclient, testEnv.certClient, radixDeployBuilder)
+	rd, err := ApplyDeploymentWithSync(testEnv.testUtil, testEnv.kubeclient, testEnv.kubeUtil, testEnv.radixclient, testEnv.kedaClient, testEnv.prometheusclient, testEnv.certClient, radixDeployBuilder)
 	assert.NoError(t, err)
 	return rd
 }
@@ -441,13 +441,13 @@ func (testEnv *testEnvProps) applyRdJobComponent(t *testing.T, appName string, e
 		WithEmptyStatus().
 		WithJobComponents(jobBuilder)
 
-	rd, err := applyDeploymentWithSync(testEnv.testUtil, testEnv.kubeclient, testEnv.kubeUtil, testEnv.radixclient, testEnv.kedaClient, testEnv.prometheusclient, testEnv.certClient, radixDeployBuilder)
+	rd, err := ApplyDeploymentWithSync(testEnv.testUtil, testEnv.kubeclient, testEnv.kubeUtil, testEnv.radixclient, testEnv.kedaClient, testEnv.prometheusclient, testEnv.certClient, radixDeployBuilder)
 	assert.NoError(t, err)
 	return rd
 }
 
 func setupTestEnv(t *testing.T) *testEnvProps {
 	testEnv := testEnvProps{}
-	testEnv.testUtil, testEnv.kubeclient, testEnv.kubeUtil, testEnv.radixclient, testEnv.kedaClient, testEnv.prometheusclient, testEnv.secretproviderclient, testEnv.certClient = setupTest(t)
+	testEnv.testUtil, testEnv.kubeclient, testEnv.kubeUtil, testEnv.radixclient, testEnv.kedaClient, testEnv.prometheusclient, testEnv.secretproviderclient, testEnv.certClient = SetupTest(t)
 	return &testEnv
 }

pkg/apis/deployment/kubedeployment.go

@@ -33,6 +33,11 @@ func (deploy *Deployment) reconcileDeployment(ctx context.Context, deployCompone
 		if err != nil {
 			return err
 		}
+
+		err = deploy.deleteTargetAuthenticationIfExists(ctx, deployComponent.GetName())
+		if err != nil {
+			return err
+		}
 	}
 
 	err = deploy.createOrUpdateCsiAzureVolumeResources(ctx, desiredDeployment)

pkg/apis/deployment/kubedeployment_test.go

@@ -190,8 +190,8 @@ func Test_UpdateResourcesInDeployment(t *testing.T) {
 }
 
 func applyDeploymentWithSyncWithComponentResources(t *testing.T, origRequests, origLimits map[string]string) Deployment {
-	tu, client, kubeUtil, radixclient, kedaClient, prometheusclient, _, certClient := setupTest(t)
-	rd, _ := applyDeploymentWithSync(tu, client, kubeUtil, radixclient, kedaClient, prometheusclient, certClient,
+	tu, client, kubeUtil, radixclient, kedaClient, prometheusclient, _, certClient := SetupTest(t)
+	rd, _ := ApplyDeploymentWithSync(tu, client, kubeUtil, radixclient, kedaClient, prometheusclient, certClient,
 		utils.ARadixDeployment().
 			WithComponents(utils.NewDeployComponentBuilder().
 				WithName("comp1").

pkg/apis/deployment/oauthproxyresourcemanager_test.go

@@ -214,29 +214,29 @@ func (s *OAuthProxyResourceManagerTestSuite) Test_Sync_OauthDeploymentReplicas()
 		{
 			name: "component with hpa and default config",
 			rd: utils.NewDeploymentBuilder().WithAppName(appName).WithEnvironment("qa").
-				WithComponent(baseComp().WithHorizontalScaling(pointers.Ptr[int32](3), 4, pointers.Ptr[int32](1), pointers.Ptr[int32](1))).
+				WithComponent(baseComp().WithHorizontalScaling(utils.NewHorizontalScalingBuilder().WithMinReplicas(3).WithMaxReplicas(4).WithCPUTrigger(1).WithMemoryTrigger(1).Build())).
 				BuildRD(),
 			expectedReplicas: 1,
 		},
 		{
 			name: "component with hpa and replicas set to 1",
 			rd: utils.NewDeploymentBuilder().WithAppName(appName).WithEnvironment("qa").
-				WithComponent(baseComp().WithReplicas(pointers.Ptr(1)).WithHorizontalScaling(pointers.Ptr[int32](3), 4, pointers.Ptr[int32](1), pointers.Ptr[int32](1))).
+				WithComponent(baseComp().WithReplicas(pointers.Ptr(1)).WithHorizontalScaling(utils.NewHorizontalScalingBuilder().WithMinReplicas(3).WithMaxReplicas(4).WithCPUTrigger(1).WithMemoryTrigger(1).Build())).
 				BuildRD(),
 			expectedReplicas: 1,
 		},
 		{
 			name: "component with hpa and replicas set to 2",
 			rd: utils.NewDeploymentBuilder().WithAppName(appName).WithEnvironment("qa").
-				WithComponent(baseComp().WithReplicas(pointers.Ptr(2)).WithHorizontalScaling(pointers.Ptr[int32](3), 4, pointers.Ptr[int32](1), pointers.Ptr[int32](1))).
+				WithComponent(baseComp().WithReplicas(pointers.Ptr(2)).WithHorizontalScaling(utils.NewHorizontalScalingBuilder().WithMinReplicas(3).WithMaxReplicas(4).WithCPUTrigger(1).WithMemoryTrigger(1).Build())).
 				BuildRD(),
 			expectedReplicas: 1,
 		},
 		{
 
 			name: "component with hpa and replicas set to 0",
 			rd: utils.NewDeploymentBuilder().WithAppName(appName).WithEnvironment("qa").
-				WithComponent(baseComp().WithReplicas(pointers.Ptr(0)).WithHorizontalScaling(pointers.Ptr[int32](3), 4, pointers.Ptr[int32](1), pointers.Ptr[int32](1))).
+				WithComponent(baseComp().WithReplicas(pointers.Ptr(0)).WithHorizontalScaling(utils.NewHorizontalScalingBuilder().WithMinReplicas(3).WithMaxReplicas(4).WithCPUTrigger(1).WithMemoryTrigger(1).Build())).
 				BuildRD(),
 			expectedReplicas: 0,
 		},

pkg/apis/deployment/pdb_test.go

@@ -7,23 +7,22 @@ import (
 	"github.com/equinor/radix-operator/pkg/apis/kube"
 	"github.com/equinor/radix-operator/pkg/apis/test"
 	"github.com/equinor/radix-operator/pkg/apis/utils"
-	"github.com/equinor/radix-operator/pkg/apis/utils/numbers"
 	"github.com/stretchr/testify/assert"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 )
 
 func TestHorizontalScaleChangePDB(t *testing.T) {
-	tu, client, kubeUtil, radixclient, kedaClient, prometheusclient, _, certClient := setupTest(t)
-	defer teardownTest()
+	tu, client, kubeUtil, radixclient, kedaClient, prometheusclient, _, certClient := SetupTest(t)
+	defer TeardownTest()
 	anyAppName := "anyappname"
 	anyEnvironmentName := "test"
 	componentOneName := "componentOneName"
 	componentTwoName := "componentTwoName"
 	componentThreeName := "componentThreeName"
 
 	// Test
-	_, err := applyDeploymentWithSync(tu, client, kubeUtil, radixclient, kedaClient, prometheusclient, certClient, utils.ARadixDeployment().
+	_, err := ApplyDeploymentWithSync(tu, client, kubeUtil, radixclient, kedaClient, prometheusclient, certClient, utils.ARadixDeployment().
 		WithAppName(anyAppName).
 		WithEnvironment(anyEnvironmentName).
 		WithJobComponents().
@@ -34,7 +33,7 @@ func TestHorizontalScaleChangePDB(t *testing.T) {
 				WithPublicPort("http").
 				WithDNSAppAlias(true).
 				WithReplicas(test.IntPtr(4)).
-				WithHorizontalScaling(numbers.Int32Ptr(2), 4, nil, nil),
+				WithHorizontalScaling(utils.NewHorizontalScalingBuilder().WithMinReplicas(2).WithMaxReplicas(4).Build()),
 			utils.NewDeployComponentBuilder().
 				WithName(componentTwoName).
 				WithPort("http", 6379).
@@ -43,7 +42,7 @@ func TestHorizontalScaleChangePDB(t *testing.T) {
 			utils.NewDeployComponentBuilder().
 				WithName(componentThreeName).
 				WithPort("http", 3000).
-				WithPublicPort("http").WithHorizontalScaling(nil, 2, nil, nil)))
+				WithPublicPort("http").WithHorizontalScaling(utils.NewHorizontalScalingBuilder().WithMaxReplicas(2).Build())))
 
 	assert.NoError(t, err)
 	envNamespace := utils.GetEnvironmentNamespace(anyAppName, anyEnvironmentName)
@@ -61,7 +60,7 @@ func TestHorizontalScaleChangePDB(t *testing.T) {
 	assert.Equal(t, int32(1), pdbs.Items[0].Spec.MinAvailable.IntVal)
 
 	// Remove components
-	_, err = applyDeploymentWithSync(tu, client, kubeUtil, radixclient, kedaClient, prometheusclient, certClient, utils.ARadixDeployment().
+	_, err = ApplyDeploymentWithSync(tu, client, kubeUtil, radixclient, kedaClient, prometheusclient, certClient, utils.ARadixDeployment().
 		WithAppName(anyAppName).
 		WithEnvironment(anyEnvironmentName).
 		WithJobComponents().
@@ -88,16 +87,16 @@ func TestHorizontalScaleChangePDB(t *testing.T) {
 }
 
 func TestObjectSynced_MultiComponentToOneComponent_HandlesPdbChange(t *testing.T) {
-	tu, client, kubeUtil, radixclient, kedaClient, prometheusclient, _, certClient := setupTest(t)
-	defer teardownTest()
+	tu, client, kubeUtil, radixclient, kedaClient, prometheusclient, _, certClient := SetupTest(t)
+	defer TeardownTest()
 	anyAppName := "anyappname"
 	anyEnvironmentName := "test"
 	componentOneName := "componentOneName"
 	componentTwoName := "componentTwoName"
 	componentThreeName := "componentThreeName"
 
 	// Test
-	_, err := applyDeploymentWithSync(tu, client, kubeUtil, radixclient, kedaClient, prometheusclient, certClient, utils.ARadixDeployment().
+	_, err := ApplyDeploymentWithSync(tu, client, kubeUtil, radixclient, kedaClient, prometheusclient, certClient, utils.ARadixDeployment().
 		WithAppName(anyAppName).
 		WithEnvironment(anyEnvironmentName).
 		WithJobComponents().
@@ -134,7 +133,7 @@ func TestObjectSynced_MultiComponentToOneComponent_HandlesPdbChange(t *testing.T
 	assert.Equal(t, int32(1), pdbs.Items[0].Spec.MinAvailable.IntVal)
 
 	// Remove components
-	_, err = applyDeploymentWithSync(tu, client, kubeUtil, radixclient, kedaClient, prometheusclient, certClient, utils.ARadixDeployment().
+	_, err = ApplyDeploymentWithSync(tu, client, kubeUtil, radixclient, kedaClient, prometheusclient, certClient, utils.ARadixDeployment().
 		WithAppName(anyAppName).
 		WithEnvironment(anyEnvironmentName).
 		WithJobComponents().
@@ -161,16 +160,16 @@ func TestObjectSynced_MultiComponentToOneComponent_HandlesPdbChange(t *testing.T
 }
 
 func TestObjectSynced_ScalingReplicas_HandlesChange(t *testing.T) {
-	tu, client, kubeUtil, radixclient, kedaClient, prometheusclient, _, certClient := setupTest(t)
-	defer teardownTest()
+	tu, client, kubeUtil, radixclient, kedaClient, prometheusclient, _, certClient := SetupTest(t)
+	defer TeardownTest()
 	anyAppName := "anyappname"
 	anyEnvironmentName := "test"
 	componentOneName := "componentOneName"
 	componentTwoName := "componentTwoName"
 	envNamespace := utils.GetEnvironmentNamespace(anyAppName, anyEnvironmentName)
 
 	// Define one component with >1 replicas and one component with <2 replicas
-	_, err := applyDeploymentWithSync(tu, client, kubeUtil, radixclient, kedaClient, prometheusclient, certClient, utils.ARadixDeployment().
+	_, err := ApplyDeploymentWithSync(tu, client, kubeUtil, radixclient, kedaClient, prometheusclient, certClient, utils.ARadixDeployment().
 		WithAppName(anyAppName).
 		WithEnvironment(anyEnvironmentName).
 		WithJobComponents().
@@ -197,7 +196,7 @@ func TestObjectSynced_ScalingReplicas_HandlesChange(t *testing.T) {
 	assert.Equal(t, int32(1), pdbs.Items[0].Spec.MinAvailable.IntVal)
 
 	// Define two components with <2 replicas
-	_, err = applyDeploymentWithSync(tu, client, kubeUtil, radixclient, kedaClient, prometheusclient, certClient, utils.ARadixDeployment().
+	_, err = ApplyDeploymentWithSync(tu, client, kubeUtil, radixclient, kedaClient, prometheusclient, certClient, utils.ARadixDeployment().
 		WithAppName(anyAppName).
 		WithEnvironment(anyEnvironmentName).
 		WithJobComponents().
@@ -222,7 +221,7 @@ func TestObjectSynced_ScalingReplicas_HandlesChange(t *testing.T) {
 	assert.Equal(t, 0, len(pdbs.Items))
 
 	// Define one component with >1 replicas and one component with <2 replicas
-	_, err = applyDeploymentWithSync(tu, client, kubeUtil, radixclient, kedaClient, prometheusclient, certClient, utils.ARadixDeployment().
+	_, err = ApplyDeploymentWithSync(tu, client, kubeUtil, radixclient, kedaClient, prometheusclient, certClient, utils.ARadixDeployment().
 		WithAppName(anyAppName).
 		WithEnvironment(anyEnvironmentName).
 		WithJobComponents().
@@ -250,7 +249,7 @@ func TestObjectSynced_ScalingReplicas_HandlesChange(t *testing.T) {
 	assert.Equal(t, int32(1), pdbs.Items[0].Spec.MinAvailable.IntVal)
 
 	// Delete component with >1 replicas. Expect PDBs to be removed
-	_, err = applyDeploymentWithSync(tu, client, kubeUtil, radixclient, kedaClient, prometheusclient, certClient, utils.ARadixDeployment().
+	_, err = ApplyDeploymentWithSync(tu, client, kubeUtil, radixclient, kedaClient, prometheusclient, certClient, utils.ARadixDeployment().
 		WithAppName(anyAppName).
 		WithEnvironment(anyEnvironmentName).
 		WithJobComponents().
@@ -271,7 +270,7 @@ func TestObjectSynced_ScalingReplicas_HandlesChange(t *testing.T) {
 	componentThreeName := "componentThreeName"
 
 	// Set 3 components with >1 replicas. Expect 3 PDBs
-	_, err = applyDeploymentWithSync(tu, client, kubeUtil, radixclient, kedaClient, prometheusclient, certClient, utils.ARadixDeployment().
+	_, err = ApplyDeploymentWithSync(tu, client, kubeUtil, radixclient, kedaClient, prometheusclient, certClient, utils.ARadixDeployment().
 		WithAppName(anyAppName).
 		WithEnvironment(anyEnvironmentName).
 		WithJobComponents().
@@ -306,16 +305,16 @@ func TestObjectSynced_ScalingReplicas_HandlesChange(t *testing.T) {
 }
 
 func TestObjectSynced_HorizontalScalingReplicas_HandlesChange(t *testing.T) {
-	tu, client, kubeUtil, radixclient, kedaClient, prometheusclient, _, certClient := setupTest(t)
-	defer teardownTest()
+	tu, client, kubeUtil, radixclient, kedaClient, prometheusclient, _, certClient := SetupTest(t)
+	defer TeardownTest()
 	anyAppName := "anyappname"
 	anyEnvironmentName := "test"
 	componentOneName := "componentOneName"
 	componentTwoName := "componentTwoName"
 	envNamespace := utils.GetEnvironmentNamespace(anyAppName, anyEnvironmentName)
 
 	// Define one component with >1 replicas and one component with <2 replicas
-	_, err := applyDeploymentWithSync(tu, client, kubeUtil, radixclient, kedaClient, prometheusclient, certClient, utils.ARadixDeployment().
+	_, err := ApplyDeploymentWithSync(tu, client, kubeUtil, radixclient, kedaClient, prometheusclient, certClient, utils.ARadixDeployment().
 		WithAppName(anyAppName).
 		WithEnvironment(anyEnvironmentName).
 		WithJobComponents().
@@ -325,7 +324,7 @@ func TestObjectSynced_HorizontalScalingReplicas_HandlesChange(t *testing.T) {
 				WithPort("http", 8080).
 				WithPublicPort("http").
 				WithReplicas(test.IntPtr(4)).
-				WithHorizontalScaling(numbers.Int32Ptr(4), 6, nil, nil),
+				WithHorizontalScaling(utils.NewHorizontalScalingBuilder().WithMinReplicas(4).WithMaxReplicas(6).Build()),
 			utils.NewDeployComponentBuilder().
 				WithName(componentTwoName).
 				WithPort("http", 6379).
@@ -343,7 +342,7 @@ func TestObjectSynced_HorizontalScalingReplicas_HandlesChange(t *testing.T) {
 	assert.Equal(t, int32(1), pdbs.Items[0].Spec.MinAvailable.IntVal)
 
 	// Define two components with <2 replicas
-	_, err = applyDeploymentWithSync(tu, client, kubeUtil, radixclient, kedaClient, prometheusclient, certClient, utils.ARadixDeployment().
+	_, err = ApplyDeploymentWithSync(tu, client, kubeUtil, radixclient, kedaClient, prometheusclient, certClient, utils.ARadixDeployment().
 		WithAppName(anyAppName).
 		WithEnvironment(anyEnvironmentName).
 		WithJobComponents().
@@ -354,7 +353,7 @@ func TestObjectSynced_HorizontalScalingReplicas_HandlesChange(t *testing.T) {
 				WithPublicPort("http").
 				WithDNSAppAlias(true).
 				WithReplicas(test.IntPtr(1)).
-				WithHorizontalScaling(numbers.Int32Ptr(1), 6, nil, nil),
+				WithHorizontalScaling(utils.NewHorizontalScalingBuilder().WithMinReplicas(1).WithMaxReplicas(6).Build()),
 			utils.NewDeployComponentBuilder().
 				WithName(componentTwoName).
 				WithPort("http", 6379).
@@ -370,15 +369,15 @@ func TestObjectSynced_HorizontalScalingReplicas_HandlesChange(t *testing.T) {
 }
 
 func TestObjectSynced_UpdatePdb_HandlesChange(t *testing.T) {
-	tu, client, kubeUtil, radixclient, kedaClient, prometheusclient, _, certClient := setupTest(t)
-	defer teardownTest()
+	tu, client, kubeUtil, radixclient, kedaClient, prometheusclient, _, certClient := SetupTest(t)
+	defer TeardownTest()
 	anyAppName := "anyappname"
 	anyEnvironmentName := "test"
 	componentOneName := "componentOneName"
 	envNamespace := utils.GetEnvironmentNamespace(anyAppName, anyEnvironmentName)
 
 	// Define a component with >1 replicas
-	_, err := applyDeploymentWithSync(tu, client, kubeUtil, radixclient, kedaClient, prometheusclient, certClient, utils.ARadixDeployment().
+	_, err := ApplyDeploymentWithSync(tu, client, kubeUtil, radixclient, kedaClient, prometheusclient, certClient, utils.ARadixDeployment().
 		WithAppName(anyAppName).
 		WithEnvironment(anyEnvironmentName).
 		WithJobComponents().
@@ -408,7 +407,7 @@ func TestObjectSynced_UpdatePdb_HandlesChange(t *testing.T) {
 	assert.Equal(t, "wrong", pdbWithWrongLabels.ObjectMeta.Labels[kube.RadixComponentLabel])
 	assert.Equal(t, "wrong", pdbWithWrongLabels.Spec.Selector.MatchLabels[kube.RadixComponentLabel])
 
-	_, err = applyDeploymentWithSync(tu, client, kubeUtil, radixclient, kedaClient, prometheusclient, certClient, utils.ARadixDeployment().
+	_, err = ApplyDeploymentWithSync(tu, client, kubeUtil, radixclient, kedaClient, prometheusclient, certClient, utils.ARadixDeployment().
 		WithAppName(anyAppName).
 		WithEnvironment(anyEnvironmentName).
 		WithJobComponents().