Skip to content

Bug 2035757: cluster-bootstrap/alibaba: set tear-down-delay to wait kube-apiserver rolls out on AlibabaCloud #5535

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 2 commits into from
Jan 19, 2022
Merged

Bug 2035757: cluster-bootstrap/alibaba: set tear-down-delay to wait kube-apiserver rolls out on AlibabaCloud #5535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85aafff
cb: set tear-down-delay to wait kube-apiserver on AlibabaCloud
mtulio Jan 14, 2022
91c637d
Update pkg/asset/ignition/bootstrap/common.go
mtulio Jan 17, 2022
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
6 changes: 5 additions & 1 deletion data/data/bootstrap/files/usr/local/bin/bootkube.sh.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,11 @@ run_cluster_bootstrap() {
--volume "$PWD:/assets:z" \
--volume /etc/kubernetes:/etc/kubernetes:z \
"${CLUSTER_BOOTSTRAP_IMAGE}" \
start --tear-down-early=false --asset-dir=/assets --required-pods="${REQUIRED_PODS}"
start \
--tear-down-early=false \
--tear-down-delay="{{.TearDownDelay}}" \
--asset-dir=/assets \
--required-pods="${REQUIRED_PODS}"
}

if [ ! -f cb-bootstrap.done ]
Expand Down
11 changes: 11 additions & 0 deletions pkg/asset/ignition/bootstrap/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ import (
"github.com/openshift/installer/pkg/asset/rhcos"
"github.com/openshift/installer/pkg/asset/tls"
"github.com/openshift/installer/pkg/types"
"github.com/openshift/installer/pkg/types/alibabacloud"
baremetaltypes "github.com/openshift/installer/pkg/types/baremetal"
vspheretypes "github.com/openshift/installer/pkg/types/vsphere"
)
Expand Down Expand Up @@ -78,6 +79,7 @@ type bootstrapTemplateData struct {
BootstrapInPlace *types.BootstrapInPlace
UseIPv6ForNodeIP bool
IsOKD bool
TearDownDelay string
}

// platformTemplateData is the data to use to replace values in bootstrap
Expand Down Expand Up @@ -278,6 +280,14 @@ func (a *Common) getTemplateData(dependencies asset.Parents, bootstrapInPlace bo
logrus.Warnf("Found override for Cluster Profile: %q", cp)
clusterProfile = cp
}

tearDownDelay := "0"
if installConfig.Config.Platform.Name() == alibabacloud.Name {
// tear-down set to let kube-apiserver rolls out and avoid loopback CLB limitation
// BZ https://bugzilla.redhat.com/show_bug.cgi?id=2035757
tearDownDelay = "10m"
}

var bootstrapInPlaceConfig *types.BootstrapInPlace
if bootstrapInPlace {
bootstrapInPlaceConfig = installConfig.Config.BootstrapInPlace
Expand All @@ -297,6 +307,7 @@ func (a *Common) getTemplateData(dependencies asset.Parents, bootstrapInPlace bo
BootstrapInPlace: bootstrapInPlaceConfig,
UseIPv6ForNodeIP: APIIntVIPonIPv6,
IsOKD: installConfig.Config.IsOKD(),
TearDownDelay: tearDownDelay,
}
}

Expand Down