d8dfun/virtual-kubelet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Use a hash of the subnetID instead of virtual node name to avoid conflict

Browse Source
This commit is contained in:
robbiezhang
2018-10-16 20:31:39 +00:00
parent c193fbe3c0
commit 10cf53cc9c
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
providers/azure/aci.go
View File

@@ -368,7 +368,9 @@ func (p *ACIProvider) setupNetworkProfile(auth *client.Authentication) error {
} }
} }
profile, err := c.GetProfile(p.resourceGroup, p.nodeName) networkProfileName := getNetworkProfileName(*subnet.ID)
profile, err := c.GetProfile(p.resourceGroup, networkProfileName)
if err != nil && !network.IsNotFound(err) { if err != nil && !network.IsNotFound(err) {
return fmt.Errorf("error while looking up network profile: %v", err) return fmt.Errorf("error while looking up network profile: %v", err)
} }
@@ -384,7 +386,7 @@ func (p *ACIProvider) setupNetworkProfile(auth *client.Authentication) error {
} }
// at this point, profile should be nil // at this point, profile should be nil
profile = network.NewNetworkProfile(p.nodeName, p.region, *subnet.ID) profile = network.NewNetworkProfile(networkProfileName, p.region, *subnet.ID)
profile, err = c.CreateOrUpdateProfile(p.resourceGroup, profile) profile, err = c.CreateOrUpdateProfile(p.resourceGroup, profile)
if err != nil { if err != nil {
return err return err
@@ -394,6 +396,13 @@ func (p *ACIProvider) setupNetworkProfile(auth *client.Authentication) error {
return nil return nil
} }
func getNetworkProfileName(subnetID string) string {
h := sha256.New()
h.Write([]byte(strings.ToUpper(subnetID)))
hashBytes := h.Sum(nil)
return fmt.Sprintf("vk-%s", hex.EncodeToString(hashBytes))
}
func getKubeProxyExtension(secretPath, masterURI, clusterCIDR string) (*aci.Extension, error) { func getKubeProxyExtension(secretPath, masterURI, clusterCIDR string) (*aci.Extension, error) {
ca, err := ioutil.ReadFile(secretPath + "/ca.crt") ca, err := ioutil.ReadFile(secretPath + "/ca.crt")
if err != nil { if err != nil {