Merge branch 'kubernetes-sigs:master' into update-1.34-examples

Author: archups

.github/dependabot.yml

@@ -519,83 +519,6 @@ updates:
         - "patch"
         - "minor"
         - "major"
-  - package-ecosystem: "gomod"
-    directory: "/"
-    open-pull-requests-limit: 1
-    schedule:
-      interval: weekly
-      time: "01:00"
-      timezone: "Asia/Shanghai"
-    labels:
-      - "area/dependency"
-      - "release-note-none"
-      - "ok-to-test"
-      - "kind/cleanup"
-      - "lgtm"
-      - "approved"
-      - "release-1.30"
-    target-branch: "release-1.30"
-    ignore:
-      - dependency-name: "k8s.io/*"
-        versions: [">=0.31.0"]
-      - dependency-name: "go"
-    groups:
-      all:
-        applies-to: version-updates
-        patterns:
-        - "*"
-        update-types:
-        - "patch"
-        - "minor"
-        - "major"
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: weekly
-      time: "01:00"
-      timezone: "Asia/Shanghai"
-    target-branch: "release-1.30"
-    labels:
-      - "area/dependency"
-      - "release-note-none"
-      - "ok-to-test"
-      - "kind/testing"
-      - "lgtm"
-      - "approved"
-      - "release-1.30"
-    groups:
-      all:
-        applies-to: version-updates
-        patterns:
-        - "*"
-        update-types:
-        - "patch"
-        - "minor"
-        - "major"
-  - package-ecosystem: "docker"
-    directory: "/"
-    schedule:
-      interval: "weekly"
-      time: "01:00"
-      timezone: "Asia/Shanghai"
-    target-branch: "release-1.30"
-    labels:
-      - "area/dependency"
-      - "release-note-none"
-      - "ok-to-test"
-      - "kind/cleanup"
-      - "lgtm"
-      - "approved"
-      - "release-1.30"
-    groups:
-      all:
-        applies-to: version-updates
-        patterns:
-        - "*"
-        update-types:
-        - "patch"
-        - "minor"
-        - "major"
   - package-ecosystem: "gomod"
     directory: "/"
     open-pull-requests-limit: 1

.github/workflows/lint-azclient.yaml

@@ -37,9 +37,9 @@ jobs:
           cache-dependency-path: |
             pkg/azclient/go.sum
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@55c2c1448f86e01eaae002a5a3a9624417608d84 # v6.5.2
+        uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8.0.0
         with:
           # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
-          version: v1.64
+          version: v2.5.0
           args: -v
           verify: true

.github/workflows/lint.yaml

@@ -51,10 +51,10 @@ jobs:
           cache-dependency-path: |
             go.sum
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@55c2c1448f86e01eaae002a5a3a9624417608d84 # v6.5.2
+        uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8.0.0
         with:
           # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
-          version: v1.64
+          version: v2.5.0
           args: -v
           install-mode: goinstall
           verify: true

.golangci.yml

@@ -1,47 +1,65 @@
+version: "2"
 run:
-  timeout: 30m
+  modules-download-mode: mod
   tests: true
-  modules-download-mode: vendor
 linters:
-  disable-all: true
+  default: none
   enable:
+    - asasalint
+    - asciicheck
+    - bidichk
     - errcheck
-    - gosimple
-    - govet
-    - ineffassign
-    - staticcheck
-    - unused
+    - errorlint
     - goconst
-    - goimports
-    - revive
     - gosec
+    - govet
+    - ineffassign
+    - loggercheck
     - misspell
     - nakedret
-    - typecheck
+    - revive
+    - staticcheck
     - unconvert
-    - asasalint
-    - asciicheck
-    - bidichk
-    - errorlint
-    - loggercheck
-  fast: false
+    - unused
+  settings:
+    goconst:
+      min-occurrences: 10
+    gosec:
+      excludes:
+        - G114
+        - G115
+    staticcheck:
+      checks:
+        - all
+        - -SA1019
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    rules:
+      - linters:
+          - revive
+        path: tests/e2e
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
 issues:
-  exclude-rules:
-    - path: tests/e2e
-      linters:
-        - revive
   max-issues-per-linter: 0
   max-same-issues: 0
-linters-settings:
-  staticcheck:
-    checks: ["all", "-SA1019"]
-  gosec:
-    excludes:
-      - G114
-      - G115
-  goimports:
-    local-prefixes: sigs.k8s.io/cloud-provider-azure
-  goconst:
-    min-occurrences: 10
-
-  
+formatters:
+  enable:
+    - goimports
+  settings:
+    goimports:
+      local-prefixes:
+        - sigs.k8s.io/cloud-provider-azure
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

Dockerfile

@@ -14,7 +14,7 @@
 
 # syntax=docker/dockerfile:1
 
-FROM --platform=linux/amd64 mcr.microsoft.com/oss/go/microsoft/golang:1.24.8-bookworm@sha256:3b2d4e2a67c649047ffd710a3c65538335a62d5270daebdcbf9e74065fd0690b AS builder
+FROM --platform=linux/amd64 mcr.microsoft.com/oss/go/microsoft/golang:1.24.9-bookworm@sha256:6b997a6bbbe5a4535e7b2d44db929532ed9ea0d936703a4288110b3c97835069 AS builder
 
 ARG ENABLE_GIT_COMMAND=true
 ARG ARCH=amd64

Makefile

@@ -454,7 +454,7 @@ delete-workload-cluster:
 ##@ Tools
 
 LINTER = $(shell pwd)/bin/golangci-lint
