object patch

Signed-off-by: Pavel Okhlopkov <pavel.okhlopkov@flant.com>
flant · Nov 15, 2024 · d6d8d1a · d6d8d1a
1 parent 7d9a675
commit d6d8d1a
Show file tree

Hide file tree

Showing 18 changed files with 12 additions and 12 deletions.
diff --git a/pkg/object_patch/helpers.go → pkg/kube/object_patch/helpers.go b/pkg/object_patch/helpers.go → pkg/kube/object_patch/helpers.go
@@ -1,4 +1,4 @@
-package objectpatch
+package object_patch
 
 import (
 	"bytes"

diff --git a/pkg/object_patch/operation.go → pkg/kube/object_patch/operation.go b/pkg/object_patch/operation.go → pkg/kube/object_patch/operation.go
@@ -1,4 +1,4 @@
-package objectpatch
+package object_patch
 
 import (
 	"fmt"

diff --git a/pkg/object_patch/options.go → pkg/kube/object_patch/options.go b/pkg/object_patch/options.go → pkg/kube/object_patch/options.go
@@ -1,4 +1,4 @@
-package objectpatch
+package object_patch
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/pkg/object_patch/patch.go → pkg/kube/object_patch/patch.go b/pkg/object_patch/patch.go → pkg/kube/object_patch/patch.go
@@ -1,4 +1,4 @@
-package objectpatch
+package object_patch
 
 import (
 	"bytes"

diff --git a/pkg/object_patch/patch_collector.go → pkg/kube/object_patch/patch_collector.go b/pkg/object_patch/patch_collector.go → pkg/kube/object_patch/patch_collector.go
@@ -1,4 +1,4 @@
-package objectpatch
+package object_patch
 
 import (
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"

diff --git a/pkg/object_patch/patch_test.go → pkg/kube/object_patch/patch_test.go b/pkg/object_patch/patch_test.go → pkg/kube/object_patch/patch_test.go
@@ -1,4 +1,4 @@
-package objectpatch
+package object_patch
 
 import (
 	"context"

diff --git a/...serialized_operations/invalid_create.yaml → ...serialized_operations/invalid_create.yaml b/...serialized_operations/invalid_create.yaml → ...serialized_operations/invalid_create.yaml
diff --git a/...serialized_operations/invalid_delete.yaml → ...serialized_operations/invalid_delete.yaml b/...serialized_operations/invalid_delete.yaml → ...serialized_operations/invalid_delete.yaml
diff --git a/.../serialized_operations/invalid_patch.yaml → .../serialized_operations/invalid_patch.yaml b/.../serialized_operations/invalid_patch.yaml → .../serialized_operations/invalid_patch.yaml
diff --git a/...a/serialized_operations/valid_create.yaml → ...a/serialized_operations/valid_create.yaml b/...a/serialized_operations/valid_create.yaml → ...a/serialized_operations/valid_create.yaml
diff --git a/...a/serialized_operations/valid_delete.yaml → ...a/serialized_operations/valid_delete.yaml b/...a/serialized_operations/valid_delete.yaml → ...a/serialized_operations/valid_delete.yaml
diff --git a/...ta/serialized_operations/valid_patch.yaml → ...ta/serialized_operations/valid_patch.yaml b/...ta/serialized_operations/valid_patch.yaml → ...ta/serialized_operations/valid_patch.yaml
diff --git a/pkg/object_patch/validation.go → pkg/kube/object_patch/validation.go b/pkg/object_patch/validation.go → pkg/kube/object_patch/validation.go
@@ -1,4 +1,4 @@
-package objectpatch
+package object_patch
 
 import (
 	"encoding/json"

diff --git a/pkg/object_patch/validation_test.go → pkg/kube/object_patch/validation_test.go b/pkg/object_patch/validation_test.go → pkg/kube/object_patch/validation_test.go
@@ -1,4 +1,4 @@
-package objectpatch
+package object_patch
 
 import (
 	"testing"

diff --git a/pkg/shell-operator/kube_client.go b/pkg/shell-operator/kube_client.go
@@ -7,8 +7,8 @@ import (
 
 	klient "github.com/flant/kube-client/client"
 	"github.com/flant/shell-operator/pkg/app"
+	objectpatch "github.com/flant/shell-operator/pkg/kube/object_patch"
 	metricstorage "github.com/flant/shell-operator/pkg/metric_storage"
-	objectpatch "github.com/flant/shell-operator/pkg/object_patch"
 	utils "github.com/flant/shell-operator/pkg/utils/labels"
 )
 

diff --git a/pkg/shell-operator/operator.go b/pkg/shell-operator/operator.go
@@ -15,10 +15,10 @@ import (
 	"github.com/flant/shell-operator/pkg/hook/controller"
 	"github.com/flant/shell-operator/pkg/hook/task_metadata"
 	"github.com/flant/shell-operator/pkg/hook/types"
+	objectpatch "github.com/flant/shell-operator/pkg/kube/object_patch"
 	kubeeventsmanager "github.com/flant/shell-operator/pkg/kube_events_manager"
 	kemTypes "github.com/flant/shell-operator/pkg/kube_events_manager/types"
 	metricstorage "github.com/flant/shell-operator/pkg/metric_storage"
-	objectpatch "github.com/flant/shell-operator/pkg/object_patch"
 	schedulemanager "github.com/flant/shell-operator/pkg/schedule_manager"
 	"github.com/flant/shell-operator/pkg/task"
 	"github.com/flant/shell-operator/pkg/task/queue"

diff --git a/test/integration/kubeclient/object_patch_test.go b/test/integration/kubeclient/object_patch_test.go
@@ -7,7 +7,7 @@ import (
 	"context"
 	"encoding/json"
 
-	objectpatch "github.com/flant/shell-operator/pkg/object_patch"
+	objectpatch "github.com/flant/shell-operator/pkg/kube/object_patch"
 	. "github.com/flant/shell-operator/test/integration/suite"
 	uuid "github.com/gofrs/uuid/v5"
 	. "github.com/onsi/ginkgo"

diff --git a/test/integration/suite/run.go b/test/integration/suite/run.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/deckhouse/deckhouse/pkg/log"
 	klient "github.com/flant/kube-client/client"
-	objectpatch "github.com/flant/shell-operator/pkg/object_patch"
+	objectpatch "github.com/flant/shell-operator/pkg/kube/object_patch"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )