From 04b7b82df31d2268945595f090fd2fd3e0a81903 Mon Sep 17 00:00:00 2001 From: Patrick Seidensal Date: Tue, 28 May 2024 12:18:59 +0200 Subject: [PATCH] Switch from omg.howdoi.website to sslip.io --- .github/scripts/register-downstream-clusters.sh | 2 +- .github/scripts/setup-latest-rancher.sh | 2 +- .github/scripts/setup-rancher.sh | 2 +- .github/workflows/rancher-upgrade-fleet-to-head.yml | 4 ++-- .github/workflows/rancher-upgrade-fleet.yml | 2 +- dev/README.md | 4 ++-- dev/setup-fleet-downstream | 2 +- dev/setup-rancher-clusters | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/scripts/register-downstream-clusters.sh b/.github/scripts/register-downstream-clusters.sh index 4704f2db74..05a69886c9 100755 --- a/.github/scripts/register-downstream-clusters.sh +++ b/.github/scripts/register-downstream-clusters.sh @@ -3,7 +3,7 @@ set -euxo pipefail -public_hostname="${public_hostname-172.18.0.1.omg.howdoi.website}" +public_hostname="${public_hostname-172.18.0.1.sslip.io}" cluster_downstream="${cluster_downstream-k3d-downstream}" ctx=$(kubectl config current-context) diff --git a/.github/scripts/setup-latest-rancher.sh b/.github/scripts/setup-latest-rancher.sh index edcd87ebf4..4169fbceb1 100755 --- a/.github/scripts/setup-latest-rancher.sh +++ b/.github/scripts/setup-latest-rancher.sh @@ -2,7 +2,7 @@ set -euxo pipefail -public_hostname="${public_hostname-172.18.0.1.omg.howdoi.website}" +public_hostname="${public_hostname-172.18.0.1.sslip.io}" cluster="${cluster-k3d-upstream}" kubectl config use-context "$cluster" diff --git a/.github/scripts/setup-rancher.sh b/.github/scripts/setup-rancher.sh index 8499982c16..b1cb901c5e 100755 --- a/.github/scripts/setup-rancher.sh +++ b/.github/scripts/setup-rancher.sh @@ -2,7 +2,7 @@ set -euxo pipefail -public_hostname="${public_hostname-172.18.0.1.omg.howdoi.website}" +public_hostname="${public_hostname-172.18.0.1.sslip.io}" fleetns="${fleetns-cattle-fleet-system}" upstream_ctx="${FLEET_E2E_CLUSTER-k3d-upstream}" version="${1-v2.7.0}" diff --git a/.github/workflows/rancher-upgrade-fleet-to-head.yml b/.github/workflows/rancher-upgrade-fleet-to-head.yml index 0bf44312fb..9f903995ab 100644 --- a/.github/workflows/rancher-upgrade-fleet-to-head.yml +++ b/.github/workflows/rancher-upgrade-fleet-to-head.yml @@ -147,13 +147,13 @@ jobs: - name: Set up latest Rancher env: - public_hostname: "172.18.0.1.omg.howdoi.website" + public_hostname: "172.18.0.1.sslip.io" run: | ./.github/scripts/setup-latest-rancher.sh - name: Register Rancher's downstream clusters env: - public_hostname: "172.18.0.1.omg.howdoi.website" + public_hostname: "172.18.0.1.sslip.io" run: | ./.github/scripts/wait-for-loadbalancer.sh ./.github/scripts/register-downstream-clusters.sh diff --git a/.github/workflows/rancher-upgrade-fleet.yml b/.github/workflows/rancher-upgrade-fleet.yml index 8d2face680..c47698f87a 100644 --- a/.github/workflows/rancher-upgrade-fleet.yml +++ b/.github/workflows/rancher-upgrade-fleet.yml @@ -106,7 +106,7 @@ jobs: - name: Set up Rancher env: - public_hostname: "172.18.0.1.omg.howdoi.website" + public_hostname: "172.18.0.1.sslip.io" fleetns: "cattle-fleet-system" run: | ./.github/scripts/setup-rancher.sh "${{github.event.inputs.rancher_version}}" diff --git a/dev/README.md b/dev/README.md index a0607644bf..122f4356ad 100644 --- a/dev/README.md +++ b/dev/README.md @@ -126,10 +126,10 @@ The variable is set to a DNS record, which points to the public interface IP of The k3d cluster is then set up with port forwardings, so that host ports are redirected to services inside the cluster. -The default `public_hostname` is `172.18.0.1.omg.howdoi.website`, which points +The default `public_hostname` is `172.18.0.1.sslip.io`, which points to the default Docker network gateway. That gateway address might vary for custom networks, see for example: `docker network inspect fleet -f '{{(index .IPAM.Config0).Gateway}}'`. -Careful, several internet routers provide "DNS rebind protection" and won't return an IP for `172.18.0.1.omg.howdoi.website`, unless the `omg.howdoi.website` domain is in an allow list. +Careful, several internet routers provide "DNS rebind protection" and won't return an IP for `172.18.0.1.sslip.io`, unless the .sslip.io` domain is in an allow list. Any magic wildcard DNS resolver will do, or you can create an A record in your own DNS zone. The k3d cluster is set up with multiple port forwardings by the scripts: `-p '80:80@server:0' -p '443:443@server:0'`. diff --git a/dev/setup-fleet-downstream b/dev/setup-fleet-downstream index b46622d06c..06e8f8e8f1 100755 --- a/dev/setup-fleet-downstream +++ b/dev/setup-fleet-downstream @@ -54,7 +54,7 @@ else fi # docker network inspect bridge -f '{{(index .IPAM.Config 0).Gateway}}' -# public_hostname="${public_hostname-172.17.0.1.omg.howdoi.website}" +# public_hostname="${public_hostname-172.17.0.1.sslip.io}" # works due to same network of k3d clustres and patched SAN cert public_hostname="${public_hostname-k3d-upstream-server-0}" diff --git a/dev/setup-rancher-clusters b/dev/setup-rancher-clusters index 20ed4776cc..3d281c044f 100755 --- a/dev/setup-rancher-clusters +++ b/dev/setup-rancher-clusters @@ -7,7 +7,7 @@ if [ ! -d ./.github/scripts ]; then exit 1 fi -public_hostname="${public_hostname-172.18.0.1.omg.howdoi.website}" +public_hostname="${public_hostname-172.18.0.1.sslip.io}" upstream_ctx="${FLEET_E2E_CLUSTER-k3d-upstream}" downstream_ctx="${FLEET_E2E_CLUSTER_DOWNSTREAM-k3d-downstream}"