diff --git a/deploy/kubernetes/overlays/stable/k_bundle.yaml b/deploy/kubernetes/overlays/stable/k_bundle.yaml index e7798a73da..523cd48bd4 100644 --- a/deploy/kubernetes/overlays/stable/k_bundle.yaml +++ b/deploy/kubernetes/overlays/stable/k_bundle.yaml @@ -374,7 +374,7 @@ spec: key: access_key name: aws-secret optional: true - image: dhub.c2.croc.ru/kaas/aws-ebs-csi-driver:v1.1.1-CROC4 + image: registry.cloud.croc.ru/kaas/aws-ebs-csi-driver:v1.1.1-CROC4 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -410,7 +410,7 @@ spec: env: - name: ADDRESS value: /var/lib/csi/sockets/pluginproxy/csi.sock - image: dhub.c2.croc.ru/kaas/csi-provisioner:v2.1.1 + image: registry.cloud.croc.ru/kaas/csi-provisioner:v2.1.1 name: csi-provisioner volumeMounts: - mountPath: /var/lib/csi/sockets/pluginproxy/ @@ -422,7 +422,7 @@ spec: env: - name: ADDRESS value: /var/lib/csi/sockets/pluginproxy/csi.sock - image: dhub.c2.croc.ru/kaas/csi-attacher:v3.1.0 + image: registry.cloud.croc.ru/kaas/csi-attacher:v3.1.0 name: csi-attacher volumeMounts: - mountPath: /var/lib/csi/sockets/pluginproxy/ @@ -433,7 +433,7 @@ spec: env: - name: ADDRESS value: /var/lib/csi/sockets/pluginproxy/csi.sock - image: dhub.c2.croc.ru/kaas/csi-snapshotter:v3.0.3 + image: registry.cloud.croc.ru/kaas/csi-snapshotter:v3.0.3 name: csi-snapshotter volumeMounts: - mountPath: /var/lib/csi/sockets/pluginproxy/ @@ -444,7 +444,7 @@ spec: env: - name: ADDRESS value: /var/lib/csi/sockets/pluginproxy/csi.sock - image: dhub.c2.croc.ru/kaas/csi-resizer:v1.0.0 + image: registry.cloud.croc.ru/kaas/csi-resizer:v1.0.0 imagePullPolicy: Always name: csi-resizer volumeMounts: @@ -452,7 +452,7 @@ spec: name: socket-dir - args: - --csi-address=/csi/csi.sock - image: dhub.c2.croc.ru/kaas/livenessprobe:v2.2.0 + image: registry.cloud.croc.ru/kaas/livenessprobe:v2.2.0 name: liveness-probe volumeMounts: - mountPath: /csi @@ -527,7 +527,7 @@ spec: fieldPath: spec.nodeName - name: AWS_REGION value: croc - image: dhub.c2.croc.ru/kaas/aws-ebs-csi-driver:v1.1.1-CROC4 + image: registry.cloud.croc.ru/kaas/aws-ebs-csi-driver:v1.1.1-CROC4 livenessProbe: failureThreshold: 5 httpGet: @@ -560,7 +560,7 @@ spec: value: /csi/csi.sock - name: DRIVER_REG_SOCK_PATH value: /var/lib/kubelet/plugins/ebs.csi.aws.com/csi.sock - image: dhub.c2.croc.ru/kaas/csi-node-driver-registrar:v2.1.0 + image: registry.cloud.croc.ru/kaas/csi-node-driver-registrar:v2.1.0 name: node-driver-registrar volumeMounts: - mountPath: /csi @@ -569,7 +569,7 @@ spec: name: registration-dir - args: - --csi-address=/csi/csi.sock - image: dhub.c2.croc.ru/kaas/livenessprobe:v2.2.0 + image: registry.cloud.croc.ru/kaas/livenessprobe:v2.2.0 name: liveness-probe volumeMounts: - mountPath: /csi diff --git a/docs/RELEASE.md b/docs/RELEASE.md index d191714d41..2e97827682 100644 --- a/docs/RELEASE.md +++ b/docs/RELEASE.md @@ -4,7 +4,7 @@ ```sh # uname -r 5.6.13-100.fc30.x86_64 -# cat /etc/os-release +# cat /etc/os-release NAME=Fedora VERSION="30 (Thirty)" ID=fedora @@ -48,6 +48,6 @@ kustomize build ./deployment/kubernetes/stable/ > ./deployment/kubernetes/stable - находясь в руте репы выполнить: ```docker build -t aws-ebs-csi-driver``` - после успешной сборки протегировать имадж: -```docker tag aws-ebs-csi-driver dhub.c2.croc.ru/kaas/aws-ebs-csi-driver:``` +```docker tag aws-ebs-csi-driver registry.cloud.croc.ru/kaas/aws-ebs-csi-driver:``` - запушить имадж в регистри (необходимы врайт права в регистри неймспейсе): -```docker push dhub.c2.croc.ru/kaas/aws-ebs-csi-driver:``` +```docker push registry.cloud.croc.ru/kaas/aws-ebs-csi-driver:``` diff --git a/pkg/cloud/cloud.go b/pkg/cloud/cloud.go index 4959cfefb5..cb0dfd9f17 100644 --- a/pkg/cloud/cloud.go +++ b/pkg/cloud/cloud.go @@ -427,7 +427,6 @@ func NewCloud(region string, awsSdkDebugLog bool, userAgentExtra string) (Cloud, return newEC2Cloud(region, awsSdkDebugLog, userAgentExtra) } - func newEC2Cloud(region string, awsSdkDebugLog bool, userAgentExtra string) (Cloud, error) { var awsConfig *aws.Config @@ -1422,7 +1421,7 @@ func (c *cloud) ResizeDisk(ctx context.Context, volumeID string, newSizeBytes in return c.checkDesiredSize(ctx, volumeID, newSizeGiB) } -// ResizeDiskC2 resizes an EBS volume in C2 cloud. +// ResizeDiskC2 resizes an EBS volume in C2 cloud. // It returns the volume size after this call or an error if the size couldn't be determined. // // ResizeDiskC2 is an adaptation of ResizeDisk function for C2 cloud. Differences: @@ -1443,7 +1442,7 @@ func (c *cloud) ResizeDiskC2(ctx context.Context, volumeID string, newSizeBytes newSizeGiB := util.RoundUpGiB(newSizeBytes) oldSizeGiB := aws.Int64Value(volume.Size) - // According to CSI spec: if a volume corresponding to the specified volume ID is already larger than + // According to CSI spec: if a volume corresponding to the specified volume ID is already larger than // or equal to the target capacity, the plugin should reply without errors. if oldSizeGiB >= newSizeGiB { klog.V(5).Infof("[Debug] Volume %q current size (%d GiB) is greater or equal to the new size (%d GiB)", volumeID, oldSizeGiB, newSizeGiB) @@ -1452,7 +1451,7 @@ func (c *cloud) ResizeDiskC2(ctx context.Context, volumeID string, newSizeBytes newSizeGiB = oldSizeGiB klog.V(4).Infof("Requested size value changed to current size value (%d GiB)", newSizeGiB) } - + modifyVolumeReq := &ec2.ModifyVolumeInput{ VolumeId: aws.String(volumeID), Size: aws.Int64(newSizeGiB), @@ -1470,14 +1469,14 @@ func (c *cloud) ResizeDiskC2(ctx context.Context, volumeID string, newSizeBytes Steps: volumeModificationWaitSteps, } - var actualSizeGiB int64 + var actualSizeGiB int64 waitErr := wait.ExponentialBackoff(backoff, func() (bool, error) { - + volume, err := c.getVolume(ctx, describeVolumesReq) if err != nil { return true, err } - + oldSizeGiB := aws.Int64Value(volume.Size) if oldSizeGiB >= newSizeGiB { actualSizeGiB = oldSizeGiB diff --git a/pkg/cloud/cloud_test.go b/pkg/cloud/cloud_test.go index 7f249f649f..b4feacac7c 100644 --- a/pkg/cloud/cloud_test.go +++ b/pkg/cloud/cloud_test.go @@ -1803,6 +1803,7 @@ func TestWaitForAttachmentState(t *testing.T) { alreadyAssigned: false, expectError: true, }, + // disabled, for Croc cloud purposes // { // name: "failure: unexpected device", // volumeID: "vol-test-1234", diff --git a/pkg/resizefs/resizefs_windows.go b/pkg/resizefs/resizefs_windows.go index 4a8c0638c5..481758437e 100644 --- a/pkg/resizefs/resizefs_windows.go +++ b/pkg/resizefs/resizefs_windows.go @@ -4,7 +4,7 @@ package resizefs import ( - "github.com/kubernetes-sigs/aws-ebs-csi-driver/pkg/mounter" + "github.com/c2devel/aws-ebs-csi-driver/pkg/mounter" "k8s.io/klog/v2" ) diff --git a/pkg/resizefs/resizefs_windows_test.go b/pkg/resizefs/resizefs_windows_test.go index 088931b922..916a5eac55 100644 --- a/pkg/resizefs/resizefs_windows_test.go +++ b/pkg/resizefs/resizefs_windows_test.go @@ -6,7 +6,7 @@ package resizefs import ( "errors" "github.com/golang/mock/gomock" - "github.com/kubernetes-sigs/aws-ebs-csi-driver/pkg/mounter" + "github.com/c2devel/aws-ebs-csi-driver/pkg/mounter" "testing" ) diff --git a/tests/e2e/driver/driver.go b/tests/e2e/driver/driver.go index b4131904da..7f1cbc0760 100644 --- a/tests/e2e/driver/driver.go +++ b/tests/e2e/driver/driver.go @@ -23,7 +23,7 @@ import ( const ( VolumeSnapshotClassKind = "VolumeSnapshotClass" - SnapshotAPIVersion = "snapshot.storage.k8s.io/v1beta1" + SnapshotAPIVersion = "snapshot.storage.k8s.io/v1" ) type PVTestDriver interface {