Skip to content

Commit

Permalink
Change deprecated zone and region label with new labels (#2732)
Browse files Browse the repository at this point in the history 
* Change deprecated zone and region label with new labels

* Use correct topology labels in entire project

This commit makes sure that we are using correct topology labels in other
places of project as well. I have knowingly not changes some places to make
sure that we are able to handle the older label as well.

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
  • Loading branch information
@viveksinghggits @mergify
viveksinghggits and mergify[bot] committed Mar 8, 2024
1 parent 639f6ed commit a4ea10b
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 27 deletions.
40 changes: 20 additions & 20 deletions pkg/blockstorage/zone/zone_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ func (s ZoneSuite) TestNodeZoneAndRegionGCP(c *C) {
node2 := &corev1.Node{
ObjectMeta: metav1.ObjectMeta{
Name: "node2",
Labels: map[string]string{kube.FDRegionLabelName: "us-west2", kube.FDZoneLabelName: "us-west2-b"},
Labels: map[string]string{kube.TopologyRegionLabelName: "us-west2", kube.TopologyZoneLabelName: "us-west2-b"},
},
Status: corev1.NodeStatus{
Conditions: []corev1.NodeCondition{
Expand All @@ -69,7 +69,7 @@ func (s ZoneSuite) TestNodeZoneAndRegionGCP(c *C) {
node3 := &corev1.Node{
ObjectMeta: metav1.ObjectMeta{
Name: "node3",
Labels: map[string]string{kube.FDRegionLabelName: "us-west2", kube.FDZoneLabelName: "us-west2-c"},
Labels: map[string]string{kube.TopologyRegionLabelName: "us-west2", kube.TopologyZoneLabelName: "us-west2-c"},
},
Status: corev1.NodeStatus{
Conditions: []corev1.NodeCondition{
Expand All @@ -84,7 +84,7 @@ func (s ZoneSuite) TestNodeZoneAndRegionGCP(c *C) {
node4 := &corev1.Node{
ObjectMeta: metav1.ObjectMeta{
Name: "node4",
Labels: map[string]string{kube.FDRegionLabelName: "us-west2", kube.FDZoneLabelName: "us-west2-c"},
Labels: map[string]string{kube.TopologyRegionLabelName: "us-west2", kube.TopologyZoneLabelName: "us-west2-c"},
},
Status: corev1.NodeStatus{
Conditions: []corev1.NodeCondition{
Expand All @@ -98,7 +98,7 @@ func (s ZoneSuite) TestNodeZoneAndRegionGCP(c *C) {
node5 := &corev1.Node{
ObjectMeta: metav1.ObjectMeta{
Name: "node5",
Labels: map[string]string{kube.FDRegionLabelName: "us-west2", kube.FDZoneLabelName: "us-west2-c"},
Labels: map[string]string{kube.TopologyRegionLabelName: "us-west2", kube.TopologyZoneLabelName: "us-west2-c"},
},
Spec: corev1.NodeSpec{
Unschedulable: true,
Expand Down Expand Up @@ -132,7 +132,7 @@ func (s ZoneSuite) TestNodeZoneAndRegionEBS(c *C) {
node1 := &corev1.Node{
ObjectMeta: metav1.ObjectMeta{
Name: "node1",
Labels: map[string]string{kube.FDRegionLabelName: "us-west-2", kube.FDZoneLabelName: "us-west-2a"},
Labels: map[string]string{kube.TopologyRegionLabelName: "us-west-2", kube.TopologyZoneLabelName: "us-west-2a"},
},
Status: corev1.NodeStatus{
Conditions: []corev1.NodeCondition{
Expand All @@ -146,7 +146,7 @@ func (s ZoneSuite) TestNodeZoneAndRegionEBS(c *C) {
node2 := &corev1.Node{
ObjectMeta: metav1.ObjectMeta{
Name: "node2",
Labels: map[string]string{kube.FDRegionLabelName: "us-west-2", kube.FDZoneLabelName: "us-west-2b"},
Labels: map[string]string{kube.TopologyRegionLabelName: "us-west-2", kube.TopologyZoneLabelName: "us-west-2b"},
},
Status: corev1.NodeStatus{
Conditions: []corev1.NodeCondition{
Expand All @@ -160,7 +160,7 @@ func (s ZoneSuite) TestNodeZoneAndRegionEBS(c *C) {
node3 := &corev1.Node{
ObjectMeta: metav1.ObjectMeta{
Name: "node3",
Labels: map[string]string{kube.FDRegionLabelName: "us-west-2", kube.FDZoneLabelName: "us-west-2c"},
Labels: map[string]string{kube.TopologyRegionLabelName: "us-west-2", kube.TopologyZoneLabelName: "us-west-2c"},
},
Status: corev1.NodeStatus{
Conditions: []corev1.NodeCondition{
Expand All @@ -175,7 +175,7 @@ func (s ZoneSuite) TestNodeZoneAndRegionEBS(c *C) {
node4 := &corev1.Node{
ObjectMeta: metav1.ObjectMeta{
Name: "node4",
Labels: map[string]string{kube.FDRegionLabelName: "us-west-2", kube.FDZoneLabelName: "us-west-2c"},
Labels: map[string]string{kube.TopologyRegionLabelName: "us-west-2", kube.TopologyZoneLabelName: "us-west-2c"},
},
Status: corev1.NodeStatus{
Conditions: []corev1.NodeCondition{
Expand Down Expand Up @@ -223,7 +223,7 @@ func (s ZoneSuite) TestNodeZoneAndRegionAD(c *C) {
node1 := &corev1.Node{
ObjectMeta: metav1.ObjectMeta{
Name: "node1",
Labels: map[string]string{kube.FDRegionLabelName: "westus2", kube.FDZoneLabelName: "westus2-1"},
Labels: map[string]string{kube.TopologyRegionLabelName: "westus2", kube.TopologyZoneLabelName: "westus2-1"},
},
Status: corev1.NodeStatus{
Conditions: []corev1.NodeCondition{
Expand Down Expand Up @@ -251,7 +251,7 @@ func (s ZoneSuite) TestNodeZoneAndRegionAD(c *C) {
node3 := &corev1.Node{
ObjectMeta: metav1.ObjectMeta{
Name: "node3",
Labels: map[string]string{kube.FDRegionLabelName: "westus2", kube.FDZoneLabelName: "westus2-3"},
Labels: map[string]string{kube.TopologyRegionLabelName: "westus2", kube.TopologyZoneLabelName: "westus2-3"},
},
Status: corev1.NodeStatus{
Conditions: []corev1.NodeCondition{
Expand All @@ -266,7 +266,7 @@ func (s ZoneSuite) TestNodeZoneAndRegionAD(c *C) {
node4 := &corev1.Node{
ObjectMeta: metav1.ObjectMeta{
Name: "node4",
Labels: map[string]string{kube.FDRegionLabelName: "westus", kube.FDZoneLabelName: "0"},
Labels: map[string]string{kube.TopologyRegionLabelName: "westus", kube.TopologyZoneLabelName: "0"},
},
Status: corev1.NodeStatus{
Conditions: []corev1.NodeCondition{
Expand All @@ -281,7 +281,7 @@ func (s ZoneSuite) TestNodeZoneAndRegionAD(c *C) {
node5 := &corev1.Node{
ObjectMeta: metav1.ObjectMeta{
Name: "node5",
Labels: map[string]string{kube.FDRegionLabelName: "us-west2", kube.FDZoneLabelName: "us-west2-4"},
Labels: map[string]string{kube.TopologyRegionLabelName: "us-west2", kube.TopologyZoneLabelName: "us-west2-4"},
},
Status: corev1.NodeStatus{
Conditions: []corev1.NodeCondition{
Expand Down Expand Up @@ -431,7 +431,7 @@ func (s ZoneSuite) TestFromSourceRegionZone(c *C) {
node1 := &corev1.Node{
ObjectMeta: metav1.ObjectMeta{
Name: "node1",
Labels: map[string]string{kube.FDRegionLabelName: "us-west-2", kube.FDZoneLabelName: "us-west-2a"},
Labels: map[string]string{kube.TopologyRegionLabelName: "us-west-2", kube.TopologyZoneLabelName: "us-west-2a"},
},
Status: corev1.NodeStatus{
Conditions: []corev1.NodeCondition{
Expand All @@ -445,7 +445,7 @@ func (s ZoneSuite) TestFromSourceRegionZone(c *C) {
node2 := &corev1.Node{
ObjectMeta: metav1.ObjectMeta{
Name: "node2",
Labels: map[string]string{kube.FDRegionLabelName: "us-west-2", kube.FDZoneLabelName: "us-west-2b"},
Labels: map[string]string{kube.TopologyRegionLabelName: "us-west-2", kube.TopologyZoneLabelName: "us-west-2b"},
},
Status: corev1.NodeStatus{
Conditions: []corev1.NodeCondition{
Expand All @@ -459,7 +459,7 @@ func (s ZoneSuite) TestFromSourceRegionZone(c *C) {
node3 := &corev1.Node{
ObjectMeta: metav1.ObjectMeta{
Name: "node3",
Labels: map[string]string{kube.FDRegionLabelName: "us-west-2", kube.FDZoneLabelName: "us-west-2c"},
Labels: map[string]string{kube.TopologyRegionLabelName: "us-west-2", kube.TopologyZoneLabelName: "us-west-2c"},
},
Status: corev1.NodeStatus{
Conditions: []corev1.NodeCondition{
Expand All @@ -474,7 +474,7 @@ func (s ZoneSuite) TestFromSourceRegionZone(c *C) {
gceNode1 := &corev1.Node{
ObjectMeta: metav1.ObjectMeta{
Name: "node1",
Labels: map[string]string{kube.FDRegionLabelName: "us-west2", kube.FDZoneLabelName: "us-west2-a"},
Labels: map[string]string{kube.TopologyRegionLabelName: "us-west2", kube.TopologyZoneLabelName: "us-west2-a"},
},
Status: corev1.NodeStatus{
Conditions: []corev1.NodeCondition{
Expand All @@ -489,7 +489,7 @@ func (s ZoneSuite) TestFromSourceRegionZone(c *C) {
gceNode2 := &corev1.Node{
ObjectMeta: metav1.ObjectMeta{
Name: "node2",
Labels: map[string]string{kube.FDRegionLabelName: "us-west2", kube.FDZoneLabelName: "us-west2-b"},
Labels: map[string]string{kube.TopologyRegionLabelName: "us-west2", kube.TopologyZoneLabelName: "us-west2-b"},
},
Status: corev1.NodeStatus{
Conditions: []corev1.NodeCondition{
Expand All @@ -504,7 +504,7 @@ func (s ZoneSuite) TestFromSourceRegionZone(c *C) {
gceNode3 := &corev1.Node{
ObjectMeta: metav1.ObjectMeta{
Name: "node3",
Labels: map[string]string{kube.FDRegionLabelName: "us-west2", kube.FDZoneLabelName: "us-west2-c"},
Labels: map[string]string{kube.TopologyRegionLabelName: "us-west2", kube.TopologyZoneLabelName: "us-west2-c"},
},
Status: corev1.NodeStatus{
Conditions: []corev1.NodeCondition{
Expand Down Expand Up @@ -675,7 +675,7 @@ func (s ZoneSuite) TestGetReadySchedulableNodes(c *C) {
node1 := &corev1.Node{
ObjectMeta: metav1.ObjectMeta{
Name: "node1",
Labels: map[string]string{kube.FDRegionLabelName: "westus2", kube.FDZoneLabelName: "westus2-1"},
Labels: map[string]string{kube.TopologyRegionLabelName: "westus2", kube.TopologyZoneLabelName: "westus2-1"},
},
Status: corev1.NodeStatus{
Conditions: []corev1.NodeCondition{
Expand All @@ -689,7 +689,7 @@ func (s ZoneSuite) TestGetReadySchedulableNodes(c *C) {
node2 := &corev1.Node{
ObjectMeta: metav1.ObjectMeta{
Name: "node2",
Labels: map[string]string{kube.FDRegionLabelName: "westus2", kube.FDZoneLabelName: "westus2-2"},
Labels: map[string]string{kube.TopologyRegionLabelName: "westus2", kube.TopologyZoneLabelName: "westus2-2"},
},
Spec: corev1.NodeSpec{
Unschedulable: true,
Expand Down
6 changes: 3 additions & 3 deletions pkg/function/create_volume_snapshot_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ func (s *CreateVolumeSnapshotTestSuite) TestGetPVCInfo(c *C) {
ObjectMeta: metav1.ObjectMeta{
Name: "pv-test-1",
Labels: map[string]string{
kube.FDZoneLabelName: "us-west-2a",
kube.FDRegionLabelName: "us-west-2",
kube.TopologyZoneLabelName: "us-west-2a",
kube.TopologyRegionLabelName: "us-west-2",
},
},
Spec: corev1.PersistentVolumeSpec{
Expand Down Expand Up @@ -119,7 +119,7 @@ func (s *CreateVolumeSnapshotTestSuite) TestGetPVCInfo(c *C) {
ObjectMeta: metav1.ObjectMeta{
Name: "pv-test-3",
Labels: map[string]string{
kube.FDZoneLabelName: "us-west-2a",
kube.TopologyZoneLabelName: "us-west-2a",
},
},
Spec: corev1.PersistentVolumeSpec{
Expand Down
8 changes: 4 additions & 4 deletions pkg/kube/volume/volume.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -279,14 +279,14 @@ func CreatePV(
pv.Spec.PersistentVolumeSource.AWSElasticBlockStore = &corev1.AWSElasticBlockStoreVolumeSource{
VolumeID: vol.ID,
}
pv.ObjectMeta.Labels[kube.FDZoneLabelName] = vol.Az
pv.ObjectMeta.Labels[kube.FDRegionLabelName] = zoneToRegion(vol.Az)
pv.ObjectMeta.Labels[kube.TopologyZoneLabelName] = vol.Az
pv.ObjectMeta.Labels[kube.TopologyRegionLabelName] = zoneToRegion(vol.Az)
case blockstorage.TypeGPD:
pv.Spec.PersistentVolumeSource.GCEPersistentDisk = &corev1.GCEPersistentDiskVolumeSource{
PDName: vol.ID,
}
pv.ObjectMeta.Labels[kube.FDZoneLabelName] = vol.Az
pv.ObjectMeta.Labels[kube.FDRegionLabelName] = zoneToRegion(vol.Az)
pv.ObjectMeta.Labels[kube.TopologyZoneLabelName] = vol.Az
pv.ObjectMeta.Labels[kube.TopologyRegionLabelName] = zoneToRegion(vol.Az)

default:
return "", errors.Errorf("Volume type %v(%T) not supported ", volType, volType)
Expand Down

0 comments on commit a4ea10b

Please sign in to comment.