Skip to content

Commit

Permalink
Merge branch 'master' into bugfix/allow-removal-with-altered-state
Browse files Browse the repository at this point in the history
  • Loading branch information
StevenPG committed Mar 17, 2021
2 parents 00d902c + 5149d1b commit 37bd3de
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 18 deletions.
11 changes: 0 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,17 +74,6 @@ Please don't ask individual project members or open GitHub issues for support
requests. Use one of the above channels so everyone in the community can
participate.

---

[![Community
Call](./docs/img/community-call.png)](https://docs.google.com/document/d/1mEsc0GxlnwbWAXzbIP7tBb6T5WgAI66_0gIWJzqB93o/edit)

Grafana Labs hosts a monthly community call for the Tanka project. Notes and the
meeting URL can be found in a [Google
Doc](https://docs.google.com/document/d/1mEsc0GxlnwbWAXzbIP7tBb6T5WgAI66_0gIWJzqB93o/edit).
Join us to share why you love Tanka, why you have a hard time, tell us what you
would like to see improved and hear about latest news!

Furthermore, see [`LICENSE`](./LICENSE) and [`GOVERNANCE`](./GOVERNANCE.md).

## :book: Additional resources
Expand Down
1 change: 0 additions & 1 deletion pkg/kubernetes/client/delete.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ func (k Kubectl) Delete(namespace, kind, name string, opts DeleteOpts) error {
}

cmd := k.ctl("delete", argv...)
// https://stackoverflow.com/questions/18159704/how-to-debug-exit-status-1-error-when-running-exec-command-in-golang

var stdout bytes.Buffer
var stderr bytes.Buffer
Expand Down
11 changes: 6 additions & 5 deletions pkg/tanka/prune.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package tanka

import (
"fmt"
"log"

"github.com/fatih/color"

Expand Down Expand Up @@ -40,7 +41,7 @@ func Prune(baseDir string, opts PruneOpts) error {
}

if len(orphaned) == 0 {
fmt.Println("Nothing found to prune.")
log.Println("Nothing found to prune.")
return nil
}

Expand All @@ -61,12 +62,12 @@ func Prune(baseDir string, opts PruneOpts) error {
}
}
if len(namespaces) > 0 {
warning := color.New(color.FgHiYellow, color.Bold).PrintFunc()
warning("WARNING: This will delete following namespaces and all resources in them:\n")
warning := color.New(color.FgHiYellow, color.Bold).FprintfFunc()
warning(color.Error, "WARNING: This will delete following namespaces and all resources in them:\n")
for _, ns := range namespaces {
fmt.Printf(" - %s\n", ns)
log.Printf(" - %s\n", ns)
}
fmt.Println("")
log.Println("")
}

// prompt for confirm
Expand Down
3 changes: 2 additions & 1 deletion pkg/tanka/workflow.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package tanka

import (
"fmt"
"log"

"github.com/fatih/color"

Expand Down Expand Up @@ -45,7 +46,7 @@ func Apply(baseDir string, opts ApplyOpts) error {
switch {
case err != nil:
// This is not fatal, the diff is not strictly required
fmt.Println("Error diffing:", err)
log.Println("Error diffing:", err)
case diff == nil:
tmp := "Warning: There are no differences. Your apply may not do anything at all."
diff = &tmp
Expand Down

0 comments on commit 37bd3de

Please sign in to comment.