Merge pull request #27 from carolynvs/pr26

Make --ignore-not-found the default for uninstall

Author: carolynvs

Makefile

@@ -98,9 +98,9 @@ bin/porter$(FILE_EXT):
 	chmod +x bin/porter$(FILE_EXT)
 
 install:
-	mkdir -p $(PORTER_HOME)/mixins/$(MIXIN)
+	mkdir -p $(PORTER_HOME)/mixins/$(MIXIN)/runtimes
 	install $(BINDIR)/$(MIXIN)$(FILE_EXT) $(PORTER_HOME)/mixins/$(MIXIN)/$(MIXIN)$(FILE_EXT)
-	install $(BINDIR)/$(MIXIN)-runtime$(FILE_EXT) $(PORTER_HOME)/mixins/$(MIXIN)/$(MIXIN)-runtime$(FILE_EXT)
+	install $(BINDIR)/$(MIXIN)-runtime$(FILE_EXT) $(PORTER_HOME)/mixins/$(MIXIN)/runtimes/$(MIXIN)-runtime$(FILE_EXT)
 
 clean: clean-packr
 	-rm -fr bin/

README.md

@@ -35,6 +35,7 @@ porter mixin install kubernetes --version $VERSION --url https://github.com/getp
 ### Mixin Configuration
 
 #### Kubernetes client version
+You can use the `clientVersion` field to specify the kubectl CLI version.
 
 ```yaml
 - kubernetes:
@@ -77,6 +78,8 @@ uninstall:
         - /cnab/app/manifests/hello
       wait: true
 
+\* Uninstall automatically applies the --ignore-not-found flag so that you can safely repeat the uninstall action without errors.
+
 ```
 
 #### Outputs

pkg/kubernetes/uninstall.go

@@ -24,12 +24,12 @@ type UninstallArguments struct {
 	Namespace string   `yaml:"namespace"`
 	Manifests []string `yaml:"manifests,omitempty"`
 
-	Force       *bool  `yaml:force,omitempty"`
-	GracePeriod *int   `yaml:"gracePeriod,omitempty"`
-	Selector    string `yaml:"selector,omitempty"`
-	Context  string    `yaml:"context,omitempty"`
-	Timeout     *int   `yaml:"timeout,omitempty"`
-	Wait        *bool  `yaml:"wait,omitempty"`
+	Force          *bool  `yaml:force,omitempty"`
+	GracePeriod    *int   `yaml:"gracePeriod,omitempty"`
+	Selector       string `yaml:"selector,omitempty"`
+	Context        string `yaml:"context,omitempty"`
+	Timeout        *int   `yaml:"timeout,omitempty"`
+	Wait           *bool  `yaml:"wait,omitempty"`
 }
 
 // Uninstall will delete anything created during the install or upgrade step
@@ -79,7 +79,7 @@ func (m *Mixin) Uninstall() error {
 }
 
 func (m *Mixin) buildUninstallCommand(args UninstallArguments, manifestPath string) ([]string, error) {
-	command := []string{"delete", "-f", manifestPath}
+	command := []string{"delete", "--ignore-not-found=true", "-f", manifestPath}
 	if args.Namespace != "" {
 		command = append(command, "-n", args.Namespace)
 	}

pkg/kubernetes/uninstall_test.go

@@ -21,7 +21,7 @@ func TestMixin_UninstallStep(t *testing.T) {
 
 	manifestDirectory := "/cnab/app/manifests"
 
-	deleteCmd := "kubectl delete -f"
+	deleteCmd := "kubectl delete --ignore-not-found=true -f"
 
 	dontWait := false
 
@@ -91,7 +91,7 @@ func TestMixin_UninstallStep(t *testing.T) {
 						Description: "Hello",
 					},
 					Manifests: []string{manifestDirectory},
-					Context:  context,
+					Context:   context,
 				},
 			},
 		},