From aacf3a3ad389fafaf662a9f8aac3d1bcfa6cc730 Mon Sep 17 00:00:00 2001 From: Lin Date: Mon, 9 Dec 2024 23:46:44 +0000 Subject: [PATCH] feat: make prober dev & local take 2 edps --- src/main/k8s/dev/BUILD.bazel | 6 ++---- src/main/k8s/dev/measurement_system_prober.cue | 4 +++- src/main/k8s/local/BUILD.bazel | 6 ++---- src/main/k8s/local/measurement_system_prober.cue | 4 +++- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/k8s/dev/BUILD.bazel b/src/main/k8s/dev/BUILD.bazel index 7e02b91c402..93a237ca75d 100644 --- a/src/main/k8s/dev/BUILD.bazel +++ b/src/main/k8s/dev/BUILD.bazel @@ -517,10 +517,8 @@ cue_dump( "image_repo_prefix": IMAGE_REPOSITORY_SETTINGS.repository_prefix, "image_tag": IMAGE_REPOSITORY_SETTINGS.image_tag, "secret_name": SECRET_NAME, - "edp_resource_names": [ - SIMULATOR_K8S_SETTINGS.edp1_name, - SIMULATOR_K8S_SETTINGS.edp2_name, - ], + "edp1_name": SIMULATOR_K8S_SETTINGS.edp1_name, + "edp2_name": SIMULATOR_K8S_SETTINGS.edp2_name, }, tags = ["manual"], deps = [ diff --git a/src/main/k8s/dev/measurement_system_prober.cue b/src/main/k8s/dev/measurement_system_prober.cue index 5e0bd520dd3..a280db6c999 100644 --- a/src/main/k8s/dev/measurement_system_prober.cue +++ b/src/main/k8s/dev/measurement_system_prober.cue @@ -3,7 +3,9 @@ package k8s _secret_name: string @tag("secret_name") _mc_resource_name: string @tag("mc_name") _mc_api_key: string @tag("mc_api_key") -_edp_resource_names: [...string] @tag("edp_resource_names") +_edp1: string @tag("edp1_name") +_edp2: string @tag("edp2_name") +_edp_resource_names: [_edp1, _edp2] #KingdomPublicApiTarget: (#Target & {name: "v2alpha-public-api-server"}).target diff --git a/src/main/k8s/local/BUILD.bazel b/src/main/k8s/local/BUILD.bazel index 1f6e3904d1b..7cbf7e6b18d 100644 --- a/src/main/k8s/local/BUILD.bazel +++ b/src/main/k8s/local/BUILD.bazel @@ -207,10 +207,8 @@ cue_dump( "image_repo_prefix": IMAGE_REPOSITORY_SETTINGS.repository_prefix, "image_tag": IMAGE_REPOSITORY_SETTINGS.image_tag, "secret_name": SECRET_NAME, - "edp_resource_names": [ - TEST_K8S_SETTINGS.edp1_name, - TEST_K8S_SETTINGS.edp2_name, - ], + "edp1_name": TEST_K8S_SETTINGS.edp1_name, + "edp2_name": TEST_K8S_SETTINGS.edp2_name, }, tags = ["manual"], deps = [ diff --git a/src/main/k8s/local/measurement_system_prober.cue b/src/main/k8s/local/measurement_system_prober.cue index 5e0bd520dd3..a280db6c999 100644 --- a/src/main/k8s/local/measurement_system_prober.cue +++ b/src/main/k8s/local/measurement_system_prober.cue @@ -3,7 +3,9 @@ package k8s _secret_name: string @tag("secret_name") _mc_resource_name: string @tag("mc_name") _mc_api_key: string @tag("mc_api_key") -_edp_resource_names: [...string] @tag("edp_resource_names") +_edp1: string @tag("edp1_name") +_edp2: string @tag("edp2_name") +_edp_resource_names: [_edp1, _edp2] #KingdomPublicApiTarget: (#Target & {name: "v2alpha-public-api-server"}).target