Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ require (
replace github.com/go-openapi/validate => github.com/flant/go-openapi-validate v0.19.12-flant.0

require (
github.com/deckhouse/module-sdk v0.10.0
github.com/deckhouse/module-sdk v0.10.2
github.com/gojuno/minimock/v3 v3.4.7
github.com/itchyny/gojq v0.12.17
github.com/muesli/termenv v0.16.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ github.com/deckhouse/deckhouse/pkg/log v0.2.0 h1:6tmZQLwNb1o/hP1gzJQBjcwfA/bubbg
github.com/deckhouse/deckhouse/pkg/log v0.2.0/go.mod h1:pbAxTSDcPmwyl3wwKDcEB3qdxHnRxqTV+J0K+sha8bw=
github.com/deckhouse/deckhouse/pkg/metrics-storage v0.3.0 h1:xZvbKuexrSQGEw6CB4n3UC7XbOb9QNLbm8UhcGZ2R1I=
github.com/deckhouse/deckhouse/pkg/metrics-storage v0.3.0/go.mod h1:Rz++SzCLkFW03WGgftnn91TimGU2shiKb5S/YuxcBuE=
github.com/deckhouse/module-sdk v0.10.0 h1:VPhYvMVQ3pT32I2WL1ITtQyrYdpiUR0RocLw7S4TfNg=
github.com/deckhouse/module-sdk v0.10.0/go.mod h1:Z1jfmd0fICoYww0daMijWAU+OZTxeJUXfMciKKuYAYA=
github.com/deckhouse/module-sdk v0.10.2 h1:jYxFTgjdaZ9NKWKbFP95RvD55WJvhwjPAeSMFKhZb0o=
github.com/deckhouse/module-sdk v0.10.2/go.mod h1:Z1jfmd0fICoYww0daMijWAU+OZTxeJUXfMciKKuYAYA=
github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g=
github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
Expand Down
41 changes: 40 additions & 1 deletion pkg/kube/object_patch/operation.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package object_patch
import (
"fmt"
"log/slog"
"strings"

"github.com/deckhouse/deckhouse/pkg/log"
sdkpkg "github.com/deckhouse/module-sdk/pkg"
Expand Down Expand Up @@ -92,7 +93,27 @@ type createOperation struct {
}

func (op *createOperation) Description() string {
return "Create object"
u, err := toUnstructured(op.object)
if err != nil {
return "Create object (unknown)"
}
return fmt.Sprintf("Create object %s/%s/%s/%s", u.GetAPIVersion(), u.GetKind(), u.GetNamespace(), u.GetName())
}

// SetObjectPrefix sets prefix for object name.
func (op *createOperation) SetObjectPrefix(prefix string) {
u, err := toUnstructured(op.object)
if err != nil {
return
}

name := u.GetName()
if strings.HasPrefix(name, prefix+"-") {
return
}

u.SetName(fmt.Sprintf("%s-%s", prefix, name))
op.object = u
}

func (op *createOperation) WithSubresource(subresource string) {
Expand Down Expand Up @@ -127,6 +148,15 @@ func (op *deleteOperation) WithSubresource(subresource string) {
op.subresource = subresource
}

// SetObjectPrefix sets prefix for object name.
func (op *deleteOperation) SetObjectPrefix(prefix string) {
if strings.HasPrefix(op.name, prefix+"-") {
return
}

op.name = fmt.Sprintf("%s-%s", prefix, op.name)
}

type patchOperation struct {
// Object coordinates for patch and delete.
apiVersion string
Expand All @@ -150,6 +180,15 @@ func (op *patchOperation) Description() string {
return fmt.Sprintf("Filter object %s/%s/%s/%s", op.apiVersion, op.kind, op.namespace, op.name)
}

// SetObjectPrefix sets prefix for object name.
func (op *patchOperation) SetObjectPrefix(prefix string) {
if strings.HasPrefix(op.name, prefix+"-") {
return
}

op.name = fmt.Sprintf("%s-%s", prefix, op.name)
}

func (op *patchOperation) hasFilterFn() bool {
return op.filterFunc != nil
}
Expand Down
Loading