Skip to content

Fix ingress-canary route for remote-libvirt-e2e #14394

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

Merged
openshift-merge-robot merged 1 commit into from
Dec 16, 2020
Merged

Fix ingress-canary route for remote-libvirt-e2e #14394

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
22 changes: 11 additions & 11 deletions ci-operator/templates/openshift/installer/cluster-launch-installer-remote-libvirt-e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,11 +500,11 @@ objects:
cat > ${ARTIFACT_DIR}/installer/worker-hostrecords.xml << EOF
<host ip='192.168.${cluster_subnet}.51'>
<hostname>alertmanager-main-openshift-monitoring.apps.${CLUSTER_NAME}.${LEASED_RESOURCE}</hostname>
<hostname>canary-openshift-ingress-canary.apps.${CLUSTER_NAME}.${LEASED_RESOURCE}</hostname>
<hostname>console-openshift-console.apps.${CLUSTER_NAME}.${LEASED_RESOURCE}</hostname>
<hostname>downloads-openshift-console.apps.${CLUSTER_NAME}.${LEASED_RESOURCE}</hostname>
<hostname>grafana-openshift-monitoring.apps.${CLUSTER_NAME}.${LEASED_RESOURCE}</hostname>
<hostname>oauth-openshift.apps.${CLUSTER_NAME}.${LEASED_RESOURCE}</hostname>
<hostname>openshift-ingress-canary.apps.${CLUSTER_NAME}.${LEASED_RESOURCE}</hostname>
<hostname>prometheus-k8s-openshift-monitoring.apps.${CLUSTER_NAME}.${LEASED_RESOURCE}</hostname>
</host>
EOF
Expand Down Expand Up @@ -685,100 +685,100 @@ objects:
- "${REMOTE_LIBVIRT_HOSTNAME}"
- "alertmanager-main-openshift-monitoring.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-0-0"
- "api.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-0-0"
- "canary-openshift-ingress-canary.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-0-0"
- "console-openshift-console.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-0-0"
- "downloads-openshift-console.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-0-0"
- "grafana-openshift-monitoring.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-0-0"
- "oauth-openshift.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-0-0"
- "openshift-ingress-canary.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-0-0"
- "prometheus-k8s-openshift-monitoring.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-0-0"
- ip: "${BASTION_SVC_0_1_IP}"
hostnames:
- "alertmanager-main-openshift-monitoring.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-0-1"
- "api.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-0-1"
- "canary-openshift-ingress-canary.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-0-1"
- "console-openshift-console.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-0-1"
- "downloads-openshift-console.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-0-1"
- "grafana-openshift-monitoring.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-0-1"
- "oauth-openshift.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-0-1"
- "openshift-ingress-canary.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-0-1"
- "prometheus-k8s-openshift-monitoring.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-0-1"
- ip: "${BASTION_SVC_0_2_IP}"
hostnames:
- "alertmanager-main-openshift-monitoring.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-0-2"
- "api.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-0-2"
- "canary-openshift-ingress-canary.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-0-2"
- "console-openshift-console.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-0-2"
- "downloads-openshift-console.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-0-2"
- "grafana-openshift-monitoring.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-0-2"
- "oauth-openshift.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-0-2"
- "openshift-ingress-canary.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-0-2"
- "prometheus-k8s-openshift-monitoring.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-0-2"
- ip: "${BASTION_SVC_0_3_IP}"
hostnames:
- "alertmanager-main-openshift-monitoring.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-0-3"
- "api.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-0-3"
- "canary-openshift-ingress-canary.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-0-3"
- "console-openshift-console.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-0-3"
- "downloads-openshift-console.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-0-3"
- "grafana-openshift-monitoring.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-0-3"
- "oauth-openshift.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-0-3"
- "openshift-ingress-canary.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-0-3"
- "prometheus-k8s-openshift-monitoring.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-0-3"
- ip: "${BASTION_SVC_0_4_IP}"
hostnames:
- "alertmanager-main-openshift-monitoring.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-0-4"
- "api.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-0-4"
- "canary-openshift-ingress-canary.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-0-4"
- "console-openshift-console.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-0-4"
- "downloads-openshift-console.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-0-4"
- "grafana-openshift-monitoring.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-0-4"
- "oauth-openshift.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-0-4"
- "openshift-ingress-canary.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-0-4"
- "prometheus-k8s-openshift-monitoring.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-0-4"
- ip: "${BASTION_SVC_1_0_IP}"
hostnames:
- "${REMOTE_LIBVIRT_HOSTNAME_1}"
- "alertmanager-main-openshift-monitoring.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-1-0"
- "api.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-1-0"
- "canary-openshift-ingress-canary.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-1-0"
- "console-openshift-console.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-1-0"
- "downloads-openshift-console.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-1-0"
- "grafana-openshift-monitoring.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-1-0"
- "oauth-openshift.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-1-0"
- "openshift-ingress-canary.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-1-0"
- "prometheus-k8s-openshift-monitoring.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-1-0"
- ip: "${BASTION_SVC_1_1_IP}"
hostnames:
- "alertmanager-main-openshift-monitoring.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-1-1"
- "api.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-1-1"
- "canary-openshift-ingress-canary.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-1-1"
- "console-openshift-console.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-1-1"
- "downloads-openshift-console.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-1-1"
- "grafana-openshift-monitoring.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-1-1"
- "oauth-openshift.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-1-1"
- "openshift-ingress-canary.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-1-1"
- "prometheus-k8s-openshift-monitoring.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-1-1"
- ip: "${BASTION_SVC_1_2_IP}"
hostnames:
- "alertmanager-main-openshift-monitoring.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-1-2"
- "api.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-1-2"
- "canary-openshift-ingress-canary.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-1-2"
- "console-openshift-console.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-1-2"
- "downloads-openshift-console.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-1-2"
- "grafana-openshift-monitoring.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-1-2"
- "oauth-openshift.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-1-2"
- "openshift-ingress-canary.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-1-2"
- "prometheus-k8s-openshift-monitoring.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-1-2"
- ip: "${BASTION_SVC_1_3_IP}"
hostnames:
- "alertmanager-main-openshift-monitoring.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-1-3"
- "api.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-1-3"
- "canary-openshift-ingress-canary.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-1-3"
- "console-openshift-console.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-1-3"
- "downloads-openshift-console.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-1-3"
- "grafana-openshift-monitoring.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-1-3"
- "oauth-openshift.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-1-3"
- "openshift-ingress-canary.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-1-3"
- "prometheus-k8s-openshift-monitoring.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-1-3"
- ip: "${BASTION_SVC_1_4_IP}"
hostnames:
- "alertmanager-main-openshift-monitoring.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-1-4"
- "api.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-1-4"
- "canary-openshift-ingress-canary.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-1-4"
- "console-openshift-console.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-1-4"
- "downloads-openshift-console.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-1-4"
- "grafana-openshift-monitoring.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-1-4"
- "oauth-openshift.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-1-4"
- "openshift-ingress-canary.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-1-4"
- "prometheus-k8s-openshift-monitoring.apps.${NAMESPACE}-${JOB_NAME_HASH}.${CLUSTER_TYPE}-1-4"