Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

style: Use factory.local for the hosts #358

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+11 −11
Open

style: Use factory.local for the hosts #358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion hack/deploy-hub-local/hub-install.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 8 additions & 8 deletions hack/deploy-hub-local/lab-dns-common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,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 '^$'
Expand All @@ -57,18 +57,18 @@ function checks() {
function set_dnsmasq(){
output=${1}
echo ">> Configuring 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" > ${output}
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" > ${output}

touch /etc/resolv.upstream.conf
cat /etc/resolv.conf /etc/resolv.upstream.conf | grep nameserver |grep -v 127.0.0.1 |sort -u > /etc/resolv.upstream.conf
Expand Down
2 changes: 1 addition & 1 deletion hack/deploy-hub-local/lab-dns-external.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,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
Expand Down
2 changes: 1 addition & 1 deletion ui/backend/src/k8s/oauth.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`,
};
Expand Down