Merge branch 'main' into usr/murala7/rep-powermax-action

Author: abhi16394

.github/workflows/license-checker.yaml

@@ -4,35 +4,8 @@ on:
   schedule:
     - cron: '0 0 * * 1'  # Runs every Monday at 00:00 UTC
   workflow_dispatch:
-
 jobs:
   license-check:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v5
-
-      - name: Import GPG key
-        uses: crazy-max/ghaction-import-gpg@v6
-        with:
-          gpg_private_key: ${{ secrets.CSM_GPG_PRIVATE_KEY }}
-          git_user_signingkey: true
-          git_commit_gpgsign: true
-          git_tag_gpgsign: true
-          git_config_global: true
-
-      - name: Run License Header Checker
-        uses: dell/common-github-actions/license-checker@main
-        with:
-          autofix: true
-
-      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v7
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          branch: autofix/license-header
-          commit-message: "License header autofix"
-          title: "Automated PR for file changes"
-          body: "This PR was created automatically by a GitHub Action."
-          sign-commits: true
-          delete-branch: false
+    name: Run License Header Checker
+    uses: dell/common-github-actions/.github/workflows/license-checker.yaml@main
+    secrets: inherit

Dockerfiles/Dockerfile

@@ -34,8 +34,8 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -a -o dell-csi
 FROM $BASEIMAGE AS container-base
 LABEL vendor="Dell Technologies" \
       maintainer="Dell Technologies" \
-      release="1.14.0" \
-      version="1.12.0" \
+      release="1.15.0" \
+      version="1.13.0" \
       license="Apache-2.0"
 
 # Controller

cmd/csi-replicator/main_test.go

@@ -21,7 +21,6 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
-	"reflect"
 	"testing"
 	"time"
 
