diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-03-16 04:27:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-16 04:27:41 -0400 |
| commit | bbae81a291159895d1dba841a591293eec6607c2 (patch) | |
| tree | e881cbcd49da88b7033fd5074f57f361642b76b7 /libpod | |
| parent | 772c6c22065efdba8ef98bc99f47c4fa628049c9 (diff) | |
| parent | 19d0c5a8a311735bb98efc2bb5a95a2d2fce0477 (diff) | |
| download | podman-bbae81a291159895d1dba841a591293eec6607c2.tar.gz podman-bbae81a291159895d1dba841a591293eec6607c2.tar.bz2 podman-bbae81a291159895d1dba841a591293eec6607c2.zip | |
Merge pull request #13489 from Luap99/k8s
move k8s deps into podman
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/kube.go | 8 |
1 files changed, 4 insertions, 4 deletions
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 |