Skip to content

Commit

Permalink
Merge "change sfop.dev to sfop.me"
Browse files Browse the repository at this point in the history
  • Loading branch information
Zuul CI authored and Gerrit Code Review committed Oct 6, 2023
2 parents b0a6aca + da52452 commit 29b2259
Show file tree
Hide file tree
Showing 18 changed files with 35 additions and 35 deletions.
2 changes: 1 addition & 1 deletion cli/sfconfig/cmd/gerrit/gerrit.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.<FQDN>)")
GerritCmd.PersistentFlags().StringP("fqdn", "f", "sfop.me", "The FQDN of gerrit (gerrit.<FQDN>)")
}
2 changes: 1 addition & 1 deletion cli/sfconfig/cmd/sfprometheus/sfprometheus.go
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ The prometheus dashboard will be accessible at https://prometheus.<fqdn>.`,
}

func init() {
PrometheusCmd.Flags().StringP("fqdn", "f", "sfop.dev", "The FQDN for prometheus (prometheus.<FQDN>)")
PrometheusCmd.Flags().StringP("fqdn", "f", "sfop.me", "The FQDN for prometheus (prometheus.<FQDN>)")
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
}
2 changes: 1 addition & 1 deletion cli/sfconfig/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion config/samples/sf_v1_logserver.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ kind: LogServer
metadata:
name: my-logserver
spec:
fqdn: "sfop.dev"
fqdn: "sfop.me"
authorizedSSHKey: c3NoLXJzYSBBQUFBQjNOemFDMXljMkVBQUFBREFRQUJBQUFDQVFDOWNkVWh0Mk5jRjNvSEVJckpPbzJGSUVtYzVPOEhCbGZhSEcxUk5BaE5YeHhzTjROQVJueitNNmlRWm9zSXJ5dENkNGVvSEx6Z2d5VTM2YktwUFpkNFhocHg3cTNwR1B5bzFZZjB6WGpDL0xaekoyUi9pUDRPbys0eDhIK2MzSjQyV2xOK0xlNTlRS2ZTK2s5V3hWZ2JHMGRDQlJ3NlJPcjZRaGVrakx6Y2JLcE10MzErakNtbDlqQnNPOXFVRmFYcDlvdEVvL0ZrNEdJU0YvM2RjZFNxTTB1UmRIQ0lGSHU5T0FYZlNkOHdndW8wTU1iZEpMeTlYNGtpYlJIeFZoenVXL3AwbTgxZ3NRRkNJZ2xEZVVlSytBYkhEdi9neFR6TlFvK0xHZW5TWEF4b2tJSEtLQmVJRlkvWW5vUnZNVGgyVXRsV1R0RFRVOWlBOStwR3BmSm5IaTdvRUR4dnpDOERJVUYybzJPZFlpcnJWSURuMlduK29YYnRmQjNJckNPM1Y1V3VpNmpoMDE5b1NwVFFvZDFoUUVEcTdqU2o5V0hVRnNnOUhBaTkwMlJPcFhGazQyK0pXUFpONlAybnNYN1hxcDhYWlVVNXVJSGtMY1dkU1R5MklPWUxZZWN2aGhBV1JJQ0w3N2FOY0taU3AzTFk2Z1ZQczhaUFZEeHJJZDZLYnpuQWcvVkZZYktkOEppalIwMlJISk9QcklYZDloYmphUStwYXpmZEJqYjBSaUdXWk8rcXpVdHplWXd4dG1VSmNYd2RkNHlmaCtXK3NHSE1BSHlsSzFtUGkwNmI3MDVTYnR3YWVsaGtKU2pCb0pFQlRhLy9BMUtjQWFleW1UL21EMVBSRGQwSzdadE1ZamE4WkdPZHJXOUF0TDBPNXRJaTNNTTUxd3J4cVE9PQo=
4 changes: 2 additions & 2 deletions config/samples/sf_v1_softwarefactory.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down
10 changes: 5 additions & 5 deletions doc/cli/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions doc/deployment/getting_started.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ metadata:
name: my-sf
namespace: sf
spec:
fqdn: "sfop.dev"
fqdn: "sfop.me"
```
then create the resource with:
Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion doc/deployment/nodepool.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions doc/developer/howtos/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions hack/dashboards.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 - <<EOF
Expand Down Expand Up @@ -72,9 +72,9 @@ rules:
verbs: ["get", "list", "watch"]
EOF

# Print token to login into: dashboards.sfop.dev
# Remember to add dashboards.sfop.dev into /etc/hosts!
# Print token to login into: dashboards.sfop.me
# Remember to add dashboards.sfop.me into /etc/hosts!
kubectl create token kubernetes-dashboard

# Now use the token to reach:
curl https://dashboards.sfop.dev/#/workloads?namespace=sf
curl https://dashboards.sfop.me/#/workloads?namespace=sf
2 changes: 1 addition & 1 deletion playbooks/group_vars/all.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
config_path: /tmp/config
fqdn: sfop.dev
fqdn: sfop.me

validate_certs: false

Expand Down
2 changes: 1 addition & 1 deletion roles/health-check/config-update-zuul/defaults/main.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
---
fqdn: sfop.dev
fqdn: sfop.me
random: dummy
zuul_host: zuul.{{ fqdn }}
2 changes: 1 addition & 1 deletion roles/health-check/test-crd/defaults/main.yaml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
fqdn: sfop.dev
fqdn: sfop.me
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ organizational_unit_name: Test
country_name: PL
state_or_province_name: Dolnoslaskie
locality_name: Wroclaw
fqdn: sfop.dev
fqdn: sfop.me
ca_common_name: "{{ fqdn }}"
common_name: "{{ service_name_custom_ssl }}.{{ ca_common_name }}"
common_name_alt: "{{ ca_common_name }}"
Expand Down
2 changes: 1 addition & 1 deletion sfconfig.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,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
8 changes: 4 additions & 4 deletions tools/create-ps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,18 @@ fi

git clone \
-c user.name="Admin" \
-c user.email="admin@sfop.dev" \
-c user.email="admin@sfop.me" \
-c http.sslVerify=false \
"https://admin:${GERRIT_ADMIN_API_KEY}@gerrit.sfop.dev/a/config" "$TMP_DIR/config"
"https://admin:${GERRIT_ADMIN_API_KEY}@gerrit.sfop.me/a/config" "$TMP_DIR/config"

cd "$TMP_DIR/config"
mkdir -p "$TMP_DIR/config/playbooks"
mkdir -p "$TMP_DIR/config/zuul.d"

git config user.name "Admin"
git config user.email admin@sfop.dev
git config user.email admin@sfop.me
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"

cat << EOF > zuul.d/config.yaml
---
Expand Down
2 changes: 1 addition & 1 deletion tools/microshift/group_vars/all.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions zuul.d/jobs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -87,7 +87,7 @@
output_logs_dir: ~/zuul-output/logs
# dnsmasq
microshift_additional_addresses:
- "sfop.dev"
- "sfop.me"

# Images publication job
- job:
Expand Down

0 comments on commit 29b2259

Please sign in to comment.