Merge branch 'main' into kubernetes-1.31

Author: jfbus

.github/workflows/build.yml

@@ -1,6 +1,9 @@
 name: Build
 
 on:
+  push:
+    branches:
+      - kubernetes-*
   pull_request:
     branches:
       - main
@@ -14,8 +17,6 @@ on:
       - "deploy/**"
       - "!tests/**"
   workflow_dispatch:
-  schedule:
-    - cron: "28 17 * * 0"
 
 permissions:
   contents: read

.github/workflows/e2e_test.yml

@@ -1,6 +1,9 @@
 name: e2e_test
 
 on:
+  push:
+    branches:
+      - kubernetes-*
   pull_request:
     branches:
       - main

cloud-controller-manager/osc/cloud/cloud.go

@@ -27,6 +27,9 @@ func New(ctx context.Context, clusterID string) (*Cloud, error) {
 	if err != nil {
 		return nil, fmt.Errorf("init cloud: %w", err)
 	}
+	if err := api.OAPI().CheckCredentials(ctx); err != nil {
+		return nil, fmt.Errorf("init cloud: %w", err)
+	}
 	c := &Cloud{api: api, Metadata: metadata, clusterID: clusterID}
 
 	id := c.Metadata.InstanceID

cloud-controller-manager/osc/oapi/interfaces.go

@@ -27,6 +27,8 @@ import (
 
 // OAPI is the interface for OAPI calls.
 type OAPI interface {
+	CheckCredentials(ctx context.Context) error
+
 	ReadVms(ctx context.Context, req osc.ReadVmsRequest) ([]osc.Vm, error)
 
 	ReadLoadBalancers(ctx context.Context, req osc.ReadLoadBalancersRequest) ([]osc.LoadBalancer, error)

cloud-controller-manager/osc/oapi/mocks/mock_oapi.go

@@ -18,8 +18,13 @@ package oapi
 
 import (
 	"context"
+	"errors"
+	"fmt"
+	"net/http"
+	"slices"
 
 	osc "github.com/outscale/osc-sdk-go/v2"
+	"k8s.io/klog/v2"
 )
 
 const (
@@ -30,6 +35,36 @@ func (c *OscClient) APIClient() *osc.APIClient {
 	return c.api
 }
 
+var (
+	authErrorCodes        = []string{"1", "5", "7", "14", "20", "4120"}
+	ErrInvalidCredentials = errors.New("authentication error (invalid credentials ?)")
+)
+
+func (c *OscClient) CheckCredentials(ctx context.Context) error {
+	logger := klog.FromContext(ctx)
+	req := osc.ReadVmsRequest{}
+	logger.V(4).Info("Check credentials", "OAPI", "ReadVms")
+	_, httpRes, err := c.api.VmApi.ReadVms(c.WithAuth(ctx)).ReadVmsRequest(req).Execute()
+	switch {
+	case err == nil || httpRes.StatusCode == http.StatusTooManyRequests:
+		return nil
+	case httpRes == nil:
+		logger.V(3).Error(err, "OAPI error", "OAPI", "ReadVms")
+		return fmt.Errorf("check credentials: %w", err)
+	default:
+		logger.V(3).Info(fmt.Sprintf("OAPI error response: %+v", err), "OAPI", "ReadVms", "http_status", httpRes.Status)
+		var oapiErr osc.GenericOpenAPIError
+		if errors.As(err, &oapiErr) {
+			if errs, ok := oapiErr.Model().(osc.ErrorResponse); ok && len(errs.GetErrors()) > 0 {
+				if slices.Contains(authErrorCodes, errs.GetErrors()[0].GetCode()) {
+					err = ErrInvalidCredentials
+				}
+			}
+		}
+		return fmt.Errorf("check credentials: %w", err)
+	}
+}
+
 func (c *OscClient) ReadVms(ctx context.Context, req osc.ReadVmsRequest) ([]osc.Vm, error) {
 	resp, httpRes, err := c.api.VmApi.ReadVms(c.WithAuth(ctx)).ReadVmsRequest(req).Execute()
 	err = logAndExtractError(ctx, "ReadVms", req, httpRes, err)

cloud-controller-manager/osc/oapi/oapi.go

@@ -0,0 +1,19 @@
+package oapi_test
+
+import (
+	"testing"
+
+	"github.com/outscale/cloud-provider-osc/cloud-controller-manager/osc/oapi"
+	"github.com/stretchr/testify/require"
+)
+
+func TestCheckCredentials(t *testing.T) {
+	t.Run("Invalid credentials are rejected with an error", func(t *testing.T) {
+		t.Setenv("OSC_ACCESS_KEY", "foo")
+		t.Setenv("OSC_SECRET_KEY", "bar")
+		api, err := oapi.NewClient("eu-west-2")
+		require.NoError(t, err)
+		err = api.OAPI().CheckCredentials(t.Context())
+		require.ErrorIs(t, err, oapi.ErrInvalidCredentials)
+	})
+}

cloud-controller-manager/osc/oapi/oapi_test.go

@@ -109,20 +109,47 @@ make build-image image-tag image-push helm_deploy test-e2e
 
 # Release
 
-1.  Update [CHANGELOG.md](CHANGELOG.md)
-2.  Update chart version (if needed) in [Chart.yaml](../deploy/k8s-osc-ccm/Chart.yaml)
-3.  Update cloud-provider-osc version in [values.yaml](../deploy/k8s-osc-ccm/values.yaml)
-4.  Update prerequisites section in [deploy/README.md](../deploy/README.md)
-5.  Generate helm doc `make helm-docs`
-6.  Update [deploy/osc-ccm-manifest.yml](../deploy/osc-ccm-manifest.yml) `make helm-manifest`
-7.  Commit version with `git commit -am "cloud-controller-manager vX.Y.Z"`
-8.  Create PR and merge it to main
-9. Tag the release
+## Helm release
+
+1. In [CHANGELOG.md](CHANGELOG.md), add a new vX.Y.Z-helm version
+2. Update chart version (if needed) in [Chart.yaml](../deploy/k8s-osc-ccm/Chart.yaml)
+3. Update cloud-provider-osc version in [values.yaml](../deploy/k8s-osc-ccm/values.yaml) (listing all active container versions)
+4. Generate helm doc `make helm-docs`
+5. Update manifests `make helm-manifest`
+6. Commit version with `git commit -am "cloud-controller-manager vX.Y.Z"`
+7. Create PR and merge it to main
+8. Tag & push the release
 ```shell
-git tag -a vX.X.X -m "🔖 Release vX.X.X"
+export HELM_VERSION=vX.Y.Z-helm
+git tag -a $HELM_VERSION -m "🔖 Helm $HELM_VERSION"
+git push origin $HELM_VERSION
 ```
-10. Push the tag
+11. Publish the release on Github
+
+## Container release
+
+There must be a release for each active Kubernetes release.
+Each Kubernetes release has its own release branch (kubernetes-1.31, kubernetes-1.32, kubernetes-1.33, kubernetes-1.34)
+
+Versioning is vX.Y.Z, where X.Y are the major/minor version numbers of each Kubernetes release.
+Z is the version of the CCM, is increased at each release, and is the same for every Kubernetes release branch.
+
+1. In [CHANGELOG.md](CHANGELOG.md), add a new version for every release branch
+2. In [README.md](README.md), update the recommended version for each Kubernetes release
+3. Create PR and merge it to main
+4. Merge main into each release branch
 ```shell
-git push origin vX.X.X
+git co kubernetes-X.Y
+git merge main
+git push origin kubernetes-X.Y
 ```
-11. Publish the release on Github
+5. Check that CI is OK on every release branch
+6. Tag release for each release branch
+```shell
+git co kubernetes-X.Y
+git pull --rebase
+export VERSION=vX.Y.Z
+git tag -a $VERSION -m "🔖 CCM $VERSION"
+git push origin $VERSION
+```
+7. Publish the releases on Github