Merge pull request #345 from yuwenma/rename-3rdparty

move applylib/third_party/forked to applylib/forked
kubernetes-sigs · Jul 7, 2023 · cc2f85e · cc2f85e
2 parents 729d2cb + 1b7beac
commit cc2f85e
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 2 deletions.
diff --git a/applylib/applyset/applyset.go b/applylib/applyset/applyset.go
@@ -33,7 +33,7 @@ import (
 	"k8s.io/client-go/dynamic"
 	"k8s.io/klog/v2"
 	"sigs.k8s.io/controller-runtime/pkg/client"
-	kubectlapply "sigs.k8s.io/kubebuilder-declarative-pattern/applylib/third_party/forked/github.com/kubernetes/kubectl/pkg/cmd/apply"
+	kubectlapply "sigs.k8s.io/kubebuilder-declarative-pattern/applylib/forked/github.com/kubernetes/kubectl/pkg/cmd/apply"
 )
 
 // ApplySet is a set of objects that we want to apply to the cluster.

diff --git a/...ernetes/kubectl/pkg/cmd/apply/applyset.go → ...ernetes/kubectl/pkg/cmd/apply/applyset.go b/...ernetes/kubectl/pkg/cmd/apply/applyset.go → ...ernetes/kubectl/pkg/cmd/apply/applyset.go
@@ -30,7 +30,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 	"k8s.io/client-go/dynamic"
-	"sigs.k8s.io/kubebuilder-declarative-pattern/applylib/third_party/forked/k8s.io/apimachinery/pkg/util/sets"
+	"sigs.k8s.io/kubebuilder-declarative-pattern/applylib/forked/k8s.io/apimachinery/pkg/util/sets"
 )
 
 // Label and annotation keys from the ApplySet specification.

diff --git a/.../kubectl/pkg/cmd/apply/applyset_pruner.go → .../kubectl/pkg/cmd/apply/applyset_pruner.go b/.../kubectl/pkg/cmd/apply/applyset_pruner.go → .../kubectl/pkg/cmd/apply/applyset_pruner.go
diff --git a/...kubernetes/kubectl/pkg/cmd/apply/prune.go → ...kubernetes/kubectl/pkg/cmd/apply/prune.go b/...kubernetes/kubectl/pkg/cmd/apply/prune.go → ...kubernetes/kubectl/pkg/cmd/apply/prune.go
diff --git a/...8s.io/apimachinery/pkg/util/sets/empty.go → ...8s.io/apimachinery/pkg/util/sets/empty.go b/...8s.io/apimachinery/pkg/util/sets/empty.go → ...8s.io/apimachinery/pkg/util/sets/empty.go
diff --git a/....io/apimachinery/pkg/util/sets/ordered.go → ....io/apimachinery/pkg/util/sets/ordered.go b/....io/apimachinery/pkg/util/sets/ordered.go → ....io/apimachinery/pkg/util/sets/ordered.go
diff --git a/.../k8s.io/apimachinery/pkg/util/sets/set.go → .../k8s.io/apimachinery/pkg/util/sets/set.go b/.../k8s.io/apimachinery/pkg/util/sets/set.go → .../k8s.io/apimachinery/pkg/util/sets/set.go