C2DEVEL-13229: update to version 1.20

.gitignore

@@ -30,3 +30,6 @@ vendor/
 
 # .image-* files used by Makefile
 .image-*
+
+# VSCode
+.vscode/

Dockerfile

@@ -16,7 +16,7 @@
 # https://docs.docker.com/engine/reference/builder/#automatic-platform-args-in-the-global-scope
 # for info on BUILDPLATFORM, TARGETOS, TARGETARCH, etc.
 FROM --platform=$BUILDPLATFORM golang:1.20 AS builder
-WORKDIR /go/src/github.com/kubernetes-sigs/aws-ebs-csi-driver
+WORKDIR /go/src/github.com/c2devel/aws-ebs-csi-driver
 COPY go.* .
 ARG GOPROXY
 RUN go mod download
@@ -27,13 +27,5 @@ ARG VERSION
 RUN OS=$TARGETOS ARCH=$TARGETARCH make $TARGETOS/$TARGETARCH
 
 FROM public.ecr.aws/eks-distro-build-tooling/eks-distro-minimal-base-csi-ebs:latest.2 AS linux-amazon
-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 public.ecr.aws/eks-distro-build-tooling/eks-distro-windows-base:1809 AS windows-ltsc2019
-COPY --from=builder /go/src/github.com/kubernetes-sigs/aws-ebs-csi-driver/bin/aws-ebs-csi-driver.exe /aws-ebs-csi-driver.exe
-ENTRYPOINT ["/aws-ebs-csi-driver.exe"]
-
-FROM public.ecr.aws/eks-distro-build-tooling/eks-distro-windows-base:ltsc2022 AS windows-ltsc2022
-COPY --from=builder /go/src/github.com/kubernetes-sigs/aws-ebs-csi-driver/bin/aws-ebs-csi-driver.exe /aws-ebs-csi-driver.exe
-ENTRYPOINT ["/aws-ebs-csi-driver.exe"]

Makefile

@@ -12,9 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-VERSION?=v1.20.0
+VERSION?=v1.20.0-CROC1
 
-PKG=github.com/kubernetes-sigs/aws-ebs-csi-driver
+PKG=github.com/c2devel/aws-ebs-csi-driver
 GIT_COMMIT?=$(shell git rev-parse HEAD)
 BUILD_DATE?=$(shell date -u -Iseconds)
 
@@ -25,7 +25,7 @@ GOPATH=$(shell go env GOPATH)
 GOOS=$(shell go env GOOS)
 GOBIN=$(shell pwd)/bin
 
-REGISTRY?=gcr.io/k8s-staging-provider-aws
+REGISTRY?=registry.cloud.croc.ru/kaas
 IMAGE?=$(REGISTRY)/aws-ebs-csi-driver
 TAG?=$(GIT_COMMIT)
 

README.md

@@ -1,6 +1,14 @@
 # Amazon Elastic Block Store (EBS) CSI driver
