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

Simple code updates for 1.8 breakages

This commit is contained in:
Justin Santa Barbara 2017-10-01 13:17:40 -04:00
parent 9d7b78766e
commit 0c89c9851e
43 changed files with 53 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -429,6 +429,8 @@ utils-dist:
.PHONY: copydeps
copydeps:
rsync -avz _vendor/ vendor/ --delete --exclude vendor/ --exclude .git
ln -sf kubernetes/staging/src/k8s.io/api vendor/k8s.io/api
ln -sf kubernetes/staging/src/k8s.io/apiextensions-apiserver vendor/k8s.io/apiextensions-apiserver
ln -sf kubernetes/staging/src/k8s.io/apimachinery vendor/k8s.io/apimachinery
ln -sf kubernetes/staging/src/k8s.io/apiserver vendor/k8s.io/apiserver
ln -sf kubernetes/staging/src/k8s.io/client-go vendor/k8s.io/client-go

2
cmd/kops/completion.go
View File

@ -25,7 +25,7 @@ import (
"github.com/spf13/cobra"
"k8s.io/kops/cmd/kops/util"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)
const boilerPlate = `

2
cmd/kops/create.go
View File

@ -33,7 +33,7 @@ import (
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/resource"
"k8s.io/kubernetes/pkg/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)
type CreateOptions struct {

2
cmd/kops/create_cluster.go
View File

@ -43,7 +43,7 @@ import (
"k8s.io/kops/upup/pkg/fi/cloudup/gce"
"k8s.io/kops/upup/pkg/fi/utils"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)
const (

2
cmd/kops/create_ig.go
View File

@ -32,7 +32,7 @@ import (
"k8s.io/kops/upup/pkg/fi/cloudup"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/kubectl/cmd/util/editor"
"k8s.io/kubernetes/pkg/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)
type CreateInstanceGroupOptions struct {

2
cmd/kops/create_secret.go
View File

@ -22,7 +22,7 @@ import (
"github.com/spf13/cobra"
"k8s.io/kops/cmd/kops/util"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)
var (

2
cmd/kops/create_secret_dockerconfig.go
View File

@ -27,7 +27,7 @@ import (
"k8s.io/kops/cmd/kops/util"
"k8s.io/kops/upup/pkg/fi"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)
var (

2
cmd/kops/create_secret_encryptionconfig.go
View File

@ -27,7 +27,7 @@ import (
"k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/upup/pkg/fi"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)
var (

2
cmd/kops/create_secret_sshpublickey.go
View File

@ -25,7 +25,7 @@ import (
"github.com/spf13/cobra"
"k8s.io/kops/cmd/kops/util"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)
var (

2
cmd/kops/delete.go
View File

@ -32,7 +32,7 @@ import (
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/resource"
"k8s.io/kubernetes/pkg/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)
type DeleteOptions struct {

2
cmd/kops/delete_cluster.go
View File

@ -32,7 +32,7 @@ import (
"k8s.io/kops/upup/pkg/fi/cloudup/awsup"
"k8s.io/kops/util/pkg/tables"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)
type DeleteClusterOptions struct {

2
cmd/kops/delete_instancegroup.go
View File

@ -29,7 +29,7 @@ import (
"k8s.io/kops/upup/pkg/fi/cloudup"
"k8s.io/kops/util/pkg/ui"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)
var (

2
cmd/kops/delete_secret.go
View File

@ -24,7 +24,7 @@ import (
"k8s.io/kops/cmd/kops/util"
"k8s.io/kops/upup/pkg/fi"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)
var (

2
cmd/kops/describe.go
View File

@ -19,7 +19,7 @@ package main
import (
"github.com/spf13/cobra"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)
var (

2
cmd/kops/describe_secrets.go
View File

@ -28,7 +28,7 @@ import (
"github.com/spf13/cobra"
"k8s.io/kops/upup/pkg/fi"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)
var (

2
cmd/kops/edit.go
View File

@ -22,7 +22,7 @@ import (
"github.com/spf13/cobra"
"k8s.io/kops/cmd/kops/util"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)
var (

2
cmd/kops/edit_cluster.go
View File

@ -36,7 +36,7 @@ import (
"k8s.io/kops/upup/pkg/fi/cloudup"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
util_editor "k8s.io/kubernetes/pkg/kubectl/cmd/util/editor"
"k8s.io/kubernetes/pkg/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)
type EditClusterOptions struct {

2
cmd/kops/edit_federation.go
View File

@ -30,7 +30,7 @@ import (
"k8s.io/kops/pkg/pretty"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/kubectl/cmd/util/editor"
"k8s.io/kubernetes/pkg/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)
var (

2
cmd/kops/edit_instancegroup.go
View File

@ -32,7 +32,7 @@ import (
"k8s.io/kops/upup/pkg/fi/cloudup"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/kubectl/cmd/util/editor"
"k8s.io/kubernetes/pkg/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)
var (

2
cmd/kops/export.go
View File

@ -22,7 +22,7 @@ import (
"github.com/spf13/cobra"
"k8s.io/kops/cmd/kops/util"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)
var (

2
cmd/kops/export_kubecfg.go
View File

@ -24,7 +24,7 @@ import (
"k8s.io/kops/pkg/kubeconfig"
"k8s.io/kops/upup/pkg/fi"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)
var (

2
cmd/kops/get.go
View File

@ -29,7 +29,7 @@ import (
"k8s.io/kops/cmd/kops/util"
api "k8s.io/kops/pkg/apis/kops"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)
var (

2
cmd/kops/get_cluster.go
View File

@ -31,7 +31,7 @@ import (
"k8s.io/kops/pkg/apis/kops/registry"
"k8s.io/kops/util/pkg/tables"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)
var (

2
cmd/kops/get_federation.go
View File

@ -28,7 +28,7 @@ import (
api "k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/util/pkg/tables"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)
var (

2
cmd/kops/get_instancegroups.go
View File

@ -30,7 +30,7 @@ import (
api "k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/util/pkg/tables"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)
var (

2
cmd/kops/get_secrets.go
View File

@ -27,7 +27,7 @@ import (
"k8s.io/kops/upup/pkg/fi"
"k8s.io/kops/util/pkg/tables"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)
var (

2
cmd/kops/import.go
View File

@ -19,7 +19,7 @@ package main
import (
"github.com/spf13/cobra"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)
var (

2
cmd/kops/replace.go
View File

@ -31,7 +31,7 @@ import (
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/resource"
"k8s.io/kubernetes/pkg/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)
var (

2
cmd/kops/rollingupdatecluster.go
View File

@ -39,7 +39,7 @@ import (
"k8s.io/kops/upup/pkg/kutil"
"k8s.io/kops/util/pkg/tables"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)
var (

2
cmd/kops/root.go
View File

@ -33,7 +33,7 @@ import (
"k8s.io/kops/pkg/client/simple"
"k8s.io/kops/upup/pkg/kutil"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
// Register our APIs
_ "k8s.io/kops/pkg/apis/kops/install"

2
cmd/kops/toolbox.go
View File

@ -22,7 +22,7 @@ import (
"github.com/spf13/cobra"
"k8s.io/kops/cmd/kops/util"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)
var (

2
cmd/kops/toolbox_convert_imported.go
View File

@ -27,7 +27,7 @@ import (
"k8s.io/kops/upup/pkg/fi/cloudup/awsup"
"k8s.io/kops/upup/pkg/kutil"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)
var (

2
cmd/kops/toolbox_dump.go
View File

@ -28,7 +28,7 @@ import (
"k8s.io/kops/pkg/resources"
"k8s.io/kops/upup/pkg/fi/cloudup"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)
var (

2
cmd/kops/toolbox_template.go
View File

@ -29,7 +29,7 @@ import (
"github.com/spf13/cobra"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)
var (

2
cmd/kops/update.go
View File

@ -22,7 +22,7 @@ import (
"github.com/spf13/cobra"
"k8s.io/kops/cmd/kops/util"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)
var (

2
cmd/kops/update_cluster.go
View File

@ -36,7 +36,7 @@ import (
"k8s.io/kops/upup/pkg/fi/utils"
"k8s.io/kops/upup/pkg/kutil"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)
var (

2
cmd/kops/update_federation.go
View File

@ -24,7 +24,7 @@ import (
"k8s.io/kops/cmd/kops/util"
"k8s.io/kops/federation"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)
var (

2
cmd/kops/upgrade.go
View File

@ -19,7 +19,7 @@ package main
import (
"github.com/spf13/cobra"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)
var (

2
cmd/kops/validate.go
View File

@ -22,7 +22,7 @@ import (
"github.com/spf13/cobra"
"k8s.io/kops/cmd/kops/util"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)
var (

2
cmd/kops/version.go
View File

@ -22,7 +22,7 @@ import (
"github.com/spf13/cobra"
"k8s.io/kops"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)
var (

3
upup/pkg/fi/cloudup/gce/gce_cloud.go
View File

@ -252,7 +252,8 @@ func (c *gceCloudImplementation) FindInstanceTemplates(clusterName string) ([]*c
match := false
for _, item := range t.Properties.Metadata.Items {
if item.Key == "cluster-name" {
if strings.TrimSpace(item.Value) == findClusterName {
value := fi.StringValue(item.Value)
if strings.TrimSpace(value) == findClusterName {
match = true
} else {
match = false

8
upup/pkg/fi/cloudup/gcetasks/instance.go
View File

@ -139,7 +139,7 @@ func (e *Instance) Find(c *fi.Context) (*Instance, error) {
if r.Metadata != nil {
actual.Metadata = make(map[string]fi.Resource)
for _, i := range r.Metadata.Items {
actual.Metadata[i.Key] = fi.NewStringResource(i.Value)
actual.Metadata[i.Key] = fi.NewStringResource(fi.StringValue(i.Value))
}
actual.metadataFingerprint = r.Metadata.Fingerprint
}
@ -195,7 +195,7 @@ func (e *Instance) mapToGCE(project string, ipAddressResolver func(*Address) (*s
}
} else {
scheduling = &compute.Scheduling{
AutomaticRestart: true,
AutomaticRestart: fi.Bool(true),
// TODO: Migrate or terminate?
OnHostMaintenance: "MIGRATE",
Preemptible: false,
@ -275,7 +275,7 @@ func (e *Instance) mapToGCE(project string, ipAddressResolver func(*Address) (*s
}
metadataItems = append(metadataItems, &compute.MetadataItems{
Key: key,
Value: v,
Value: fi.String(v),
})
}
@ -460,7 +460,7 @@ func (_ *Instance) RenderTerraform(t *terraform.TerraformTarget, a, e, changes *
if i.Scheduling != nil {
tf.Scheduling = &terraformScheduling{
AutomaticRestart: i.Scheduling.AutomaticRestart,
AutomaticRestart: fi.BoolValue(i.Scheduling.AutomaticRestart),
OnHostMaintenance: i.Scheduling.OnHostMaintenance,
Preemptible: i.Scheduling.Preemptible,
}

12
upup/pkg/fi/cloudup/gcetasks/instancetemplate.go
View File

@ -149,7 +149,7 @@ func (e *InstanceTemplate) Find(c *fi.Context) (*InstanceTemplate, error) {
if p.Metadata != nil {
actual.Metadata = make(map[string]*fi.ResourceHolder)
for _, meta := range p.Metadata.Items {
actual.Metadata[meta.Key] = fi.WrapResource(fi.NewStringResource(meta.Value))
actual.Metadata[meta.Key] = fi.WrapResource(fi.NewStringResource(fi.StringValue(meta.Value)))
}
}
@ -190,13 +190,13 @@ func (e *InstanceTemplate) mapToGCE(project string) (*compute.InstanceTemplate,
if fi.BoolValue(e.Preemptible) {
scheduling = &compute.Scheduling{
AutomaticRestart: false,
AutomaticRestart: fi.Bool(false),
OnHostMaintenance: "TERMINATE",
Preemptible: true,
}
} else {
scheduling = &compute.Scheduling{
AutomaticRestart: true,
AutomaticRestart: fi.Bool(true),
// TODO: Migrate or terminate?
OnHostMaintenance: "MIGRATE",
Preemptible: false,
@ -265,7 +265,7 @@ func (e *InstanceTemplate) mapToGCE(project string) (*compute.InstanceTemplate,
}
metadataItems = append(metadataItems, &compute.MetadataItems{
Key: key,
Value: v,
Value: fi.String(v),
})
}
@ -473,7 +473,7 @@ func (t *terraformInstanceCommon) AddMetadata(target *terraform.TerraformTarget,
t.Metadata = make(map[string]*terraform.Literal)
}
for _, g := range metadata.Items {
v := fi.NewStringResource(g.Value)
v := fi.NewStringResource(fi.StringValue(g.Value))
tfResource, err := target.AddFile("google_compute_instance_template", name, "metadata_"+g.Key, v)
if err != nil {
return err
@ -541,7 +541,7 @@ func (_ *InstanceTemplate) RenderTerraform(t *terraform.TerraformTarget, a, e, c
if i.Properties.Scheduling != nil {
tf.Scheduling = &terraformScheduling{
AutomaticRestart: i.Properties.Scheduling.AutomaticRestart,
AutomaticRestart: fi.BoolValue(i.Properties.Scheduling.AutomaticRestart),
OnHostMaintenance: i.Properties.Scheduling.OnHostMaintenance,
Preemptible: i.Properties.Scheduling.Preemptible,
}