Update workflows for QA environment.

world-federation-of-advertisers · Apr 2, 2024 · 7b7c617 · 7b7c617
1 parent d6a3ed4
commit 7b7c617
Show file tree

Hide file tree

Showing 22 changed files with 129 additions and 76 deletions.
diff --git a/.github/workflows/configure-aws-duchy.yml b/.github/workflows/configure-aws-duchy.yml
@@ -35,6 +35,7 @@ on:
   workflow_dispatch:
     inputs:
       environment:
+        description: "GitHub-managed environment"
         required: true
         type: choice
         options:
@@ -91,6 +92,9 @@ jobs:
         POSTGRES_HOST: ${{ vars.AWS_POSTGRES_HOST }}
         POSTGRES_CRED_SECRET_NAME: ${{ vars.AWS_POSTGRES_CRED_SECRET_NAME }}
         KINGDOM_SYSTEM_API_TARGET: ${{ vars.KINGDOM_SYSTEM_API_TARGET }}
+        AGGREGATOR_SYSTEM_API_TARGET: ${{ vars.AGGREGATOR_SYSTEM_API_TARGET }}
+        WORKER1_SYSTEM_API_TARGET: ${{ vars.WORKER1_SYSTEM_API_TARGET }}
+        WORKER2_SYSTEM_API_TARGET: ${{ vars.WORKER2_SYSTEM_API_TARGET }}
         COMPUTATION_CONTROL_SERVER_EIPS: ${{ vars.AWS_COMPUTATION_CONTROL_SERVER_EIPS }}
         S3_BUCKET: ${{ vars.AWS_S3_BUCKET }}
       run: |
@@ -99,6 +103,9 @@ jobs:
         common --config=ghcr
         build --define image_tag=$IMAGE_TAG
         build --define kingdom_system_api_target=$KINGDOM_SYSTEM_API_TARGET
+        build --define aggregator_system_api_target=$AGGREGATOR_SYSTEM_API_TARGET
+        build --define worker1_system_api_target=$WORKER1_SYSTEM_API_TARGET
+        build --define worker2_system_api_target=$WORKER2_SYSTEM_API_TARGET
         build --define s3_bucket=$S3_BUCKET
         build --define s3_region=$AWS_REGION
         build --define duchy_cert_id=$DUCHY_CERT_ID

diff --git a/.github/workflows/configure-duchy.yml b/.github/workflows/configure-duchy.yml
@@ -35,10 +35,12 @@ on:
   workflow_dispatch:
     inputs:
       environment:
+        description: "GitHub-managed environment"
         required: true
         type: choice
         options:
         - dev
+        - qa
       image-tag:
         description: "Tag of container images"
         type: string
@@ -90,6 +92,9 @@ jobs:
         POSTGRES_HOST: ${{ vars.AWS_POSTGRES_HOST }}
         POSTGRES_CRED_SECRET_NAME: ${{ vars.AWS_POSTGRES_CRED_SECRET_NAME }}
         KINGDOM_SYSTEM_API_TARGET: ${{ vars.KINGDOM_SYSTEM_API_TARGET }}
+        AGGREGATOR_SYSTEM_API_TARGET: ${{ vars.AGGREGATOR_SYSTEM_API_TARGET }}
+        WORKER1_SYSTEM_API_TARGET: ${{ vars.WORKER1_SYSTEM_API_TARGET }}
+        WORKER2_SYSTEM_API_TARGET: ${{ vars.WORKER2_SYSTEM_API_TARGET }}
         COMPUTATION_CONTROL_SERVER_EIPS: ${{ vars.AWS_COMPUTATION_CONTROL_SERVER_EIPS }}
         S3_BUCKET: ${{ vars.AWS_S3_BUCKET }}
       run: |
@@ -98,6 +103,9 @@ jobs:
         common --config=ghcr
         build --define image_tag=$IMAGE_TAG
         build --define kingdom_system_api_target=$KINGDOM_SYSTEM_API_TARGET
+        build --define aggregator_system_api_target=$AGGREGATOR_SYSTEM_API_TARGET
+        build --define worker1_system_api_target=$WORKER1_SYSTEM_API_TARGET
+        build --define worker2_system_api_target=$WORKER2_SYSTEM_API_TARGET
         build --define s3_bucket=$S3_BUCKET
         build --define s3_region=$AWS_REGION
         build --define duchy_cert_id=$DUCHY_CERT_ID
