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

Merge pull request #9411 from johngmyers/apply-logic 

Move apply logic down into pkg for import use
This commit is contained in:
Kubernetes Prow Robot 2020-06-20 08:04:38 -07:00 committed by GitHub
parent 80e1da9dd2 99c8c4b8fc
commit f79f36804b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
cmd/kops/update_cluster.go
View File

@ -27,7 +27,6 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/spf13/viper" "github.com/spf13/viper"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/tools/clientcmd" "k8s.io/client-go/tools/clientcmd"
"k8s.io/klog" "k8s.io/klog"
"k8s.io/kops/cmd/kops/util" "k8s.io/kops/cmd/kops/util"
@ -236,33 +235,10 @@ func RunUpdateCluster(ctx context.Context, f *util.Factory, clusterName string,
lifecycleOverrideMap[taskName] = lifecycleOverride lifecycleOverrideMap[taskName] = lifecycleOverride
} }
var instanceGroups []*kops.InstanceGroup
{
list, err := clientset.InstanceGroupsFor(cluster).List(ctx, metav1.ListOptions{})
if err != nil {
return nil, err
}
for i := range list.Items {
instanceGroups = append(instanceGroups, &list.Items[i])
// Try to guess the path for additional third party volume plugins in Flatcar
image := strings.ToLower(list.Items[i].Spec.Image)
if strings.Contains(image, "flatcar") {
if cluster.Spec.Kubelet == nil {
cluster.Spec.Kubelet = &kops.KubeletConfigSpec{}
}
if cluster.Spec.Kubelet.VolumePluginDirectory == "" {
cluster.Spec.Kubelet.VolumePluginDirectory = "/var/lib/kubelet/volumeplugins/"
}
}
}
}
applyCmd := &cloudup.ApplyClusterCmd{ applyCmd := &cloudup.ApplyClusterCmd{
Clientset: clientset, Clientset: clientset,
Cluster: cluster, Cluster: cluster,
DryRun: isDryrun, DryRun: isDryrun,
InstanceGroups: instanceGroups,
RunTasksOptions: &c.RunTasksOptions, RunTasksOptions: &c.RunTasksOptions,
Models: strings.Split(c.Models, ","), Models: strings.Split(c.Models, ","),
OutDir: c.OutDir, OutDir: c.OutDir,
@ -360,7 +336,7 @@ func RunUpdateCluster(ctx context.Context, f *util.Factory, clusterName string,
fmt.Fprintf(sb, "Suggestions:\n") fmt.Fprintf(sb, "Suggestions:\n")
fmt.Fprintf(sb, " * validate cluster: kops validate cluster --wait 10m\n") fmt.Fprintf(sb, " * validate cluster: kops validate cluster --wait 10m\n")
fmt.Fprintf(sb, " * list nodes: kubectl get nodes --show-labels\n") fmt.Fprintf(sb, " * list nodes: kubectl get nodes --show-labels\n")
if !usesBastion(instanceGroups) { if !usesBastion(applyCmd.InstanceGroups) {
fmt.Fprintf(sb, " * ssh to the master: ssh -i ~/.ssh/id_rsa ubuntu@%s\n", cluster.Spec.MasterPublicName) fmt.Fprintf(sb, " * ssh to the master: ssh -i ~/.ssh/id_rsa ubuntu@%s\n", cluster.Spec.MasterPublicName)
} else { } else {
bastionPublicName := findBastionPublicName(cluster) bastionPublicName := findBastionPublicName(cluster)

13
upup/pkg/fi/cloudup/apply_cluster.go
View File

@ -155,6 +155,19 @@ func (c *ApplyClusterCmd) Run(ctx context.Context) error {
c.InstanceGroups = instanceGroups c.InstanceGroups = instanceGroups
} }
for _, ig := range c.InstanceGroups {
// Try to guess the path for additional third party volume plugins in Flatcar
image := strings.ToLower(ig.Spec.Image)
if strings.Contains(image, "flatcar") {
if c.Cluster.Spec.Kubelet == nil {
c.Cluster.Spec.Kubelet = &kops.KubeletConfigSpec{}
}
if c.Cluster.Spec.Kubelet.VolumePluginDirectory == "" {
c.Cluster.Spec.Kubelet.VolumePluginDirectory = "/var/lib/kubelet/volumeplugins/"
}
}
}
if c.Models == nil { if c.Models == nil {
c.Models = CloudupModels c.Models = CloudupModels
} }