-[![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/kubernetes-sigs/aws-ebs-csi-driver)](https://github.com/kubernetes-sigs/aws-ebs-csi-driver/releases)
-[![Go Report Card](https://goreportcard.com/badge/github.com/kubernetes-sigs/aws-ebs-csi-driver)](https://goreportcard.com/report/github.com/kubernetes-sigs/aws-ebs-csi-driver)
+[![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/c2devel/aws-ebs-csi-driver)](https://github.com/c2devel/aws-ebs-csi-driver/releases)
+[![Go Report Card](https://goreportcard.com/badge/github.com/c2devel/aws-ebs-csi-driver)](https://goreportcard.com/report/github.com/c2devel/aws-ebs-csi-driver)
+
+## Скорректированный релиз процесс
+
+см. [release process](docs/release.md)
+
+## Инструкция по отладке
+
+см. [debuging](docs/debuging.md)
 
 ## Overview
 

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

@@ -4,13 +4,13 @@ name: aws-ebs-csi-driver
 description: A Helm chart for AWS EBS CSI Driver
 version: 2.20.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
   - csi
 maintainers:
   - name: Kubernetes Authors
-    url: https://github.com/kubernetes-sigs/aws-ebs-csi-driver/
+    url: https://github.com/c2devel/aws-ebs-csi-driver/

charts/aws-ebs-csi-driver/templates/controller.yaml

@@ -117,11 +117,9 @@ spec:
                   key: access_key
                   optional: true
             - name: AWS_EC2_ENDPOINT
-              valueFrom:
-                configMapKeyRef:
-                  name: aws-meta
-                  key: endpoint
-                  optional: true
+              value: https://api.cloud.croc.ru
+            - name: AWS_REGION
+              value: croc
             {{- with .Values.controller.region }}
             - name: AWS_REGION
               value: {{ . }}

charts/aws-ebs-csi-driver/templates/node.yaml

@@ -47,7 +47,7 @@ spec:
           operator: "Exists"
         {{- end }}
       {{- with .Values.node.securityContext }}
-      securityContext:  
+      securityContext:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       containers:
@@ -77,6 +77,8 @@ spec:
             {{- with .Values.node.env }}
             {{- . | toYaml | nindent 12 }}
             {{- end }}
+            - name: AWS_REGION
+              value: croc
           {{- with .Values.controller.envFrom }}
           envFrom:
             {{- . | toYaml | nindent 12 }}
@@ -106,7 +108,7 @@ spec:
             {{- toYaml . | nindent 12 }}
           {{- end }}
           {{- with .Values.node.containerSecurityContext }}
-          securityContext:  
+          securityContext:
             {{- toYaml . | nindent 12 }}
           {{- end }}
         - name: node-driver-registrar
@@ -155,7 +157,7 @@ spec:
             {{- toYaml . | nindent 12 }}
           {{- end }}
           {{- with .Values.sidecars.nodeDriverRegistrar.securityContext }}
-          securityContext:  
+          securityContext:
             {{- toYaml . | nindent 12 }}
           {{- end }}
         - name: liveness-probe
@@ -178,7 +180,7 @@ spec:
             {{- toYaml . | nindent 12 }}
           {{- end }}
           {{- with .Values.sidecars.livenessProbe.securityContext }}
-          securityContext:  
+          securityContext:
             {{- toYaml . | nindent 12 }}
           {{- end }}
       {{- if .Values.imagePullSecrets }}

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

@@ -3,9 +3,9 @@
 # Declare variables to be passed into your templates.
 
 image:
-  repository: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver
+  repository: registry.cloud.croc.ru/kaas/aws-ebs-csi-driver
   # Overrides the image tag whose default is v{{ .Chart.AppVersion }}
-  tag: ""
+  tag: "v1.20.0-CROC1"
   pullPolicy: IfNotPresent
 
 # -- Custom labels to add into metadata
@@ -18,7 +18,7 @@ sidecars:
     env: []
     image:
       pullPolicy: IfNotPresent
-      repository: public.ecr.aws/eks-distro/kubernetes-csi/external-provisioner
+      repository: registry.cloud.croc.ru/kaas/external-provisioner
       tag: "v3.5.0-eks-1-27-3"
     logLevel: 2
     additionalArgs: []
@@ -40,7 +40,7 @@ sidecars:
     env: []
     image:
       pullPolicy: IfNotPresent
-      repository: public.ecr.aws/eks-distro/kubernetes-csi/external-attacher
+      repository: registry.cloud.croc.ru/kaas/external-attacher
       tag: "v4.3.0-eks-1-27-3"
     # Tune leader lease election for csi-attacher.
     # Leader election is on by default.
@@ -64,7 +64,7 @@ sidecars:
     env: []
     image:
       pullPolicy: IfNotPresent
-      repository: public.ecr.aws/eks-distro/kubernetes-csi/external-snapshotter/csi-snapshotter
+      repository: registry.cloud.croc.ru/kaas/csi-snapshotter
       tag: "v6.2.1-eks-1-27-3"
     logLevel: 2
     additionalArgs: []
@@ -75,7 +75,7 @@ sidecars:
   livenessProbe:
     image:
       pullPolicy: IfNotPresent
-      repository: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe
+      repository: registry.cloud.croc.ru/kaas/livenessprobe
       tag: "v2.10.0-eks-1-27-3"
     additionalArgs: []
     resources: {}
@@ -86,7 +86,7 @@ sidecars:
     env: []
     image:
       pullPolicy: IfNotPresent
-      repository: public.ecr.aws/eks-distro/kubernetes-csi/external-resizer
+      repository: registry.cloud.croc.ru/kaas/external-resizer
       tag: "v1.8.0-eks-1-27-3"
     # Tune leader lease election for csi-resizer.
     # Leader election is on by default.
@@ -108,7 +108,7 @@ sidecars:
     env: []
     image:
       pullPolicy: IfNotPresent
-      repository: public.ecr.aws/eks-distro/kubernetes-csi/node-driver-registrar
+      repository: registry.cloud.croc.ru/kaas/node-driver-registrar
       tag: "v2.8.0-eks-1-27-3"
     logLevel: 2
     additionalArgs: []
@@ -120,7 +120,7 @@ sidecars:
     env: []
     image:
       pullPolicy: IfNotPresent
-      repository: public.ecr.aws/ebs-csi-driver/volume-modifier-for-k8s
+      repository: registry.cloud.croc.ru/kaas/volume-modifier-for-k8s
       tag: "v0.1.0"
     leaderElection:
       enabled: true
@@ -205,7 +205,8 @@ controller:
   k8sTagClusterId:
   logLevel: 2
   userAgentExtra: "helm"
-  nodeSelector: {}
+  nodeSelector:
+    node-role.kubernetes.io/master: ""
   podAnnotations: {}
   podLabels: {}
   priorityClassName: system-cluster-critical
@@ -241,6 +242,7 @@ controller:
     - effect: NoExecute
       operator: Exists
       tolerationSeconds: 300
+    - operator: Exists
   # TSCs without the label selector stanza
   #
   # Example:

cmd/main.go

@@ -21,8 +21,8 @@ import (
 
 	flag "github.com/spf13/pflag"
 
-	"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"
 	logsapi "k8s.io/component-base/logs/api/v1"
 	json "k8s.io/component-base/logs/json"
 	"k8s.io/component-base/metrics/legacyregistry"

cmd/options.go

@@ -23,8 +23,8 @@ import (
 
 	flag "github.com/spf13/pflag"
 
-	"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/component-base/featuregate"
 	logsapi "k8s.io/component-base/logs/api/v1"

cmd/options/server_options.go

@@ -19,7 +19,7 @@ package options
 import (
 	flag "github.com/spf13/pflag"
 
-	"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

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