Update GKE correctness test guide to use GcsCorrectnessTest.

This also updates all GKE guides to use Kustomize.
world-federation-of-advertisers · Apr 26, 2023 · 40f368b · 40f368b
1 parent 6172c4c
commit 40f368b
Show file tree

Hide file tree

Showing 56 changed files with 826 additions and 1,766 deletions.
diff --git a/build/k8s/defs.bzl b/build/k8s/defs.bzl
@@ -244,7 +244,10 @@ def _kustomization_file_impl(ctx):
             dir_info = src[KustomizationDirInfo]
             resources.append(_relative_path(dir_info.path, dir_path))
         else:
-            resources.append(src.files.to_list()[0].basename)
+            src_name = src.files.to_list()[0].basename
+            if not src_name.endswith(".yaml"):
+                fail("%s does not end in .yaml" % src_name)
+            resources.append(src_name)
 
     content_lines = ["resources:"] + [
         "- " + resource
@@ -263,7 +266,6 @@ _kustomization_file = rule(
     attrs = {
         "srcs": attr.label_list(
             doc = "Items to list in resources",
-            allow_files = [".yaml"],
             providers = [
                 [DefaultInfo],
                 [KustomizationDirInfo],

diff --git a/build/repositories.bzl b/build/repositories.bzl
@@ -18,6 +18,8 @@ Adds external repos necessary for wfa_measurement_system.
 
 load("//build/wfa:repositories.bzl", "wfa_repo_archive")
 
+MEASUREMENT_SYSTEM_REPO = "https://github.com/world-federation-of-advertisers/cross-media-measurement"
+
 def wfa_measurement_system_repositories():
     """Imports all direct dependencies for wfa_measurement_system."""
 
@@ -73,6 +75,6 @@ def wfa_measurement_system_repositories():
     wfa_repo_archive(
         name = "wfa_rules_cue",
         repo = "rules_cue",
-        sha256 = "652379dec5174ed7fa8fe4223d0adf9a1d610ff0aa02e1bd1e74f79834b526a6",
-        version = "0.2.0",
+        sha256 = "0261b7797fa9083183536667958b1094fc732725fc48fca5cb68e6f731cdce2f",
+        version = "0.3.0",
     )
diff --git a/build/variables.bzl b/build/variables.bzl
@@ -56,23 +56,25 @@ TEST_K8S_SETTINGS = struct(
 GCLOUD_SETTINGS = struct(
     project = "$(google_cloud_project)",
     spanner_instance = "$(spanner_instance)",
+    postgres_instance = "$(postgres_instance)",
+    postgres_region = "$(postgres_region)",
 )
 
 # Settings for Kingdom Kubernetes deployments.
 KINGDOM_K8S_SETTINGS = struct(
-    secret_name = "$(k8s_kingdom_secret_name)",
+    public_api_target = "$(kingdom_public_api_target)",
+    system_api_target = "$(kingdom_system_api_target)",
 )
 
 # Settings for Duchy Kubernetes deployments.
 DUCHY_K8S_SETTINGS = struct(
-    secret_name = "$(k8s_duchy_secret_name)",
     certificate_id = "$(duchy_cert_id)",
     storage_bucket = "$(duchy_storage_bucket)",
+    public_api_target = "$(duchy_public_api_target)",
 )
 
 # Settings for simulator Kubernetes deployments.
 SIMULATOR_K8S_SETTINGS = struct(
-    secret_name = "$(k8s_simulator_secret_name)",
     storage_bucket = "$(simulator_storage_bucket)",
     mc_name = "$(mc_name)",
     mc_api_key = "$(mc_api_key)",
@@ -84,12 +86,6 @@ SIMULATOR_K8S_SETTINGS = struct(
     edp6_name = "$(edp6_name)",
 )
 
-# Settings for Reporting server Kubernetes deployments.
-REPORTING_K8S_SETTINGS = struct(
-    secret_name = "$(k8s_reporting_secret_name)",
-    mc_config_secret_name = "$(k8s_reporting_mc_config_secret_name)",
-)
-
 # Settings for Grafana Kubernetes deployments.
 GRAFANA_K8S_SETTINGS = struct(
     secret_name = "$(k8s_grafana_secret_name)",

diff --git a/docs/gke/cluster-config.md b/docs/gke/cluster-config.md
@@ -100,7 +100,7 @@ the `gcloud` and `bq` CLI tools.
 ```shell
 gcloud projects add-iam-policy-binding halo-cmm-dev \
   --role=roles/bigquery.jobUser \
-  --member='serviceAccount:[email protected]`
+  --member='serviceAccount:[email protected]'
 ```
 
 ```shell