From da52452178470ee9a92fea6dd5ecf431f637379d Mon Sep 17 00:00:00 2001 From: Fabien Boucher Date: Fri, 6 Oct 2023 10:51:56 +0000 Subject: [PATCH] change sfop.dev to sfop.me The TLD .dev is in the HSTS preload list which make using sf-operator in dev mode (using self-sign certs) is not possible. Using a regular browser prevent any of the subdomain zuul.sfop.dev, ... to be used. See https://endtimes.dev/dev-and-hsts-preload/ Change-Id: Iedaaa3d4394fbc98de47e8c3f3fb7aacfba096ce --- cli/sfconfig/cmd/gerrit/gerrit.go | 2 +- cli/sfconfig/cmd/sfprometheus/sfprometheus.go | 2 +- cli/sfconfig/config/config.go | 2 +- config/samples/sf_v1_logserver.yaml | 2 +- config/samples/sf_v1_softwarefactory.yaml | 4 ++-- doc/cli/index.md | 10 +++++----- doc/deployment/getting_started.md | 10 +++++----- doc/deployment/nodepool.md | 2 +- doc/developer/howtos/index.md | 4 ++-- hack/dashboards.sh | 8 ++++---- playbooks/group_vars/all.yaml | 2 +- .../health-check/config-update-zuul/defaults/main.yaml | 2 +- roles/health-check/test-crd/defaults/main.yaml | 2 +- .../test-custom-route-certs/defaults/main.yaml | 2 +- sfconfig.yaml | 2 +- tools/create-ps.sh | 8 ++++---- tools/microshift/group_vars/all.yaml | 2 +- zuul.d/jobs.yaml | 4 ++-- 18 files changed, 35 insertions(+), 35 deletions(-) diff --git a/cli/sfconfig/cmd/gerrit/gerrit.go b/cli/sfconfig/cmd/gerrit/gerrit.go index 488941a5..486aae30 100644 --- a/cli/sfconfig/cmd/gerrit/gerrit.go +++ b/cli/sfconfig/cmd/gerrit/gerrit.go @@ -517,5 +517,5 @@ var GerritCmd = &cobra.Command{ func init() { GerritCmd.Flags().BoolP("deploy", "", false, "Deploy Gerrit") GerritCmd.Flags().BoolP("wipe", "", false, "Wipe Gerrit deployment") - GerritCmd.PersistentFlags().StringP("fqdn", "f", "sfop.dev", "The FQDN of gerrit (gerrit.)") + GerritCmd.PersistentFlags().StringP("fqdn", "f", "sfop.me", "The FQDN of gerrit (gerrit.)") } diff --git a/cli/sfconfig/cmd/sfprometheus/sfprometheus.go b/cli/sfconfig/cmd/sfprometheus/sfprometheus.go index 78bc3a5d..c2313117 100644 --- a/cli/sfconfig/cmd/sfprometheus/sfprometheus.go +++ b/cli/sfconfig/cmd/sfprometheus/sfprometheus.go @@ -292,7 +292,7 @@ The prometheus dashboard will be accessible at https://prometheus..`, } func init() { - PrometheusCmd.Flags().StringP("fqdn", "f", "sfop.dev", "The FQDN for prometheus (prometheus.)") + PrometheusCmd.Flags().StringP("fqdn", "f", "sfop.me", "The FQDN for prometheus (prometheus.)") PrometheusCmd.Flags().BoolP("skip-operator-setup", "", false, "do not check if the prometheus operator is present and do not install it") // TODO we may want to deploy prometheus in a different namespace } diff --git a/cli/sfconfig/config/config.go b/cli/sfconfig/config/config.go index 9853144e..020acbaf 100644 --- a/cli/sfconfig/config/config.go +++ b/cli/sfconfig/config/config.go @@ -28,7 +28,7 @@ func GetSFConfigOrDie() SFConfig { // Setting configuration defaults viper.SetDefault("ansible_microshift_role_path", "~/src/github.com/openstack-k8s-operators/ansible-microshift-role") - viper.SetDefault("fqdn", "sfop.dev") + viper.SetDefault("fqdn", "sfop.me") viper.SetDefault("microshift.host", "microshift.dev") viper.SetDefault("microshift.user", "cloud-user") viper.SetDefault("nodepool.clouds_file", "/etc/sf-operator/nodepool/clouds.yaml") diff --git a/config/samples/sf_v1_logserver.yaml b/config/samples/sf_v1_logserver.yaml index dfff5811..dcd70e00 100644 --- a/config/samples/sf_v1_logserver.yaml +++ b/config/samples/sf_v1_logserver.yaml @@ -3,5 +3,5 @@ kind: LogServer metadata: name: my-logserver spec: - fqdn: "sfop.dev" + fqdn: "sfop.me" authorizedSSHKey: c3NoLXJzYSBBQUFBQjNOemFDMXljMkVBQUFBREFRQUJBQUFDQVFDOWNkVWh0Mk5jRjNvSEVJckpPbzJGSUVtYzVPOEhCbGZhSEcxUk5BaE5YeHhzTjROQVJueitNNmlRWm9zSXJ5dENkNGVvSEx6Z2d5VTM2YktwUFpkNFhocHg3cTNwR1B5bzFZZjB6WGpDL0xaekoyUi9pUDRPbys0eDhIK2MzSjQyV2xOK0xlNTlRS2ZTK2s5V3hWZ2JHMGRDQlJ3NlJPcjZRaGVrakx6Y2JLcE10MzErakNtbDlqQnNPOXFVRmFYcDlvdEVvL0ZrNEdJU0YvM2RjZFNxTTB1UmRIQ0lGSHU5T0FYZlNkOHdndW8wTU1iZEpMeTlYNGtpYlJIeFZoenVXL3AwbTgxZ3NRRkNJZ2xEZVVlSytBYkhEdi9neFR6TlFvK0xHZW5TWEF4b2tJSEtLQmVJRlkvWW5vUnZNVGgyVXRsV1R0RFRVOWlBOStwR3BmSm5IaTdvRUR4dnpDOERJVUYybzJPZFlpcnJWSURuMlduK29YYnRmQjNJckNPM1Y1V3VpNmpoMDE5b1NwVFFvZDFoUUVEcTdqU2o5V0hVRnNnOUhBaTkwMlJPcFhGazQyK0pXUFpONlAybnNYN1hxcDhYWlVVNXVJSGtMY1dkU1R5MklPWUxZZWN2aGhBV1JJQ0w3N2FOY0taU3AzTFk2Z1ZQczhaUFZEeHJJZDZLYnpuQWcvVkZZYktkOEppalIwMlJISk9QcklYZDloYmphUStwYXpmZEJqYjBSaUdXWk8rcXpVdHplWXd4dG1VSmNYd2RkNHlmaCtXK3NHSE1BSHlsSzFtUGkwNmI3MDVTYnR3YWVsaGtKU2pCb0pFQlRhLy9BMUtjQWFleW1UL21EMVBSRGQwSzdadE1ZamE4WkdPZHJXOUF0TDBPNXRJaTNNTTUxd3J4cVE9PQo= diff --git a/config/samples/sf_v1_softwarefactory.yaml b/config/samples/sf_v1_softwarefactory.yaml index 8a148060..da4e9abe 100644 --- a/config/samples/sf_v1_softwarefactory.yaml +++ b/config/samples/sf_v1_softwarefactory.yaml @@ -3,7 +3,7 @@ kind: SoftwareFactory metadata: name: my-sf spec: - fqdn: "sfop.dev" + fqdn: "sfop.me" config-location: base-url: "http://gerrit-httpd/" name: config @@ -13,7 +13,7 @@ spec: - name: gerrit username: zuul hostname: gerrit-sshd - puburl: "https://gerrit.sfop.dev" + puburl: "https://gerrit.sfop.me" logserver: loopDelay: 5 storage: diff --git a/doc/cli/index.md b/doc/cli/index.md index b1ad8195..53ac1dc5 100644 --- a/doc/cli/index.md +++ b/doc/cli/index.md @@ -20,7 +20,7 @@ The CLI can be run with ./tools/sfconfig ``` -And contextual help is available with +And contextual help is available with ```sh ./tools/sfconfig [COMMAND] --help @@ -37,7 +37,7 @@ ansible_microshift_role_path: ~/src/github.com/openstack-k8s-operators/ansible-m microshift: host: microshift.dev user: cloud-user -fqdn: sfop.dev +fqdn: sfop.me nodepool: clouds_file: /etc/sf-operator/nodepool/clouds.yaml kube_file: /etc/sf-operator/nodepool/kubeconfig.yaml @@ -134,7 +134,7 @@ Flags: ### Nodepool #### create-namespace-for-nodepool -This command creates +This command creates * a suitable namespace on the OpenShift cluster, * a kube configuration set to this namespace, @@ -251,7 +251,7 @@ Flags: | Argument | Type | Description | Default | |----------|------|-------|----| | --deploy | boolean | Deploy Gerrit on the cluster|-| -| -f, --fqdn| string | The FQDN of gerrit (gerrit.FQDN)|sfop.dev| +| -f, --fqdn| string | The FQDN of gerrit (gerrit.FQDN)|sfop.me| | --wipe | boolean | Wipe Gerrit deployment|-| ### microshift @@ -284,7 +284,7 @@ Flags: | Argument | Type | Description | Default | |----------|------|-------|----| -| -f, --fqdn| string | The FQDN for prometheus (prometheus.FQDN)|sfop.dev| +| -f, --fqdn| string | The FQDN for prometheus (prometheus.FQDN)|sfop.me| | --skip-operator-installation | boolean | Do not attempt to install the prometheus operator prior to deploying a Prometheus instance|-| ### runTests diff --git a/doc/deployment/getting_started.md b/doc/deployment/getting_started.md index 268f9a91..4e263482 100644 --- a/doc/deployment/getting_started.md +++ b/doc/deployment/getting_started.md @@ -42,7 +42,7 @@ metadata: name: my-sf namespace: sf spec: - fqdn: "sfop.dev" + fqdn: "sfop.me" ``` then create the resource with: @@ -65,12 +65,12 @@ The following `Routes` (or `Ingresses`) are created: kubectl -n sf get routes -o custom-columns=HOST:.spec.host HOST -zuul.sfop.dev -logserver.sfop.dev -nodepool.sfop.dev +zuul.sfop.me +logserver.sfop.me +nodepool.sfop.me ``` -At that point you have successfully deployed a **SoftwareFactory** instance. You can access the Zuul Web UI at https://zuul.sfop.dev . +At that point you have successfully deployed a **SoftwareFactory** instance. You can access the Zuul Web UI at https://zuul.sfop.me . ## Next steps diff --git a/doc/deployment/nodepool.md b/doc/deployment/nodepool.md index 8e32691c..d4a0126c 100644 --- a/doc/deployment/nodepool.md +++ b/doc/deployment/nodepool.md @@ -51,7 +51,7 @@ ansible_microshift_role_path: ~/src/github.com/openstack-k8s-operators/ansible-m microshift: host: microshift.dev user: cloud-user -fqdn: sfop.dev +fqdn: sfop.me nodepool: clouds_file: /path/to/clouds.yaml kube_file: /path/to/kube/config diff --git a/doc/developer/howtos/index.md b/doc/developer/howtos/index.md index 8dc8bd89..a8447a62 100644 --- a/doc/developer/howtos/index.md +++ b/doc/developer/howtos/index.md @@ -40,10 +40,10 @@ First checkout the **config** repository. # Get the Gerrit admin user API key gerrit_admin_api_key=$(./tools/get-secret.sh gerrit-admin-api-key) # Then checkout the config repository -git -c http.sslVerify=false clone "https://admin:${gerrit_admin_api_key}@gerrit.sfop.dev/a/config" /tmp/config +git -c http.sslVerify=false clone "https://admin:${gerrit_admin_api_key}@gerrit.sfop.me/a/config" /tmp/config cd /tmp/config git config http.sslverify false -git remote add gerrit "https://admin:${gerrit_admin_api_key}@gerrit.sfop.dev/a/config" +git remote add gerrit "https://admin:${gerrit_admin_api_key}@gerrit.sfop.me/a/config" ``` Then add a change and send the review: diff --git a/hack/dashboards.sh b/hack/dashboards.sh index eff9ead6..43f1562f 100644 --- a/hack/dashboards.sh +++ b/hack/dashboards.sh @@ -13,7 +13,7 @@ sed -i 's/port: 443/port: 8443/g' recommended.yaml kubectl apply -f recommended.yaml -oc create route passthrough kubernetes-dashboard --service=kubernetes-dashboard --port=8443 --hostname=dashboards.sfop.dev +oc create route passthrough kubernetes-dashboard --service=kubernetes-dashboard --port=8443 --hostname=dashboards.sfop.me kubectl adm policy add-scc-to-user privileged -z kubernetes-dashboard kubectl apply -f - < zuul.d/config.yaml --- diff --git a/tools/microshift/group_vars/all.yaml b/tools/microshift/group_vars/all.yaml index 1b6c7ff1..c68d44ed 100644 --- a/tools/microshift/group_vars/all.yaml +++ b/tools/microshift/group_vars/all.yaml @@ -1,7 +1,7 @@ --- microshift_ip: "{{ hostvars.microshift.ansible_host }}" microshift_fqdn: microshift.dev -sf_fqdn: sfop.dev +sf_fqdn: sfop.me disk_file_sparsed: true standard_user: false create_pv: false diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 7c4cc4ae..69a36a90 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -51,7 +51,7 @@ output_logs_dir: ~/zuul-output/logs # dnsmasq microshift_additional_addresses: - - "sfop.dev" + - "sfop.me" etcd_on_ramdisk: true cloudprovider_dns: - 199.204.44.24 @@ -87,7 +87,7 @@ output_logs_dir: ~/zuul-output/logs # dnsmasq microshift_additional_addresses: - - "sfop.dev" + - "sfop.me" # Images publication job - job: