Skip to content

Commit

Permalink
fix: azure providerID
Browse files Browse the repository at this point in the history
Set resourceGroup name to low case.
It helps azure-node-autoscaller to find the node.

Signed-off-by: Serge Logvinov <[email protected]>
  • Loading branch information
sergelogvinov committed Nov 16, 2023
1 parent eff652f commit 5d41626
Show file tree
Hide file tree
Showing 5 changed files with 62 additions and 2 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/build-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ jobs:
version: v1.55.2
args: --config=.golangci.yml
- name: Build
run: make build
timeout-minutes: 10
run: make images
env:
PLATFORM: "linux/amd64"
- name: Test
run: make unit
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# syntax = docker/dockerfile:1.4
########################################

FROM --platform=${BUILDPLATFORM} golang:1.20-alpine AS builder
FROM --platform=${BUILDPLATFORM} golang:1.21-alpine AS builder
RUN apk update && apk add --no-cache make
WORKDIR /src

Expand Down
5 changes: 5 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,11 @@ help: ## This help menu.
build-all-archs:
@for arch in $(ARCHS); do $(MAKE) ARCH=$${arch} build ; done

.PHONY: clean
clean: ## Clean
rm -rf dist/
rm -f talos-cloud-controller-manager-*

.PHONY: build
build: ## Build
CGO_ENABLED=0 GOOS=$(OS) GOARCH=$(ARCH) go build -ldflags "$(GO_LDFLAGS)" \
Expand Down
10 changes: 10 additions & 0 deletions pkg/talos/instances.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import (
"fmt"
"strings"

"github.com/siderolabs/talos-cloud-controller-manager/pkg/utils/platform"

v1 "k8s.io/api/core/v1"
cloudprovider "k8s.io/cloud-provider"
cloudproviderapi "k8s.io/cloud-provider/api"
Expand Down Expand Up @@ -56,6 +58,14 @@ func (i *instances) InstanceMetadata(ctx context.Context, node *v1.Node) (*cloud
providerID = fmt.Sprintf("%s://%s/%s", ProviderName, meta.Platform, providedIP)
}

// Fix for Azure, resource group name must be lower case.
if meta.Platform == "azure" {
providerID, err = platform.AzureConvertResourceGroupNameToLower(providerID)
if err != nil {
return nil, fmt.Errorf("error converting resource group name to lower case: %w", err)
}
}

ifaces, err := i.c.getNodeIfaces(ctx, providedIP)
if err != nil {
return nil, fmt.Errorf("error getting interfaces list from the node %s: %w", node.Name, err)
Expand Down
42 changes: 42 additions & 0 deletions pkg/utils/platform/azure.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
/*
Copyright 2017 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 platform includes platform specific functions.
package platform

import (
"fmt"
"regexp"
"strings"
)

// https://github.com/kubernetes-sigs/cloud-provider-azure/blob/4192b264611aebef8070505dd56680a862acfbbf/pkg/provider/azure_wrap.go#L37
var (
azureResourceGroupNameRE = regexp.MustCompile(`.*/subscriptions/(?:.*)/resourceGroups/(.+)/providers/(?:.*)`)
)

// AzureConvertResourceGroupNameToLower converts the resource group name in the resource ID to be lowered.
// https://github.com/kubernetes-sigs/cloud-provider-azure/blob/4192b264611aebef8070505dd56680a862acfbbf/pkg/provider/azure_wrap.go#L91
func AzureConvertResourceGroupNameToLower(resourceID string) (string, error) {
matches := azureResourceGroupNameRE.FindStringSubmatch(resourceID)
if len(matches) != 2 {
return "", fmt.Errorf("%q isn't in Azure resource ID format %q", resourceID, azureResourceGroupNameRE.String())
}

resourceGroup := matches[1]

return strings.Replace(resourceID, resourceGroup, strings.ToLower(resourceGroup), 1), nil
}

0 comments on commit 5d41626

Please sign in to comment.