Merge pull request #3925 from justinsb/avoid_ca_create_race

Automatic merge from submit-queue.

Avoid generating a CA keypair on-demand

upup/pkg/fi/clientset_castore.go

@@ -62,7 +62,8 @@ func NewClientsetCAStore(cluster *kops.Cluster, clientset kopsinternalversion.Ko
 	return c
 }
 
-// readCAKeypairs retrieves the CA keypair, generating a new keypair if not found
+// readCAKeypairs retrieves the CA keypair.
+// (No longer generates a keypair if not found.)
 func (c *ClientsetCAStore) readCAKeypairs(id string) (*keyset, error) {
 	c.mutex.Lock()
 	defer c.mutex.Unlock()
@@ -78,14 +79,9 @@ func (c *ClientsetCAStore) readCAKeypairs(id string) (*keyset, error) {
 	}
 
 	if keyset == nil {
-		keyset, err = c.generateCACertificate(id)
+		return nil, nil
-		if err != nil {
-			return nil, err
-		}
-
 	}
 	c.cachedCaKeysets[id] = keyset
-
 	return keyset, nil
 }
 

upup/pkg/fi/fitasks/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@io_bazel_rules_go//go:def.bzl", "go_library")
+load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
 
 go_library(
     name = "go_default_library",
@@ -27,3 +27,12 @@ go_library(
         "//vendor/k8s.io/apimachinery/pkg/util/validation/field:go_default_library",
     ],
 )
+
+go_test(
+    name = "go_default_test",
+    size = "small",
+    srcs = ["keypair_test.go"],
+    importpath = "k8s.io/kops/upup/pkg/fi/fitasks",
+    library = ":go_default_library",
+    deps = ["//upup/pkg/fi:go_default_library"],
+)

upup/pkg/fi/fitasks/keypair_test.go

@@ -0,0 +1,44 @@
+/*
+Copyright 2017 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 fitasks
+
+import (
+	"k8s.io/kops/upup/pkg/fi"
+	"strings"
+	"testing"
+)
+
+func TestKeypairDeps(t *testing.T) {
+	ca := &Keypair{}
+	cert := &Keypair{
+		Signer: ca,
+	}
+
+	tasks := make(map[string]fi.Task)
+	tasks["ca"] = ca
+	tasks["cert"] = cert
+
+	deps := fi.FindTaskDependencies(tasks)
+
+	if strings.Join(deps["ca"], ",") != "" {
+		t.Errorf("unexpected dependencies for ca: %v", deps["ca"])
+	}
+
+	if strings.Join(deps["cert"], ",") != "ca" {
+		t.Errorf("unexpected dependencies for cert: %v", deps["cert"])
+	}
+}

upup/pkg/fi/vfs_castore.go

@@ -68,7 +68,7 @@ func (s *VFSCAStore) VFSPath() vfs.Path {
 	return s.basedir
 }
 
-// Retrieves the CA keypair, generating a new keypair if not found
+// Retrieves the CA keypair.  No longer generates keypairs if not found.
 func (s *VFSCAStore) readCAKeypairs(id string) (*certificates, *privateKeys, error) {
 	s.mutex.Lock()
 	defer s.mutex.Unlock()
@@ -98,16 +98,15 @@ func (s *VFSCAStore) readCAKeypairs(id string) (*certificates, *privateKeys, err
 	}
 
 	if caPrivateKeys == nil {
-		caCertificates, caPrivateKeys, err = s.generateCACertificate(id)
+		// We no longer generate CA certificates automatically - too race-prone
-		if err != nil {
+		return caCertificates, caPrivateKeys, nil
-			return nil, nil, err
-		}
-
 	}
+
 	cached = &cachedEntry{certificates: caCertificates, privateKeys: caPrivateKeys}
 	s.cachedCAs[id] = cached
 
 	return cached.certificates, cached.privateKeys, nil
+
 }
 
 func BuildCAX509Template() *x509.Certificate {