[mq] working branch - merge fadf6ef on top of main at 5cdcff8

{"baseBranch":"main","baseCommit":"5cdcff875ede8d4b8999f63000ce3a0f0d820d36","createdAt":"2024-12-17T11:03:54.712494Z","headSha":"fadf6ef61b505f29574f40bec21f82ac582bdc51","id":"c9b79970-b8b4-4cd2-9881-b240bdba576f","priority":"200","pullRequestNumber":"1301","queuedAt":"2024-12-17T11:03:54.709459Z","status":"STATUS_QUEUED"}
DataDog · Dec 17, 2024 · 9308378 · 9308378
2 parents ad58ea4 + fadf6ef
commit 9308378
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/scenarios/aws/eks/run.go b/scenarios/aws/eks/run.go
@@ -38,9 +38,11 @@ func Run(ctx *pulumi.Context) error {
 		return err
 	}
 
-	if _, err := vpa.DeployCRD(&awsEnv, cluster.KubeProvider); err != nil {
+	vpaCrd, err := vpa.DeployCRD(&awsEnv, cluster.KubeProvider)
+	if err != nil {
 		return err
 	}
+	dependsOnVPA := utils.PulumiDependsOn(vpaCrd)
 
 	if awsEnv.InitOnly() {
 		return nil
@@ -110,11 +112,11 @@ func Run(ctx *pulumi.Context) error {
 
 	// Deploy testing workload
 	if awsEnv.TestingWorkloadDeploy() {
-		if _, err := nginx.K8sAppDefinition(&awsEnv, cluster.KubeProvider, "workload-nginx", "", true, utils.PulumiDependsOn(workloadWithCRDDeps...)); err != nil {
+		if _, err := nginx.K8sAppDefinition(&awsEnv, cluster.KubeProvider, "workload-nginx", "", true, utils.PulumiDependsOn(workloadWithCRDDeps...), dependsOnVPA); err != nil {
 			return err
 		}
 
-		if _, err := redis.K8sAppDefinition(&awsEnv, cluster.KubeProvider, "workload-redis", true, utils.PulumiDependsOn(workloadWithCRDDeps...)); err != nil {
+		if _, err := redis.K8sAppDefinition(&awsEnv, cluster.KubeProvider, "workload-redis", true, utils.PulumiDependsOn(workloadWithCRDDeps...), dependsOnVPA); err != nil {
 			return err
 		}
 

diff --git a/scenarios/aws/kindvm/run.go b/scenarios/aws/kindvm/run.go
@@ -69,9 +69,11 @@ func Run(ctx *pulumi.Context) error {
 		return err
 	}
 
-	if _, err := vpa.DeployCRD(&awsEnv, kindKubeProvider); err != nil {
+	vpaCrd, err := vpa.DeployCRD(&awsEnv, kindKubeProvider)
+	if err != nil {
 		return err
 	}
+	dependsOnVPA := utils.PulumiDependsOn(vpaCrd)
 
 	var dependsOnCrd pulumi.ResourceOption
 
@@ -203,11 +205,11 @@ spec:
 
 	// Deploy testing workload
 	if awsEnv.TestingWorkloadDeploy() {
-		if _, err := nginx.K8sAppDefinition(&awsEnv, kindKubeProvider, "workload-nginx", "", true, dependsOnCrd); err != nil {
+		if _, err := nginx.K8sAppDefinition(&awsEnv, kindKubeProvider, "workload-nginx", "", true, dependsOnCrd, dependsOnVPA); err != nil {
 			return err
 		}
 
-		if _, err := redis.K8sAppDefinition(&awsEnv, kindKubeProvider, "workload-redis", true, dependsOnCrd); err != nil {
+		if _, err := redis.K8sAppDefinition(&awsEnv, kindKubeProvider, "workload-redis", true, dependsOnCrd, dependsOnVPA); err != nil {
 			return err
 		}