Skip to content

Commit

Permalink
Merge pull request #3632 from nojnhuh/preflight-comments
Browse files Browse the repository at this point in the history
update comments regarding skipping preflight kubeadm phase
  • Loading branch information
k8s-ci-robot authored May 31, 2024
2 parents 06b98aa + 4d9c950 commit 68590c1
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
4 changes: 2 additions & 2 deletions pkg/cluster/internal/create/actions/kubeadminit/init.go
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ func (a *action) Execute(ctx *actions.ActionContext) error {

// Newer versions set this in the config file.
if kubeVersion.LessThan(version.MustParseSemantic("v1.23.0")) {
// skip preflight checks, as these have undesirable side effects
// and don't tell us much. requires kubeadm 1.13+
// Skip preflight to avoid pulling images.
// Kind pre-pulls images and preflight may conflict with that.
skipPhases := "preflight"
if a.skipKubeProxy {
skipPhases += ",addon/kube-proxy"
Expand Down
4 changes: 2 additions & 2 deletions pkg/cluster/internal/create/actions/kubeadmjoin/join.go
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,8 @@ func runKubeadmJoin(logger log.Logger, node nodes.Node) error {
}
// Newer versions set this in the config file.
if kubeVersion.LessThan(version.MustParseSemantic("v1.23.0")) {
// skip preflight checks, as these have undesirable side effects
// and don't tell us much. requires kubeadm 1.13+
// Skip preflight to avoid pulling images.
// Kind pre-pulls images and preflight may conflict with that.
args = append(args, "--skip-phases=preflight")
}

Expand Down
5 changes: 3 additions & 2 deletions pkg/cluster/internal/kubeadm/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,9 @@ func (c *ConfigData) Derive() {
}
c.RuntimeConfigString = strings.Join(runtimeConfig, ",")

// skip preflight checks, as these have undesirable side effects
// and don't tell us much. requires kubeadm 1.22+
// Skip preflight to avoid pulling images.
// Kind pre-pulls images and preflight may conflict with that.
// requires kubeadm 1.22+
c.JoinSkipPhases = []string{"preflight"}
c.InitSkipPhases = []string{"preflight"}
if c.KubeProxyMode == string(config.NoneProxyMode) {
Expand Down

0 comments on commit 68590c1

Please sign in to comment.