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

Merge pull request #3478 from chrislovecnm/using-same-disk-size-gce 

Automatic merge from submit-queue.

using same disk sizes for gce

Using the same disk size for gce and aws.  We need to override the disk sizes in the e2e tests, but that is another PR.

Closes: https://github.com/kubernetes/kops/issues/3294
This commit is contained in:
Kubernetes Submit Queue 2017-09-30 16:01:38 -07:00 committed by GitHub
parent 0b97571545 892ff7a6b7
commit eb110f5b6c
5 changed files with 62 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hack/.packages
View File

@ -69,6 +69,7 @@ k8s.io/kops/pkg/kubemanifest
k8s.io/kops/pkg/model
k8s.io/kops/pkg/model/awsmodel
k8s.io/kops/pkg/model/components
k8s.io/kops/pkg/model/defaults
k8s.io/kops/pkg/model/gcemodel
k8s.io/kops/pkg/model/iam
k8s.io/kops/pkg/model/resources

25
pkg/model/awsmodel/autoscalinggroup.go
View File

@ -23,16 +23,14 @@ import (
"k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/pkg/model"
"k8s.io/kops/pkg/model/defaults"
"k8s.io/kops/upup/pkg/fi"
"k8s.io/kops/upup/pkg/fi/cloudup/awstasks"
)
const (
DefaultVolumeSizeNode = 128
DefaultVolumeSizeMaster = 64
DefaultVolumeSizeBastion = 32
DefaultVolumeType = "gp2"
DefaultVolumeIops = 100
DefaultVolumeType = "gp2"
DefaultVolumeIops = 100
)
// AutoscalingGroupModelBuilder configures AutoscalingGroup objects
@ -52,18 +50,9 @@ func (b *AutoscalingGroupModelBuilder) Build(c *fi.ModelBuilderContext) error {
// LaunchConfiguration
var launchConfiguration *awstasks.LaunchConfiguration
{
volumeSize := fi.Int32Value(ig.Spec.RootVolumeSize)
if volumeSize == 0 {
switch ig.Spec.Role {
case kops.InstanceGroupRoleMaster:
volumeSize = DefaultVolumeSizeMaster
case kops.InstanceGroupRoleNode:
volumeSize = DefaultVolumeSizeNode
case kops.InstanceGroupRoleBastion:
volumeSize = DefaultVolumeSizeBastion
default:
return fmt.Errorf("this case should not get hit, kops.Role not found %s", ig.Spec.Role)
}
volumeSize, err := defaults.FindDefaultVolumeSize(fi.Int32Value(ig.Spec.RootVolumeSize), ig.Spec.Role)
if err != nil {
return fmt.Errorf("this case should not get hit, kops.Role not found %s", ig.Spec.Role)
}
volumeType := fi.StringValue(ig.Spec.RootVolumeType)
volumeIops := fi.Int32Value(ig.Spec.RootVolumeIops)
@ -113,8 +102,6 @@ func (b *AutoscalingGroupModelBuilder) Build(c *fi.ModelBuilderContext) error {
t.SecurityGroups = append(t.SecurityGroups, sgTask)
}
var err error
if t.SSHKey, err = b.LinkToSSHKey(); err != nil {
return err
}

47
pkg/model/defaults/volumes.go Normal file
View File

@ -0,0 +1,47 @@
/*
Copyright 2016 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package defaults
import (
"fmt"
"k8s.io/kops/pkg/apis/kops"
)
const (
DefaultVolumeSizeNode = 128
DefaultVolumeSizeMaster = 64
DefaultVolumeSizeBastion = 32
)
// FindDefaultVolumeSize returns the default volume size based on role.
func FindDefaultVolumeSize(volumeSize int32, role kops.InstanceGroupRole) (int32, error) {
if volumeSize == 0 {
switch role {
case kops.InstanceGroupRoleMaster:
volumeSize = DefaultVolumeSizeMaster
case kops.InstanceGroupRoleNode:
volumeSize = DefaultVolumeSizeNode
case kops.InstanceGroupRoleBastion:
volumeSize = DefaultVolumeSizeBastion
default:
return -1, fmt.Errorf("this case should not get hit, kops.Role not found %s", role)
}
}
return volumeSize, nil
}

7
pkg/model/gcemodel/autoscalinggroup.go
View File

@ -22,12 +22,12 @@ import (
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/pkg/model"
"k8s.io/kops/pkg/model/defaults"
"k8s.io/kops/upup/pkg/fi"
"k8s.io/kops/upup/pkg/fi/cloudup/gcetasks"
)
const (
DefaultVolumeSize = 100
DefaultVolumeType = "pd-standard"
)
@ -54,8 +54,9 @@ func (b *AutoscalingGroupModelBuilder) Build(c *fi.ModelBuilderContext) error {
var instanceTemplate *gcetasks.InstanceTemplate
{
volumeSize := fi.Int32Value(ig.Spec.RootVolumeSize)
if volumeSize == 0 {
volumeSize = DefaultVolumeSize
volumeSize, err := defaults.FindDefaultVolumeSize(fi.Int32Value(ig.Spec.RootVolumeSize), ig.Spec.Role)
if err != nil {
return fmt.Errorf("this case should not get hit, kops.Role not found %s", ig.Spec.Role)
}
volumeType := fi.StringValue(ig.Spec.RootVolumeType)
if volumeType == "" {

8
tests/integration/ha_gce/kubernetes.tf
View File

@ -343,7 +343,7 @@ resource "google_compute_instance_template" "master-us-test1-a-ha-gce-example-co
source_image = "https://www.googleapis.com/compute/v1/projects/cos-cloud/global/images/cos-stable-57-9202-64-0"
mode = "READ_WRITE"
disk_type = "pd-standard"
disk_size_gb = 100
disk_size_gb = 64
}
network_interface = {
@ -382,7 +382,7 @@ resource "google_compute_instance_template" "master-us-test1-b-ha-gce-example-co
source_image = "https://www.googleapis.com/compute/v1/projects/cos-cloud/global/images/cos-stable-57-9202-64-0"
mode = "READ_WRITE"
disk_type = "pd-standard"
disk_size_gb = 100
disk_size_gb = 64
}
network_interface = {
@ -421,7 +421,7 @@ resource "google_compute_instance_template" "master-us-test1-c-ha-gce-example-co
source_image = "https://www.googleapis.com/compute/v1/projects/cos-cloud/global/images/cos-stable-57-9202-64-0"
mode = "READ_WRITE"
disk_type = "pd-standard"
disk_size_gb = 100
disk_size_gb = 64
}
network_interface = {
@ -460,7 +460,7 @@ resource "google_compute_instance_template" "nodes-ha-gce-example-com" {
source_image = "https://www.googleapis.com/compute/v1/projects/cos-cloud/global/images/cos-stable-57-9202-64-0"
mode = "READ_WRITE"
disk_type = "pd-standard"
disk_size_gb = 100
disk_size_gb = 128
}
network_interface = {