github/troubleshoot
1
0
Fork 0
mirror of https://github.com/replicatedhq/troubleshoot.git synced 2026-04-15 07:16:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

don't override namespace

Browse Source
This commit is contained in:
Andrew Lavery
2020-04-06 17:44:57 -04:00
parent 544c832d6e
commit 3844a3dbd3
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/collect/secret.go
View File

@@ -34,10 +34,6 @@ func Secret(ctx *Context, secretCollector *troubleshootv1beta1.Secret) ([]byte,
Errors: make(map[string][]byte),
}
if secretCollector.Namespace == "" {
secretCollector.Namespace = "default"
}
path, encoded, err := secret(client, secretCollector)
if err != nil {
errorBytes, err := marshalNonNil([]string{err.Error()})
@@ -65,9 +61,13 @@ func Secret(ctx *Context, secretCollector *troubleshootv1beta1.Secret) ([]byte,
}
func secret(client *kubernetes.Clientset, secretCollector *troubleshootv1beta1.Secret) (string, []byte, error) {
path := fmt.Sprintf("%s/%s.json", secretCollector.Namespace, secretCollector.SecretName)
ns := secretCollector.Namespace
if ns == "" {
ns = "current-namespace"
}
path := fmt.Sprintf("%s/%s.json", ns, secretCollector.SecretName)
if secretCollector.Key != "" {
path = fmt.Sprintf("%s/%s/%s.json", secretCollector.Namespace, secretCollector.SecretName, secretCollector.Key)
path = fmt.Sprintf("%s/%s/%s.json", ns, secretCollector.SecretName, secretCollector.Key)
}
found, err := client.CoreV1().Secrets(secretCollector.Namespace).Get(secretCollector.SecretName, metav1.GetOptions{})
@@ -86,6 +86,13 @@ func secret(client *kubernetes.Clientset, secretCollector *troubleshootv1beta1.S
return path, b, err
}
ns = found.Namespace
if secretCollector.Key != "" {
path = fmt.Sprintf("%s/%s/%s.json", ns, secretCollector.SecretName, secretCollector.Key)
} else {
path = fmt.Sprintf("%s/%s.json", ns, secretCollector.SecretName)
}
keyExists := false
keyData := ""
if secretCollector.Key != "" {