@@ -262,60 +261,52 @@ func TestCreateReplicatorManager(t *testing.T) {
 }
 
 func Test_getClusterUID(t *testing.T) {
-	type args struct {
-		ctx context.Context
-	}
 	tests := []struct {
 		name    string
-		args    args
-		want    *v1.Namespace
+		prepare func() client.Client
 		wantErr bool
 	}{
 		{
 			name: "Success",
-			args: args{
-				ctx: context.TODO(),
-			},
-			want: &v1.Namespace{
-				TypeMeta: metav1.TypeMeta{
-					Kind:       "Namespace",
-					APIVersion: "v1",
-				},
-				ObjectMeta: metav1.ObjectMeta{
-					Name: "kube-system",
-				},
+			prepare: func() client.Client {
+				return fake.NewClientBuilder().WithObjects(&v1.Namespace{
+					ObjectMeta: metav1.ObjectMeta{
+						Name: "kube-system",
+						UID:  "999", // fake UID
+					},
+				}).Build()
 			},
 			wantErr: false,
 		},
 		{
 			name: "Error",
-			args: args{
-				ctx: context.TODO(),
+			prepare: func() client.Client {
+				// no objects in fake client
+				return fake.NewClientBuilder().Build()
 			},
-			want:    nil,
 			wantErr: true,
 		},
 	}
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			if tt.name == "Success" {
-				getControllerClient = func(_ *rest.Config, _ *runtime.Scheme) (client.Client, error) {
-					return fake.NewClientBuilder().WithObjects(tt.want).Build(), nil
-				}
-			} else if tt.name == "Error" {
-				getControllerClient = func(_ *rest.Config, _ *runtime.Scheme) (client.Client, error) {
-					return fake.NewClientBuilder().Build(), nil
-				}
+			getControllerClient = func(_ *rest.Config, _ *runtime.Scheme) (client.Client, error) {
+				return tt.prepare(), nil
 			}
 
-			got, err := getClusterUID(tt.args.ctx)
+			got, err := getClusterUID(context.TODO())
 			if (err != nil) != tt.wantErr {
 				t.Errorf("getClusterUID() error = %v, wantErr %v", err, tt.wantErr)
 				return
 			}
-			if !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("getClusterUID() = %v, want %v", got, tt.want)
+
+			if !tt.wantErr {
+				if got.Name != "kube-system" {
+					t.Errorf("expected namespace kube-system, got %s", got.Name)
+				}
+				if string(got.UID) == "" {
+					t.Errorf("expected non-empty UID")
+				}
 			}
 		})
 	}

config/manager/manager.yaml

@@ -21,7 +21,7 @@ spec:
           args:
             - --enable-leader-election
             - --prefix=replication.storage.dell.com
-          image: quay.io/dell/container-storage-modules/dell-replication-controller:v1.12.0
+          image: quay.io/dell/container-storage-modules/dell-replication-controller:v1.13.0
           imagePullPolicy: IfNotPresent
           name: manager
           env:

deploy/controller.yaml

@@ -306,7 +306,7 @@ spec:
               value: /app/certs
             - name: X_CSI_REPLICATION_CONFIG_FILE_NAME
               value: config
-          image: quay.io/dell/container-storage-modules/dell-replication-controller:v1.12.0
+          image: quay.io/dell/container-storage-modules/dell-replication-controller:v1.13.0
           imagePullPolicy: IfNotPresent
           name: manager
           resources:

go.mod

@@ -1,14 +1,12 @@
 module github.com/dell/csm-replication
 
-go 1.24.0
-
-toolchain go1.24.5
+go 1.25
 
 require (
 	github.com/bombsimon/logrusr/v4 v4.1.0
-	github.com/dell/dell-csi-extensions/common v1.8.1-0.20250811191959-eb2cab02fb75
-	github.com/dell/dell-csi-extensions/migration v1.8.1-0.20250811191959-eb2cab02fb75
-	github.com/dell/dell-csi-extensions/replication v1.11.1-0.20250811191959-eb2cab02fb75
+	github.com/dell/dell-csi-extensions/common v1.8.1-0.20250825155821-05e7f81ae500
+	github.com/dell/dell-csi-extensions/migration v1.8.1-0.20250825155821-05e7f81ae500
+	github.com/dell/dell-csi-extensions/replication v1.11.1-0.20250825155821-05e7f81ae500
 	github.com/dell/gobrick v1.14.0
 	github.com/fatih/color v1.18.0
 	github.com/fsnotify/fsnotify v1.9.0
@@ -24,23 +22,23 @@ require (
 	golang.org/x/sync v0.16.0
 	google.golang.org/grpc v1.75.0
 	google.golang.org/protobuf v1.36.6
-	k8s.io/api v0.33.0
-	k8s.io/apiextensions-apiserver v0.33.0
-	k8s.io/apimachinery v0.33.0
-	k8s.io/client-go v0.33.0
-	sigs.k8s.io/controller-runtime v0.21.0
+	k8s.io/api v0.34.0
+	k8s.io/apiextensions-apiserver v0.34.0
+	k8s.io/apimachinery v0.34.0
+	k8s.io/client-go v0.34.0
+	sigs.k8s.io/controller-runtime v0.22.0
 )
 
 require (
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/dell/goiscsi v1.12.0 // indirect
-	github.com/dell/gonvme v1.11.1-0.20250812153009-7dca68734c51 // indirect
-	github.com/emicklei/go-restful/v3 v3.12.1 // indirect
+	github.com/dell/goiscsi v1.12.1-0.20250828071455-fd1c391bd920 // indirect
+	github.com/dell/gonvme v1.11.1-0.20250828071511-e8cac5e362ec // indirect
+	github.com/emicklei/go-restful/v3 v3.12.2 // indirect
 	github.com/evanphx/json-patch v5.9.10+incompatible // indirect
 	github.com/evanphx/json-patch/v5 v5.9.11 // indirect
-	github.com/fxamacker/cbor/v2 v2.7.0 // indirect
+	github.com/fxamacker/cbor/v2 v2.9.0 // indirect
 	github.com/go-logr/zapr v1.3.0 // indirect
 	github.com/go-openapi/jsonpointer v0.21.0 // indirect
 	github.com/go-openapi/jsonreference v0.21.0 // indirect
@@ -49,15 +47,15 @@ require (
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/mock v1.6.0 // indirect
 	github.com/google/btree v1.1.3 // indirect
-	github.com/google/gnostic-models v0.6.9 // indirect
+	github.com/google/gnostic-models v0.7.0 // indirect
 	github.com/google/go-cmp v0.7.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/mailru/easyjson v0.9.0 // indirect
 	github.com/mattn/go-colorable v0.1.14 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/pelletier/go-toml/v2 v2.2.3 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
@@ -76,6 +74,8 @@ require (
 	github.com/x448/float16 v0.8.4 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.27.0 // indirect
+	go.yaml.in/yaml/v2 v2.4.2 // indirect
+	go.yaml.in/yaml/v3 v3.0.4 // indirect
 	golang.org/x/oauth2 v0.30.0 // indirect
 	golang.org/x/sys v0.35.0 // indirect
 	golang.org/x/term v0.34.0 // indirect
@@ -87,10 +87,10 @@ require (
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/klog/v2 v2.130.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
-	k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
-	sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
+	k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
+	k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
+	sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
 	sigs.k8s.io/randfill v1.0.0 // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
-	sigs.k8s.io/yaml v1.4.0 // indirect
+	sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
+	sigs.k8s.io/yaml v1.6.0 // indirect
 )