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>

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

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=

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

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) {

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) {

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) {

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"

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{

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;
 }
-

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

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 (

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.

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"

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{

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;
 }
-

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

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

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.

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 (

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.

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{

pkg/k8s.io/apimachinery/pkg/api/resource/generated.proto

@@ -85,4 +85,3 @@ option go_package = "resource";
 message Quantity {
   optional string string = 1;
 }
-

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

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 {

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 {

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"

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{

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;
 }
-

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

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

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

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.

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

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.

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() {

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.

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.

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

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"

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"

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"

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

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.

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"

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.

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 (

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.

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,

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.

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{}

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"

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 {

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 {

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{

pkg/k8s.io/apimachinery/pkg/runtime/generated.proto

@@ -124,4 +124,3 @@ message Unknown {
   // Unspecified means ContentTypeJSON.
   optional string contentType = 4;
 }
-

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.

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 (

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 {

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

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) {

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{

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";
-

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"}