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

Merge pull request #3030 from chrislovecnm/code-cleanup 

Automatic merge from submit-queue

removing dead code

This has been bugging me for a bit.
This commit is contained in:
Kubernetes Submit Queue 2017-07-22 20:19:43 -07:00 committed by GitHub
parent 89dd78bee9 c5581d7b90
commit e8d2aa3d64
1 changed files with 0 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -677,24 +677,6 @@ func (c *ApplyClusterCmd) Run() error {
return fmt.Errorf("unknown cloudprovider %q", cluster.Spec.CloudProvider) return fmt.Errorf("unknown cloudprovider %q", cluster.Spec.CloudProvider)
} }
//// TotalNodeCount computes the total count of nodes
//l.TemplateFunctions["TotalNodeCount"] = func() (int, error) {
// count := 0
// for _, group := range c.InstanceGroups {
// if group.IsMaster() {
// continue
// }
// if group.Spec.MaxSize != nil {
// count += *group.Spec.MaxSize
// } else if group.Spec.MinSize != nil {
// count += *group.Spec.MinSize
// } else {
// // Guestimate
// count += 5
// }
// }
// return count, nil
//}
l.TemplateFunctions["Masters"] = tf.modelContext.MasterInstanceGroups l.TemplateFunctions["Masters"] = tf.modelContext.MasterInstanceGroups
tf.AddTo(l.TemplateFunctions) tf.AddTo(l.TemplateFunctions)
@ -827,11 +809,6 @@ func findHash(url string) (*hashing.Hash, error) {
// upgradeSpecs ensures that fields are fully populated / defaulted // upgradeSpecs ensures that fields are fully populated / defaulted
func (c *ApplyClusterCmd) upgradeSpecs(assetBuilder *assets.AssetBuilder) error { func (c *ApplyClusterCmd) upgradeSpecs(assetBuilder *assets.AssetBuilder) error {
//err := c.Cluster.PerformAssignments()
//if err != nil {
// return fmt.Errorf("error populating configuration: %v", err)
//}
fullCluster, err := PopulateClusterSpec(c.Cluster, assetBuilder) fullCluster, err := PopulateClusterSpec(c.Cluster, assetBuilder)
if err != nil { if err != nil {
return err return err