Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commitf9d0f5c

Browse files
committed
merge#19466
1 parent5c70bdc commitf9d0f5c

File tree

2 files changed

+19
-10
lines changed

2 files changed

+19
-10
lines changed

‎scaletest/terraform/action/main.tf‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -46,20 +46,19 @@ terraform {
4646
provider"google" {
4747
}
4848

49-
data"google_container_cluster""observability" {
50-
name=var.observability_cluster_name
51-
location=var.observability_cluster_location
52-
project=var.project_id
53-
}
54-
55-
# This is managed manually
56-
data"google_secret_manager_secret_version""cloudflare_api_token_dns" {
57-
secret=var.cloudflare_api_token_secret
49+
data"google_secret_manager_secret_version_access""cloudflare_api_token_dns" {
50+
secret="cloudflare-api-token-dns"
5851
project=var.project_id
5952
}
6053

6154
provider"cloudflare" {
62-
api_token=data.google_secret_manager_secret_version.cloudflare_api_token_dns.secret_data
55+
api_token=coalesce(var.cloudflare_api_token, data.google_secret_manager_secret_version_access.cloudflare_api_token_dns.secret_data)
56+
}
57+
58+
data"google_container_cluster""observability" {
59+
name=var.observability_cluster_name
60+
location=var.observability_cluster_location
61+
project=var.project_id
6362
}
6463

6564
provider"kubernetes" {

‎scaletest/terraform/action/vars.tf‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,23 @@ variable "scenario" {
1717
// GCP
1818
variable"project_id" {
1919
description="The project in which to provision resources"
20+
default="coder-scaletest"
2021
}
2122

2223
variable"k8s_version" {
2324
description="Kubernetes version to provision."
2425
default="1.24"
2526
}
2627

28+
// Cloudflare
29+
variable"cloudflare_api_token" {
30+
description="Cloudflare API token."
31+
sensitive=true
32+
# only override if you want to change the cloudflare_domain; pulls the token for scaletest.dev from Google Secrets
33+
# Manager if null.
34+
default=null
35+
}
36+
2737
variable"cloudflare_domain" {
2838
description="Cloudflare coder domain."
2939
}

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp