From 5e6f77f345ae17ffb0a9241bbefbfe8200ef8ed4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Iranzo=20G=C3=B3mez?= Date: Thu, 2 Jun 2022 16:57:15 +0200 Subject: [PATCH] style: Use factory.local for the hosts --- hack/deploy-hub-local/hub-install.yml | 2 +- hack/deploy-hub-local/lab-dns-external.sh | 20 ++++++++++---------- hack/deploy-hub-local/lab-dns-internal.sh | 16 ++++++++-------- ui/backend/src/k8s/oauth.ts | 2 +- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/hack/deploy-hub-local/hub-install.yml b/hack/deploy-hub-local/hub-install.yml index c41283cda..928fcc00d 100644 --- a/hack/deploy-hub-local/hub-install.yml +++ b/hack/deploy-hub-local/hub-install.yml @@ -2,7 +2,7 @@ version: stable network_type: OVNKubernetes kvm_openstack: true cluster: test-ci -domain: alklabs.local +domain: factory.local numcpus: 16 disk_size: 100 network: bare-net diff --git a/hack/deploy-hub-local/lab-dns-external.sh b/hack/deploy-hub-local/lab-dns-external.sh index bde489120..3aeff46d2 100755 --- a/hack/deploy-hub-local/lab-dns-external.sh +++ b/hack/deploy-hub-local/lab-dns-external.sh @@ -7,7 +7,7 @@ function set_hostname(){ uuid=$(echo "$(uuidgen)" | cut -f1 -d\-) host="flavio-${uuid}" fi - hostnamectl set-hostname ${host}.alklabs.local + hostnamectl set-hostname ${host}.factory.local } function set_firewall(){ @@ -28,7 +28,7 @@ dns=none" > /etc/NetworkManager/conf.d/00-no-dnsmasq.conf #!/bin/bash echo " -search alklabs.local test-ci.alklabs.local edgecluster0-cluster.alklabs.local +search factory.local test-ci.factory.local edgecluster0-cluster.factory.local nameserver 127.0.0.1 options edns0 trust-ad " > /run/NetworkManager/resolv.conf @@ -80,18 +80,18 @@ bogus-priv dhcp-authoritative conf-dir=/etc/dnsmasq.d,.rpmnew,.rpmsave,.rpmorig" > /etc/dnsmasq.conf - echo "domain=test-ci.alklabs.local,192.168.150.0/24,local + echo "domain=test-ci.factory.local,192.168.150.0/24,local resolv-file=/etc/resolv.upstream.conf # Hub Cluster -address=/.apps.test-ci.alklabs.local/192.168.150.252 -address=/api.test-ci.alklabs.local/192.168.150.253 -address=/api-int.test-ci.alklabs.local/192.168.150.253 +address=/.apps.test-ci.factory.local/192.168.150.252 +address=/api.test-ci.factory.local/192.168.150.253 +address=/api-int.test-ci.factory.local/192.168.150.253 # Edge-cluster Cluster -address=/.apps.edgecluster0-cluster.alklabs.local/192.168.150.200 -address=/api.edgecluster0-cluster.alklabs.local/192.168.150.201 -address=/api-int.edgecluster0-cluster.alklabs.local/192.168.150.201" > /etc/dnsmasq.d/00-test-ci.conf +address=/.apps.edgecluster0-cluster.factory.local/192.168.150.200 +address=/api.edgecluster0-cluster.factory.local/192.168.150.201 +address=/api-int.edgecluster0-cluster.factory.local/192.168.150.201" > /etc/dnsmasq.d/00-test-ci.conf echo "nameserver 8.8.8.8 nameserver 8.8.4.4" > /etc/resolv.upstream.conf @@ -125,7 +125,7 @@ function checks() { echo echo ">>>> Checking Hub Routes Internal resolution" - for dns_name in "test.apps.test-ci.alklabs.local" "api.test-ci.alklabs.local" "api-int.test-ci.alklabs.local" + for dns_name in "test.apps.test-ci.factory.local" "api.test-ci.factory.local" "api-int.test-ci.factory.local" do echo -n "${dns_name}: " dig +short @192.168.150.1 ${dns_name} | grep -v -e '^$' diff --git a/hack/deploy-hub-local/lab-dns-internal.sh b/hack/deploy-hub-local/lab-dns-internal.sh index d60d8c8d6..ef20f2797 100755 --- a/hack/deploy-hub-local/lab-dns-internal.sh +++ b/hack/deploy-hub-local/lab-dns-internal.sh @@ -34,17 +34,17 @@ dns=dnsmasq" > /etc/NetworkManager/conf.d/00-dnsmasq.conf function set_nm_dnsmasq(){ echo ">> Configuring NetworkManager's dnsmasq" - echo "domain=test-ci.alklabs.local,192.168.150.0/24,local + echo "domain=test-ci.factory.local,192.168.150.0/24,local resolv-file=/etc/resolv.upstream.conf # Hub Cluster -address=/.apps.test-ci.alklabs.local/192.168.150.252 -address=/api.test-ci.alklabs.local/192.168.150.253 -address=/api-int.test-ci.alklabs.local/192.168.150.253 +address=/.apps.test-ci.factory.local/192.168.150.252 +address=/api.test-ci.factory.local/192.168.150.253 +address=/api-int.test-ci.factory.local/192.168.150.253 # Edge-cluster Cluster -address=/.apps.edgecluster0-cluster.alklabs.local/192.168.150.200 -address=/api.edgecluster0-cluster.alklabs.local/192.168.150.201 -address=/api-int.edgecluster0-cluster.alklabs.local/192.168.150.201" > /etc/NetworkManager/dnsmasq.d/00-test-ci.conf +address=/.apps.edgecluster0-cluster.factory.local/192.168.150.200 +address=/api.edgecluster0-cluster.factory.local/192.168.150.201 +address=/api-int.edgecluster0-cluster.factory.local/192.168.150.201" > /etc/NetworkManager/dnsmasq.d/00-test-ci.conf cat /etc/resolv.conf | grep nameserver > /etc/resolv.upstream.conf } @@ -78,7 +78,7 @@ function checks() { echo echo ">>>> Checking Hub Routes Internal resolution" - for dns_name in "test.apps.test-ci.alklabs.local" "api.test-ci.alklabs.local" "api-int.test-ci.alklabs.local" + for dns_name in "test.apps.test-ci.factory.local" "api.test-ci.factory.local" "api-int.test-ci.factory.local" do echo -n "${dns_name}: " dig +short @192.168.150.1 ${dns_name} | grep -v -e '^$' diff --git a/ui/backend/src/k8s/oauth.ts b/ui/backend/src/k8s/oauth.ts index 45f6a64ca..7a138a793 100644 --- a/ui/backend/src/k8s/oauth.ts +++ b/ui/backend/src/k8s/oauth.ts @@ -44,7 +44,7 @@ export const getOauthInfoPromise = async () => { OAUTH_ROUTE_PREFIX, ); const oauth = { - // https://oauth-openshift.apps.edgecluster0-cluster.alklabs.local/oauth/authorize + // https://oauth-openshift.apps.edgecluster0-cluster.factory.local/oauth/authorize authorization_endpoint: `${oauthServer}/oauth/authorize`, token_endpoint: `${oauthServer}/oauth/token`, };