Skip to content

Commit

Permalink
Use CMMS testing certs for dev panel match. (#1207)
Browse files Browse the repository at this point in the history
  • Loading branch information
SanjayVas authored and ple13 committed Aug 16, 2024
1 parent 9e7d5b3 commit 9c43cb4
Show file tree
Hide file tree
Showing 14 changed files with 63 additions and 91 deletions.
16 changes: 16 additions & 0 deletions src/main/k8s/panelmatch/dev/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,18 @@ load("//build/k8s:defs.bzl", "kustomization_dir")

SECRET_NAME = "certs-and-configs"

kustomization_dir(
name = "edp_daemon_secret",
srcs = ["edp_daemon_secret_kustomization.yaml"],
renames = {"edp_daemon_secret_kustomization.yaml": "kustomization.yaml"},
)

kustomization_dir(
name = "mp_daemon_secret",
srcs = ["mp_daemon_secret_kustomization.yaml"],
renames = {"mp_daemon_secret_kustomization.yaml": "kustomization.yaml"},
)

cue_library(
name = "base_gke",
srcs = ["base_gke.cue"],
Expand Down Expand Up @@ -51,6 +63,7 @@ kustomization_dir(
],
generate_kustomization = True,
tags = ["manual"],
deps = [":edp_daemon_secret"],
)

cue_dump(
Expand All @@ -72,6 +85,7 @@ kustomization_dir(
],
generate_kustomization = True,
tags = ["manual"],
deps = [":mp_daemon_secret"],
)

cue_dump(
Expand All @@ -93,6 +107,7 @@ kustomization_dir(
],
generate_kustomization = True,
tags = ["manual"],
deps = [":edp_daemon_secret"],
)

cue_dump(
Expand All @@ -114,4 +129,5 @@ kustomization_dir(
],
generate_kustomization = True,
tags = ["manual"],
deps = [":mp_daemon_secret"],
)
20 changes: 20 additions & 0 deletions src/main/k8s/panelmatch/dev/edp_daemon_secret_kustomization.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Copyright 2023 The Cross-Media Measurement Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

secretGenerator:
- name: certs-and-configs
files:
- trusted_certs.pem
- edp1_tls.key
- edp1_tls.pem
20 changes: 20 additions & 0 deletions src/main/k8s/panelmatch/dev/mp_daemon_secret_kustomization.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Copyright 2023 The Cross-Media Measurement Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

secretGenerator:
- name: certs-and-configs
files:
- trusted_certs.pem
- mp1_tls.key
- mp1_tls.pem
2 changes: 0 additions & 2 deletions src/main/k8s/panelmatch/testing/secretfiles/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ genrule(
SECRET_FILES = [
"edp1_tls.key",
"edp1_tls.pem",
"health_probe_tls.key",
"health_probe_tls.pem",
"mp1_tls.key",
"mp1_tls.pem",
"trusted_certs.pem",
Expand Down
12 changes: 0 additions & 12 deletions src/main/k8s/panelmatch/testing/secretfiles/edp1_root.pem

This file was deleted.

1 change: 1 addition & 0 deletions src/main/k8s/panelmatch/testing/secretfiles/edp1_root.pem
5 changes: 0 additions & 5 deletions src/main/k8s/panelmatch/testing/secretfiles/edp1_tls.key

This file was deleted.

1 change: 1 addition & 0 deletions src/main/k8s/panelmatch/testing/secretfiles/edp1_tls.key
13 changes: 0 additions & 13 deletions src/main/k8s/panelmatch/testing/secretfiles/edp1_tls.pem

This file was deleted.

1 change: 1 addition & 0 deletions src/main/k8s/panelmatch/testing/secretfiles/edp1_tls.pem
12 changes: 0 additions & 12 deletions src/main/k8s/panelmatch/testing/secretfiles/health_probe_root.pem

This file was deleted.

This file was deleted.

13 changes: 0 additions & 13 deletions src/main/k8s/panelmatch/testing/secretfiles/health_probe_tls.pem

This file was deleted.

12 changes: 0 additions & 12 deletions src/main/k8s/panelmatch/testing/secretfiles/mp1_root.pem

This file was deleted.

1 change: 1 addition & 0 deletions src/main/k8s/panelmatch/testing/secretfiles/mp1_root.pem
5 changes: 0 additions & 5 deletions src/main/k8s/panelmatch/testing/secretfiles/mp1_tls.key

This file was deleted.

1 change: 1 addition & 0 deletions src/main/k8s/panelmatch/testing/secretfiles/mp1_tls.key
12 changes: 0 additions & 12 deletions src/main/k8s/panelmatch/testing/secretfiles/mp1_tls.pem

This file was deleted.

1 change: 1 addition & 0 deletions src/main/k8s/panelmatch/testing/secretfiles/mp1_tls.pem

0 comments on commit 9c43cb4

Please sign in to comment.