Merge pull request #6 from f41gh7/change-topology-zone

changed topology zone
f41gh7 · Jul 9, 2020 · baf033f · baf033f
2 parents ffd1975 + fe3661b
commit baf033f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@ inspired by https://github.com/flant/yandex-csi-driver
  - ensure that kubectl get nodes and vm name at VDC is the same
  - label node for each vdc
  ```bash 
-kubectl label node nod1  topology.kubernetes.io/vcd=some-vdc
+kubectl label node nod1  failure-domain.beta.kubernetes.io/zone=some-vdc
 ```
  - create secret for access cloud - you can find example at deploy/secret.yaml
 ```yaml
@@ -58,7 +58,7 @@ volumeBindingMode: WaitForFirstConsumer
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
               - matchExpressions:
-                  - key: "topology.kubernetes.io/vcd"
+                  - key: "topology.kubernetes.io/zone"
                     operator: In
                     values:
                       - "some-vdc"

diff --git a/cmd/provisioner/main.go b/cmd/provisioner/main.go
@@ -61,6 +61,7 @@ func main() {
 
 	mounter := mount.NewMounter(l)
 	l.Infof("inited client, lets start driver init")
+
 	csiDriver, err := driver.NewCsiDriver(l, c, client, mounter,lock, wg)
 	if err != nil {
 		l.WithError(err).Errorf("cannot create driver")

diff --git a/deploy/ds.yaml b/deploy/ds.yaml
@@ -21,7 +21,7 @@ spec:
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
               - matchExpressions:
-                  - key: "topology.vcd.csi.fght.net/vcd"
+                  - key: "failure-domain.beta.kubernetes.io/zone"
                     operator: In
                     values:
                       - "some-vdc"

diff --git a/internal/driver/disk.go b/internal/driver/disk.go
@@ -49,7 +49,7 @@ const (
 	defaultVolumeSizeInBytes int64 = 5 * giB
 	vcdParam                       = "vcd"
 	storageProfileParam            = "storageProfile"
-	topologyKey                    = "topology.vcd.csi.fght.net/vcd"
+	topologyKey                    = "failure-domain.beta.kubernetes.io/zone"
 
 	pubContextUnit     = "diskUnitNum"
 	pubContextDiskSize = "diskSizeB"