move k8s deps into podman

We only need a small part of the k8s dependencies but they are the biggest dependencies in podman by far. Moving them into podman allows us to remove the unnecessary parts. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
author: Paul Holzinger <pholzing@redhat.com> 2022-03-11 15:02:04 +0100
committer: Paul Holzinger <pholzing@redhat.com> 2022-03-15 14:46:29 +0100
commit: 918fc88a983ea1c1ee7e0abb0fc1dce3c0a35be3 (patch)
tree: c967a39935b452f4cc61f425188bdbf42111c10a
parent: 68ce83fe919f2d37762b8b746a73495f45e550f3 (diff)
download: podman-918fc88a983ea1c1ee7e0abb0fc1dce3c0a35be3.tar.gz
podman-918fc88a983ea1c1ee7e0abb0fc1dce3c0a35be3.tar.bz2
podman-918fc88a983ea1c1ee7e0abb0fc1dce3c0a35be3.zip
164 files changed, 184 insertions, 236 deletions
diff --git a/go.mod b/go.mod
index 1813b3c5c..53f0d5896 100644
--- a/go.mod
+++ b/go.mod
@@ -31,7 +31,11 @@ require (
 	github.com/dtylman/scp v0.0.0-20181017070807-f3000a34aef4
 	github.com/fsnotify/fsnotify v1.5.1
 	github.com/ghodss/yaml v1.0.0
+	github.com/go-logr/logr v1.2.2
 	github.com/godbus/dbus/v5 v5.1.0
+	github.com/gogo/protobuf v1.3.2
+	github.com/google/go-cmp v0.5.7
+	github.com/google/gofuzz v1.2.0
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
 	github.com/google/uuid v1.3.0
 	github.com/gorilla/handlers v1.5.1
@@ -65,13 +69,14 @@ require (
 	github.com/vishvananda/netlink v1.1.1-0.20220115184804-dd687eb2f2d4
 	go.etcd.io/bbolt v1.3.6
 	golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce
+	golang.org/x/net v0.0.0-20220225172249-27dd8689420f
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
 	golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9
 	golang.org/x/text v0.3.7
 	google.golang.org/protobuf v1.27.1
+	gopkg.in/inf.v0 v0.9.1
 	gopkg.in/yaml.v2 v2.4.0
-	k8s.io/api v0.22.5
-	k8s.io/apimachinery v0.22.5
+	sigs.k8s.io/structured-merge-diff/v4 v4.1.2
 )
 
 replace github.com/onsi/gomega => github.com/onsi/gomega v1.16.0
diff --git a/go.sum b/go.sum
index dc8603a97..09f066acf 100644
--- a/go.sum
+++ b/go.sum
@@ -2140,13 +2140,11 @@ honnef.co/go/tools v0.2.1/go.mod h1:lPVVZ2BS5TfnjLyizF7o7hv7j9/L+8cZY2hLyjP9cGY=
 k8s.io/api v0.20.1/go.mod h1:KqwcCVogGxQY3nBlRpwt+wpAMF/KjaCc7RpywacvqUo=
 k8s.io/api v0.20.4/go.mod h1:++lNL1AJMkDymriNniQsWRkMDzRaX2Y/POTUi8yvqYQ=
 k8s.io/api v0.20.6/go.mod h1:X9e8Qag6JV/bL5G6bU8sdVRltWKmdHsFUGS3eVndqE8=
-k8s.io/api v0.22.5 h1:xk7C+rMjF/EGELiD560jdmwzrB788mfcHiNbMQLIVI8=
 k8s.io/api v0.22.5/go.mod h1:mEhXyLaSD1qTOf40rRiKXkc+2iCem09rWLlFwhCEiAs=
 k8s.io/apimachinery v0.20.1/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU=
 k8s.io/apimachinery v0.20.4/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU=
 k8s.io/apimachinery v0.20.6/go.mod h1:ejZXtW1Ra6V1O5H8xPBGz+T3+4gfkTCeExAHKU57MAc=
 k8s.io/apimachinery v0.22.1/go.mod h1:O3oNtNadZdeOMxHFVxOreoznohCpy0z6mocxbZr7oJ0=
-k8s.io/apimachinery v0.22.5 h1:cIPwldOYm1Slq9VLBRPtEYpyhjIm1C6aAMAoENuvN9s=
 k8s.io/apimachinery v0.22.5/go.mod h1:xziclGKwuuJ2RM5/rSFQSYAj0zdbci3DH8kj+WvyN0U=
 k8s.io/apiserver v0.20.1/go.mod h1:ro5QHeQkgMS7ZGpvf4tSMx6bBOgPfE+f52KwvXfScaU=
 k8s.io/apiserver v0.20.4/go.mod h1:Mc80thBKOyy7tbvFtB4kJv1kbdD0eIH8k8vianJcbFM=
@@ -2169,13 +2167,11 @@ k8s.io/cri-api v0.23.1/go.mod h1:REJE3PSU0h/LOV1APBrupxrEJqnoxZC8KWzkBUHwrK4=
 k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/gengo v0.0.0-20201113003025-83324d819ded/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
-k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
 k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
 k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
 k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
 k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
 k8s.io/klog/v2 v2.9.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec=
-k8s.io/klog/v2 v2.30.0 h1:bUO6drIvCIsvZ/XFgfxoGFQU/a4Qkh0iAlvUR7vlHJw=
 k8s.io/klog/v2 v2.30.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
 k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o=
 k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM=
diff --git a/libpod/kube.go b/libpod/kube.go
index d68d46415..a193df2cb 100644
--- a/libpod/kube.go
+++ b/libpod/kube.go
@@ -15,6 +15,10 @@ import (
 	"github.com/containers/common/pkg/config"
 	"github.com/containers/podman/v4/libpod/define"
 	"github.com/containers/podman/v4/pkg/env"
+	v1 "github.com/containers/podman/v4/pkg/k8s.io/api/core/v1"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/api/resource"
+	v12 "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/apis/meta/v1"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/util/intstr"
 	"github.com/containers/podman/v4/pkg/lookup"
 	"github.com/containers/podman/v4/pkg/namespaces"
 	"github.com/containers/podman/v4/pkg/specgen"
@@ -23,10 +27,6 @@ import (
 	"github.com/opencontainers/runtime-tools/generate"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
-	v1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/api/resource"
-	v12 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/util/intstr"
 )
 
 // GenerateForKube takes a slice of libpod containers and generates
diff --git a/pkg/domain/infra/abi/generate.go b/pkg/domain/infra/abi/generate.go
index cd5ac00b7..ff85dee9b 100644
--- a/pkg/domain/infra/abi/generate.go
+++ b/pkg/domain/infra/abi/generate.go
@@ -9,10 +9,10 @@ import (
 	"github.com/containers/podman/v4/libpod"
 	"github.com/containers/podman/v4/libpod/define"
 	"github.com/containers/podman/v4/pkg/domain/entities"
+	k8sAPI "github.com/containers/podman/v4/pkg/k8s.io/api/core/v1"
 	"github.com/containers/podman/v4/pkg/systemd/generate"
 	"github.com/ghodss/yaml"
 	"github.com/pkg/errors"
-	k8sAPI "k8s.io/api/core/v1"
 )
 
 func (ic *ContainerEngine) GenerateSystemd(ctx context.Context, nameOrID string, options entities.GenerateSystemdOptions) (*entities.GenerateSystemdReport, error) {
diff --git a/pkg/domain/infra/abi/play.go b/pkg/domain/infra/abi/play.go
index 3242e64a2..0a9a0d04b 100644
--- a/pkg/domain/infra/abi/play.go
+++ b/pkg/domain/infra/abi/play.go
@@ -20,6 +20,8 @@ import (
 	"github.com/containers/podman/v4/libpod/define"
 	"github.com/containers/podman/v4/pkg/autoupdate"
 	"github.com/containers/podman/v4/pkg/domain/entities"
+	v1apps "github.com/containers/podman/v4/pkg/k8s.io/api/apps/v1"
+	v1 "github.com/containers/podman/v4/pkg/k8s.io/api/core/v1"
 	"github.com/containers/podman/v4/pkg/specgen"
 	"github.com/containers/podman/v4/pkg/specgen/generate"
 	"github.com/containers/podman/v4/pkg/specgen/generate/kube"
@@ -29,8 +31,6 @@ import (
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	yamlv2 "gopkg.in/yaml.v2"
-	v1apps "k8s.io/api/apps/v1"
-	v1 "k8s.io/api/core/v1"
 )
 
 func (ic *ContainerEngine) PlayKube(ctx context.Context, path string, options entities.PlayKubeOptions) (*entities.PlayKubeReport, error) {
diff --git a/pkg/domain/infra/abi/play_test.go b/pkg/domain/infra/abi/play_test.go
index bbc7c3493..e11581fa2 100644
--- a/pkg/domain/infra/abi/play_test.go
+++ b/pkg/domain/infra/abi/play_test.go
@@ -4,9 +4,9 @@ import (
 	"bytes"
 	"testing"
 
+	v1 "github.com/containers/podman/v4/pkg/k8s.io/api/core/v1"
+	v12 "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/apis/meta/v1"
 	"github.com/stretchr/testify/assert"
-	v1 "k8s.io/api/core/v1"
-	v12 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 func TestReadConfigMapFromFile(t *testing.T) {
diff --git a/vendor/k8s.io/api/LICENSE b/pkg/k8s.io/api/LICENSE
index d64569567..d64569567 100644
--- a/vendor/k8s.io/api/LICENSE
+++ b/pkg/k8s.io/api/LICENSE
diff --git a/vendor/k8s.io/api/apps/v1/doc.go b/pkg/k8s.io/api/apps/v1/doc.go
index 61dc97bde..67236fdc8 100644
--- a/vendor/k8s.io/api/apps/v1/doc.go
+++ b/pkg/k8s.io/api/apps/v1/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 // +k8s:protobuf-gen=package
 // +k8s:openapi-gen=true
 
-package v1 // import "k8s.io/api/apps/v1"
+package v1 // import "github.com/containers/podman/v4/pkg/k8s.io/api/apps/v1"
diff --git a/vendor/k8s.io/api/apps/v1/generated.pb.go b/pkg/k8s.io/api/apps/v1/generated.pb.go
index 0a15aff4d..2137e78e6 100644
--- a/vendor/k8s.io/api/apps/v1/generated.pb.go
+++ b/pkg/k8s.io/api/apps/v1/generated.pb.go
@@ -25,16 +25,16 @@ import (
 	io "io"
 
 	proto "github.com/gogo/protobuf/proto"
-	k8s_io_api_core_v1 "k8s.io/api/core/v1"
-	v11 "k8s.io/api/core/v1"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	k8s_io_api_core_v1 "github.com/containers/podman/v4/pkg/k8s.io/api/core/v1"
+	v11 "github.com/containers/podman/v4/pkg/k8s.io/api/core/v1"
+	v1 "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	math "math"
 	math_bits "math/bits"
 	reflect "reflect"
 	strings "strings"
 
-	intstr "k8s.io/apimachinery/pkg/util/intstr"
+	intstr "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/util/intstr"
 )
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -864,7 +864,7 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("k8s.io/kubernetes/vendor/k8s.io/api/apps/v1/generated.proto", fileDescriptor_e1014cab6f31e43b)
+	proto.RegisterFile("github.com/containers/podman/v4/pkg/k8s.io/kubernetes/vendor/k8s.io/api/apps/v1/generated.proto", fileDescriptor_e1014cab6f31e43b)
 }
 
 var fileDescriptor_e1014cab6f31e43b = []byte{
diff --git a/vendor/k8s.io/api/apps/v1/generated.proto b/pkg/k8s.io/api/apps/v1/generated.proto
index 6e593a379..dba3c1909 100644
--- a/vendor/k8s.io/api/apps/v1/generated.proto
+++ b/pkg/k8s.io/api/apps/v1/generated.proto
@@ -21,11 +21,11 @@ syntax = "proto2";
 
 package k8s.io.api.apps.v1;
 
-import "k8s.io/api/core/v1/generated.proto";
-import "k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto";
-import "k8s.io/apimachinery/pkg/runtime/generated.proto";
-import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto";
-import "k8s.io/apimachinery/pkg/util/intstr/generated.proto";
+import "github.com/containers/podman/v4/pkg/k8s.io/api/core/v1/generated.proto";
+import "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto";
+import "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/runtime/generated.proto";
+import "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/runtime/schema/generated.proto";
+import "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/util/intstr/generated.proto";
 
 // Package-wide variables from generator "generated".
 option go_package = "v1";
@@ -740,4 +740,3 @@ message StatefulSetUpdateStrategy {
   // +optional
   optional RollingUpdateStatefulSetStrategy rollingUpdate = 2;
 }
-
diff --git a/vendor/k8s.io/api/apps/v1/register.go b/pkg/k8s.io/api/apps/v1/register.go
index 027101046..5c435e78d 100644
--- a/vendor/k8s.io/api/apps/v1/register.go
+++ b/pkg/k8s.io/api/apps/v1/register.go
@@ -17,9 +17,9 @@ limitations under the License.
 package v1
 
 import (
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/runtime/schema"
+	metav1 "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/apis/meta/v1"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/runtime"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/runtime/schema"
 )
 
 // GroupName is the group name use in this package
diff --git a/vendor/k8s.io/api/apps/v1/types.go b/pkg/k8s.io/api/apps/v1/types.go
index 51c9fa43d..607d37b95 100644
--- a/vendor/k8s.io/api/apps/v1/types.go
+++ b/pkg/k8s.io/api/apps/v1/types.go
@@ -17,10 +17,10 @@ limitations under the License.
 package v1
 
 import (
-	"k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	runtime "k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/util/intstr"
+	v1 "github.com/containers/podman/v4/pkg/k8s.io/api/core/v1"
+	metav1 "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/apis/meta/v1"
+	runtime "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/runtime"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/util/intstr"
 )
 
 const (
diff --git a/vendor/k8s.io/api/apps/v1/types_swagger_doc_generated.go b/pkg/k8s.io/api/apps/v1/types_swagger_doc_generated.go
index 39c733adb..39c733adb 100644
--- a/vendor/k8s.io/api/apps/v1/types_swagger_doc_generated.go
+++ b/pkg/k8s.io/api/apps/v1/types_swagger_doc_generated.go
diff --git a/vendor/k8s.io/api/apps/v1/zz_generated.deepcopy.go b/pkg/k8s.io/api/apps/v1/zz_generated.deepcopy.go
index 0c8054852..6a2a82790 100644
--- a/vendor/k8s.io/api/apps/v1/zz_generated.deepcopy.go
+++ b/pkg/k8s.io/api/apps/v1/zz_generated.deepcopy.go
@@ -21,10 +21,10 @@ limitations under the License.
 package v1
 
 import (
-	corev1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	runtime "k8s.io/apimachinery/pkg/runtime"
-	intstr "k8s.io/apimachinery/pkg/util/intstr"
+	corev1 "github.com/containers/podman/v4/pkg/k8s.io/api/core/v1"
+	metav1 "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/apis/meta/v1"
+	runtime "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/runtime"
+	intstr "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/util/intstr"
 )
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
diff --git a/vendor/k8s.io/api/core/v1/annotation_key_constants.go b/pkg/k8s.io/api/core/v1/annotation_key_constants.go
index 7fde09126..7fde09126 100644
--- a/vendor/k8s.io/api/core/v1/annotation_key_constants.go
+++ b/pkg/k8s.io/api/core/v1/annotation_key_constants.go
diff --git a/vendor/k8s.io/api/core/v1/doc.go b/pkg/k8s.io/api/core/v1/doc.go
index 1bdf0b25b..75c64fb41 100644
--- a/vendor/k8s.io/api/core/v1/doc.go
+++ b/pkg/k8s.io/api/core/v1/doc.go
@@ -19,4 +19,4 @@ limitations under the License.
 // +k8s:protobuf-gen=package
 
 // Package v1 is the v1 version of the core API.
-package v1 // import "k8s.io/api/core/v1"
+package v1 // import "github.com/containers/podman/v4/pkg/k8s.io/api/core/v1"
diff --git a/vendor/k8s.io/api/core/v1/generated.pb.go b/pkg/k8s.io/api/core/v1/generated.pb.go
index 259444371..7e6f650ec 100644
--- a/vendor/k8s.io/api/core/v1/generated.pb.go
+++ b/pkg/k8s.io/api/core/v1/generated.pb.go
@@ -26,16 +26,16 @@ import (
 
 	proto "github.com/gogo/protobuf/proto"
 	github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys"
-	resource "k8s.io/apimachinery/pkg/api/resource"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	runtime "k8s.io/apimachinery/pkg/runtime"
+	resource "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/api/resource"
+	v1 "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/apis/meta/v1"
+	runtime "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/runtime"
 
 	math "math"
 	math_bits "math/bits"
 	reflect "reflect"
 	strings "strings"
 
-	k8s_io_apimachinery_pkg_types "k8s.io/apimachinery/pkg/types"
+	k8s_io_apimachinery_pkg_types "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/types"
 )
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -6083,7 +6083,7 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("k8s.io/kubernetes/vendor/k8s.io/api/core/v1/generated.proto", fileDescriptor_83c10c24ec417dc9)
+	proto.RegisterFile("github.com/containers/podman/v4/pkg/k8s.io/kubernetes/vendor/k8s.io/api/core/v1/generated.proto", fileDescriptor_83c10c24ec417dc9)
 }
 
 var fileDescriptor_83c10c24ec417dc9 = []byte{
diff --git a/vendor/k8s.io/api/core/v1/generated.proto b/pkg/k8s.io/api/core/v1/generated.proto
index ff63fd29f..d7d1dceac 100644
--- a/vendor/k8s.io/api/core/v1/generated.proto
+++ b/pkg/k8s.io/api/core/v1/generated.proto
@@ -21,11 +21,11 @@ syntax = "proto2";
 
 package k8s.io.api.core.v1;
 
-import "k8s.io/apimachinery/pkg/api/resource/generated.proto";
-import "k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto";
-import "k8s.io/apimachinery/pkg/runtime/generated.proto";
-import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto";
-import "k8s.io/apimachinery/pkg/util/intstr/generated.proto";
+import "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/api/resource/generated.proto";
+import "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto";
+import "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/runtime/generated.proto";
+import "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/runtime/schema/generated.proto";
+import "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/util/intstr/generated.proto";
 
 // Package-wide variables from generator "generated".
 option go_package = "v1";
@@ -5648,4 +5648,3 @@ message WindowsSecurityContextOptions {
   // +optional
   optional bool hostProcess = 4;
 }
-
diff --git a/vendor/k8s.io/api/core/v1/lifecycle.go b/pkg/k8s.io/api/core/v1/lifecycle.go
index 21ca90e81..21ca90e81 100644
--- a/vendor/k8s.io/api/core/v1/lifecycle.go
+++ b/pkg/k8s.io/api/core/v1/lifecycle.go
diff --git a/vendor/k8s.io/api/core/v1/objectreference.go b/pkg/k8s.io/api/core/v1/objectreference.go
index ee5335ee8..55285c3cf 100644
--- a/vendor/k8s.io/api/core/v1/objectreference.go
+++ b/pkg/k8s.io/api/core/v1/objectreference.go
@@ -17,7 +17,7 @@ limitations under the License.
 package v1
 
 import (
-	"k8s.io/apimachinery/pkg/runtime/schema"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/runtime/schema"
 )
 
 // IsAnAPIObject allows clients to preemptively get a reference to an API object and pass it to places that
diff --git a/vendor/k8s.io/api/core/v1/register.go b/pkg/k8s.io/api/core/v1/register.go
index 1aac0cb41..32b11ec57 100644
--- a/vendor/k8s.io/api/core/v1/register.go
+++ b/pkg/k8s.io/api/core/v1/register.go
@@ -17,9 +17,9 @@ limitations under the License.
 package v1
 
 import (
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/runtime/schema"
+	metav1 "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/apis/meta/v1"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/runtime"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/runtime/schema"
 )
 
 // GroupName is the group name use in this package
diff --git a/vendor/k8s.io/api/core/v1/resource.go b/pkg/k8s.io/api/core/v1/resource.go
index 4e249d03a..fcc00d6e0 100644
--- a/vendor/k8s.io/api/core/v1/resource.go
+++ b/pkg/k8s.io/api/core/v1/resource.go
@@ -17,7 +17,7 @@ limitations under the License.
 package v1
 
 import (
-	"k8s.io/apimachinery/pkg/api/resource"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/api/resource"
 )
 
 // Returns string version of ResourceName.
diff --git a/vendor/k8s.io/api/core/v1/taint.go b/pkg/k8s.io/api/core/v1/taint.go
index db71bd2fd..db71bd2fd 100644
--- a/vendor/k8s.io/api/core/v1/taint.go
+++ b/pkg/k8s.io/api/core/v1/taint.go
diff --git a/vendor/k8s.io/api/core/v1/toleration.go b/pkg/k8s.io/api/core/v1/toleration.go
index b203d335b..b203d335b 100644
--- a/vendor/k8s.io/api/core/v1/toleration.go
+++ b/pkg/k8s.io/api/core/v1/toleration.go
diff --git a/vendor/k8s.io/api/core/v1/types.go b/pkg/k8s.io/api/core/v1/types.go
index 027d73edd..1d8c448e8 100644
--- a/vendor/k8s.io/api/core/v1/types.go
+++ b/pkg/k8s.io/api/core/v1/types.go
@@ -17,10 +17,10 @@ limitations under the License.
 package v1
 
 import (
-	"k8s.io/apimachinery/pkg/api/resource"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/apimachinery/pkg/util/intstr"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/api/resource"
+	metav1 "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/apis/meta/v1"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/types"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/util/intstr"
 )
 
 const (
diff --git a/vendor/k8s.io/api/core/v1/types_swagger_doc_generated.go b/pkg/k8s.io/api/core/v1/types_swagger_doc_generated.go
index 8d6327375..8d6327375 100644
--- a/vendor/k8s.io/api/core/v1/types_swagger_doc_generated.go
+++ b/pkg/k8s.io/api/core/v1/types_swagger_doc_generated.go
diff --git a/vendor/k8s.io/api/core/v1/well_known_labels.go b/pkg/k8s.io/api/core/v1/well_known_labels.go
index 5cf82a981..5cf82a981 100644
--- a/vendor/k8s.io/api/core/v1/well_known_labels.go
+++ b/pkg/k8s.io/api/core/v1/well_known_labels.go
diff --git a/vendor/k8s.io/api/core/v1/well_known_taints.go b/pkg/k8s.io/api/core/v1/well_known_taints.go
index 84d268197..84d268197 100644
--- a/vendor/k8s.io/api/core/v1/well_known_taints.go
+++ b/pkg/k8s.io/api/core/v1/well_known_taints.go
diff --git a/vendor/k8s.io/api/core/v1/zz_generated.deepcopy.go b/pkg/k8s.io/api/core/v1/zz_generated.deepcopy.go
index ff660ae27..0c066c714 100644
--- a/vendor/k8s.io/api/core/v1/zz_generated.deepcopy.go
+++ b/pkg/k8s.io/api/core/v1/zz_generated.deepcopy.go
@@ -21,9 +21,9 @@ limitations under the License.
 package v1
 
 import (
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	runtime "k8s.io/apimachinery/pkg/runtime"
-	types "k8s.io/apimachinery/pkg/types"
+	metav1 "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/apis/meta/v1"
+	runtime "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/runtime"
+	types "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/types"
 )
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
diff --git a/vendor/k8s.io/apimachinery/LICENSE b/pkg/k8s.io/apimachinery/LICENSE
index d64569567..d64569567 100644
--- a/vendor/k8s.io/apimachinery/LICENSE
+++ b/pkg/k8s.io/apimachinery/LICENSE
diff --git a/vendor/k8s.io/apimachinery/pkg/api/resource/OWNERS b/pkg/k8s.io/apimachinery/pkg/api/resource/OWNERS
index 15bded17a..15bded17a 100644
--- a/vendor/k8s.io/apimachinery/pkg/api/resource/OWNERS
+++ b/pkg/k8s.io/apimachinery/pkg/api/resource/OWNERS
diff --git a/vendor/k8s.io/apimachinery/pkg/api/resource/amount.go b/pkg/k8s.io/apimachinery/pkg/api/resource/amount.go
index a8866a43e..a8866a43e 100644
--- a/vendor/k8s.io/apimachinery/pkg/api/resource/amount.go
+++ b/pkg/k8s.io/apimachinery/pkg/api/resource/amount.go
diff --git a/vendor/k8s.io/apimachinery/pkg/api/resource/generated.pb.go b/pkg/k8s.io/apimachinery/pkg/api/resource/generated.pb.go
index 2e09f4fac..a9ecf8249 100644
--- a/vendor/k8s.io/apimachinery/pkg/api/resource/generated.pb.go
+++ b/pkg/k8s.io/apimachinery/pkg/api/resource/generated.pb.go
@@ -66,7 +66,7 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("k8s.io/kubernetes/vendor/k8s.io/apimachinery/pkg/api/resource/generated.proto", fileDescriptor_612bba87bd70906c)
+	proto.RegisterFile("github.com/containers/podman/v4/pkg/k8s.io/kubernetes/vendor/k8s.io/apimachinery/pkg/api/resource/generated.proto", fileDescriptor_612bba87bd70906c)
 }
 
 var fileDescriptor_612bba87bd70906c = []byte{
diff --git a/vendor/k8s.io/apimachinery/pkg/api/resource/generated.proto b/pkg/k8s.io/apimachinery/pkg/api/resource/generated.proto
index 472104d54..2e34cd35a 100644
--- a/vendor/k8s.io/apimachinery/pkg/api/resource/generated.proto
+++ b/pkg/k8s.io/apimachinery/pkg/api/resource/generated.proto
@@ -85,4 +85,3 @@ option go_package = "resource";
 message Quantity {
   optional string string = 1;
 }
-
diff --git a/vendor/k8s.io/apimachinery/pkg/api/resource/math.go b/pkg/k8s.io/apimachinery/pkg/api/resource/math.go
index 8ffcb9f09..8ffcb9f09 100644
--- a/vendor/k8s.io/apimachinery/pkg/api/resource/math.go
+++ b/pkg/k8s.io/apimachinery/pkg/api/resource/math.go
diff --git a/vendor/k8s.io/apimachinery/pkg/api/resource/quantity.go b/pkg/k8s.io/apimachinery/pkg/api/resource/quantity.go
index 2395656cc..2395656cc 100644
--- a/vendor/k8s.io/apimachinery/pkg/api/resource/quantity.go
+++ b/pkg/k8s.io/apimachinery/pkg/api/resource/quantity.go
diff --git a/vendor/k8s.io/apimachinery/pkg/api/resource/quantity_proto.go b/pkg/k8s.io/apimachinery/pkg/api/resource/quantity_proto.go
index 3e0cdb10d..3e0cdb10d 100644
--- a/vendor/k8s.io/apimachinery/pkg/api/resource/quantity_proto.go
+++ b/pkg/k8s.io/apimachinery/pkg/api/resource/quantity_proto.go
diff --git a/vendor/k8s.io/apimachinery/pkg/api/resource/scale_int.go b/pkg/k8s.io/apimachinery/pkg/api/resource/scale_int.go
index 55e177b0e..55e177b0e 100644
--- a/vendor/k8s.io/apimachinery/pkg/api/resource/scale_int.go
+++ b/pkg/k8s.io/apimachinery/pkg/api/resource/scale_int.go
diff --git a/vendor/k8s.io/apimachinery/pkg/api/resource/suffix.go b/pkg/k8s.io/apimachinery/pkg/api/resource/suffix.go
index 5ed7abe66..5ed7abe66 100644
--- a/vendor/k8s.io/apimachinery/pkg/api/resource/suffix.go
+++ b/pkg/k8s.io/apimachinery/pkg/api/resource/suffix.go
diff --git a/vendor/k8s.io/apimachinery/pkg/api/resource/zz_generated.deepcopy.go b/pkg/k8s.io/apimachinery/pkg/api/resource/zz_generated.deepcopy.go
index ab4740790..ab4740790 100644
--- a/vendor/k8s.io/apimachinery/pkg/api/resource/zz_generated.deepcopy.go
+++ b/pkg/k8s.io/apimachinery/pkg/api/resource/zz_generated.deepcopy.go
diff --git a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/OWNERS b/pkg/k8s.io/apimachinery/pkg/apis/meta/v1/OWNERS
index 5731b9ee2..5731b9ee2 100644
--- a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/OWNERS
+++ b/pkg/k8s.io/apimachinery/pkg/apis/meta/v1/OWNERS
diff --git a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/controller_ref.go b/pkg/k8s.io/apimachinery/pkg/apis/meta/v1/controller_ref.go
index 15b45ffa8..2094d6927 100644
--- a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/controller_ref.go
+++ b/pkg/k8s.io/apimachinery/pkg/apis/meta/v1/controller_ref.go
@@ -17,7 +17,7 @@ limitations under the License.
 package v1
 
 import (
-	"k8s.io/apimachinery/pkg/runtime/schema"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/runtime/schema"
 )
 
 // IsControlledBy checks if the  object has a controllerRef set to the given owner
diff --git a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/conversion.go b/pkg/k8s.io/apimachinery/pkg/apis/meta/v1/conversion.go
index 8eaebb80e..ccd8ce036 100644
--- a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/conversion.go
+++ b/pkg/k8s.io/apimachinery/pkg/apis/meta/v1/conversion.go
@@ -22,12 +22,12 @@ import (
 	"strconv"
 	"strings"
 
-	"k8s.io/apimachinery/pkg/api/resource"
-	"k8s.io/apimachinery/pkg/conversion"
-	"k8s.io/apimachinery/pkg/fields"
-	"k8s.io/apimachinery/pkg/labels"
-	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/apimachinery/pkg/util/intstr"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/api/resource"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/conversion"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/fields"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/labels"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/types"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/util/intstr"
 )
 
 func Convert_Pointer_float64_To_float64(in **float64, out *float64, s conversion.Scope) error {
diff --git a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/deepcopy.go b/pkg/k8s.io/apimachinery/pkg/apis/meta/v1/deepcopy.go
index 8751d0524..f20bde65b 100644
--- a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/deepcopy.go
+++ b/pkg/k8s.io/apimachinery/pkg/apis/meta/v1/deepcopy.go
@@ -17,7 +17,7 @@ limitations under the License.
 package v1
 
 import (
-	"k8s.io/apimachinery/pkg/runtime"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/runtime"
 )
 
 func (in *TableRow) DeepCopy() *TableRow {
diff --git a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/doc.go b/pkg/k8s.io/apimachinery/pkg/apis/meta/v1/doc.go
index 7736753d6..1f5aef0b0 100644
--- a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/doc.go
+++ b/pkg/k8s.io/apimachinery/pkg/apis/meta/v1/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 
 // +groupName=meta.k8s.io
 
-package v1 // import "k8s.io/apimachinery/pkg/apis/meta/v1"
+package v1 // import "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/duration.go b/pkg/k8s.io/apimachinery/pkg/apis/meta/v1/duration.go
index a22b07878..a22b07878 100644
--- a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/duration.go
+++ b/pkg/k8s.io/apimachinery/pkg/apis/meta/v1/duration.go
diff --git a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/generated.pb.go b/pkg/k8s.io/apimachinery/pkg/apis/meta/v1/generated.pb.go
index 326f68812..8c862ab34 100644
--- a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/generated.pb.go
+++ b/pkg/k8s.io/apimachinery/pkg/apis/meta/v1/generated.pb.go
@@ -26,7 +26,7 @@ import (
 
 	proto "github.com/gogo/protobuf/proto"
 	github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys"
-	runtime "k8s.io/apimachinery/pkg/runtime"
+	runtime "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/runtime"
 
 	math "math"
 	math_bits "math/bits"
@@ -34,7 +34,7 @@ import (
 	strings "strings"
 	time "time"
 
-	k8s_io_apimachinery_pkg_types "k8s.io/apimachinery/pkg/types"
+	k8s_io_apimachinery_pkg_types "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/types"
 )
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -1322,7 +1322,7 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("k8s.io/kubernetes/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto", fileDescriptor_cf52fa777ced5367)
+	proto.RegisterFile("github.com/containers/podman/v4/pkg/k8s.io/kubernetes/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto", fileDescriptor_cf52fa777ced5367)
 }
 
 var fileDescriptor_cf52fa777ced5367 = []byte{
diff --git a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto b/pkg/k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto
index 7d450644d..aba4fd861 100644
--- a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto
+++ b/pkg/k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto
@@ -21,8 +21,8 @@ syntax = "proto2";
 
 package k8s.io.apimachinery.pkg.apis.meta.v1;
 
-import "k8s.io/apimachinery/pkg/runtime/generated.proto";
-import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto";
+import "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/runtime/generated.proto";
+import "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/runtime/schema/generated.proto";
 
 // Package-wide variables from generator "generated".
 option go_package = "v1";
@@ -1122,4 +1122,3 @@ message WatchEvent {
   //    depending on context.
   optional k8s.io.apimachinery.pkg.runtime.RawExtension object = 2;
 }
-
diff --git a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/group_version.go b/pkg/k8s.io/apimachinery/pkg/apis/meta/v1/group_version.go
index 54a0944af..70dbd0a46 100644
--- a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/group_version.go
+++ b/pkg/k8s.io/apimachinery/pkg/apis/meta/v1/group_version.go
@@ -21,7 +21,7 @@ import (
 	"fmt"
 	"strings"
 
-	"k8s.io/apimachinery/pkg/runtime/schema"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/runtime/schema"
 )
 
 // GroupResource specifies a Group and a Resource, but does not force a version.  This is useful for identifying
diff --git a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/helpers.go b/pkg/k8s.io/apimachinery/pkg/apis/meta/v1/helpers.go
index 2b6a30b65..e25491d19 100644
--- a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/helpers.go
+++ b/pkg/k8s.io/apimachinery/pkg/apis/meta/v1/helpers.go
@@ -22,10 +22,10 @@ import (
 	"errors"
 	"fmt"
 
-	"k8s.io/apimachinery/pkg/fields"
-	"k8s.io/apimachinery/pkg/labels"
-	"k8s.io/apimachinery/pkg/selection"
-	"k8s.io/apimachinery/pkg/types"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/fields"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/labels"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/selection"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/types"
 )
 
 // LabelSelectorAsSelector converts the LabelSelector api type into a struct that implements
diff --git a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/labels.go b/pkg/k8s.io/apimachinery/pkg/apis/meta/v1/labels.go
index 9b45145da..9b45145da 100644
--- a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/labels.go
+++ b/pkg/k8s.io/apimachinery/pkg/apis/meta/v1/labels.go
diff --git a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/meta.go b/pkg/k8s.io/apimachinery/pkg/apis/meta/v1/meta.go
index 2002f91b0..2f1904b9a 100644
--- a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/meta.go
+++ b/pkg/k8s.io/apimachinery/pkg/apis/meta/v1/meta.go
@@ -17,8 +17,8 @@ limitations under the License.
 package v1
 
 import (
-	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/apimachinery/pkg/types"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/runtime/schema"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/types"
 )
 
 // TODO: move this, Object, List, and Type to a different package
diff --git a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/micro_time.go b/pkg/k8s.io/apimachinery/pkg/apis/meta/v1/micro_time.go
index 8eb37f436..8eb37f436 100644
--- a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/micro_time.go
+++ b/pkg/k8s.io/apimachinery/pkg/apis/meta/v1/micro_time.go
diff --git a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/micro_time_fuzz.go b/pkg/k8s.io/apimachinery/pkg/apis/meta/v1/micro_time_fuzz.go
index befab16f7..befab16f7 100644
--- a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/micro_time_fuzz.go
+++ b/pkg/k8s.io/apimachinery/pkg/apis/meta/v1/micro_time_fuzz.go
diff --git a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/micro_time_proto.go b/pkg/k8s.io/apimachinery/pkg/apis/meta/v1/micro_time_proto.go
index 6dd6d8999..6dd6d8999 100644
--- a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/micro_time_proto.go
+++ b/pkg/k8s.io/apimachinery/pkg/apis/meta/v1/micro_time_proto.go
diff --git a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/register.go b/pkg/k8s.io/apimachinery/pkg/apis/meta/v1/register.go
index 1abdd626d..6224173eb 100644
--- a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/register.go
+++ b/pkg/k8s.io/apimachinery/pkg/apis/meta/v1/register.go
@@ -17,9 +17,9 @@ limitations under the License.
 package v1
 
 import (
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/runtime/schema"
-	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/runtime"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/runtime/schema"
+	utilruntime "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/util/runtime"
 )
 
 // GroupName is the group name for this API.
diff --git a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/time.go b/pkg/k8s.io/apimachinery/pkg/apis/meta/v1/time.go
index 421770d43..421770d43 100644
--- a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/time.go
+++ b/pkg/k8s.io/apimachinery/pkg/apis/meta/v1/time.go
diff --git a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/time_fuzz.go b/pkg/k8s.io/apimachinery/pkg/apis/meta/v1/time_fuzz.go
index 94ad8d7cf..94ad8d7cf 100644
--- a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/time_fuzz.go
+++ b/pkg/k8s.io/apimachinery/pkg/apis/meta/v1/time_fuzz.go
diff --git a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/time_proto.go b/pkg/k8s.io/apimachinery/pkg/apis/meta/v1/time_proto.go
index eac8d9658..eac8d9658 100644
--- a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/time_proto.go
+++ b/pkg/k8s.io/apimachinery/pkg/apis/meta/v1/time_proto.go
diff --git a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/types.go b/pkg/k8s.io/apimachinery/pkg/apis/meta/v1/types.go
index 9660282c4..d7933a2e0 100644
--- a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/types.go
+++ b/pkg/k8s.io/apimachinery/pkg/apis/meta/v1/types.go
@@ -29,8 +29,8 @@ import (
 	"fmt"
 	"strings"
 
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/types"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/runtime"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/types"
 )
 
 // TypeMeta describes an individual object in an API response or request
diff --git a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/types_swagger_doc_generated.go b/pkg/k8s.io/apimachinery/pkg/apis/meta/v1/types_swagger_doc_generated.go
index 3eae04d07..3eae04d07 100644
--- a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/types_swagger_doc_generated.go
+++ b/pkg/k8s.io/apimachinery/pkg/apis/meta/v1/types_swagger_doc_generated.go
diff --git a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/watch.go b/pkg/k8s.io/apimachinery/pkg/apis/meta/v1/watch.go
index 58f077380..20c26bdfe 100644
--- a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/watch.go
+++ b/pkg/k8s.io/apimachinery/pkg/apis/meta/v1/watch.go
@@ -17,10 +17,10 @@ limitations under the License.
 package v1
 
 import (
-	"k8s.io/apimachinery/pkg/conversion"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/apimachinery/pkg/watch"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/conversion"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/runtime"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/runtime/schema"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/watch"
 )
 
 // Event represents a single event to a watched resource.
diff --git a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/zz_generated.conversion.go b/pkg/k8s.io/apimachinery/pkg/apis/meta/v1/zz_generated.conversion.go
index 3ecb67c82..af111a227 100644
--- a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/zz_generated.conversion.go
+++ b/pkg/k8s.io/apimachinery/pkg/apis/meta/v1/zz_generated.conversion.go
@@ -24,13 +24,13 @@ import (
 	url "net/url"
 	unsafe "unsafe"
 
-	resource "k8s.io/apimachinery/pkg/api/resource"
-	conversion "k8s.io/apimachinery/pkg/conversion"
-	fields "k8s.io/apimachinery/pkg/fields"
-	labels "k8s.io/apimachinery/pkg/labels"
-	runtime "k8s.io/apimachinery/pkg/runtime"
-	intstr "k8s.io/apimachinery/pkg/util/intstr"
-	watch "k8s.io/apimachinery/pkg/watch"
+	resource "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/api/resource"
+	conversion "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/conversion"
+	fields "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/fields"
+	labels "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/labels"
+	runtime "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/runtime"
+	intstr "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/util/intstr"
+	watch "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/watch"
 )
 
 func init() {
diff --git a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/zz_generated.deepcopy.go b/pkg/k8s.io/apimachinery/pkg/apis/meta/v1/zz_generated.deepcopy.go
index d43020da5..6ef479fcf 100644
--- a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/zz_generated.deepcopy.go
+++ b/pkg/k8s.io/apimachinery/pkg/apis/meta/v1/zz_generated.deepcopy.go
@@ -21,8 +21,8 @@ limitations under the License.
 package v1
 
 import (
-	runtime "k8s.io/apimachinery/pkg/runtime"
-	types "k8s.io/apimachinery/pkg/types"
+	runtime "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/runtime"
+	types "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/types"
 )
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
diff --git a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/zz_generated.defaults.go b/pkg/k8s.io/apimachinery/pkg/apis/meta/v1/zz_generated.defaults.go
index cce2e603a..5802d5bcc 100644
--- a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/zz_generated.defaults.go
+++ b/pkg/k8s.io/apimachinery/pkg/apis/meta/v1/zz_generated.defaults.go
@@ -21,7 +21,7 @@ limitations under the License.
 package v1
 
 import (
-	runtime "k8s.io/apimachinery/pkg/runtime"
+	runtime "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/runtime"
 )
 
 // RegisterDefaults adds defaulters functions to the given scheme.
diff --git a/vendor/k8s.io/apimachinery/pkg/conversion/converter.go b/pkg/k8s.io/apimachinery/pkg/conversion/converter.go
index 791348476..791348476 100644
--- a/vendor/k8s.io/apimachinery/pkg/conversion/converter.go
+++ b/pkg/k8s.io/apimachinery/pkg/conversion/converter.go
diff --git a/vendor/k8s.io/apimachinery/pkg/conversion/deep_equal.go b/pkg/k8s.io/apimachinery/pkg/conversion/deep_equal.go
index f21abe1e5..f849e9e37 100644
--- a/vendor/k8s.io/apimachinery/pkg/conversion/deep_equal.go
+++ b/pkg/k8s.io/apimachinery/pkg/conversion/deep_equal.go
@@ -17,7 +17,7 @@ limitations under the License.
 package conversion
 
 import (
-	"k8s.io/apimachinery/third_party/forked/golang/reflect"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/third_party/forked/golang/reflect"
 )
 
 // The code for this type must be located in third_party, since it forks from
diff --git a/vendor/k8s.io/apimachinery/pkg/conversion/doc.go b/pkg/k8s.io/apimachinery/pkg/conversion/doc.go
index 7415d8164..7b0e5b70d 100644
--- a/vendor/k8s.io/apimachinery/pkg/conversion/doc.go
+++ b/pkg/k8s.io/apimachinery/pkg/conversion/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 // but for the fields which did not change, copying is automated. This makes it
 // easy to modify the structures you use in memory without affecting the format
 // you store on disk or respond to in your external API calls.
-package conversion // import "k8s.io/apimachinery/pkg/conversion"
+package conversion // import "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/conversion"
diff --git a/vendor/k8s.io/apimachinery/pkg/conversion/helper.go b/pkg/k8s.io/apimachinery/pkg/conversion/helper.go
index 4ebc1ebc5..4ebc1ebc5 100644
--- a/vendor/k8s.io/apimachinery/pkg/conversion/helper.go
+++ b/pkg/k8s.io/apimachinery/pkg/conversion/helper.go
diff --git a/vendor/k8s.io/apimachinery/pkg/conversion/queryparams/convert.go b/pkg/k8s.io/apimachinery/pkg/conversion/queryparams/convert.go
index 2f0dd0074..2f0dd0074 100644
--- a/vendor/k8s.io/apimachinery/pkg/conversion/queryparams/convert.go
+++ b/pkg/k8s.io/apimachinery/pkg/conversion/queryparams/convert.go
diff --git a/vendor/k8s.io/apimachinery/pkg/conversion/queryparams/doc.go b/pkg/k8s.io/apimachinery/pkg/conversion/queryparams/doc.go
index 7b763de6f..be59de3e6 100644
--- a/vendor/k8s.io/apimachinery/pkg/conversion/queryparams/doc.go
+++ b/pkg/k8s.io/apimachinery/pkg/conversion/queryparams/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package queryparams provides conversion from versioned
 // runtime objects to URL query values
-package queryparams // import "k8s.io/apimachinery/pkg/conversion/queryparams"
+package queryparams // import "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/conversion/queryparams"
diff --git a/vendor/k8s.io/apimachinery/pkg/fields/doc.go b/pkg/k8s.io/apimachinery/pkg/fields/doc.go
index c39b8039a..afbef4f0e 100644
--- a/vendor/k8s.io/apimachinery/pkg/fields/doc.go
+++ b/pkg/k8s.io/apimachinery/pkg/fields/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package fields implements a simple field system, parsing and matching
 // selectors with sets of fields.
-package fields // import "k8s.io/apimachinery/pkg/fields"
+package fields // import "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/fields"
diff --git a/vendor/k8s.io/apimachinery/pkg/fields/fields.go b/pkg/k8s.io/apimachinery/pkg/fields/fields.go
index 623b27e95..623b27e95 100644
--- a/vendor/k8s.io/apimachinery/pkg/fields/fields.go
+++ b/pkg/k8s.io/apimachinery/pkg/fields/fields.go
diff --git a/vendor/k8s.io/apimachinery/pkg/fields/requirements.go b/pkg/k8s.io/apimachinery/pkg/fields/requirements.go
index 70d94ded8..6bab1c260 100644
--- a/vendor/k8s.io/apimachinery/pkg/fields/requirements.go
+++ b/pkg/k8s.io/apimachinery/pkg/fields/requirements.go
@@ -16,7 +16,7 @@ limitations under the License.
 
 package fields
 
-import "k8s.io/apimachinery/pkg/selection"
+import "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/selection"
 
 // Requirements is AND of all requirements.
 type Requirements []Requirement
diff --git a/vendor/k8s.io/apimachinery/pkg/fields/selector.go b/pkg/k8s.io/apimachinery/pkg/fields/selector.go
index a9e204976..aa2c01be6 100644
--- a/vendor/k8s.io/apimachinery/pkg/fields/selector.go
+++ b/pkg/k8s.io/apimachinery/pkg/fields/selector.go
@@ -22,7 +22,7 @@ import (
 	"sort"
 	"strings"
 
-	"k8s.io/apimachinery/pkg/selection"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/selection"
 )
 
 // Selector represents a field selector.
diff --git a/vendor/k8s.io/apimachinery/pkg/labels/doc.go b/pkg/k8s.io/apimachinery/pkg/labels/doc.go
index 82de0051b..add8d2703 100644
--- a/vendor/k8s.io/apimachinery/pkg/labels/doc.go
+++ b/pkg/k8s.io/apimachinery/pkg/labels/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package labels implements a simple label system, parsing and matching
 // selectors with sets of labels.
-package labels // import "k8s.io/apimachinery/pkg/labels"
+package labels // import "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/labels"
diff --git a/vendor/k8s.io/apimachinery/pkg/labels/labels.go b/pkg/k8s.io/apimachinery/pkg/labels/labels.go
index 8360d842b..3cb67e3ed 100644
--- a/vendor/k8s.io/apimachinery/pkg/labels/labels.go
+++ b/pkg/k8s.io/apimachinery/pkg/labels/labels.go
@@ -21,7 +21,7 @@ import (
 	"sort"
 	"strings"
 
-	"k8s.io/apimachinery/pkg/util/validation/field"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/util/validation/field"
 )
 
 // Labels allows you to present labels independently from their storage.
diff --git a/vendor/k8s.io/apimachinery/pkg/labels/selector.go b/pkg/k8s.io/apimachinery/pkg/labels/selector.go
index 9eea34579..c5142fb54 100644
--- a/vendor/k8s.io/apimachinery/pkg/labels/selector.go
+++ b/pkg/k8s.io/apimachinery/pkg/labels/selector.go
@@ -22,12 +22,12 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/selection"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/util/sets"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/util/validation"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/util/validation/field"
+	"github.com/containers/podman/v4/pkg/k8s.io/klog"
 	"github.com/google/go-cmp/cmp"
-	"k8s.io/apimachinery/pkg/selection"
-	"k8s.io/apimachinery/pkg/util/sets"
-	"k8s.io/apimachinery/pkg/util/validation"
-	"k8s.io/apimachinery/pkg/util/validation/field"
-	"k8s.io/klog/v2"
 )
 
 var (
diff --git a/vendor/k8s.io/apimachinery/pkg/labels/zz_generated.deepcopy.go b/pkg/k8s.io/apimachinery/pkg/labels/zz_generated.deepcopy.go
index 4d482947f..4d482947f 100644
--- a/vendor/k8s.io/apimachinery/pkg/labels/zz_generated.deepcopy.go
+++ b/pkg/k8s.io/apimachinery/pkg/labels/zz_generated.deepcopy.go
diff --git a/vendor/k8s.io/apimachinery/pkg/runtime/codec.go b/pkg/k8s.io/apimachinery/pkg/runtime/codec.go
index a92863139..d69d0a0d7 100644
--- a/vendor/k8s.io/apimachinery/pkg/runtime/codec.go
+++ b/pkg/k8s.io/apimachinery/pkg/runtime/codec.go
@@ -27,9 +27,9 @@ import (
 	"strconv"
 	"strings"
 
-	"k8s.io/apimachinery/pkg/conversion/queryparams"
-	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/klog/v2"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/conversion/queryparams"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/runtime/schema"
+	"github.com/containers/podman/v4/pkg/k8s.io/klog"
 )
 
 // codec binds an encoder and decoder.
diff --git a/vendor/k8s.io/apimachinery/pkg/runtime/codec_check.go b/pkg/k8s.io/apimachinery/pkg/runtime/codec_check.go
index 000228061..a6da13f35 100644
--- a/vendor/k8s.io/apimachinery/pkg/runtime/codec_check.go
+++ b/pkg/k8s.io/apimachinery/pkg/runtime/codec_check.go
@@ -20,8 +20,8 @@ import (
 	"fmt"
 	"reflect"
 
-	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/apimachinery/pkg/util/json"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/runtime/schema"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/util/json"
 )
 
 // CheckCodec makes sure that the codec can encode objects like internalType,
diff --git a/vendor/k8s.io/apimachinery/pkg/runtime/conversion.go b/pkg/k8s.io/apimachinery/pkg/runtime/conversion.go
index d04d701f3..9c03d6774 100644
--- a/vendor/k8s.io/apimachinery/pkg/runtime/conversion.go
+++ b/pkg/k8s.io/apimachinery/pkg/runtime/conversion.go
@@ -24,7 +24,7 @@ import (
 	"strconv"
 	"strings"
 
-	"k8s.io/apimachinery/pkg/conversion"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/conversion"
 )
 
 // DefaultMetaV1FieldSelectorConversion auto-accepts metav1 values for name and namespace.
diff --git a/vendor/k8s.io/apimachinery/pkg/runtime/converter.go b/pkg/k8s.io/apimachinery/pkg/runtime/converter.go
index 4a6cc6857..f6389ea68 100644
--- a/vendor/k8s.io/apimachinery/pkg/runtime/converter.go
+++ b/pkg/k8s.io/apimachinery/pkg/runtime/converter.go
@@ -28,12 +28,12 @@ import (
 	"sync/atomic"
 	"time"
 
-	"k8s.io/apimachinery/pkg/conversion"
-	"k8s.io/apimachinery/pkg/util/json"
-	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/conversion"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/util/json"
+	utilruntime "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/util/runtime"
 	"sigs.k8s.io/structured-merge-diff/v4/value"
 
-	"k8s.io/klog/v2"
+	"github.com/containers/podman/v4/pkg/k8s.io/klog"
 )
 
 // UnstructuredConverter is an interface for converting between interface{}
diff --git a/vendor/k8s.io/apimachinery/pkg/runtime/doc.go b/pkg/k8s.io/apimachinery/pkg/runtime/doc.go
index 89feb4010..c82560b6e 100644
--- a/vendor/k8s.io/apimachinery/pkg/runtime/doc.go
+++ b/pkg/k8s.io/apimachinery/pkg/runtime/doc.go
@@ -48,4 +48,4 @@ limitations under the License.
 //
 // As a bonus, a few common types useful from all api objects and versions
 // are provided in types.go.
-package runtime // import "k8s.io/apimachinery/pkg/runtime"
+package runtime // import "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/runtime"
diff --git a/vendor/k8s.io/apimachinery/pkg/runtime/embedded.go b/pkg/k8s.io/apimachinery/pkg/runtime/embedded.go
index 7251e65f6..35f97ec89 100644
--- a/vendor/k8s.io/apimachinery/pkg/runtime/embedded.go
+++ b/pkg/k8s.io/apimachinery/pkg/runtime/embedded.go
@@ -19,8 +19,8 @@ package runtime
 import (
 	"errors"
 
-	"k8s.io/apimachinery/pkg/conversion"
-	"k8s.io/apimachinery/pkg/runtime/schema"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/conversion"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/runtime/schema"
 )
 
 type encodable struct {
diff --git a/vendor/k8s.io/apimachinery/pkg/runtime/error.go b/pkg/k8s.io/apimachinery/pkg/runtime/error.go
index be0c5edc8..1d0e3941a 100644
--- a/vendor/k8s.io/apimachinery/pkg/runtime/error.go
+++ b/pkg/k8s.io/apimachinery/pkg/runtime/error.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"reflect"
 
-	"k8s.io/apimachinery/pkg/runtime/schema"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/runtime/schema"
 )
 
 type notRegisteredErr struct {
diff --git a/vendor/k8s.io/apimachinery/pkg/runtime/extension.go b/pkg/k8s.io/apimachinery/pkg/runtime/extension.go
index 9056397fa..9056397fa 100644
--- a/vendor/k8s.io/apimachinery/pkg/runtime/extension.go
+++ b/pkg/k8s.io/apimachinery/pkg/runtime/extension.go
diff --git a/vendor/k8s.io/apimachinery/pkg/runtime/generated.pb.go b/pkg/k8s.io/apimachinery/pkg/runtime/generated.pb.go
index ac428d610..8d12d5c0c 100644
--- a/vendor/k8s.io/apimachinery/pkg/runtime/generated.pb.go
+++ b/pkg/k8s.io/apimachinery/pkg/runtime/generated.pb.go
@@ -133,7 +133,7 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("k8s.io/kubernetes/vendor/k8s.io/apimachinery/pkg/runtime/generated.proto", fileDescriptor_9d3c45d7f546725c)
+	proto.RegisterFile("github.com/containers/podman/v4/pkg/k8s.io/kubernetes/vendor/k8s.io/apimachinery/pkg/runtime/generated.proto", fileDescriptor_9d3c45d7f546725c)
 }
 
 var fileDescriptor_9d3c45d7f546725c = []byte{
diff --git a/vendor/k8s.io/apimachinery/pkg/runtime/generated.proto b/pkg/k8s.io/apimachinery/pkg/runtime/generated.proto
index 3b25391fa..8700c90ad 100644
--- a/vendor/k8s.io/apimachinery/pkg/runtime/generated.proto
+++ b/pkg/k8s.io/apimachinery/pkg/runtime/generated.proto
@@ -124,4 +124,3 @@ message Unknown {
   // Unspecified means ContentTypeJSON.
   optional string contentType = 4;
 }
-
diff --git a/vendor/k8s.io/apimachinery/pkg/runtime/helper.go b/pkg/k8s.io/apimachinery/pkg/runtime/helper.go
index 7bd1a3a6a..1f88710ac 100644
--- a/vendor/k8s.io/apimachinery/pkg/runtime/helper.go
+++ b/pkg/k8s.io/apimachinery/pkg/runtime/helper.go
@@ -21,9 +21,9 @@ import (
 	"io"
 	"reflect"
 
-	"k8s.io/apimachinery/pkg/conversion"
-	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/apimachinery/pkg/util/errors"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/conversion"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/runtime/schema"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/util/errors"
 )
 
 // unsafeObjectConvertor implements ObjectConvertor using the unsafe conversion path.
diff --git a/vendor/k8s.io/apimachinery/pkg/runtime/interfaces.go b/pkg/k8s.io/apimachinery/pkg/runtime/interfaces.go
index 3e1fab1d1..685bad428 100644
--- a/vendor/k8s.io/apimachinery/pkg/runtime/interfaces.go
+++ b/pkg/k8s.io/apimachinery/pkg/runtime/interfaces.go
@@ -20,7 +20,7 @@ import (
 	"io"
 	"net/url"
 
-	"k8s.io/apimachinery/pkg/runtime/schema"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/runtime/schema"
 )
 
 const (
diff --git a/vendor/k8s.io/apimachinery/pkg/runtime/mapper.go b/pkg/k8s.io/apimachinery/pkg/runtime/mapper.go
index 3ff84611a..028eedffe 100644
--- a/vendor/k8s.io/apimachinery/pkg/runtime/mapper.go
+++ b/pkg/k8s.io/apimachinery/pkg/runtime/mapper.go
@@ -19,7 +19,7 @@ package runtime
 import (
 	"sync"
 
-	"k8s.io/apimachinery/pkg/runtime/schema"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/runtime/schema"
 )
 
 type equivalentResourceRegistry struct {
diff --git a/vendor/k8s.io/apimachinery/pkg/runtime/negotiate.go b/pkg/k8s.io/apimachinery/pkg/runtime/negotiate.go
index 3ab119b0a..1de577916 100644
--- a/vendor/k8s.io/apimachinery/pkg/runtime/negotiate.go
+++ b/pkg/k8s.io/apimachinery/pkg/runtime/negotiate.go
@@ -19,7 +19,7 @@ package runtime
 import (
 	"fmt"
 
-	"k8s.io/apimachinery/pkg/runtime/schema"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/runtime/schema"
 )
 
 // NegotiateError is returned when a ClientNegotiator is unable to locate
diff --git a/vendor/k8s.io/apimachinery/pkg/runtime/register.go b/pkg/k8s.io/apimachinery/pkg/runtime/register.go
index 1cd2e4c38..7d10eba29 100644
--- a/vendor/k8s.io/apimachinery/pkg/runtime/register.go
+++ b/pkg/k8s.io/apimachinery/pkg/runtime/register.go
@@ -16,7 +16,7 @@ limitations under the License.
 
 package runtime
 
-import "k8s.io/apimachinery/pkg/runtime/schema"
+import "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/runtime/schema"
 
 // SetGroupVersionKind satisfies the ObjectKind interface for all objects that embed TypeMeta
 func (obj *TypeMeta) SetGroupVersionKind(gvk schema.GroupVersionKind) {
diff --git a/vendor/k8s.io/apimachinery/pkg/runtime/schema/generated.pb.go b/pkg/k8s.io/apimachinery/pkg/runtime/schema/generated.pb.go
index 29d3ac45b..17272cf80 100644
--- a/vendor/k8s.io/apimachinery/pkg/runtime/schema/generated.pb.go
+++ b/pkg/k8s.io/apimachinery/pkg/runtime/schema/generated.pb.go
@@ -39,7 +39,7 @@ var _ = math.Inf
 const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 
 func init() {
-	proto.RegisterFile("k8s.io/kubernetes/vendor/k8s.io/apimachinery/pkg/runtime/schema/generated.proto", fileDescriptor_0462724132518e0d)
+	proto.RegisterFile("github.com/containers/podman/v4/pkg/k8s.io/kubernetes/vendor/k8s.io/apimachinery/pkg/runtime/schema/generated.proto", fileDescriptor_0462724132518e0d)
 }
 
 var fileDescriptor_0462724132518e0d = []byte{
diff --git a/vendor/k8s.io/apimachinery/pkg/runtime/schema/generated.proto b/pkg/k8s.io/apimachinery/pkg/runtime/schema/generated.proto
index c50766a4b..0d61d6fcd 100644
--- a/vendor/k8s.io/apimachinery/pkg/runtime/schema/generated.proto
+++ b/pkg/k8s.io/apimachinery/pkg/runtime/schema/generated.proto
@@ -23,4 +23,3 @@ package k8s.io.apimachinery.pkg.runtime.schema;
 
 // Package-wide variables from generator "generated".
 option go_package = "schema";
-
diff --git a/vendor/k8s.io/apimachinery/pkg/runtime/schema/group_version.go b/pkg/k8s.io/apimachinery/pkg/runtime/schema/group_version.go
index 994a3e3fa..994a3e3fa 100644
--- a/vendor/k8s.io/apimachinery/pkg/runtime/schema/group_version.go
+++ b/pkg/k8s.io/apimachinery/pkg/runtime/schema/group_version.go
diff --git a/vendor/k8s.io/apimachinery/pkg/runtime/schema/interfaces.go b/pkg/k8s.io/apimachinery/pkg/runtime/schema/interfaces.go
index f04453fb0..f04453fb0 100644
--- a/vendor/k8s.io/apimachinery/pkg/runtime/schema/interfaces.go
+++ b/pkg/k8s.io/apimachinery/pkg/runtime/schema/interfaces.go
diff --git a/vendor/k8s.io/apimachinery/pkg/runtime/scheme.go b/pkg/k8s.io/apimachinery/pkg/runtime/scheme.go
index ae47ab3ab..94cc5d2bd 100644
--- a/vendor/k8s.io/apimachinery/pkg/runtime/scheme.go
+++ b/pkg/k8s.io/apimachinery/pkg/runtime/scheme.go
@@ -21,11 +21,11 @@ import (
 	"reflect"
 	"strings"
 
-	"k8s.io/apimachinery/pkg/conversion"
-	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/apimachinery/pkg/util/naming"
-	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
-	"k8s.io/apimachinery/pkg/util/sets"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/conversion"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/runtime/schema"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/util/naming"
+	utilruntime "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/util/runtime"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/util/sets"
 )
 
 // Scheme defines methods for serializing and deserializing API objects, a type
@@ -725,4 +725,4 @@ func (s *Scheme) Name() string {
 
 // internalPackages are packages that ignored when creating a default reflector name. These packages are in the common
 // call chains to NewReflector, so they'd be low entropy names for reflectors
-var internalPackages = []string{"k8s.io/apimachinery/pkg/runtime/scheme.go"}
+var internalPackages = []string{"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/runtime/scheme.go"}
diff --git a/vendor/k8s.io/apimachinery/pkg/runtime/scheme_builder.go b/pkg/k8s.io/apimachinery/pkg/runtime/scheme_builder.go
index 944db4818..944db4818 100644
--- a/vendor/k8s.io/apimachinery/pkg/runtime/scheme_builder.go
+++ b/pkg/k8s.io/apimachinery/pkg/runtime/scheme_builder.go
diff --git a/vendor/k8s.io/apimachinery/pkg/runtime/swagger_doc_generator.go b/pkg/k8s.io/apimachinery/pkg/runtime/swagger_doc_generator.go
index 5bc642bc8..5bc642bc8 100644
--- a/vendor/k8s.io/apimachinery/pkg/runtime/swagger_doc_generator.go
+++ b/pkg/k8s.io/apimachinery/pkg/runtime/swagger_doc_generator.go
diff --git a/vendor/k8s.io/apimachinery/pkg/runtime/types.go b/pkg/k8s.io/apimachinery/pkg/runtime/types.go
index 31359f35f..31359f35f 100644
--- a/vendor/k8s.io/apimachinery/pkg/runtime/types.go
+++ b/pkg/k8s.io/apimachinery/pkg/runtime/types.go
diff --git a/vendor/k8s.io/apimachinery/pkg/runtime/types_proto.go b/pkg/k8s.io/apimachinery/pkg/runtime/types_proto.go
index a82227b23..a82227b23 100644
--- a/vendor/k8s.io/apimachinery/pkg/runtime/types_proto.go
+++ b/pkg/k8s.io/apimachinery/pkg/runtime/types_proto.go
diff --git a/vendor/k8s.io/apimachinery/pkg/runtime/zz_generated.deepcopy.go b/pkg/k8s.io/apimachinery/pkg/runtime/zz_generated.deepcopy.go
index b0393839e..b0393839e 100644
--- a/vendor/k8s.io/apimachinery/pkg/runtime/zz_generated.deepcopy.go
+++ b/pkg/k8s.io/apimachinery/pkg/runtime/zz_generated.deepcopy.go
diff --git a/vendor/k8s.io/apimachinery/pkg/selection/operator.go b/pkg/k8s.io/apimachinery/pkg/selection/operator.go
index 298f798c4..298f798c4 100644
--- a/vendor/k8s.io/apimachinery/pkg/selection/operator.go
+++ b/pkg/k8s.io/apimachinery/pkg/selection/operator.go
diff --git a/vendor/k8s.io/apimachinery/pkg/types/doc.go b/pkg/k8s.io/apimachinery/pkg/types/doc.go
index 5667fa992..bbc067674 100644
--- a/vendor/k8s.io/apimachinery/pkg/types/doc.go
+++ b/pkg/k8s.io/apimachinery/pkg/types/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package types implements various generic types used throughout kubernetes.
-package types // import "k8s.io/apimachinery/pkg/types"
+package types // import "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/types"
diff --git a/vendor/k8s.io/apimachinery/pkg/types/namespacedname.go b/pkg/k8s.io/apimachinery/pkg/types/namespacedname.go
index b19750f3a..b19750f3a 100644
--- a/vendor/k8s.io/apimachinery/pkg/types/namespacedname.go
+++ b/pkg/k8s.io/apimachinery/pkg/types/namespacedname.go
diff --git a/vendor/k8s.io/apimachinery/pkg/types/nodename.go b/pkg/k8s.io/apimachinery/pkg/types/nodename.go
index fee348d7e..fee348d7e 100644
--- a/vendor/k8s.io/apimachinery/pkg/types/nodename.go
+++ b/pkg/k8s.io/apimachinery/pkg/types/nodename.go
diff --git a/vendor/k8s.io/apimachinery/pkg/types/patch.go b/pkg/k8s.io/apimachinery/pkg/types/patch.go
index fe8ecaaff..fe8ecaaff 100644
--- a/vendor/k8s.io/apimachinery/pkg/types/patch.go
+++ b/pkg/k8s.io/apimachinery/pkg/types/patch.go
diff --git a/vendor/k8s.io/apimachinery/pkg/types/uid.go b/pkg/k8s.io/apimachinery/pkg/types/uid.go
index 869339222..869339222 100644
--- a/vendor/k8s.io/apimachinery/pkg/types/uid.go
+++ b/pkg/k8s.io/apimachinery/pkg/types/uid.go
diff --git a/vendor/k8s.io/apimachinery/pkg/util/errors/doc.go b/pkg/k8s.io/apimachinery/pkg/util/errors/doc.go
index 5d4d6250a..6bb3fd619 100644
--- a/vendor/k8s.io/apimachinery/pkg/util/errors/doc.go
+++ b/pkg/k8s.io/apimachinery/pkg/util/errors/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package errors implements various utility functions and types around errors.
-package errors // import "k8s.io/apimachinery/pkg/util/errors"
+package errors // import "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/util/errors"
diff --git a/vendor/k8s.io/apimachinery/pkg/util/errors/errors.go b/pkg/k8s.io/apimachinery/pkg/util/errors/errors.go
index 1f5a04fd4..b97eaecf7 100644
--- a/vendor/k8s.io/apimachinery/pkg/util/errors/errors.go
+++ b/pkg/k8s.io/apimachinery/pkg/util/errors/errors.go
@@ -20,7 +20,7 @@ import (
 	"errors"
 	"fmt"
 
-	"k8s.io/apimachinery/pkg/util/sets"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/util/sets"
 )
 
 // MessageCountMap contains occurrence for each error message.
diff --git a/vendor/k8s.io/apimachinery/pkg/util/intstr/generated.pb.go b/pkg/k8s.io/apimachinery/pkg/util/intstr/generated.pb.go
index a4792034a..11c8b6a44 100644
--- a/vendor/k8s.io/apimachinery/pkg/util/intstr/generated.pb.go
+++ b/pkg/k8s.io/apimachinery/pkg/util/intstr/generated.pb.go
@@ -73,7 +73,7 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("k8s.io/kubernetes/vendor/k8s.io/apimachinery/pkg/util/intstr/generated.proto", fileDescriptor_94e046ae3ce6121c)
+	proto.RegisterFile("github.com/containers/podman/v4/pkg/k8s.io/kubernetes/vendor/k8s.io/apimachinery/pkg/util/intstr/generated.proto", fileDescriptor_94e046ae3ce6121c)
 }
 
 var fileDescriptor_94e046ae3ce6121c = []byte{
diff --git a/vendor/k8s.io/apimachinery/pkg/util/intstr/generated.proto b/pkg/k8s.io/apimachinery/pkg/util/intstr/generated.proto
index a76f79851..8d5d6f606 100644
--- a/vendor/k8s.io/apimachinery/pkg/util/intstr/generated.proto
+++ b/pkg/k8s.io/apimachinery/pkg/util/intstr/generated.proto
@@ -40,4 +40,3 @@ message IntOrString {
 
   optional string strVal = 3;
 }
-
diff --git a/vendor/k8s.io/apimachinery/pkg/util/intstr/instr_fuzz.go b/pkg/k8s.io/apimachinery/pkg/util/intstr/instr_fuzz.go
index 2501d5516..2501d5516 100644
--- a/vendor/k8s.io/apimachinery/pkg/util/intstr/instr_fuzz.go
+++ b/pkg/k8s.io/apimachinery/pkg/util/intstr/instr_fuzz.go
diff --git a/vendor/k8s.io/apimachinery/pkg/util/intstr/intstr.go b/pkg/k8s.io/apimachinery/pkg/util/intstr/intstr.go
index c0e8927fe..43f986527 100644
--- a/vendor/k8s.io/apimachinery/pkg/util/intstr/intstr.go
+++ b/pkg/k8s.io/apimachinery/pkg/util/intstr/intstr.go
@@ -25,7 +25,7 @@ import (
 	"strconv"
 	"strings"
 
-	"k8s.io/klog/v2"
+	"github.com/containers/podman/v4/pkg/k8s.io/klog"
 )
 
 // IntOrString is a type that can hold an int32 or a string.  When used in
diff --git a/vendor/k8s.io/apimachinery/pkg/util/json/json.go b/pkg/k8s.io/apimachinery/pkg/util/json/json.go
index 778e58f70..778e58f70 100644
--- a/vendor/k8s.io/apimachinery/pkg/util/json/json.go
+++ b/pkg/k8s.io/apimachinery/pkg/util/json/json.go
diff --git a/vendor/k8s.io/apimachinery/pkg/util/naming/from_stack.go b/pkg/k8s.io/apimachinery/pkg/util/naming/from_stack.go
index d69bf32ca..d69bf32ca 100644
--- a/vendor/k8s.io/apimachinery/pkg/util/naming/from_stack.go
+++ b/pkg/k8s.io/apimachinery/pkg/util/naming/from_stack.go
diff --git a/vendor/k8s.io/apimachinery/pkg/util/net/http.go b/pkg/k8s.io/apimachinery/pkg/util/net/http.go
index d75ac6efa..f7755896d 100644
--- a/vendor/k8s.io/apimachinery/pkg/util/net/http.go
+++ b/pkg/k8s.io/apimachinery/pkg/util/net/http.go
@@ -37,8 +37,8 @@ import (
 	"unicode"
 	"unicode/utf8"
 
+	"github.com/containers/podman/v4/pkg/k8s.io/klog"
 	"golang.org/x/net/http2"
-	"k8s.io/klog/v2"
 )
 
 // JoinPreservingTrailingSlash does a path.Join of the specified elements,
diff --git a/vendor/k8s.io/apimachinery/pkg/util/net/interface.go b/pkg/k8s.io/apimachinery/pkg/util/net/interface.go
index 9adf4cfe4..e4273ef71 100644
--- a/vendor/k8s.io/apimachinery/pkg/util/net/interface.go
+++ b/pkg/k8s.io/apimachinery/pkg/util/net/interface.go
@@ -26,7 +26,7 @@ import (
 
 	"strings"
 
-	"k8s.io/klog/v2"
+	"github.com/containers/podman/v4/pkg/k8s.io/klog"
 )
 
 type AddressFamily uint
diff --git a/vendor/k8s.io/apimachinery/pkg/util/net/port_range.go b/pkg/k8s.io/apimachinery/pkg/util/net/port_range.go
index 42ecffcca..42ecffcca 100644
--- a/vendor/k8s.io/apimachinery/pkg/util/net/port_range.go
+++ b/pkg/k8s.io/apimachinery/pkg/util/net/port_range.go
diff --git a/vendor/k8s.io/apimachinery/pkg/util/net/port_split.go b/pkg/k8s.io/apimachinery/pkg/util/net/port_split.go
index c0fd4e20f..349a80a45 100644
--- a/vendor/k8s.io/apimachinery/pkg/util/net/port_split.go
+++ b/pkg/k8s.io/apimachinery/pkg/util/net/port_split.go
@@ -19,7 +19,7 @@ package net
 import (
 	"strings"
 
-	"k8s.io/apimachinery/pkg/util/sets"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/util/sets"
 )
 
 var validSchemes = sets.NewString("http", "https", "")
diff --git a/vendor/k8s.io/apimachinery/pkg/util/net/util.go b/pkg/k8s.io/apimachinery/pkg/util/net/util.go
index 5950087e0..5950087e0 100644
--- a/vendor/k8s.io/apimachinery/pkg/util/net/util.go
+++ b/pkg/k8s.io/apimachinery/pkg/util/net/util.go
diff --git a/vendor/k8s.io/apimachinery/pkg/util/runtime/runtime.go b/pkg/k8s.io/apimachinery/pkg/util/runtime/runtime.go
index 035c52811..1d8fd0e96 100644
--- a/vendor/k8s.io/apimachinery/pkg/util/runtime/runtime.go
+++ b/pkg/k8s.io/apimachinery/pkg/util/runtime/runtime.go
@@ -23,7 +23,7 @@ import (
 	"sync"
 	"time"
 
-	"k8s.io/klog/v2"
+	"github.com/containers/podman/v4/pkg/k8s.io/klog"
 )
 
 var (
diff --git a/vendor/k8s.io/apimachinery/pkg/util/sets/byte.go b/pkg/k8s.io/apimachinery/pkg/util/sets/byte.go
index 9bfa85d43..9bfa85d43 100644
--- a/vendor/k8s.io/apimachinery/pkg/util/sets/byte.go
+++ b/pkg/k8s.io/apimachinery/pkg/util/sets/byte.go
diff --git a/vendor/k8s.io/apimachinery/pkg/util/sets/doc.go b/pkg/k8s.io/apimachinery/pkg/util/sets/doc.go
index b152a0bf0..b152a0bf0 100644
--- a/vendor/k8s.io/apimachinery/pkg/util/sets/doc.go
+++ b/pkg/k8s.io/apimachinery/pkg/util/sets/doc.go
diff --git a/vendor/k8s.io/apimachinery/pkg/util/sets/empty.go b/pkg/k8s.io/apimachinery/pkg/util/sets/empty.go
index e11e622c5..e11e622c5 100644
--- a/vendor/k8s.io/apimachinery/pkg/util/sets/empty.go
+++ b/pkg/k8s.io/apimachinery/pkg/util/sets/empty.go
diff --git a/vendor/k8s.io/apimachinery/pkg/util/sets/int.go b/pkg/k8s.io/apimachinery/pkg/util/sets/int.go
index 88bd70967..88bd70967 100644
--- a/vendor/k8s.io/apimachinery/pkg/util/sets/int.go
+++ b/pkg/k8s.io/apimachinery/pkg/util/sets/int.go
diff --git a/vendor/k8s.io/apimachinery/pkg/util/sets/int32.go b/pkg/k8s.io/apimachinery/pkg/util/sets/int32.go
index 96a485554..96a485554 100644
--- a/vendor/k8s.io/apimachinery/pkg/util/sets/int32.go
+++ b/pkg/k8s.io/apimachinery/pkg/util/sets/int32.go
diff --git a/vendor/k8s.io/apimachinery/pkg/util/sets/int64.go b/pkg/k8s.io/apimachinery/pkg/util/sets/int64.go
index b375a1b06..b375a1b06 100644
--- a/vendor/k8s.io/apimachinery/pkg/util/sets/int64.go
+++ b/pkg/k8s.io/apimachinery/pkg/util/sets/int64.go
diff --git a/vendor/k8s.io/apimachinery/pkg/util/sets/string.go b/pkg/k8s.io/apimachinery/pkg/util/sets/string.go
index e6f37db88..e6f37db88 100644
--- a/vendor/k8s.io/apimachinery/pkg/util/sets/string.go
+++ b/pkg/k8s.io/apimachinery/pkg/util/sets/string.go
diff --git a/vendor/k8s.io/apimachinery/pkg/util/validation/field/errors.go b/pkg/k8s.io/apimachinery/pkg/util/validation/field/errors.go
index c283ad189..6434a2816 100644
--- a/vendor/k8s.io/apimachinery/pkg/util/validation/field/errors.go
+++ b/pkg/k8s.io/apimachinery/pkg/util/validation/field/errors.go
@@ -22,8 +22,8 @@ import (
 	"strconv"
 	"strings"
 
-	utilerrors "k8s.io/apimachinery/pkg/util/errors"
-	"k8s.io/apimachinery/pkg/util/sets"
+	utilerrors "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/util/errors"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/util/sets"
 )
 
 // Error is an implementation of the 'error' interface, which represents a
diff --git a/vendor/k8s.io/apimachinery/pkg/util/validation/field/path.go b/pkg/k8s.io/apimachinery/pkg/util/validation/field/path.go
index daccb0589..daccb0589 100644
--- a/vendor/k8s.io/apimachinery/pkg/util/validation/field/path.go
+++ b/pkg/k8s.io/apimachinery/pkg/util/validation/field/path.go
diff --git a/vendor/k8s.io/apimachinery/pkg/util/validation/validation.go b/pkg/k8s.io/apimachinery/pkg/util/validation/validation.go
index c8b419984..d1d5ff998 100644
--- a/vendor/k8s.io/apimachinery/pkg/util/validation/validation.go
+++ b/pkg/k8s.io/apimachinery/pkg/util/validation/validation.go
@@ -24,7 +24,7 @@ import (
 	"strconv"
 	"strings"
 
-	"k8s.io/apimachinery/pkg/util/validation/field"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/util/validation/field"
 )
 
 const qnameCharFmt string = "[A-Za-z0-9]"
diff --git a/vendor/k8s.io/apimachinery/pkg/watch/doc.go b/pkg/k8s.io/apimachinery/pkg/watch/doc.go
index 7e6bf3fb9..35ddd3970 100644
--- a/vendor/k8s.io/apimachinery/pkg/watch/doc.go
+++ b/pkg/k8s.io/apimachinery/pkg/watch/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package watch contains a generic watchable interface, and a fake for
 // testing code that uses the watch interface.
-package watch // import "k8s.io/apimachinery/pkg/watch"
+package watch // import "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/watch"
diff --git a/vendor/k8s.io/apimachinery/pkg/watch/filter.go b/pkg/k8s.io/apimachinery/pkg/watch/filter.go
index 22c9449f5..22c9449f5 100644
--- a/vendor/k8s.io/apimachinery/pkg/watch/filter.go
+++ b/pkg/k8s.io/apimachinery/pkg/watch/filter.go
diff --git a/vendor/k8s.io/apimachinery/pkg/watch/mux.go b/pkg/k8s.io/apimachinery/pkg/watch/mux.go
index e01d51906..12fdd85aa 100644
--- a/vendor/k8s.io/apimachinery/pkg/watch/mux.go
+++ b/pkg/k8s.io/apimachinery/pkg/watch/mux.go
@@ -19,8 +19,8 @@ package watch
 import (
 	"sync"
 
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/runtime/schema"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/runtime"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/runtime/schema"
 )
 
 // FullChannelBehavior controls how the Broadcaster reacts if a watcher's watch
diff --git a/vendor/k8s.io/apimachinery/pkg/watch/streamwatcher.go b/pkg/k8s.io/apimachinery/pkg/watch/streamwatcher.go
index 42dcac2b9..110acf93b 100644
--- a/vendor/k8s.io/apimachinery/pkg/watch/streamwatcher.go
+++ b/pkg/k8s.io/apimachinery/pkg/watch/streamwatcher.go
@@ -21,11 +21,11 @@ import (
 	"io"
 	"sync"
 
-	"k8s.io/klog/v2"
+	"github.com/containers/podman/v4/pkg/k8s.io/klog"
 
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/util/net"
-	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/runtime"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/util/net"
+	utilruntime "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/util/runtime"
 )
 
 // Decoder allows StreamWatcher to watch any stream for which a Decoder can be written.
diff --git a/vendor/k8s.io/apimachinery/pkg/watch/watch.go b/pkg/k8s.io/apimachinery/pkg/watch/watch.go
index fd0550e4a..6f2c88cdf 100644
--- a/vendor/k8s.io/apimachinery/pkg/watch/watch.go
+++ b/pkg/k8s.io/apimachinery/pkg/watch/watch.go
@@ -20,9 +20,9 @@ import (
 	"fmt"
 	"sync"
 
-	"k8s.io/klog/v2"
+	"github.com/containers/podman/v4/pkg/k8s.io/klog"
 
-	"k8s.io/apimachinery/pkg/runtime"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/runtime"
 )
 
 // Interface can be implemented by anything that knows how to watch and report changes.
diff --git a/vendor/k8s.io/apimachinery/pkg/watch/zz_generated.deepcopy.go b/pkg/k8s.io/apimachinery/pkg/watch/zz_generated.deepcopy.go
index 71ef4da33..71ef4da33 100644
--- a/vendor/k8s.io/apimachinery/pkg/watch/zz_generated.deepcopy.go
+++ b/pkg/k8s.io/apimachinery/pkg/watch/zz_generated.deepcopy.go
diff --git a/vendor/k8s.io/apimachinery/third_party/forked/golang/LICENSE b/pkg/k8s.io/apimachinery/third_party/forked/golang/LICENSE
index 6a66aea5e..6a66aea5e 100644
--- a/vendor/k8s.io/apimachinery/third_party/forked/golang/LICENSE
+++ b/pkg/k8s.io/apimachinery/third_party/forked/golang/LICENSE
diff --git a/vendor/k8s.io/apimachinery/third_party/forked/golang/PATENTS b/pkg/k8s.io/apimachinery/third_party/forked/golang/PATENTS
index 733099041..733099041 100644
--- a/vendor/k8s.io/apimachinery/third_party/forked/golang/PATENTS
+++ b/pkg/k8s.io/apimachinery/third_party/forked/golang/PATENTS
diff --git a/vendor/k8s.io/apimachinery/third_party/forked/golang/reflect/deep_equal.go b/pkg/k8s.io/apimachinery/third_party/forked/golang/reflect/deep_equal.go
index 6be80349a..6be80349a 100644
--- a/vendor/k8s.io/apimachinery/third_party/forked/golang/reflect/deep_equal.go
+++ b/pkg/k8s.io/apimachinery/third_party/forked/golang/reflect/deep_equal.go
diff --git a/vendor/k8s.io/klog/v2/CONTRIBUTING.md b/pkg/k8s.io/klog/CONTRIBUTING.md
index 2641b1f41..2641b1f41 100644
--- a/vendor/k8s.io/klog/v2/CONTRIBUTING.md
+++ b/pkg/k8s.io/klog/CONTRIBUTING.md
diff --git a/vendor/k8s.io/klog/v2/LICENSE b/pkg/k8s.io/klog/LICENSE
index 37ec93a14..37ec93a14 100644
--- a/vendor/k8s.io/klog/v2/LICENSE
+++ b/pkg/k8s.io/klog/LICENSE
diff --git a/vendor/k8s.io/klog/v2/OWNERS b/pkg/k8s.io/klog/OWNERS
index ad5063fdf..ad5063fdf 100644
--- a/vendor/k8s.io/klog/v2/OWNERS
+++ b/pkg/k8s.io/klog/OWNERS
diff --git a/vendor/k8s.io/klog/v2/README.md b/pkg/k8s.io/klog/README.md
index 64d29622e..dcb75e33e 100644
--- a/vendor/k8s.io/klog/v2/README.md
+++ b/pkg/k8s.io/klog/README.md
@@ -15,7 +15,7 @@ This makes us unable to solve many use cases without a fork. The factors that co
  * `glog` [presents a lot "gotchas"](https://github.com/kubernetes/kubernetes/issues/61006) and introduces challenges in containerized environments, all of which aren't well documented.
  * `glog` doesn't provide an easy way to test logs, which detracts from the stability of software using it
  * A long term goal is to implement a logging interface that allows us to add context, change output format, etc.
- 
+
 Historical context is available here:
 
  * https://github.com/kubernetes/kubernetes/issues/61006
@@ -27,7 +27,7 @@ Historical context is available here:
 
 How to use klog
 ===============
-- Replace imports for `"github.com/golang/glog"` with `"k8s.io/klog/v2"`
+- Replace imports for `"github.com/golang/glog"` with `"github.com/containers/podman/v4/pkg/k8s.io/klog"`
 - Use `klog.InitFlags(nil)` explicitly for initializing global flags as we no longer use `init()` method to register the flags
 - You can now use `log_file` instead of `log_dir` for logging to a single file (See `examples/log_file/usage_log_file.go`)
 - If you want to redirect everything logged using klog somewhere else (say syslog!), you can use `klog.SetOutput()` method and supply a `io.Writer`. (See `examples/set_output/usage_set_output.go`)
diff --git a/vendor/k8s.io/klog/v2/RELEASE.md b/pkg/k8s.io/klog/RELEASE.md
index b53eb960c..b53eb960c 100644
--- a/vendor/k8s.io/klog/v2/RELEASE.md
+++ b/pkg/k8s.io/klog/RELEASE.md
diff --git a/vendor/k8s.io/klog/v2/SECURITY.md b/pkg/k8s.io/klog/SECURITY.md
index 2083d44cd..2083d44cd 100644
--- a/vendor/k8s.io/klog/v2/SECURITY.md
+++ b/pkg/k8s.io/klog/SECURITY.md
diff --git a/vendor/k8s.io/klog/v2/SECURITY_CONTACTS b/pkg/k8s.io/klog/SECURITY_CONTACTS
index 6128a5869..6128a5869 100644
--- a/vendor/k8s.io/klog/v2/SECURITY_CONTACTS
+++ b/pkg/k8s.io/klog/SECURITY_CONTACTS
diff --git a/vendor/k8s.io/klog/v2/code-of-conduct.md b/pkg/k8s.io/klog/code-of-conduct.md
index 0d15c00cf..0d15c00cf 100644
--- a/vendor/k8s.io/klog/v2/code-of-conduct.md
+++ b/pkg/k8s.io/klog/code-of-conduct.md
diff --git a/vendor/k8s.io/klog/v2/klog.go b/pkg/k8s.io/klog/klog.go
index 45efbb075..45efbb075 100644
--- a/vendor/k8s.io/klog/v2/klog.go
+++ b/pkg/k8s.io/klog/klog.go
diff --git a/vendor/k8s.io/klog/v2/klog_file.go b/pkg/k8s.io/klog/klog_file.go
index de830d922..de830d922 100644
--- a/vendor/k8s.io/klog/v2/klog_file.go
+++ b/pkg/k8s.io/klog/klog_file.go
diff --git a/pkg/kubeutils/resize.go b/pkg/kubeutils/resize.go
index 7b14b6db3..a48e6be1d 100644
--- a/pkg/kubeutils/resize.go
+++ b/pkg/kubeutils/resize.go
@@ -18,7 +18,7 @@ package kubeutils
 
 import (
 	"github.com/containers/podman/v4/libpod/define"
-	"k8s.io/apimachinery/pkg/util/runtime"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/util/runtime"
 )
 
 // HandleResizing spawns a goroutine that processes the resize channel, calling resizeFunc for each
diff --git a/pkg/specgen/generate/kube/kube.go b/pkg/specgen/generate/kube/kube.go
index e0331b0a6..df751a780 100644
--- a/pkg/specgen/generate/kube/kube.go
+++ b/pkg/specgen/generate/kube/kube.go
@@ -20,6 +20,8 @@ import (
 	"github.com/containers/podman/v4/libpod/define"
 	ann "github.com/containers/podman/v4/pkg/annotations"
 	"github.com/containers/podman/v4/pkg/domain/entities"
+	v1 "github.com/containers/podman/v4/pkg/k8s.io/api/core/v1"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/api/resource"
 	"github.com/containers/podman/v4/pkg/specgen"
 	"github.com/containers/podman/v4/pkg/specgen/generate"
 	"github.com/containers/podman/v4/pkg/util"
@@ -27,8 +29,6 @@ import (
 	"github.com/docker/go-units"
 	spec "github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/pkg/errors"
-	v1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/api/resource"
 )
 
 func ToPodOpt(ctx context.Context, podName string, p entities.PodCreateOptions, podYAML *v1.PodTemplateSpec) (entities.PodCreateOptions, error) {
diff --git a/pkg/specgen/generate/kube/kube_test.go b/pkg/specgen/generate/kube/kube_test.go
index 62793ebb6..0898d427d 100644
--- a/pkg/specgen/generate/kube/kube_test.go
+++ b/pkg/specgen/generate/kube/kube_test.go
@@ -3,8 +3,8 @@ package kube
 import (
 	"testing"
 
+	v1 "github.com/containers/podman/v4/pkg/k8s.io/api/core/v1"
 	"github.com/stretchr/testify/assert"
-	v1 "k8s.io/api/core/v1"
 	//"github.com/stretchr/testify/require"
 )
 
diff --git a/pkg/specgen/generate/kube/play_test.go b/pkg/specgen/generate/kube/play_test.go
index 6798fdb1b..448522c2a 100644
--- a/pkg/specgen/generate/kube/play_test.go
+++ b/pkg/specgen/generate/kube/play_test.go
@@ -11,11 +11,11 @@ import (
 	"testing"
 
 	"github.com/containers/common/pkg/secrets"
+	v1 "github.com/containers/podman/v4/pkg/k8s.io/api/core/v1"
+	"github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/api/resource"
+	v12 "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/apis/meta/v1"
 	"github.com/docker/docker/pkg/system"
 	"github.com/stretchr/testify/assert"
-	v1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/api/resource"
-	v12 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 func createSecrets(t *testing.T, d string) *secrets.SecretsManager {
diff --git a/pkg/specgen/generate/kube/seccomp.go b/pkg/specgen/generate/kube/seccomp.go
index b977b6f50..1e681e977 100644
--- a/pkg/specgen/generate/kube/seccomp.go
+++ b/pkg/specgen/generate/kube/seccomp.go
@@ -5,8 +5,8 @@ import (
 	"strings"
 
 	"github.com/containers/podman/v4/libpod"
+	v1 "github.com/containers/podman/v4/pkg/k8s.io/api/core/v1"
 	"github.com/pkg/errors"
-	v1 "k8s.io/api/core/v1"
 )
 
 // KubeSeccompPaths holds information about a pod YAML's seccomp configuration
diff --git a/pkg/specgen/generate/kube/volume.go b/pkg/specgen/generate/kube/volume.go
index 01f731b60..d57cb5685 100644
--- a/pkg/specgen/generate/kube/volume.go
+++ b/pkg/specgen/generate/kube/volume.go
@@ -5,9 +5,9 @@ import (
 
 	"github.com/containers/common/pkg/parse"
 	"github.com/containers/podman/v4/libpod"
+	v1 "github.com/containers/podman/v4/pkg/k8s.io/api/core/v1"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
-	v1 "k8s.io/api/core/v1"
 )
 
 const (
diff --git a/test/e2e/generate_kube_test.go b/test/e2e/generate_kube_test.go
index 53829e89b..a0e6ccce6 100644
--- a/test/e2e/generate_kube_test.go
+++ b/test/e2e/generate_kube_test.go
@@ -9,13 +9,13 @@ import (
 
 	"github.com/containers/podman/v4/libpod/define"
 
+	v1 "github.com/containers/podman/v4/pkg/k8s.io/api/core/v1"
 	"github.com/containers/podman/v4/pkg/util"
 	. "github.com/containers/podman/v4/test/utils"
 	"github.com/ghodss/yaml"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	. "github.com/onsi/gomega/gexec"
-	v1 "k8s.io/api/core/v1"
 )
 
 var _ = Describe("Podman generate kube", func() {
diff --git a/vendor/k8s.io/klog/v2/.gitignore b/vendor/k8s.io/klog/v2/.gitignore
deleted file mode 100644
index 0aa200239..000000000
--- a/vendor/k8s.io/klog/v2/.gitignore
+++ /dev/null
@@ -1,17 +0,0 @@
-# OSX leaves these everywhere on SMB shares
-._*
-
-# OSX trash
-.DS_Store
-
-# Eclipse files
-.classpath
-.project
-.settings/**
-
-# Files generated by JetBrains IDEs, e.g. IntelliJ IDEA
-.idea/
-*.iml
-
-# Vscode files
-.vscode
diff --git a/vendor/k8s.io/klog/v2/go.mod b/vendor/k8s.io/klog/v2/go.mod
deleted file mode 100644
index 31aefba74..000000000
--- a/vendor/k8s.io/klog/v2/go.mod
+++ /dev/null
@@ -1,5 +0,0 @@
-module k8s.io/klog/v2
-
-go 1.13
-
-require github.com/go-logr/logr v1.2.0
diff --git a/vendor/k8s.io/klog/v2/go.sum b/vendor/k8s.io/klog/v2/go.sum
deleted file mode 100644
index 919fbadbc..000000000
--- a/vendor/k8s.io/klog/v2/go.sum
+++ /dev/null
@@ -1,2 +0,0 @@
-github.com/go-logr/logr v1.2.0 h1:QK40JKJyMdUDz+h+xvCsru/bJhvG0UxvePV0ufL/AcE=
-github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
diff --git a/vendor/modules.txt b/vendor/modules.txt
index d3ed30c11..8d33cc2ac 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -395,6 +395,7 @@ github.com/fsouza/go-dockerclient
 ## explicit
 github.com/ghodss/yaml
 # github.com/go-logr/logr v1.2.2
+## explicit
 github.com/go-logr/logr
 # github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0
 github.com/go-task/slim-sprig
@@ -402,6 +403,7 @@ github.com/go-task/slim-sprig
 ## explicit
 github.com/godbus/dbus/v5
 # github.com/gogo/protobuf v1.3.2
+## explicit
 github.com/gogo/protobuf/gogoproto
 github.com/gogo/protobuf/proto
 github.com/gogo/protobuf/protoc-gen-gogo/descriptor
@@ -415,6 +417,7 @@ github.com/golang/protobuf/ptypes/any
 github.com/golang/protobuf/ptypes/duration
 github.com/golang/protobuf/ptypes/timestamp
 # github.com/google/go-cmp v0.5.7
+## explicit
 github.com/google/go-cmp/cmp
 github.com/google/go-cmp/cmp/internal/diff
 github.com/google/go-cmp/cmp/internal/flags
@@ -423,6 +426,7 @@ github.com/google/go-cmp/cmp/internal/value
 # github.com/google/go-intervals v0.0.2
 github.com/google/go-intervals/intervalset
 # github.com/google/gofuzz v1.2.0
+## explicit
 github.com/google/gofuzz
 github.com/google/gofuzz/bytesource
 # github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
@@ -737,6 +741,7 @@ golang.org/x/crypto/ssh/internal/bcrypt_pbkdf
 golang.org/x/crypto/ssh/knownhosts
 golang.org/x/crypto/ssh/terminal
 # golang.org/x/net v0.0.0-20220225172249-27dd8689420f
+## explicit
 golang.org/x/net/context
 golang.org/x/net/html
 golang.org/x/net/html/atom
@@ -869,6 +874,7 @@ google.golang.org/protobuf/types/known/timestamppb
 # gopkg.in/fsnotify.v1 v1.4.7
 gopkg.in/fsnotify.v1
 # gopkg.in/inf.v0 v0.9.1
+## explicit
 gopkg.in/inf.v0
 # gopkg.in/square/go-jose.v2 v2.5.1
 gopkg.in/square/go-jose.v2
@@ -881,36 +887,8 @@ gopkg.in/tomb.v1
 gopkg.in/yaml.v2
 # gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
 gopkg.in/yaml.v3
-# k8s.io/api v0.22.5
-## explicit
-k8s.io/api/apps/v1
-k8s.io/api/core/v1
-# k8s.io/apimachinery v0.22.5
-## explicit
-k8s.io/apimachinery/pkg/api/resource
-k8s.io/apimachinery/pkg/apis/meta/v1
-k8s.io/apimachinery/pkg/conversion
-k8s.io/apimachinery/pkg/conversion/queryparams
-k8s.io/apimachinery/pkg/fields
-k8s.io/apimachinery/pkg/labels
-k8s.io/apimachinery/pkg/runtime
-k8s.io/apimachinery/pkg/runtime/schema
-k8s.io/apimachinery/pkg/selection
-k8s.io/apimachinery/pkg/types
-k8s.io/apimachinery/pkg/util/errors
-k8s.io/apimachinery/pkg/util/intstr
-k8s.io/apimachinery/pkg/util/json
-k8s.io/apimachinery/pkg/util/naming
-k8s.io/apimachinery/pkg/util/net
-k8s.io/apimachinery/pkg/util/runtime
-k8s.io/apimachinery/pkg/util/sets
-k8s.io/apimachinery/pkg/util/validation
-k8s.io/apimachinery/pkg/util/validation/field
-k8s.io/apimachinery/pkg/watch
-k8s.io/apimachinery/third_party/forked/golang/reflect
-# k8s.io/klog/v2 v2.30.0
-k8s.io/klog/v2
 # sigs.k8s.io/structured-merge-diff/v4 v4.1.2
+## explicit
 sigs.k8s.io/structured-merge-diff/v4/value
 # sigs.k8s.io/yaml v1.3.0
 sigs.k8s.io/yaml
author	Paul Holzinger <pholzing@redhat.com>	2022-03-11 15:02:04 +0100
committer	Paul Holzinger <pholzing@redhat.com>	2022-03-15 14:46:29 +0100
commit	918fc88a983ea1c1ee7e0abb0fc1dce3c0a35be3 (patch)
tree	c967a39935b452f4cc61f425188bdbf42111c10a
parent	68ce83fe919f2d37762b8b746a73495f45e550f3 (diff)
download	podman-918fc88a983ea1c1ee7e0abb0fc1dce3c0a35be3.tar.gz podman-918fc88a983ea1c1ee7e0abb0fc1dce3c0a35be3.tar.bz2 podman-918fc88a983ea1c1ee7e0abb0fc1dce3c0a35be3.zip