Diff between c2 and original

.gitignore

@@ -23,4 +23,7 @@ Vagrantfile
 .idea/
 
 #MacOS system files
-*.DS_Store
+*.DS_Store
+
+# VSCode
+.vscode/

.travis.yml

@@ -1,5 +1,5 @@
 language: go
-go_import_path: github.com/kubernetes-sigs/aws-ebs-csi-driver
+go_import_path: github.com/c2devel/aws-ebs-csi-driver
 dist: xenial
 env:
   global:

Dockerfile

@@ -13,18 +13,18 @@
 # limitations under the License.
 
 FROM golang:1.16 AS builder
-WORKDIR /go/src/github.com/kubernetes-sigs/aws-ebs-csi-driver
+WORKDIR /go/src/github.com/c2devel/aws-ebs-csi-driver
 COPY . .
 RUN make
 
 FROM amazonlinux:2 AS amazonlinux
 RUN yum install ca-certificates e2fsprogs xfsprogs util-linux -y
-COPY --from=builder /go/src/github.com/kubernetes-sigs/aws-ebs-csi-driver/bin/aws-ebs-csi-driver /bin/aws-ebs-csi-driver
+COPY --from=builder /go/src/github.com/c2devel/aws-ebs-csi-driver/bin/aws-ebs-csi-driver /bin/aws-ebs-csi-driver
 
 ENTRYPOINT ["/bin/aws-ebs-csi-driver"]
 
 FROM k8s.gcr.io/build-image/debian-base:v2.1.3 AS debian-base
 RUN clean-install ca-certificates e2fsprogs mount udev util-linux xfsprogs
-COPY --from=builder /go/src/github.com/kubernetes-sigs/aws-ebs-csi-driver/bin/aws-ebs-csi-driver /bin/aws-ebs-csi-driver
+COPY --from=builder /go/src/github.com/c2devel/aws-ebs-csi-driver/bin/aws-ebs-csi-driver /bin/aws-ebs-csi-driver
 
 ENTRYPOINT ["/bin/aws-ebs-csi-driver"]

Makefile

@@ -12,8 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-PKG=github.com/kubernetes-sigs/aws-ebs-csi-driver
-IMAGE?=amazon/aws-ebs-csi-driver
+PKG=github.com/c2devel/aws-ebs-csi-driver
+IMAGE?=dhub.c2.croc.ru/kaas/aws-ebs-csi-driver
 VERSION=v1.1.1
 VERSION_AMAZONLINUX=$(VERSION)-amazonlinux
 GIT_COMMIT?=$(shell git rev-parse HEAD)

charts/aws-ebs-csi-driver/Chart.yaml

@@ -4,9 +4,9 @@ name: aws-ebs-csi-driver
 description: A Helm chart for AWS EBS CSI Driver
 version: 2.0.0
 kubeVersion: ">=1.17.0-0"
-home: https://github.com/kubernetes-sigs/aws-ebs-csi-driver
+home: https://github.com/c2devel/aws-ebs-csi-driver
 sources:
-  - https://github.com/kubernetes-sigs/aws-ebs-csi-driver
+  - https://github.com/c2devel/aws-ebs-csi-driver
 keywords:
   - aws
   - ebs

cmd/main.go