@@ -112,7 +120,7 @@ jobs:
       run: echo "BAZEL_BIN=$(bazelisk info bazel-bin)" >> $GITHUB_ENV
 
     - name: Get GKE cluster credentials
-      uses: google-github-actions/get-gke-credentials@v1
+      uses: google-github-actions/get-gke-credentials@v2
       with:
         cluster_name: ${{ format('{0}-duchy', inputs.duchy-name) }}
         location: ${{ vars.GCLOUD_ZONE }}

diff --git a/.github/workflows/configure-kingdom.yml b/.github/workflows/configure-kingdom.yml
@@ -31,10 +31,12 @@ on:
   workflow_dispatch:
     inputs:
       environment:
+        description: "GitHub-managed environment"
         required: true
         type: choice
         options:
           - dev
+          - qa
       image-tag:
         description: "Tag of container images"
         type: string
@@ -82,7 +84,7 @@ jobs:
         run: echo "BAZEL_BIN=$(bazelisk info bazel-bin)" >> $GITHUB_ENV
 
       - name: Get GKE cluster credentials
-        uses: google-github-actions/get-gke-credentials@v1
+        uses: google-github-actions/get-gke-credentials@v2
         with:
           cluster_name: kingdom
           location: ${{ vars.GCLOUD_ZONE }}

diff --git a/.github/workflows/configure-reporting-v2.yml b/.github/workflows/configure-reporting-v2.yml
@@ -31,10 +31,12 @@ on:
   workflow_dispatch:
     inputs:
       environment:
+        description: "GitHub-managed environment"
         required: true
         type: choice
         options:
         - dev
+        - qa
       image-tag:
         description: "Tag of container images"
         type: string
@@ -86,7 +88,7 @@ jobs:
       run: echo "BAZEL_BIN=$(bazelisk info bazel-bin)" >> $GITHUB_ENV
 
     - name: Get GKE cluster credentials
-      uses: google-github-actions/get-gke-credentials@v1
+      uses: google-github-actions/get-gke-credentials@v2
       with:
         cluster_name: reporting-v2
         location: ${{ vars.GCLOUD_ZONE }}

diff --git a/.github/workflows/configure-reporting.yml b/.github/workflows/configure-reporting.yml
@@ -31,10 +31,12 @@ on:
   workflow_dispatch:
     inputs:
       environment:
+        description: "GitHub-managed environment"
         required: true
         type: choice
         options:
         - dev
+        - qa
       image-tag:
         description: "Tag of container images"
         type: string
@@ -87,7 +89,7 @@ jobs:
       run: echo "BAZEL_BIN=$(bazelisk info bazel-bin)" >> $GITHUB_ENV
 
     - name: Get GKE cluster credentials
-      uses: google-github-actions/get-gke-credentials@v1
+      uses: google-github-actions/get-gke-credentials@v2
       with:
         cluster_name: reporting
         location: ${{ vars.GCLOUD_ZONE }}

diff --git a/.github/workflows/configure-simulators.yml b/.github/workflows/configure-simulators.yml
@@ -31,10 +31,12 @@ on:
   workflow_dispatch:
     inputs:
       environment:
+        description: "GitHub-managed environment"
         required: true
         type: choice
         options:
         - dev
+        - qa
       image-tag:
         description: "Tag of container images"
         type: string
@@ -110,7 +112,7 @@ jobs:
       run: echo "BAZEL_BIN=$(bazelisk info bazel-bin)" >> $GITHUB_ENV
 
     - name: Get GKE cluster credentials
-      uses: google-github-actions/get-gke-credentials@v1
+      uses: google-github-actions/get-gke-credentials@v2
       with:
         cluster_name: simulators
         location: ${{ vars.GCLOUD_ZONE }}

diff --git a/.github/workflows/run-k8s-tests.yml b/.github/workflows/run-k8s-tests.yml
@@ -23,10 +23,12 @@ on:
   workflow_dispatch:
     inputs:
       environment:
+        description: "GitHub-managed environment"
         required: true
         type: choice
         options:
         - dev
+        - qa
 
 permissions:
   id-token: write

