From 1b7beacdf995c864c68f91874b2a83410d7b6174 Mon Sep 17 00:00:00 2001 From: Yuwen Ma Date: Fri, 7 Jul 2023 13:50:19 -0700 Subject: [PATCH] move applylib/third_party/forked to applylib/forked --- applylib/applyset/applyset.go | 2 +- .../github.com/kubernetes/kubectl/pkg/cmd/apply/applyset.go | 2 +- .../kubernetes/kubectl/pkg/cmd/apply/applyset_pruner.go | 0 .../forked/github.com/kubernetes/kubectl/pkg/cmd/apply/prune.go | 0 .../forked/k8s.io/apimachinery/pkg/util/sets/empty.go | 0 .../forked/k8s.io/apimachinery/pkg/util/sets/ordered.go | 0 .../forked/k8s.io/apimachinery/pkg/util/sets/set.go | 0 7 files changed, 2 insertions(+), 2 deletions(-) rename applylib/{third_party => }/forked/github.com/kubernetes/kubectl/pkg/cmd/apply/applyset.go (99%) rename applylib/{third_party => }/forked/github.com/kubernetes/kubectl/pkg/cmd/apply/applyset_pruner.go (100%) rename applylib/{third_party => }/forked/github.com/kubernetes/kubectl/pkg/cmd/apply/prune.go (100%) rename applylib/{third_party => }/forked/k8s.io/apimachinery/pkg/util/sets/empty.go (100%) rename applylib/{third_party => }/forked/k8s.io/apimachinery/pkg/util/sets/ordered.go (100%) rename applylib/{third_party => }/forked/k8s.io/apimachinery/pkg/util/sets/set.go (100%) diff --git a/applylib/applyset/applyset.go b/applylib/applyset/applyset.go index 0b84553c..489c5af8 100644 --- 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/applylib/third_party/forked/github.com/kubernetes/kubectl/pkg/cmd/apply/applyset.go b/applylib/forked/github.com/kubernetes/kubectl/pkg/cmd/apply/applyset.go similarity index 99% rename from applylib/third_party/forked/github.com/kubernetes/kubectl/pkg/cmd/apply/applyset.go rename to applylib/forked/github.com/kubernetes/kubectl/pkg/cmd/apply/applyset.go index 8389c109..ec3028fe 100644 --- a/applylib/third_party/forked/github.com/kubernetes/kubectl/pkg/cmd/apply/applyset.go +++ b/applylib/forked/github.com/kubernetes/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/applylib/third_party/forked/github.com/kubernetes/kubectl/pkg/cmd/apply/applyset_pruner.go b/applylib/forked/github.com/kubernetes/kubectl/pkg/cmd/apply/applyset_pruner.go similarity index 100% rename from applylib/third_party/forked/github.com/kubernetes/kubectl/pkg/cmd/apply/applyset_pruner.go rename to applylib/forked/github.com/kubernetes/kubectl/pkg/cmd/apply/applyset_pruner.go diff --git a/applylib/third_party/forked/github.com/kubernetes/kubectl/pkg/cmd/apply/prune.go b/applylib/forked/github.com/kubernetes/kubectl/pkg/cmd/apply/prune.go similarity index 100% rename from applylib/third_party/forked/github.com/kubernetes/kubectl/pkg/cmd/apply/prune.go rename to applylib/forked/github.com/kubernetes/kubectl/pkg/cmd/apply/prune.go diff --git a/applylib/third_party/forked/k8s.io/apimachinery/pkg/util/sets/empty.go b/applylib/forked/k8s.io/apimachinery/pkg/util/sets/empty.go similarity index 100% rename from applylib/third_party/forked/k8s.io/apimachinery/pkg/util/sets/empty.go rename to applylib/forked/k8s.io/apimachinery/pkg/util/sets/empty.go diff --git a/applylib/third_party/forked/k8s.io/apimachinery/pkg/util/sets/ordered.go b/applylib/forked/k8s.io/apimachinery/pkg/util/sets/ordered.go similarity index 100% rename from applylib/third_party/forked/k8s.io/apimachinery/pkg/util/sets/ordered.go rename to applylib/forked/k8s.io/apimachinery/pkg/util/sets/ordered.go diff --git a/applylib/third_party/forked/k8s.io/apimachinery/pkg/util/sets/set.go b/applylib/forked/k8s.io/apimachinery/pkg/util/sets/set.go similarity index 100% rename from applylib/third_party/forked/k8s.io/apimachinery/pkg/util/sets/set.go rename to applylib/forked/k8s.io/apimachinery/pkg/util/sets/set.go