kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix double imports

This commit is contained in:
Ole Markus With 2022-12-04 14:19:34 +01:00
parent dc80fc2c63
commit 7c64d9ba0d
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/kops/create.go
View File

@ -28,7 +28,6 @@ import (
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/klog/v2" "k8s.io/klog/v2"
"k8s.io/kops/cmd/kops/util" "k8s.io/kops/cmd/kops/util"
"k8s.io/kops/pkg/apis/kops"
kopsapi "k8s.io/kops/pkg/apis/kops" kopsapi "k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/pkg/kopscodecs" "k8s.io/kops/pkg/kopscodecs"
"k8s.io/kops/pkg/kubemanifest" "k8s.io/kops/pkg/kubemanifest"
@ -109,7 +108,7 @@ func RunCreate(ctx context.Context, f *util.Factory, out io.Writer, c *CreateOpt
fmt.Fprintf(&sb, "\n") fmt.Fprintf(&sb, "\n")
var addons kubemanifest.ObjectList var addons kubemanifest.ObjectList
var clusters []*kops.Cluster var clusters []*kopsapi.Cluster
for _, f := range c.Filenames { for _, f := range c.Filenames {
var contents []byte var contents []byte

3
cmd/kops/create_cluster.go
View File

@ -41,7 +41,6 @@ import (
kopsbase "k8s.io/kops" kopsbase "k8s.io/kops"
"k8s.io/kops/cmd/kops/util" "k8s.io/kops/cmd/kops/util"
"k8s.io/kops/pkg/apis/kops"
api "k8s.io/kops/pkg/apis/kops" api "k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/pkg/apis/kops/registry" "k8s.io/kops/pkg/apis/kops/registry"
kopsutil "k8s.io/kops/pkg/apis/kops/util" kopsutil "k8s.io/kops/pkg/apis/kops/util"
@ -675,7 +674,7 @@ func RunCreateCluster(ctx context.Context, f *util.Factory, out io.Writer, c *Cr
{ {
// Build full IG spec to ensure we end up with a valid IG // Build full IG spec to ensure we end up with a valid IG
fullInstanceGroups := []*kops.InstanceGroup{} fullInstanceGroups := []*api.InstanceGroup{}
for _, group := range instanceGroups { for _, group := range instanceGroups {
fullGroup, err := cloudup.PopulateInstanceGroupSpec(cluster, group, cloud, clusterResult.Channel) fullGroup, err := cloudup.PopulateInstanceGroupSpec(cluster, group, cloud, clusterResult.Channel)
if err != nil { if err != nil {