Merge pull request #8419 from johngmyers/automated-cherry-pick-of-#83…

…38-upstream-release-1.15 Automated cherry pick of #8338: Don't load nonexistent calico-client cert when CNI is Cilium
kubernetes · Jan 27, 2020 · 3bbc979 · 3bbc979
2 parents df4d557 + c80faa3
commit 3bbc979
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/upup/pkg/fi/nodeup/command.go b/upup/pkg/fi/nodeup/command.go
@@ -253,7 +253,7 @@ func (c *NodeUpCommand) Run(out io.Writer) error {
 	} else {
 		loader.Builders = append(loader.Builders, &model.KubeRouterBuilder{NodeupModelContext: modelContext})
 	}
-	if c.cluster.Spec.Networking.Calico != nil || c.cluster.Spec.Networking.Cilium != nil {
+	if c.cluster.Spec.Networking.Calico != nil {
 		loader.Builders = append(loader.Builders, &model.EtcdTLSBuilder{NodeupModelContext: modelContext})
 	}