Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions .github/workflows/terraform.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,12 @@ jobs:
echo "$PARAMS" | jq -c '.[]' | while read -r param; do
name=$(echo "$param" | jq -r '.[0]')
value=$(echo "$param" | jq -r '.[1]')

# Mask fetched values before exporting them to later step environments
masked_value="${value//'%'/'%25'}"
masked_value="${masked_value//$'\r'/'%0D'}"
masked_value="${masked_value//$'\n'/'%0A'}"
printf '::add-mask::%s\n' "$masked_value"

# Convert /infra/terraform/providers/hcloud_token to TF_VAR_hcloud_token
# Convert /infra/terraform/dns/schluesselmomente_dkim to TF_VAR_schluesselmomente_dkim
Expand Down Expand Up @@ -203,6 +209,12 @@ jobs:
echo "$PARAMS" | jq -c '.[]' | while read -r param; do
name=$(echo "$param" | jq -r '.[0]')
value=$(echo "$param" | jq -r '.[1]')

# Mask fetched values before exporting them to later step environments
masked_value="${value//'%'/'%25'}"
masked_value="${masked_value//$'\r'/'%0D'}"
masked_value="${masked_value//$'\n'/'%0A'}"
printf '::add-mask::%s\n' "$masked_value"

# Convert /infra/terraform/providers/hcloud_token to TF_VAR_hcloud_token
# Convert /infra/terraform/dns/schluesselmomente_dkim to TF_VAR_schluesselmomente_dkim
Expand Down
13 changes: 13 additions & 0 deletions terraform/firewall.tf
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,19 @@ resource "hcloud_firewall" "k8s_cluster" {
]
}

# Allow kubelet metrics access between cluster nodes
rule {
direction = "in"
protocol = "tcp"
port = "10250"
source_ips = [
"116.203.111.240/32", # k8s-node-1
"195.201.5.29/32", # k8s-node-2
"91.98.235.232/32", # k8s-node-3
"178.104.133.8/32", # k8s-worker-1
]
}

# Kubernetes NodePort range (for load balancer health checks)
rule {
direction = "in"
Expand Down
6 changes: 3 additions & 3 deletions terraform/global/dns/jakob-lingel.dev.tf
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,12 @@ resource "digitalocean_record" "jakob_lingel_dev_immo_google_verification" {
ttl = 1800
}

# google search ownership verification TXT record for portfolio.jakob-lingel.dev
resource "digitalocean_record" "jakob_lingel_dev_portfolio_google_verification" {
# Preserve the existing Google site verification record and Terraform identity
resource "digitalocean_record" "jakob_lingel_dev_google_verification" {
domain = digitalocean_domain.jakob-lingel-dev.name
type = "TXT"
name = "@"
value = "google-site-verification=9mS_je2OJqOW8vlDGA6jXDVgi79c4rpxNg1t5u2VRN8"
value = "google-site-verification=6cc-R32CLdo5pnRguKt10WTFCVnkBcy8lQKiHPXGfUo"
ttl = 1800
}

Expand Down
Loading