|
|
|
@ -51,28 +51,29 @@ func (b *Builder) Manager() (*ssa.ResourceManager, error) {
|
|
|
|
return ssa.NewResourceManager(b.client, statusPoller, owner), nil
|
|
|
|
return ssa.NewResourceManager(b.client, statusPoller, owner), nil
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
func (b *Builder) Diff() (string, error) {
|
|
|
|
func (b *Builder) Diff() (string, bool, error) {
|
|
|
|
output := strings.Builder{}
|
|
|
|
output := strings.Builder{}
|
|
|
|
|
|
|
|
createdOrDrifted := false
|
|
|
|
res, err := b.Build()
|
|
|
|
res, err := b.Build()
|
|
|
|
if err != nil {
|
|
|
|
if err != nil {
|
|
|
|
return "", err
|
|
|
|
return "", createdOrDrifted, err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// convert the build result into Kubernetes unstructured objects
|
|
|
|
// convert the build result into Kubernetes unstructured objects
|
|
|
|
objects, err := ssa.ReadObjects(bytes.NewReader(res))
|
|
|
|
objects, err := ssa.ReadObjects(bytes.NewReader(res))
|
|
|
|
if err != nil {
|
|
|
|
if err != nil {
|
|
|
|
return "", err
|
|
|
|
return "", createdOrDrifted, err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
resourceManager, err := b.Manager()
|
|
|
|
resourceManager, err := b.Manager()
|
|
|
|
if err != nil {
|
|
|
|
if err != nil {
|
|
|
|
return "", err
|
|
|
|
return "", createdOrDrifted, err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
ctx, cancel := context.WithTimeout(context.Background(), b.timeout)
|
|
|
|
ctx, cancel := context.WithTimeout(context.Background(), b.timeout)
|
|
|
|
defer cancel()
|
|
|
|
defer cancel()
|
|
|
|
|
|
|
|
|
|
|
|
if err := ssa.SetNativeKindsDefaults(objects); err != nil {
|
|
|
|
if err := ssa.SetNativeKindsDefaults(objects); err != nil {
|
|
|
|
return "", err
|
|
|
|
return "", createdOrDrifted, err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// create an inventory of objects to be reconciled
|
|
|
|
// create an inventory of objects to be reconciled
|
|
|
|
@ -101,20 +102,23 @@ func (b *Builder) Diff() (string, error) {
|
|
|
|
|
|
|
|
|
|
|
|
if change.Action == string(ssa.CreatedAction) {
|
|
|
|
if change.Action == string(ssa.CreatedAction) {
|
|
|
|
output.WriteString(writeString(fmt.Sprintf("► %s created\n", change.Subject), bunt.Green))
|
|
|
|
output.WriteString(writeString(fmt.Sprintf("► %s created\n", change.Subject), bunt.Green))
|
|
|
|
|
|
|
|
createdOrDrifted = true
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if change.Action == string(ssa.ConfiguredAction) {
|
|
|
|
if change.Action == string(ssa.ConfiguredAction) {
|
|
|
|
output.WriteString(writeString(fmt.Sprintf("► %s drifted\n", change.Subject), bunt.WhiteSmoke))
|
|
|
|
output.WriteString(writeString(fmt.Sprintf("► %s drifted\n", change.Subject), bunt.WhiteSmoke))
|
|
|
|
liveFile, mergedFile, tmpDir, err := writeYamls(liveObject, mergedObject)
|
|
|
|
liveFile, mergedFile, tmpDir, err := writeYamls(liveObject, mergedObject)
|
|
|
|
if err != nil {
|
|
|
|
if err != nil {
|
|
|
|
return "", err
|
|
|
|
return "", createdOrDrifted, err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
defer cleanupDir(tmpDir)
|
|
|
|
defer cleanupDir(tmpDir)
|
|
|
|
|
|
|
|
|
|
|
|
err = diff(liveFile, mergedFile, &output)
|
|
|
|
err = diff(liveFile, mergedFile, &output)
|
|
|
|
if err != nil {
|
|
|
|
if err != nil {
|
|
|
|
return "", err
|
|
|
|
return "", createdOrDrifted, err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
createdOrDrifted = true
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
addObjectsToInventory(newInventory, change)
|
|
|
|
addObjectsToInventory(newInventory, change)
|
|
|
|
@ -125,7 +129,7 @@ func (b *Builder) Diff() (string, error) {
|
|
|
|
if oldStatus.Inventory != nil {
|
|
|
|
if oldStatus.Inventory != nil {
|
|
|
|
diffObjects, err := diffInventory(oldStatus.Inventory, newInventory)
|
|
|
|
diffObjects, err := diffInventory(oldStatus.Inventory, newInventory)
|
|
|
|
if err != nil {
|
|
|
|
if err != nil {
|
|
|
|
return "", err
|
|
|
|
return "", createdOrDrifted, err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
for _, object := range diffObjects {
|
|
|
|
for _, object := range diffObjects {
|
|
|
|
output.WriteString(writeString(fmt.Sprintf("► %s deleted\n", ssa.FmtUnstructured(object)), bunt.OrangeRed))
|
|
|
|
output.WriteString(writeString(fmt.Sprintf("► %s deleted\n", ssa.FmtUnstructured(object)), bunt.OrangeRed))
|
|
|
|
@ -133,7 +137,7 @@ func (b *Builder) Diff() (string, error) {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
return output.String(), nil
|
|
|
|
return output.String(), createdOrDrifted, nil
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
func writeYamls(liveObject, mergedObject *unstructured.Unstructured) (string, string, string, error) {
|
|
|
|
func writeYamls(liveObject, mergedObject *unstructured.Unstructured) (string, string, string, error) {
|
|
|
|
|
GopherPro
3 years ago
committed by
GitHub