From 552d04589e873b7fc87f1ab0c37739ae55881bd2 Mon Sep 17 00:00:00 2001
From: Justin Santa Barbara <justin@fathomdb.com>
Date: Tue, 17 Oct 2017 09:58:59 -0400
Subject: [PATCH] Avoid spurious mirror tasks in plan

---
 upup/pkg/fi/fitasks/mirrorkeystore.go | 6 ++++++
 upup/pkg/fi/fitasks/mirrorsecrets.go  | 7 +++++++
 2 files changed, 13 insertions(+)

diff --git a/upup/pkg/fi/fitasks/mirrorkeystore.go b/upup/pkg/fi/fitasks/mirrorkeystore.go
index 0936869ad2ed7..7f1908f3e9ef1 100644
--- a/upup/pkg/fi/fitasks/mirrorkeystore.go
+++ b/upup/pkg/fi/fitasks/mirrorkeystore.go
@@ -45,6 +45,12 @@ func (e *MirrorKeystore) GetDependencies(tasks map[string]fi.Task) []fi.Task {
 
 // Find implements fi.Task::Find
 func (e *MirrorKeystore) Find(c *fi.Context) (*MirrorKeystore, error) {
+	if vfsKeystore, ok := c.Keystore.(*fi.VFSCAStore); ok {
+		if vfsKeystore.VFSPath().Path() == e.MirrorPath.Path() {
+			return e, nil
+		}
+	}
+
 	// TODO: implement Find so that we aren't always mirroring
 	glog.V(2).Infof("MirrorKeystore::Find not implemented; always copying (inefficient)")
 	return nil, nil
diff --git a/upup/pkg/fi/fitasks/mirrorsecrets.go b/upup/pkg/fi/fitasks/mirrorsecrets.go
index e638f83c5cdb6..da70bec6c09f8 100644
--- a/upup/pkg/fi/fitasks/mirrorsecrets.go
+++ b/upup/pkg/fi/fitasks/mirrorsecrets.go
@@ -19,6 +19,7 @@ package fitasks
 import (
 	"github.com/golang/glog"
 	"k8s.io/kops/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/fi/secrets"
 	"k8s.io/kops/util/pkg/vfs"
 )
 
@@ -45,6 +46,12 @@ func (e *MirrorSecrets) GetDependencies(tasks map[string]fi.Task) []fi.Task {
 
 // Find implements fi.Task::Find
 func (e *MirrorSecrets) Find(c *fi.Context) (*MirrorSecrets, error) {
+	if vfsSecretStore, ok := c.SecretStore.(*secrets.VFSSecretStore); ok {
+		if vfsSecretStore.VFSPath().Path() == e.MirrorPath.Path() {
+			return e, nil
+		}
+	}
+
 	// TODO: implement Find so that we aren't always mirroring
 	glog.V(2).Infof("MirrorSecrets::Find not implemented; always copying (inefficient)")
 	return nil, nil