Skip to content

Commit 089b244

Browse files
johnstcnjohnstcn
committed
multiple fixes
1 parent 5b887e7 commit 089b244

File tree

4 files changed

+50
-5
lines changed

4 files changed

+50
-5
lines changed

‎scaletest/terraform/coder.tf

Lines changed: 37 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ locals {
55
coder_helm_chart = "coder"
66
coder_release_name = "coder-${var.name}"
77
coder_namespace = "coder-${var.name}"
8+
coder_admin_email = "admin@coder.com"
9+
coder_admin_user = "coder"
810
}
911

1012
provider "kubernetes" {
@@ -45,7 +47,7 @@ resource "kubernetes_secret" "coder-db" {
4547
namespace = kubernetes_namespace.coder_namespace.metadata.0.name
4648
}
4749
data = {
48-
url = "postgres://coder:${urlencode(random_password.coder-postgres-password.result)}@${google_sql_database_instance.db.private_ip_address}/${google_sql_database.coder.name}?sslmode=disable"
50+
url = "postgres://${google_sql_user.coder.name}:${urlencode(random_password.coder-postgres-password.result)}@${google_sql_database_instance.db.private_ip_address}/${google_sql_database.coder.name}?sslmode=disable"
4951
}
5052
}
5153

@@ -71,6 +73,10 @@ resource "tls_self_signed_cert" "coder" {
7173
"${local.coder_release_name}.${local.coder_namespace}",
7274
"${local.coder_release_name}",
7375
]
76+
77+
ip_addresses = [
78+
google_compute_address.coder.address
79+
]
7480
}
7581

7682
resource "kubernetes_secret" "coder-tls" {
@@ -108,9 +114,29 @@ resource "helm_release" "coder-chart" {
108114
]
109115
values = [<<EOF
110116
coder:
117+
affinity:
118+
nodeAffinity:
119+
requiredDuringSchedulingIgnoredDuringExecution:
120+
nodeSelectorTerms:
121+
- matchExpressions:
122+
- key: "cloud.google.com/gke-nodepool"
123+
operator: "In"
124+
values: ["${google_container_node_pool.workspaces.name}"]
125+
podAntiAffinity:
126+
preferredDuringSchedulingIgnoredDuringExecution:
127+
- weight: 1
128+
podAffinityTerm:
129+
topologyKey: "kubernetes.io/hostname"
130+
labelSelector:
131+
matchExpressions:
132+
- key: "app.kubernetes.io/instance"
133+
operator: "In"
134+
values: ["${local.coder_release_name}"]
111135
env:
112136
- name: "CODER_CACHE_DIRECTORY"
113137
value: "/tmp/coder"
138+
- name: "CODER_ENABLE_TELEMETRY"
139+
value: "false"
114140
- name: "CODER_LOGGING_HUMAN"
115141
value: "/dev/null"
116142
- name: "CODER_LOGGING_STACKDRIVER"
@@ -122,6 +148,8 @@ coder:
122148
key: url
123149
- name: "CODER_PROMETHEUS_ENABLE"
124150
value: "true"
151+
- name: "CODER_TLS_REDIRECT_HTTP_TO_HTTPS"
152+
value: "true"
125153
- name: "CODER_VERBOSE"
126154
value: "true"
127155
image:
@@ -139,6 +167,7 @@ coder:
139167
readOnlyRootFilesystem: true
140168
service:
141169
enable: true
170+
loadBalancerIP: "${google_compute_address.coder.address}"
142171
tls:
143172
secretNames:
144173
- "${kubernetes_secret.coder-tls.metadata.0.name}"
@@ -169,6 +198,11 @@ EOF
169198
]
170199
}
171200

201+
resource "local_file" "url" {
202+
filename = "${path.module}/coder_url"
203+
content = "https://${google_compute_address.coder.address}"
204+
}
205+
172206
resource "local_file" "kubernetes_template" {
173207
filename = "${path.module}/.coderv2/templates/kubernetes/main.tf"
174208
content = <<EOF
@@ -242,10 +276,10 @@ resource "local_file" "kubernetes_template" {
242276
affinity {
243277
node_affinity {
244278
required_during_scheduling_ignored_during_execution {
245-
node_selector_terms {
279+
node_selector_term {
246280
match_expressions {
247281
key = "cloud.google.com/gke-nodepool"
248-
operator = "in"
282+
operator = "In"
249283
values = ["${google_container_node_pool.workspaces.name}"]
250284
}
251285
}

‎scaletest/terraform/coder_init.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,14 @@ fi
1313
CODER_URL=$1
1414
CONFIG_DIR="${PWD}/.coderv2"
1515
ARCH="$(arch)"
16+
if [[ "$ARCH" == "x86_64" ]]; then
17+
ARCH="amd64"
18+
fi
1619
PLATFORM="$(uname | tr '[:upper:]' '[:lower:]')"
1720

1821
mkdir -p "${CONFIG_DIR}"
1922
echo "Fetching Coder CLI for first-time setup!"
20-
curl -fsSL "${CODER_URL}/bin/coder-${PLATFORM}-${ARCH}" -o "${CONFIG_DIR}/coder"
23+
curl -fsSLk "${CODER_URL}/bin/coder-${PLATFORM}-${ARCH}" -o "${CONFIG_DIR}/coder"
2124
chmod +x "${CONFIG_DIR}/coder"
2225

2326
set +o pipefail

‎scaletest/terraform/gcp_db.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ resource "google_sql_database" "coder" {
5454
resource "google_sql_user" "coder" {
5555
project = var.project_id
5656
instance = google_sql_database_instance.db.id
57-
name = "coder"
57+
name = "${var.name}-coder"
5858
type = "BUILT_IN"
5959
password = random_password.coder-postgres-password.result
6060
# required for postgres, otherwise user fails to delete

‎scaletest/terraform/gcp_vpc.tf

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,14 @@ resource "google_compute_global_address" "sql_peering" {
2424
network = google_compute_network.vpc.id
2525
}
2626

27+
resource "google_compute_address" "coder" {
28+
project = var.project_id
29+
region = var.region
30+
name = "${var.name}-coder"
31+
address_type = "EXTERNAL"
32+
network_tier = "PREMIUM"
33+
}
34+
2735
resource "google_service_networking_connection" "private_vpc_connection" {
2836
network = google_compute_network.vpc.id
2937
service = "servicenetworking.googleapis.com"

0 commit comments

Comments
 (0)