@@ -20,8 +20,8 @@ import (
 	"flag"
 	"net/http"
 
-	"github.com/kubernetes-sigs/aws-ebs-csi-driver/pkg/cloud"
-	"github.com/kubernetes-sigs/aws-ebs-csi-driver/pkg/driver"
+	"github.com/c2devel/aws-ebs-csi-driver/pkg/cloud"
+	"github.com/c2devel/aws-ebs-csi-driver/pkg/driver"
 	"k8s.io/component-base/metrics/legacyregistry"
 
 	"k8s.io/klog"

cmd/options.go

@@ -22,8 +22,8 @@ import (
 	"os"
 	"strings"
 
-	"github.com/kubernetes-sigs/aws-ebs-csi-driver/cmd/options"
-	"github.com/kubernetes-sigs/aws-ebs-csi-driver/pkg/driver"
+	"github.com/c2devel/aws-ebs-csi-driver/cmd/options"
+	"github.com/c2devel/aws-ebs-csi-driver/pkg/driver"
 
 	"k8s.io/klog"
 )

cmd/options/server_options.go

@@ -19,7 +19,7 @@ package options
 import (
 	"flag"
 
-	"github.com/kubernetes-sigs/aws-ebs-csi-driver/pkg/driver"
+	"github.com/c2devel/aws-ebs-csi-driver/pkg/driver"
 )
 
 // ServerOptions contains options and configuration settings for the driver server.

cmd/options_test.go

@@ -23,7 +23,7 @@ import (
 	"strconv"
 	"testing"
 
-	"github.com/kubernetes-sigs/aws-ebs-csi-driver/pkg/driver"
+	"github.com/c2devel/aws-ebs-csi-driver/pkg/driver"
 )
 
 func TestGetOptions(t *testing.T) {

deploy/kubernetes/base/controller.yaml

@@ -31,7 +31,7 @@ spec:
           tolerationSeconds: 300
       containers:
         - name: ebs-plugin
-          image: k8s.gcr.io/provider-aws/aws-ebs-csi-driver:v1.1.1
+          image: dhub.c2.croc.ru/kaas/aws-ebs-csi-driver:latest
           imagePullPolicy: IfNotPresent
           args:
             # - {all,controller,node} # specify the driver mode
@@ -45,6 +45,10 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: spec.nodeName
+            - name: AWS_EC2_ENDPOINT
+              value: https://api.cloud.croc.ru
+            - name: AWS_REGION
+              value: croc
             - name: AWS_ACCESS_KEY_ID
               valueFrom:
                 secretKeyRef:
@@ -81,7 +85,7 @@ spec:
             periodSeconds: 10
             failureThreshold: 5
         - name: csi-provisioner
-          image: k8s.gcr.io/sig-storage/csi-provisioner:v2.1.1
+          image: dhub.c2.croc.ru/kaas/csi-provisioner:v2.1.1
           args:
             - --csi-address=$(ADDRESS)
             - --v=2
@@ -96,7 +100,7 @@ spec:
             - name: socket-dir
               mountPath: /var/lib/csi/sockets/pluginproxy/
         - name: csi-attacher
-          image: k8s.gcr.io/sig-storage/csi-attacher:v3.1.0
+          image: dhub.c2.croc.ru/kaas/csi-attacher:v3.1.0
           args:
             - --csi-address=$(ADDRESS)
             - --v=2
@@ -131,7 +135,7 @@ spec:
             - name: socket-dir
               mountPath: /var/lib/csi/sockets/pluginproxy/
         - name: liveness-probe
-          image: k8s.gcr.io/sig-storage/livenessprobe:v2.2.0
+          image: dhub.c2.croc.ru/kaas/livenessprobe:v2.2.0
           args:
             - --csi-address=/csi/csi.sock
           volumeMounts:

deploy/kubernetes/base/node.yaml

@@ -41,7 +41,7 @@ spec:
         - name: ebs-plugin
           securityContext:
             privileged: true
-          image: k8s.gcr.io/provider-aws/aws-ebs-csi-driver:v1.1.1
+          image: dhub.c2.croc.ru/kaas/aws-ebs-csi-driver:latest
           args:
             - node
             - --endpoint=$(CSI_ENDPOINT)
@@ -54,6 +54,8 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: spec.nodeName
+            - name: AWS_REGION
+              value: croc
           volumeMounts:
             - name: kubelet-dir
               mountPath: /var/lib/kubelet
@@ -75,7 +77,7 @@ spec:
             periodSeconds: 10
             failureThreshold: 5
         - name: node-driver-registrar
-          image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.1.0
+          image: dhub.c2.croc.ru/kaas/csi-node-driver-registrar:v2.1.0
           args:
             - --csi-address=$(ADDRESS)
             - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)
@@ -91,7 +93,7 @@ spec:
             - name: registration-dir
               mountPath: /registration
         - name: liveness-probe
-          image: k8s.gcr.io/sig-storage/livenessprobe:v2.2.0
+          image: dhub.c2.croc.ru/kaas/livenessprobe:v2.2.0
           args:
             - --csi-address=/csi/csi.sock
           volumeMounts: