@@ -339,7 +339,7 @@ func (c *Client) Get(namespace string, reader io.Reader) (string, error) {
339 339
err = perform(tinfos, func(info *resource.Info) error {
340 340
mux.Lock()
341 341
defer mux.Unlock()
342 -
c.Log("Doing get for %s: %q", info.Mapping.GroupVersionKind.Kind, info.Name)
342 +
c.Log("Doing get for %s: %q in %q", info.Mapping.GroupVersionKind.Kind, info.Name, info.Namespace)
343 343
if err := info.Get(); err != nil {
344 344
c.Log("WARNING: Failed Get for resource %q: %s", info.Name, err)
345 345
missing = append(missing, fmt.Sprintf("%v\t\t%s", info.Mapping.Resource, info.Name))
@@ -515,7 +515,7 @@ func (c *Client) UpdateWithOptions(namespace string, originalReader, targetReade
515 515
newlyCreatedResources = append(newlyCreatedResources, info)
516 516 517 517
kind := info.Mapping.GroupVersionKind.Kind
518 -
c.Log("Created a new %s called %q\n", kind, info.Name)
518 +
c.Log("Created a new %s called %q in %s\n", kind, info.Name, info.Namespace)
519 519
return nil
520 520
}
521 521
@@ -528,9 +528,10 @@ func (c *Client) UpdateWithOptions(namespace string, originalReader, targetReade
528 528
// See https://github.com/helm/helm/issues/1193 for more info.
529 529
if originalInfo == nil {
530 530
return fmt.Errorf(
531 -
"kind %s with the name %q already exists in the cluster and wasn't defined in the previous release. Before upgrading, please either delete the resource from the cluster or remove it from the chart",
531 +
"kind %s with the name %q in %q already exists in the cluster and wasn't defined in the previous release. Before upgrading, please either delete the resource from the cluster or remove it from the chart",
532 532
info.Mapping.GroupVersionKind.Kind,
533 533
info.Name,
534 +
info.Namespace,
534 535
)
535 536
}
536 537
@@ -846,7 +847,7 @@ func updateResource(c *Client, target *resource.Info, currentObj runtime.Object,
846 847
return fmt.Errorf("failed to create patch: %s", err)
847 848
}
848 849
if patch == nil {
849 -
c.Log("Looks like there are no changes for %s %q", target.Mapping.GroupVersionKind.Kind, target.Name)
850 +
c.Log("Looks like there are no changes for %s %q in %q", target.Mapping.GroupVersionKind.Kind, target.Name, target.Namespace)
850 851
// This needs to happen to make sure that tiller has the latest info from the API
851 852
// Otherwise there will be no labels and other functions that use labels will panic
852 853
if err := target.Get(); err != nil {
@@ -859,20 +860,20 @@ func updateResource(c *Client, target *resource.Info, currentObj runtime.Object,
859 860
obj, err := helper.Patch(target.Namespace, target.Name, patchType, patch, nil)
860 861
if err != nil {
861 862
kind := target.Mapping.GroupVersionKind.Kind
862 -
log.Printf("Cannot patch %s: %q (%v)", kind, target.Name, err)
863 +
log.Printf("Cannot patch %s: %q in %q (%v)", kind, target.Name, target.Namespace, err)
863 864 864 865
if force {
865 866
// Attempt to delete...
866 867
if err := deleteResource(target); err != nil {
867 868
return err
868 869
}
869 -
log.Printf("Deleted %s: %q", kind, target.Name)
870 +
log.Printf("Deleted %s: %q in %q", kind, target.Name, target.Namespace)
870 871 871 872
// ... and recreate
872 873
if err := createResource(target); err != nil {
873 874
return fmt.Errorf("Failed to recreate resource: %s", err)
874 875
}
875 -
log.Printf("Created a new %s called %q\n", kind, target.Name)
876 +
log.Printf("Created a new %s called %q in %s\n", kind, target.Name, target.Namespace)
876 877 877 878
// No need to refresh the target, as we recreated the resource based
878 879
// on it. In addition, it might not exist yet and a call to `Refresh`
@@ -973,7 +974,7 @@ func (c *Client) watchUntilReady(timeout time.Duration, info *resource.Info) err
973 974
lw := cachetools.NewListWatchFromClient(info.Client, info.Mapping.Resource.Resource, info.Namespace, selector)
974 975 975 976
kind := info.Mapping.GroupVersionKind.Kind
976 -
c.Log("Watching for changes to %s %s with timeout of %v", kind, info.Name, timeout)
977 +
c.Log("Watching for changes to %s %s in %s with timeout of %v", kind, info.Name, info.Namespace, timeout)
977 978 978 979
// What we watch for depends on the Kind.
979 980
// - For a Job, we watch for completion.
RetroSearch is an open source project built by @garambo | Open a GitHub Issue
Search and Browse the WWW like it's 1997 | Search results from DuckDuckGo
HTML:
3.2
| Encoding:
UTF-8
| Version:
0.7.4