-LINTER_VERSION = v1.64.8
+LINTER_VERSION = v2.5.0
 .PHONY: golangci-lint
 golangci-lint:  ## Download golangci-lint locally if necessary.
 	@echo "Installing golangci-lint"

cloud-node-manager.Dockerfile

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM --platform=linux/amd64 mcr.microsoft.com/oss/go/microsoft/golang:1.24.8-bookworm@sha256:3b2d4e2a67c649047ffd710a3c65538335a62d5270daebdcbf9e74065fd0690b AS builder
+FROM --platform=linux/amd64 mcr.microsoft.com/oss/go/microsoft/golang:1.24.9-bookworm@sha256:6b997a6bbbe5a4535e7b2d44db929532ed9ea0d936703a4288110b3c97835069 AS builder
 
 ARG ENABLE_GIT_COMMAND=true
 ARG ARCH=amd64

cmd/acr-credential-provider/main.go

@@ -31,7 +31,6 @@ import (
 	"k8s.io/component-base/logs"
 	"k8s.io/klog/v2"
 
-	"sigs.k8s.io/cloud-provider-azure/pkg/credentialprovider"
 	"sigs.k8s.io/cloud-provider-azure/pkg/version"
 )
 
@@ -46,22 +45,16 @@ func main() {
 		Long:  `The acr credential provider is responsible for providing ACR credentials for kubelet`,
 		Args: func(_ *cobra.Command, args []string) error {
 			if len(args) == 0 {
-				return errors.New("Config file is not specified")
+				return errors.New("config file is not specified")
 			}
 			if len(args) > 1 {
 				return fmt.Errorf("expected exactly one argument (config file); Got arguments: %v", args)
 			}
 			return nil
 		},
 		Version: version.Get().GitVersion,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			acrProvider, err := credentialprovider.NewAcrProviderFromConfig(args[0], RegistryMirrorStr)
-			if err != nil {
-				klog.Errorf("Failed to initialize ACR provider: %v", err)
-				return err
-			}
-
-			if err := NewCredentialProvider(acrProvider).Run(cmd.Context()); err != nil {
+		RunE: func(_ *cobra.Command, args []string) error {
+			if err := NewCredentialProvider(args[0], RegistryMirrorStr).Run(context.TODO()); err != nil {
 				klog.Errorf("Error running acr credential provider: %v", err)
 				return err
 			}

cmd/acr-credential-provider/plugin.go

@@ -44,13 +44,18 @@ func init() {
 
 // ExecPlugin implements the exec-based plugin for fetching credentials that is invoked by the kubelet.
 type ExecPlugin struct {
-	plugin credentialprovider.CredentialProvider
+	configFile        string
+	RegistryMirrorStr string
+	plugin            credentialprovider.CredentialProvider
 }
 
 // NewCredentialProvider returns an instance of execPlugin that fetches
 // credentials based on the provided plugin implementing the CredentialProvider interface.
-func NewCredentialProvider(plugin credentialprovider.CredentialProvider) *ExecPlugin {
-	return &ExecPlugin{plugin}
+func NewCredentialProvider(configFile string, registryMirrorStr string) *ExecPlugin {
+	return &ExecPlugin{
+		configFile:        configFile,
+		RegistryMirrorStr: registryMirrorStr,
+	}
 }
 
 // Run executes the credential provider plugin. Required information for the plugin request (in
@@ -85,6 +90,14 @@ func (e *ExecPlugin) runPlugin(ctx context.Context, r io.Reader, w io.Writer, ar
 		return errors.New("image in plugin request was empty")
 	}
 
+	if e.plugin == nil {
+		// acr provider plugin are decided at runtime by the request information.
+		e.plugin, err = credentialprovider.NewAcrProvider(request, e.RegistryMirrorStr, e.configFile)
+		if err != nil {
+			return err
+		}
+	}
+
 	response, err := e.plugin.GetCredentials(ctx, request.Image, args)
 	if err != nil {
 		return err

cmd/acr-credential-provider/plugin_test.go

@@ -19,6 +19,7 @@ package main
 import (
 	"bytes"
 	"context"
+	"os"
 	"reflect"
 	"testing"
 	"time"
@@ -79,10 +80,25 @@ func Test_runPlugin(t *testing.T) {
 
 	for _, testcase := range testcases {
 		t.Run(testcase.name, func(t *testing.T) {
-			p := NewCredentialProvider(&fakePlugin{})
+			configFile, err := os.CreateTemp(".", "config.json")
+			if err != nil {
+				t.Fatalf("Unexpected error when creating temp file: %v", err)
+			}
+			defer os.Remove(configFile.Name())
 
+			_, err = configFile.WriteString(`
+			{
+				"aadClientId": "foo",
+				"aadClientSecret": "bar"
+			}`)
+			if err != nil {
+				t.Fatalf("Unexpected error when writing to temp file: %v", err)
+			}
+			p := NewCredentialProvider(configFile.Name(), "mcr.microsoft.com:fakeacrname.azurecr.io")
+			p.plugin = &fakePlugin{}
 			out := &bytes.Buffer{}
-			err := p.runPlugin(context.TODO(), testcase.in, out, nil)
+
+			err = p.runPlugin(context.TODO(), testcase.in, out, []string{configFile.Name(), "--registry-mirror=mcr.microsoft.com:fakeacrname.azurecr.io"})
 			if err != nil && !testcase.expectErr {
 				t.Fatal(err)
 			}