Merge pull request #94102 from neolit123/1.19-fix-etcd-700-perms

kubeadm: adjust the logic around etcd data directory creation

cmd/kubeadm/app/cmd/phases/init/BUILD

@@ -44,6 +44,7 @@ go_library(
         "//cmd/kubeadm/app/preflight:go_default_library",
         "//cmd/kubeadm/app/util/apiclient:go_default_library",
         "//cmd/kubeadm/app/util/dryrun:go_default_library",
+        "//cmd/kubeadm/app/util/etcd:go_default_library",
         "//cmd/kubeadm/app/util/pkiutil:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library",

cmd/kubeadm/app/cmd/phases/init/etcd.go

@@ -18,7 +18,6 @@ package phases
 
 import (
 	"fmt"
-	"os"
 
 	"github.com/pkg/errors"
 	"k8s.io/klog/v2"
@@ -26,6 +25,7 @@ import (
 	"k8s.io/kubernetes/cmd/kubeadm/app/cmd/phases/workflow"
 	cmdutil "k8s.io/kubernetes/cmd/kubeadm/app/cmd/util"
 	etcdphase "k8s.io/kubernetes/cmd/kubeadm/app/phases/etcd"
+	etcdutil "k8s.io/kubernetes/cmd/kubeadm/app/util/etcd"
 )
 
 var (
@@ -87,8 +87,9 @@ func runEtcdPhaseLocal() func(c workflow.RunData) error {
 		if cfg.Etcd.External == nil {
 			// creates target folder if doesn't exist already
 			if !data.DryRun() {
-				if err := os.MkdirAll(cfg.Etcd.Local.DataDir, 0700); err != nil {
+				// Create the etcd data directory
-					return errors.Wrapf(err, "failed to create etcd directory %q", cfg.Etcd.Local.DataDir)
+				if err := etcdutil.CreateDataDirectory(cfg.Etcd.Local.DataDir); err != nil {
+					return err
 				}
 			} else {
 				fmt.Printf("[dryrun] Would ensure that %q directory is present\n", cfg.Etcd.Local.DataDir)

cmd/kubeadm/app/cmd/phases/join/BUILD

@@ -29,6 +29,7 @@ go_library(
         "//cmd/kubeadm/app/phases/uploadconfig:go_default_library",
         "//cmd/kubeadm/app/preflight:go_default_library",
         "//cmd/kubeadm/app/util/apiclient:go_default_library",
+        "//cmd/kubeadm/app/util/etcd:go_default_library",
         "//cmd/kubeadm/app/util/kubeconfig:go_default_library",
         "//staging/src/k8s.io/api/core/v1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library",

cmd/kubeadm/app/cmd/phases/join/controlplanejoin.go

@@ -29,6 +29,7 @@ import (
 	etcdphase "k8s.io/kubernetes/cmd/kubeadm/app/phases/etcd"
 	markcontrolplanephase "k8s.io/kubernetes/cmd/kubeadm/app/phases/markcontrolplane"
 	uploadconfigphase "k8s.io/kubernetes/cmd/kubeadm/app/phases/uploadconfig"
+	etcdutil "k8s.io/kubernetes/cmd/kubeadm/app/util/etcd"
 )
 
 var controlPlaneJoinExample = cmdutil.Examples(`
@@ -131,6 +132,11 @@ func runEtcdPhase(c workflow.RunData) error {
 		return nil
 	}
 
+	// Create the etcd data directory
+	if err := etcdutil.CreateDataDirectory(cfg.Etcd.Local.DataDir); err != nil {
+		return err
+	}
+
 	// Adds a new etcd instance; in order to do this the new etcd instance should be "announced" to
 	// the existing etcd members before being created.
 	// This operation must be executed after kubelet is already started in order to minimize the time

cmd/kubeadm/app/util/etcd/BUILD

@@ -2,7 +2,10 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
 
 go_library(
     name = "go_default_library",
-    srcs = ["etcd.go"],
+    srcs = [
+        "etcd.go",
+        "etcddata.go",
+    ],
     importpath = "k8s.io/kubernetes/cmd/kubeadm/app/util/etcd",
     visibility = ["//visibility:public"],
     deps = [

cmd/kubeadm/app/util/etcd/etcddata.go

@@ -0,0 +1,31 @@
+/*
+Copyright 2020 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package etcd
+
+import (
+	"os"
+
+	"github.com/pkg/errors"
+)
+
+// CreateDataDirectory creates the etcd data directory (commonly /var/lib/etcd) with the right permissions.
+func CreateDataDirectory(dir string) error {
+	if err := os.MkdirAll(dir, 0700); err != nil {
+		return errors.Wrapf(err, "failed to create the etcd data directory: %q", dir)
+	}
+	return nil
+}