diff --git a/docs/quickstart.md b/docs/quickstart.md index b4f290c77..bcaafddc8 100644 --- a/docs/quickstart.md +++ b/docs/quickstart.md @@ -89,7 +89,7 @@ worker_ips = [ ``` -When using wildcard domain like nip.io or xip.io then `etc_host_entries` is empty +When using wildcard domain like nip.io or sslip.io then `etc_host_entries` is empty ``` bastion_private_ip = 192.168.25.171 @@ -134,7 +134,7 @@ Once the deployment is completed successfully, you can safely delete the bootstr #### Create API and Ingress DNS Records -Please skip this section if your `cluster_domain` is one of the online wildcard DNS domains: nip.io, xip.io and sslip.io. Also, not required when using `use_ibm_cloud_services = true`. +Please skip this section if your `cluster_domain` is one of the online wildcard DNS domains: nip.io and sslip.io. Also, not required when using `use_ibm_cloud_services = true`. >**Note**: If you just need to add the DNS entries in the CIS domain zone without using IBM Cloud Services eg: VPC Load Balancer, then set `ibm_cloud_cis_crn` with the CIS domain CRN and keep `use_ibm_cloud_services = false`. diff --git a/docs/var.tfvars-doc.md b/docs/var.tfvars-doc.md index c77d9f2c4..689a69ee7 100644 --- a/docs/var.tfvars-doc.md +++ b/docs/var.tfvars-doc.md @@ -212,7 +212,7 @@ cluster_id = "" use_zone_info_for_names = true ``` -Set the `cluster_domain` to `nip.io`, `xip.io` or `sslip.io` if you prefer using online wildcard domains. +Set the `cluster_domain` to `nip.io` or `sslip.io` if you prefer using online wildcard domains. Default is `ibm.com`. The `cluster_id_prefix` should not be more than 8 characters. Nodes are pre-fixed with this value. Default value is `test-ocp` diff --git a/modules/4_nodes/nodes.tf b/modules/4_nodes/nodes.tf index 7fba31573..13362c986 100644 --- a/modules/4_nodes/nodes.tf +++ b/modules/4_nodes/nodes.tf @@ -18,7 +18,7 @@ # ################################################################ locals { - wildcard_dns = ["nip.io", "xip.io", "sslip.io"] + wildcard_dns = ["nip.io", "sslip.io"] cluster_domain = contains(local.wildcard_dns, var.cluster_domain) ? "${var.bastion_external_vip != "" ? var.bastion_external_vip : var.bastion_public_ip[0]}.${var.cluster_domain}" : var.cluster_domain worker = { volume_count = lookup(var.worker, "data_volume_count", 0), diff --git a/modules/5_install/install.tf b/modules/5_install/install.tf index ce8d44572..09d82bbb2 100644 --- a/modules/5_install/install.tf +++ b/modules/5_install/install.tf @@ -19,7 +19,7 @@ ################################################################ locals { - wildcard_dns = ["nip.io", "xip.io", "sslip.io"] + wildcard_dns = ["nip.io", "sslip.io"] cluster_domain = contains(local.wildcard_dns, var.cluster_domain) ? "${var.bastion_external_vip != "" ? var.bastion_external_vip : var.bastion_public_ip[0]}.${var.cluster_domain}" : var.cluster_domain public_vrrp = { diff --git a/outputs.tf b/outputs.tf index 9dfd98138..67c01240f 100644 --- a/outputs.tf +++ b/outputs.tf @@ -59,7 +59,7 @@ output "worker_ips" { } output "dns_entries" { - value = var.use_ibm_cloud_services || var.cluster_domain == "nip.io" || var.cluster_domain == "xip.io" || var.cluster_domain == "sslip.io" ? null : <<-EOF + value = var.use_ibm_cloud_services || var.cluster_domain == "nip.io" || var.cluster_domain == "sslip.io" ? null : <<-EOF api.${local.cluster_id}.${var.cluster_domain}. IN A ${module.install.bastion_external_vip == "" ? module.prepare.bastion_public_ip[0] : module.install.bastion_external_vip} *.apps.${local.cluster_id}.${var.cluster_domain}. IN A ${module.install.bastion_external_vip == "" ? module.prepare.bastion_public_ip[0] : module.install.bastion_external_vip} @@ -67,7 +67,7 @@ EOF } output "etc_hosts_entries" { - value = var.use_ibm_cloud_services || var.cluster_domain == "nip.io" || var.cluster_domain == "xip.io" || var.cluster_domain == "sslip.io" ? null : <<-EOF + value = var.use_ibm_cloud_services || var.cluster_domain == "nip.io" || var.cluster_domain == "sslip.io" ? null : <<-EOF ${module.install.bastion_external_vip == "" ? module.prepare.bastion_public_ip[0] : module.install.bastion_external_vip} api.${local.cluster_id}.${var.cluster_domain} console-openshift-console.apps.${local.cluster_id}.${var.cluster_domain} integrated-oauth-server-openshift-authentication.apps.${local.cluster_id}.${var.cluster_domain} oauth-openshift.apps.${local.cluster_id}.${var.cluster_domain} prometheus-k8s-openshift-monitoring.apps.${local.cluster_id}.${var.cluster_domain} grafana-openshift-monitoring.apps.${local.cluster_id}.${var.cluster_domain} example.apps.${local.cluster_id}.${var.cluster_domain} EOF diff --git a/var.tfvars b/var.tfvars index 3b224d9ae..389ce80bd 100644 --- a/var.tfvars +++ b/var.tfvars @@ -49,7 +49,7 @@ openshift_install_tarball = "https://mirror.openshift.com/pub/openshift-v4/ppc64 openshift_client_tarball = "https://mirror.openshift.com/pub/openshift-v4/ppc64le/clients/ocp/stable/openshift-client-linux.tar.gz" pull_secret_file = "data/pull-secret.txt" -cluster_domain = "ibm.com" #Set domain to nip.io or xip.io if you prefer using online wildcard domain and avoid modifying /etc/hosts +cluster_domain = "ibm.com" #Set domain to nip.io or sslip.io if you prefer using online wildcard domain and avoid modifying /etc/hosts cluster_id_prefix = "test-ocp" # Set it to empty if just want to use cluster_id without prefix cluster_id = "" # It will use random generated id with cluster_id_prefix if this is not set