diff --git a/.github/workflows/update-cmms.yml b/.github/workflows/update-cmms.yml
@@ -27,10 +27,12 @@ on:
   workflow_dispatch:
     inputs:
       environment:
+        description: "GitHub-managed environment"
         required: true
         type: choice
         options:
         - dev
+        - qa
       apply:
         description: "Apply the new configuration"
         type: boolean

diff --git a/build/variables.bzl b/build/variables.bzl
@@ -91,6 +91,9 @@ DUCHY_K8S_SETTINGS = struct(
     certificate_id = "$(duchy_cert_id)",
     storage_bucket = "$(duchy_storage_bucket)",
     public_api_target = "$(duchy_public_api_target)",
+    aggregator_system_api_target = "$(aggregator_system_api_target)",
+    worker1_system_api_target = "$(worker1_system_api_target)",
+    worker2_system_api_target = "$(worker2_system_api_target)",
 )
 
 # Settings for simulator Kubernetes deployments.

diff --git a/src/main/k8s/dev/BUILD.bazel b/src/main/k8s/dev/BUILD.bazel
@@ -120,6 +120,9 @@ cue_dump(
         "google_cloud_project": GCLOUD_SETTINGS.project,
         "spanner_instance": GCLOUD_SETTINGS.spanner_instance,
         "kingdom_system_api_target": KINGDOM_K8S_SETTINGS.system_api_target,
+        "aggregator_system_api_target": DUCHY_K8S_SETTINGS.aggregator_system_api_target,
+        "worker1_system_api_target": DUCHY_K8S_SETTINGS.worker1_system_api_target,
+        "worker2_system_api_target": DUCHY_K8S_SETTINGS.worker2_system_api_target,
     },
     tags = ["manual"],
     deps = [
@@ -145,6 +148,9 @@ cue_dump(
         "google_cloud_project": GCLOUD_SETTINGS.project,
         "spanner_instance": GCLOUD_SETTINGS.spanner_instance,
         "kingdom_system_api_target": KINGDOM_K8S_SETTINGS.system_api_target,
+        "aggregator_system_api_target": DUCHY_K8S_SETTINGS.aggregator_system_api_target,
+        "worker1_system_api_target": DUCHY_K8S_SETTINGS.worker1_system_api_target,
+        "worker2_system_api_target": DUCHY_K8S_SETTINGS.worker2_system_api_target,
     },
     tags = ["manual"],
     deps = [
@@ -170,6 +176,9 @@ cue_dump(
         "google_cloud_project": GCLOUD_SETTINGS.project,
         "spanner_instance": GCLOUD_SETTINGS.spanner_instance,
         "kingdom_system_api_target": KINGDOM_K8S_SETTINGS.system_api_target,
+        "aggregator_system_api_target": DUCHY_K8S_SETTINGS.aggregator_system_api_target,
+        "worker1_system_api_target": DUCHY_K8S_SETTINGS.worker1_system_api_target,
+        "worker2_system_api_target": DUCHY_K8S_SETTINGS.worker2_system_api_target,
     },
     tags = ["manual"],
     deps = [
@@ -199,6 +208,9 @@ cue_dump(
         "s3_region": AWS_SETTINGS.s3_region,
         "computation_control_server_eips": AWS_SETTINGS.computation_control_server_eips,
         "kingdom_system_api_target": KINGDOM_K8S_SETTINGS.system_api_target,
+        "aggregator_system_api_target": DUCHY_K8S_SETTINGS.aggregator_system_api_target,
+        "worker1_system_api_target": DUCHY_K8S_SETTINGS.worker1_system_api_target,
+        "worker2_system_api_target": DUCHY_K8S_SETTINGS.worker2_system_api_target,
     },
     tags = ["manual"],
     deps = [

diff --git a/src/main/k8s/dev/duchy_eks.cue b/src/main/k8s/dev/duchy_eks.cue
@@ -19,6 +19,9 @@ _duchyProtocolsSetupConfig:    string @tag("duchy_protocols_setup_config")
 _secretName:                   string @tag("secret_name")
 _certificateId:                string @tag("certificate_id")
 _computationControlServerEips: string @tag("computation_control_server_eips")
+_aggregatorSystemApiTarget:    string @tag("aggregator_system_api_target")
+_worker1SystemApiTarget:       string @tag("worker1_system_api_target")
+_worker2SystemApiTarget:       string @tag("worker2_system_api_target")
 
 _duchyCertName: "duchies/\(_duchyName)/certificates/\(_certificateId)"
 
@@ -71,9 +74,9 @@ duchy: #PostgresDuchy & {
 	}
 	_duchy_secret_name: _secretName
 	_computation_control_targets: {
-		"aggregator": "system.aggregator.dev.halo-cmm.org:8443"
-		"worker1":    "system.worker1.dev.halo-cmm.org:8443"
-		"worker2":    "v1alpha.system.aws.worker2.dev.halo-cmm.org:8443"
+		"aggregator": _aggregatorSystemApiTarget
+		"worker1":    _worker1SystemApiTarget
+		"worker2":    _worker2SystemApiTarget
 	}
 	_kingdom_system_api_target: #KingdomSystemApiTarget
 	_blob_storage_flags:        #AwsS3Config.flags

diff --git a/src/main/k8s/dev/duchy_gke.cue b/src/main/k8s/dev/duchy_gke.cue
@@ -19,6 +19,9 @@ _duchy_protocols_setup_config: string @tag("duchy_protocols_setup_config")
 _secret_name:                  string @tag("secret_name")
 _cloudStorageBucket:           string @tag("cloud_storage_bucket")
 _certificateId:                string @tag("certificate_id")
+_aggregatorSystemApiTarget:    string @tag("aggregator_system_api_target")
+_worker1SystemApiTarget:       string @tag("worker1_system_api_target")
+_worker2SystemApiTarget:       string @tag("worker2_system_api_target")
 
 _duchy_cert_name: "duchies/\(_duchy_name)/certificates/\(_certificateId)"
 
@@ -70,9 +73,9 @@ duchy: #SpannerDuchy & {
 	}
 	_duchy_secret_name: _secret_name
 	_computation_control_targets: {
-		"aggregator": "system.aggregator.dev.halo-cmm.org:8443"
-		"worker1":    "system.worker1.dev.halo-cmm.org:8443"
-		"worker2":    "v1alpha.system.aws.worker2.dev.halo-cmm.org:8443"
+		"aggregator": _aggregatorSystemApiTarget
+		"worker1":    _worker1SystemApiTarget
+		"worker2":    _worker2SystemApiTarget
 	}
 	_kingdom_system_api_target: #KingdomSystemApiTarget
 	_blob_storage_flags:        _cloudStorageConfig.flags

diff --git a/src/main/k8s/testing/secretfiles/aggregator_tls.key b/src/main/k8s/testing/secretfiles/aggregator_tls.key
@@ -1,5 +1,5 @@
 -----BEGIN PRIVATE KEY-----
-MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgFg8rf8ht4MxLof81
-mwl5AWu2ZdMbLmqdvxoVxnbPOd2hRANCAAR7m2j6Q8oJoJG/L68ml3/FEzddCZ1+
-LNArX8mGy8XwdV1BrLOfHO2v8cmcBtBBd5tDHIOTy4ep3taTZJettt5h
+MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgfbExO89801Zs5aIO
+bz/hW3mfX4lPAUt97q38psXcsNyhRANCAAS5DgE+j9J+RRE+bAHYWp4Hgj+Bn8cx
+RnVOB6pRMrO+eo4zFJ8YfIXmCxe4Jv/ntpEBylRGV5CtWShP8G2Ytkdh
 -----END PRIVATE KEY-----
diff --git a/src/main/k8s/testing/secretfiles/aggregator_tls.pem b/src/main/k8s/testing/secretfiles/aggregator_tls.pem
@@ -1,13 +1,14 @@
 -----BEGIN CERTIFICATE-----
-MIIB7jCCAZSgAwIBAgIUEYt6J389gAkWjkgusgSwc+cWokQwCgYIKoZIzj0EAwIw
+MIICKDCCAc6gAwIBAgIUVhwAfUxVFl6KvPvkmnYRzrx2/GkwCgYIKoZIzj0EAwIw
 LzEVMBMGA1UECgwMSGFsbyBDTU0gRGV2MRYwFAYDVQQDDA1BZ2dyZWdhdG9yIENB
-MB4XDTIyMDcyOTE3NDA0NloXDTMyMDcyNjE3NDA0NlowLDEVMBMGA1UECgwMSGFs
-byBDTU0gRGV2MRMwEQYDVQQDDApBZ2dyZWdhdG9yMFkwEwYHKoZIzj0CAQYIKoZI
-zj0DAQcDQgAEe5to+kPKCaCRvy+vJpd/xRM3XQmdfizQK1/JhsvF8HVdQayznxzt
-r/HJnAbQQXebQxyDk8uHqd7Wk2SXrbbeYaOBkDCBjTAJBgNVHRMEAjAAMB8GA1Ud
-IwQYMBaAFEetV5EszT17lLVF0r4f7V52atw5MB0GA1UdDgQWBBSm0fkDd5IBUcmX
-I2/yEQGbRIbUVzALBgNVHQ8EBAMCBeAwMwYDVR0RBCwwKoIdKi5hZ2dyZWdhdG9y
-LmRldi5oYWxvLWNtbS5vcmeCCWxvY2FsaG9zdDAKBggqhkjOPQQDAgNIADBFAiB2
-TlIDw6sxOoQcXYd1QHARbgjdEU5eoDQqQRMYIugrTQIhAInmfhSxTrWjZUjAGk1k
-GcAiMzylSLAJEnYVn5q5w5gf
+MB4XDTI0MDIyODIyMzAyNFoXDTM0MDIyNTIyMzAyNFowKDERMA8GA1UECgwISGFs
+byBDTU0xEzARBgNVBAMMCmFnZ3JlZ2F0b3IwWTATBgcqhkjOPQIBBggqhkjOPQMB
+BwNCAAS5DgE+j9J+RRE+bAHYWp4Hgj+Bn8cxRnVOB6pRMrO+eo4zFJ8YfIXmCxe4
+Jv/ntpEBylRGV5CtWShP8G2Ytkdho4HOMIHLMAkGA1UdEwQCMAAwHwYDVR0jBBgw
+FoAUR61XkSzNPXuUtUXSvh/tXnZq3DkwHQYDVR0OBBYEFLcirKRDo8JvlPmk/mTD
+/Ym3H5qkMAsGA1UdDwQEAwIF4DBxBgNVHREEajBogglsb2NhbGhvc3SCHSouYWdn
+cmVnYXRvci5kZXYuaGFsby1jbW0ub3JnghwqLmFnZ3JlZ2F0b3IucWEuaGFsby1j
+bW0ub3Jngh4qLmFnZ3JlZ2F0b3IuaGVhZC5oYWxvLWNtbS5vcmcwCgYIKoZIzj0E
+AwIDSAAwRQIhAJ+qpofUcluzVZ4yMVTFLJFpTvJgJTrY1CmoBsL/p3/TAiBT1ARP
+Z2X+7mLQ7AjxFMUi58/lbNM8wRydjOp7d4ZmsQ==
 -----END CERTIFICATE-----
diff --git a/src/main/k8s/testing/secretfiles/kingdom_tls.key b/src/main/k8s/testing/secretfiles/kingdom_tls.key
@@ -1,5 +1,5 @@
 -----BEGIN PRIVATE KEY-----
-MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg2GItxS77zNpyPxFx
-TcZhl81LVTT5bYKXGd71p39MjUehRANCAATEs2tZU4p+fRAjT6Hha0qC9i4lpV7g
-QNEhlOdsD7WYZrGBPKHfTmyvwBYdWvIGC/qXKLTqZSz9h17AwsooxFko
+MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgR/As3VKUJ0owVplZ
+elLyFxqyCWIUivJBgSb+V/hxd52hRANCAATsY07gicRoXrNL7IS70tlhxN22/cyw
+0ZMaAVPoQZYK/qPDNaJw1fozs1bkYhVa/Jspa5YHPgkHgC/PoieS8vKt
 -----END PRIVATE KEY-----
diff --git a/src/main/k8s/testing/secretfiles/kingdom_tls.pem b/src/main/k8s/testing/secretfiles/kingdom_tls.pem
@@ -1,13 +1,14 @@
 -----BEGIN CERTIFICATE-----
-MIIB5jCCAYugAwIBAgIUJZAOo0G7ml1aQxgm5Fnk0VlAI0swCgYIKoZIzj0EAwIw
+MIICGjCCAb+gAwIBAgIUT1m7Mf9gQIpCTnwKyrxgptNkRxwwCgYIKoZIzj0EAwIw
 LDEVMBMGA1UECgwMSGFsbyBDTU0gRGV2MRMwEQYDVQQDDApLaW5nZG9tIENBMB4X
-DTIyMDcyOTE3NDQwOFoXDTMyMDcyNjE3NDQwOFowKTEVMBMGA1UECgwMSGFsbyBD
-TU0gRGV2MRAwDgYDVQQDDAdLaW5nZG9tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcD
-QgAExLNrWVOKfn0QI0+h4WtKgvYuJaVe4EDRIZTnbA+1mGaxgTyh305sr8AWHVry
-Bgv6lyi06mUs/YdewMLKKMRZKKOBjTCBijAJBgNVHRMEAjAAMB8GA1UdIwQYMBaA
-FI4o/451aIt41V1bHhkBZHzRr4MCMB0GA1UdDgQWBBTjbdPBjeER2EC4Od6nEV9z
-3fh2fjALBgNVHQ8EBAMCBeAwMAYDVR0RBCkwJ4IaKi5raW5nZG9tLmRldi5oYWxv
-LWNtbS5vcmeCCWxvY2FsaG9zdDAKBggqhkjOPQQDAgNJADBGAiEA50A9CXGegWl5
-KZZQ7bJMA/w6a4R0wON0nzfkVrx6LlUCIQCD7LdpHkoZSD7sP/0UfIlb3OJB+wFc
-yAKvca26mwsRgw==
+DTI0MDIyMTIwMTc0OFoXDTM0MDIxODIwMTc0OFowJTERMA8GA1UECgwISGFsbyBD
+TU0xEDAOBgNVBAMMB0tpbmdkb20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATs
+Y07gicRoXrNL7IS70tlhxN22/cyw0ZMaAVPoQZYK/qPDNaJw1fozs1bkYhVa/Jsp
+a5YHPgkHgC/PoieS8vKto4HFMIHCMAkGA1UdEwQCMAAwHwYDVR0jBBgwFoAUjij/
+jnVoi3jVXVseGQFkfNGvgwIwHQYDVR0OBBYEFAryn2DM0uvxe7/bfZnf4PX4py46
+MAsGA1UdDwQEAwIF4DBoBgNVHREEYTBfgglsb2NhbGhvc3SCGioua2luZ2RvbS5k
+ZXYuaGFsby1jbW0ub3JnghkqLmtpbmdkb20ucWEuaGFsby1jbW0ub3JnghsqLmtp
+bmdkb20uaGVhZC5oYWxvLWNtbS5vcmcwCgYIKoZIzj0EAwIDSQAwRgIhAO1fcDGH
+/xCEF4EX5KU1xVcSC++gFTUDGyt09rciY+ePAiEA8jMN5xniIwfousdD5irkbgVv
+Rxn+qDD9LmQ+RfHjs6E=
 -----END CERTIFICATE-----
diff --git a/src/main/k8s/testing/secretfiles/reporting_tls.key b/src/main/k8s/testing/secretfiles/reporting_tls.key
@@ -1,5 +1,5 @@
 -----BEGIN PRIVATE KEY-----
-MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg4MKyoffbtwKuyNB1
-WPdA4MMn0HOnhUrs/U1szyn4z1mhRANCAAS7fWqNLZnX1vFNbbjGqGlgI/UQyGCL
-lOJ607PfOrKpJyzdFcGZ8iQRSarFBvMIpBXHtxMe3AkIQOw/bxbO2gxw
+MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgMJksfIRVlx3FLa38
+6h68jINHK0J5G+497cfBifizwPShRANCAAQUr8Xza7dND6JTmiRXsdtLSO6Qzjrd
+ZKpkmMF3vIVVFpXUw5crM4evCihpaFNDyhyH8W6CUFRUBrPYqSJf4x9H
 -----END PRIVATE KEY-----
diff --git a/src/main/k8s/testing/secretfiles/reporting_tls.pem b/src/main/k8s/testing/secretfiles/reporting_tls.pem
@@ -1,13 +1,14 @@
 -----BEGIN CERTIFICATE-----
-MIIB6zCCAZGgAwIBAgIUVB4cuhgGLMvMu3xQbbAXuIJ53dIwCgYIKoZIzj0EAwIw
+MIICIjCCAcmgAwIBAgIUBt5lm8A9x8ZHQ6XM01XNgcxGvwIwCgYIKoZIzj0EAwIw
 LjEVMBMGA1UECgwMSGFsbyBDTU0gRGV2MRUwEwYDVQQDDAxSZXBvcnRpbmcgQ0Ew
-HhcNMjMwODAzMTgxNjM2WhcNMzMwNzMxMTgxNjM2WjArMRUwEwYDVQQKDAxIYWxv
-IENNTSBEZXYxEjAQBgNVBAMMCVJlcG9ydGluZzBZMBMGByqGSM49AgEGCCqGSM49
-AwEHA0IABLt9ao0tmdfW8U1tuMaoaWAj9RDIYIuU4nrTs986sqknLN0VwZnyJBFJ
-qsUG8wikFce3Ex7cCQhA7D9vFs7aDHCjgY8wgYwwCQYDVR0TBAIwADAfBgNVHSME
-GDAWgBTCgH5dXBAIbcdXcQl/c/19Qc3gIzAdBgNVHQ4EFgQUakkF616qshhiENrR
-P6fEYc7bzH8wCwYDVR0PBAQDAgXgMDIGA1UdEQQrMCmCHCoucmVwb3J0aW5nLmRl
-di5oYWxvLWNtbS5vcmeCCWxvY2FsaG9zdDAKBggqhkjOPQQDAgNIADBFAiEAhSsE
-gZUM3G1vAirp95Y8OUc3XL0V4dNJXSwdXbH1/40CIFSdgSObjBE8YRCKRtOSg9WN
-hq351rwlqz/eQJn92wJR
+HhcNMjQwMjI4MjMxNTQ0WhcNMzQwMjI1MjMxNTQ0WjAnMREwDwYDVQQKDAhIYWxv
+IENNTTESMBAGA1UEAwwJUmVwb3J0aW5nMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcD
+QgAEFK/F82u3TQ+iU5okV7HbS0jukM463WSqZJjBd7yFVRaV1MOXKzOHrwooaWhT
+Q8och/FuglBUVAaz2KkiX+MfR6OByzCByDAJBgNVHRMEAjAAMB8GA1UdIwQYMBaA
+FMKAfl1cEAhtx1dxCX9z/X1BzeAjMB0GA1UdDgQWBBRxjxBJDxCA4zrgRm90ZOuG
+Zj2oiDALBgNVHQ8EBAMCBeAwbgYDVR0RBGcwZYIJbG9jYWxob3N0ghwqLnJlcG9y
+dGluZy5kZXYuaGFsby1jbW0ub3JnghsqLnJlcG9ydGluZy5xYS5oYWxvLWNtbS5v
+cmeCHSoucmVwb3J0aW5nLmhlYWQuaGFsby1jbW0ub3JnMAoGCCqGSM49BAMCA0cA
+MEQCIGPEghcSvFPak/M2wBIitMCFwLIeLA1Iy4q5tlh9rdyyAiAwYtZT7P1zXqhw
+wUuPxVVEin+UM8l6ihVgFD0Yd8BL4A==
 -----END CERTIFICATE-----
diff --git a/src/main/k8s/testing/secretfiles/worker1_tls.key b/src/main/k8s/testing/secretfiles/worker1_tls.key
@@ -1,5 +1,5 @@
 -----BEGIN PRIVATE KEY-----
-MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgZ+/ylhOq41bNv3Ms
-LOWH4uiVJKOjm//vVZZNOrG0JS6hRANCAATGXBj+8H8ld01T1yk/EGbYStDQamMq
-hMKXKkv6LmJVh/9tTiodE28E73qCt/MqcAmR2JMDG4qXfMPImtC5I9dZ
+MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg2P/MdKA9KUR+FHdy
+YIqQ7r793pkVJ+8Dau6cPf0XFYihRANCAARcFRVaaHWObieSdwXTbWiucqsjkeSD
+Vc67eOjDtFhT+K9czPOP2L5egyFH7azzYK1hB5nPlO02w2aRXOSmhsQ+
 -----END PRIVATE KEY-----