|
|
|
@ -18,6 +18,7 @@ package kube // import "k8s.io/helm/pkg/kube"
|
|
|
|
|
|
|
|
|
|
import (
|
|
|
|
|
"bytes"
|
|
|
|
|
"encoding/json"
|
|
|
|
|
goerrors "errors"
|
|
|
|
|
"fmt"
|
|
|
|
|
"io"
|
|
|
|
@ -25,6 +26,7 @@ import (
|
|
|
|
|
"strings"
|
|
|
|
|
"time"
|
|
|
|
|
|
|
|
|
|
jsonpatch "github.com/evanphx/json-patch"
|
|
|
|
|
"k8s.io/kubernetes/pkg/api"
|
|
|
|
|
"k8s.io/kubernetes/pkg/api/errors"
|
|
|
|
|
"k8s.io/kubernetes/pkg/api/v1"
|
|
|
|
@ -116,7 +118,8 @@ func (c *Client) BuildUnstructured(namespace string, reader io.Reader) (Result,
|
|
|
|
|
|
|
|
|
|
mapper, typer, err := c.UnstructuredObject()
|
|
|
|
|
if err != nil {
|
|
|
|
|
log.Printf("warning: failed to load mapper: %s", err)
|
|
|
|
|
log.Printf("failed to load mapper: %s", err)
|
|
|
|
|
return nil, err
|
|
|
|
|
}
|
|
|
|
|
var result Result
|
|
|
|
|
result, err = resource.NewBuilder(mapper, typer, resource.ClientMapperFunc(c.UnstructuredClientForMapping), runtime.UnstructuredJSONScheme).
|
|
|
|
@ -239,12 +242,7 @@ func (c *Client) Update(namespace string, originalReader, targetReader io.Reader
|
|
|
|
|
return fmt.Errorf("no resource with the name %s found", info.Name)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
versionedObject, err := originalInfo.Mapping.ConvertToVersion(originalInfo.Object, originalInfo.Mapping.GroupVersionKind.GroupVersion())
|
|
|
|
|
if err != nil {
|
|
|
|
|
return err
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if err := updateResource(c, info, versionedObject, recreate); err != nil {
|
|
|
|
|
if err := updateResource(c, info, originalInfo.Object, recreate); err != nil {
|
|
|
|
|
log.Printf("error updating the resource %s:\n\t %v", info.Name, err)
|
|
|
|
|
updateErrors = append(updateErrors, err.Error())
|
|
|
|
|
}
|
|
|
|
@ -268,10 +266,7 @@ func (c *Client) Update(namespace string, originalReader, targetReader io.Reader
|
|
|
|
|
if shouldWait {
|
|
|
|
|
err = c.waitForResources(time.Duration(timeout)*time.Second, target)
|
|
|
|
|
}
|
|
|
|
|
if err != nil {
|
|
|
|
|
return err
|
|
|
|
|
}
|
|
|
|
|
return nil
|
|
|
|
|
return err
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Delete deletes kubernetes resources from an io.reader
|
|
|
|
@ -360,32 +355,51 @@ func deleteResource(c *Client, info *resource.Info) error {
|
|
|
|
|
return reaper.Stop(info.Namespace, info.Name, 0, nil)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func updateResource(c *Client, target *resource.Info, currentObj runtime.Object, recreate bool) error {
|
|
|
|
|
encoder := c.JSONEncoder()
|
|
|
|
|
original, err := runtime.Encode(encoder, currentObj)
|
|
|
|
|
func createPatch(target *resource.Info, currentObj runtime.Object) ([]byte, api.PatchType, error) {
|
|
|
|
|
// Get a versioned object
|
|
|
|
|
versionedObject, err := api.Scheme.New(target.Mapping.GroupVersionKind)
|
|
|
|
|
if err != nil {
|
|
|
|
|
return err
|
|
|
|
|
return nil, api.StrategicMergePatchType, fmt.Errorf("failed to get versionedObject: %s", err)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
modified, err := runtime.Encode(encoder, target.Object)
|
|
|
|
|
oldData, err := json.Marshal(currentObj)
|
|
|
|
|
if err != nil {
|
|
|
|
|
return err
|
|
|
|
|
return nil, api.StrategicMergePatchType, fmt.Errorf("serializing current configuration: %s", err)
|
|
|
|
|
}
|
|
|
|
|
newData, err := json.Marshal(target.Object)
|
|
|
|
|
if err != nil {
|
|
|
|
|
return nil, api.StrategicMergePatchType, fmt.Errorf("serializing target configuration: %s", err)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if api.Semantic.DeepEqual(original, modified) {
|
|
|
|
|
log.Printf("Looks like there are no changes for %s", target.Name)
|
|
|
|
|
return nil
|
|
|
|
|
if api.Semantic.DeepEqual(oldData, newData) {
|
|
|
|
|
return nil, api.StrategicMergePatchType, nil
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
patch, err := strategicpatch.CreateTwoWayMergePatch(original, modified, currentObj)
|
|
|
|
|
switch target.Object.(type) {
|
|
|
|
|
case *runtime.Unstructured:
|
|
|
|
|
patch, err := jsonpatch.CreateMergePatch(oldData, newData)
|
|
|
|
|
return patch, api.MergePatchType, err
|
|
|
|
|
default:
|
|
|
|
|
log.Printf("generating strategic merge patch for %T", target.Object)
|
|
|
|
|
patch, err := strategicpatch.CreateTwoWayMergePatch(oldData, newData, versionedObject)
|
|
|
|
|
return patch, api.StrategicMergePatchType, err
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func updateResource(c *Client, target *resource.Info, currentObj runtime.Object, recreate bool) error {
|
|
|
|
|
patch, patchType, err := createPatch(target, currentObj)
|
|
|
|
|
if err != nil {
|
|
|
|
|
return err
|
|
|
|
|
return fmt.Errorf("failed to create patch: %s", err)
|
|
|
|
|
}
|
|
|
|
|
if patch == nil {
|
|
|
|
|
log.Printf("Looks like there are no changes for %s", target.Name)
|
|
|
|
|
return nil
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// send patch to server
|
|
|
|
|
helper := resource.NewHelper(target.Client, target.Mapping)
|
|
|
|
|
var obj runtime.Object
|
|
|
|
|
if obj, err = helper.Patch(target.Namespace, target.Name, api.StrategicMergePatchType, patch); err != nil {
|
|
|
|
|
if obj, err = helper.Patch(target.Namespace, target.Name, patchType, patch); err != nil {
|
|
|
|
|
return err
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|