Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove code for unsupported Kubernetes version #9134

Merged
merged 1 commit into from
May 17, 2020
Merged

Remove code for unsupported Kubernetes version #9134

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 6 additions & 25 deletions nodeup/pkg/model/cloudconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import (
"strings"

"k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/pkg/apis/kops/util"
"k8s.io/kops/pkg/try"
"k8s.io/kops/upup/pkg/fi"
"k8s.io/kops/upup/pkg/fi/nodeup/nodetasks"
Expand All @@ -32,9 +31,6 @@ import (
const (
CloudConfigFilePath = "/etc/kubernetes/cloud.config"

// Required for vSphere CloudProvider
MinimumVersionForVMUUID = "1.5.3"

// VM UUID is set by cloud-init
VM_UUID_FILE_PATH = "/etc/vmware/vm_uuid"
)
Expand Down Expand Up @@ -179,31 +175,16 @@ func (b *CloudConfigBuilder) Build(c *fi.ModelBuilderContext) error {
// We need this for vSphere CloudProvider
// getVMUUID gets instance uuid of the VM from the file written by cloud-init
func getVMUUID(kubernetesVersion string) (string, error) {

actualKubernetesVersion, err := util.ParseKubernetesVersion(kubernetesVersion)
if err != nil {
return "", err
}
minimumVersionForUUID, err := util.ParseKubernetesVersion(MinimumVersionForVMUUID)
file, err := os.Open(VM_UUID_FILE_PATH)
if err != nil {
return "", err
}

// VM UUID is required only for Kubernetes version greater than 1.5.3
if actualKubernetesVersion.GTE(*minimumVersionForUUID) {
file, err := os.Open(VM_UUID_FILE_PATH)
if err != nil {
return "", err
}
defer try.CloseFile(file)

defer try.CloseFile(file)

VMUUID, err := bufio.NewReader(file).ReadString('\n')
if err != nil {
return "", err
}
return VMUUID, err
VMUUID, err := bufio.NewReader(file).ReadString('\n')
if err != nil {
return "", err
}

return "", err
return VMUUID, err
}