♻️ refacto: switch to SDKv3

Author: jfbus

Makefile

@@ -21,7 +21,7 @@ BUILD_ENV := "buildenv/cloud-provider-osc:0.0"
 BUILD_ENV_RUN := "build-cloud-provider-osc"
 DEPLOY_NAME := "k8s-osc-ccm"
 
-SOURCES := $(shell find ./cloud-controller-manager -name '*.go')
+SOURCES := $(shell find ./ccm -name '*.go')
 GOOS ?= $(shell go env GOOS)
 VERSION ?= $(shell git describe --tags --always --dirty)
 LDFLAGS   := "-w -s -X 'github.com/outscale/cloud-provider-osc/cloud-controller-manager/utils.version=$(VERSION)'"
@@ -63,7 +63,7 @@ build: $(SOURCES)
 	CGO_ENABLED=0 GOOS=$(GOOS) go build $(GO_ADD_OPTIONS) \
 		-ldflags $(LDFLAGS) \
 		-o osc-cloud-controller-manager \
-		cloud-controller-manager/cmd/osc-cloud-controller-manager/main.go
+		ccm/cmd/osc-cloud-controller-manager/main.go
 
 .PHONY: verify
 verify: verify-fmt vet
@@ -82,7 +82,7 @@ mock-generate:
 
 .PHONY: test
 test:
-	CGO_ENABLED=0 OSC_ACCESS_KEY=test OSC_SECRET_KEY=test go test -count=1  -v ./cloud-controller-manager/... ./deploy/...
+	CGO_ENABLED=0 OSC_ACCESS_KEY=test OSC_SECRET_KEY=test go test -count=1  -v ./ccm/... ./deploy/...
 
 
 .PHONY: build-image

REUSE.toml

@@ -5,7 +5,7 @@
 version = 1
 
 [[annotations]]
-path = ["*", "cloud-controller-manager/**", "tests/**", ".github/**", "deploy/**"]
+path = ["*", "ccm/**", "tests/**", ".github/**", "deploy/**"]
 SPDX-FileCopyrightText = "2025 Outscale SAS <[email protected]>"
 SPDX-License-Identifier = "BSD-3-Clause"
 

…troller-manager/osc/cloud/annotations.go ccm/cloud/annotations.gocloud-controller-manager/osc/cloud/annotations.go renamed to ccm/cloud/annotations.go cloud-controller-manager/osc/cloud/annotations.go renamed to ccm/cloud/annotations.go

@@ -10,9 +10,10 @@ import (
 	"fmt"
 	"slices"
 
-	"github.com/outscale/cloud-provider-osc/cloud-controller-manager/osc/oapi"
-	"github.com/outscale/cloud-provider-osc/cloud-controller-manager/utils"
-	"github.com/outscale/osc-sdk-go/v2"
+	"github.com/outscale/cloud-provider-osc/ccm/oapi"
+	"github.com/outscale/goutils/k8s/tags"
+	"github.com/outscale/osc-sdk-go/v3/pkg/osc"
+	"github.com/samber/lo"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	clientset "k8s.io/client-go/kubernetes"
 	"k8s.io/klog/v2"
@@ -51,16 +52,16 @@ func New(ctx context.Context, clusterID string) (*Cloud, error) {
 	} else {
 		// primary cluster ID (CAPOSC v1)
 		c.clusterID = []string{self.ClusterID()}
-		if self.SubnetID != "" {
+		if self.SubnetID != nil {
 			// alternate cluster ID (CAPOSC v0)
 			subs, err := api.OAPI().ReadSubnets(ctx, osc.ReadSubnetsRequest{
-				Filters: &osc.FiltersSubnet{SubnetIds: &[]string{self.SubnetID}},
+				Filters: &osc.FiltersSubnet{SubnetIds: &[]string{*self.SubnetID}},
 			})
 			if err != nil {
 				return nil, fmt.Errorf("error finding self subnets: %w", err)
 			}
 			if len(subs) == 1 {
-				clusterID := getClusterIDFromTags(subs[0].GetTags())
+				clusterID := tags.GetClusterID(subs[0].Tags)
 				if clusterID != "" && !slices.Contains(c.clusterID, clusterID) {
 					c.clusterID = append(c.clusterID, clusterID)
 				}
@@ -101,8 +102,8 @@ func (c *Cloud) Initialize(ctx context.Context, kube clientset.Interface) {
 	logger.V(3).Info("Inferred cluster ID: " + string(ns.UID))
 }
 
-func (c *Cloud) sameCluster(tags []osc.ResourceTag) bool {
-	return slices.Contains(c.clusterID, getClusterIDFromTags(tags))
+func (c *Cloud) sameCluster(t []osc.ResourceTag) bool {
+	return slices.Contains(c.clusterID, tags.GetClusterID(t))
 }
 
 func (c *Cloud) mainSGTagKey() string {
@@ -116,11 +117,11 @@ func (c *Cloud) clusterIDTagKey() string {
 	if len(c.clusterID) == 0 {
 		return ""
 	}
-	return clusterIDTagKey(c.clusterID[0])
+	return tags.ClusterIDKey(c.clusterID[0])
 }
 
 func (c *Cloud) clusterIDTagKeys() []string {
-	return utils.Map(c.clusterID, func(c string) (string, bool) {
-		return clusterIDTagKey(c), true
+	return lo.Map(c.clusterID, func(c string, _ int) string {
+		return tags.ClusterIDKey(c)
 	})
 }