From f7b1bd585d497287fecac8f3a6a248f311f05322 Mon Sep 17 00:00:00 2001 From: "Frank A. Zdarsky" Date: Sun, 11 Dec 2022 08:02:44 +0000 Subject: [PATCH] Fix missing change of router manifest Signed-off-by: Frank A. Zdarsky --- scripts/auto-rebase/rebase.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/auto-rebase/rebase.sh b/scripts/auto-rebase/rebase.sh index 74f6f8693d..f3297839fd 100755 --- a/scripts/auto-rebase/rebase.sh +++ b/scripts/auto-rebase/rebase.sh @@ -569,9 +569,9 @@ update_manifests() { # Not use proxy protocol due to lack of load balancer support yq -i '.spec.template.spec.containers[0].env += {"name": "ROUTER_USE_PROXY_PROTOCOL", "value": "false"}' "${REPOROOT}"/assets/components/openshift-router/deployment.yaml yq -i '.spec.template.spec.containers[0].env += {"name": "GRACEFUL_SHUTDOWN_DELAY", "value": "1s"}' "${REPOROOT}"/assets/components/openshift-router/deployment.yaml - yq -i '.spec.template.spec.containers[0].env += {"name": "ROUTER_DOMAIN", "value": "apps.{{ .ClusterDomain }}"}' "${REPOROOT}"/assets/components/openshift-router/deployment.yaml + yq -i '.spec.template.spec.containers[0].env += {"name": "ROUTER_DOMAIN", "value": "apps.REPLACE_CLUSTER_DOMAIN"}' "${REPOROOT}"/assets/components/openshift-router/deployment.yaml # 4) Replace MicroShift templating vars (do this last, as yq trips over Go templates) - sed -i 's|REPLACE_CLUSTER_DOMAIN|{{ .ClusterDomain }}|' "${REPOROOT}"/assets/components/openshift-router/deployment.yaml + sed -i 's|REPLACE_CLUSTER_DOMAIN|{{ .ClusterName }}.{{ .BaseDomain }}|g' "${REPOROOT}"/assets/components/openshift-router/deployment.yaml sed -i 's|REPLACE_ROUTER_IMAGE|{{ .ReleaseImage.haproxy_router }}|' "${REPOROOT}"/assets/components/openshift-router/deployment.yaml