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

Merge pull request #8016 from bittopaz/ali-patch-6 

Alicloud: etcd-manager support
This commit is contained in:
Kubernetes Prow Robot 2020-01-28 22:52:14 -08:00 committed by GitHub
parent 1a23444dba d81566482b
commit 044196ac94
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/model/components/etcdmanager/BUILD.bazel
View File

@ -21,6 +21,7 @@ go_library(
"//pkg/urls:go_default_library", "//pkg/urls:go_default_library",
"//pkg/wellknownports:go_default_library", "//pkg/wellknownports:go_default_library",
"//upup/pkg/fi:go_default_library", "//upup/pkg/fi:go_default_library",
"//upup/pkg/fi/cloudup/aliup:go_default_library",
"//upup/pkg/fi/cloudup/awsup:go_default_library", "//upup/pkg/fi/cloudup/awsup:go_default_library",
"//upup/pkg/fi/cloudup/do:go_default_library", "//upup/pkg/fi/cloudup/do:go_default_library",
"//upup/pkg/fi/cloudup/gce:go_default_library", "//upup/pkg/fi/cloudup/gce:go_default_library",

11
pkg/model/components/etcdmanager/model.go
View File

@ -39,6 +39,7 @@ import (
"k8s.io/kops/pkg/model" "k8s.io/kops/pkg/model"
"k8s.io/kops/pkg/wellknownports" "k8s.io/kops/pkg/wellknownports"
"k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi"
"k8s.io/kops/upup/pkg/fi/cloudup/aliup"
"k8s.io/kops/upup/pkg/fi/cloudup/awsup" "k8s.io/kops/upup/pkg/fi/cloudup/awsup"
"k8s.io/kops/upup/pkg/fi/cloudup/do" "k8s.io/kops/upup/pkg/fi/cloudup/do"
"k8s.io/kops/upup/pkg/fi/cloudup/gce" "k8s.io/kops/upup/pkg/fi/cloudup/gce"
@ -376,6 +377,16 @@ func (b *EtcdManagerBuilder) buildPod(etcdCluster *kops.EtcdClusterSpec) (*v1.Po
} }
config.VolumeNameTag = awsup.TagNameEtcdClusterPrefix + etcdCluster.Name config.VolumeNameTag = awsup.TagNameEtcdClusterPrefix + etcdCluster.Name
case kops.CloudProviderALI:
config.VolumeProvider = "alicloud"
config.VolumeTag = []string{
fmt.Sprintf("kubernetes.io/cluster/%s=owned", b.Cluster.Name),
aliup.TagNameEtcdClusterPrefix + etcdCluster.Name,
aliup.TagNameRolePrefix + "master=1",
}
config.VolumeNameTag = aliup.TagNameEtcdClusterPrefix + etcdCluster.Name
case kops.CloudProviderGCE: case kops.CloudProviderGCE:
config.VolumeProvider = "gce" config.VolumeProvider = "gce"

2
pkg/model/master_volumes.go
View File

@ -308,6 +308,8 @@ func (b *MasterVolumeBuilder) addALIVolume(c *fi.ModelBuilderContext, name strin
tags[aliup.TagNameEtcdClusterPrefix+etcd.Name] = m.Name + "/" + strings.Join(allMembers, ",") tags[aliup.TagNameEtcdClusterPrefix+etcd.Name] = m.Name + "/" + strings.Join(allMembers, ",")
// This says "only mount on a master" // This says "only mount on a master"
tags[aliup.TagNameRolePrefix+"master"] = "1" tags[aliup.TagNameRolePrefix+"master"] = "1"
// We always add an owned tags (these can't be shared)
tags["kubernetes.io/cluster/"+b.Cluster.ObjectMeta.Name] = "owned"
encrypted := fi.BoolValue(m.EncryptedVolume) encrypted := fi.BoolValue(m.EncryptedVolume)