Skip to content

Commit

Permalink
pkg/client: improve error message for deleting hashed secrets
Browse files Browse the repository at this point in the history
Include the affected namespace in the error message.
  • Loading branch information
pgier committed May 7, 2020
1 parent 8e98183 commit b7252ef
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions pkg/client/client.go
Expand Up @@ -360,13 +360,13 @@ func (c *Client) DeleteHashedConfigMap(namespace, prefix, newHash string) error
LabelSelector: ls,
})
if err != nil {
return errors.Wrapf(err, "error listing configmaps with label selector %s", ls)
return errors.Wrapf(err, "error listing configmaps in namespace %s with label selector %s", namespace, ls)
}

for _, cm := range configMaps.Items {
err := c.KubernetesInterface().CoreV1().ConfigMaps(namespace).Delete(cm.Name, &metav1.DeleteOptions{})
if err != nil {
return errors.Wrapf(err, "error deleting configmap: %s", cm.Name)
return errors.Wrapf(err, "error deleting configmap: %s/%s", namespace, cm.Name)
}
}

Expand All @@ -381,13 +381,13 @@ func (c *Client) DeleteHashedSecret(namespace, prefix, newHash string) error {
LabelSelector: ls,
})
if err != nil {
return errors.Wrapf(err, "error listing secrets with label selector %s", ls)
return errors.Wrapf(err, "error listing secrets in namespace %s with label selector %s", namespace, ls)
}

for _, s := range secrets.Items {
err := c.KubernetesInterface().CoreV1().Secrets(namespace).Delete(s.Name, &metav1.DeleteOptions{})
if err != nil {
return errors.Wrapf(err, "error deleting secret: %s", s.Name)
return errors.Wrapf(err, "error deleting secret: %s/%s", namespace, s.Name)
}
}

Expand Down

0 comments on commit b7252ef

Please sign in to comment.