diff --git a/pkg/driver/controller.go b/pkg/driver/controller.go index ed6bed69c9..59fc133151 100644 --- a/pkg/driver/controller.go +++ b/pkg/driver/controller.go @@ -655,7 +655,7 @@ func newCreateVolumeResponse(disk *cloud.Disk) *csi.CreateVolumeResponse { } } - segments := map[string]string{TopologyKey: disk.AvailabilityZone, WellKnownTopologyKey: disk.AvailabilityZone} + segments := map[string]string{TopologyKey: disk.AvailabilityZone} arn, err := arn.Parse(disk.OutpostArn) diff --git a/pkg/driver/controller_test.go b/pkg/driver/controller_test.go index 7fb380fc98..84d78db1b0 100644 --- a/pkg/driver/controller_test.go +++ b/pkg/driver/controller_test.go @@ -242,12 +242,11 @@ func TestCreateVolume(t *testing.T) { AccessibleTopology: []*csi.Topology{ { Segments: map[string]string{ - TopologyKey: expZone, - WellKnownTopologyKey: expZone, - AwsAccountIDKey: outpostArn.AccountID, - AwsOutpostIDKey: outpostArn.Resource, - AwsRegionKey: outpostArn.Region, - AwsPartitionKey: outpostArn.Partition, + TopologyKey: expZone, + AwsAccountIDKey: outpostArn.AccountID, + AwsOutpostIDKey: outpostArn.Resource, + AwsRegionKey: outpostArn.Region, + AwsPartitionKey: outpostArn.Partition, }, }, }, @@ -1231,7 +1230,7 @@ func TestCreateVolume(t *testing.T) { VolumeContext: map[string]string{}, AccessibleTopology: []*csi.Topology{ { - Segments: map[string]string{TopologyKey: expZone, WellKnownTopologyKey: expZone}, + Segments: map[string]string{TopologyKey: expZone}, }, }, } diff --git a/pkg/driver/node.go b/pkg/driver/node.go index 46dd519e61..bb8e728189 100644 --- a/pkg/driver/node.go +++ b/pkg/driver/node.go @@ -516,8 +516,7 @@ func (d *nodeService) NodeGetInfo(ctx context.Context, req *csi.NodeGetInfoReque zone := d.metadata.GetAvailabilityZone() segments := map[string]string{ - TopologyKey: zone, - WellKnownTopologyKey: zone, + TopologyKey: zone, } outpostArn := d.metadata.GetOutpostArn() diff --git a/pkg/driver/node_test.go b/pkg/driver/node_test.go index f1e16ea8c6..20bf8c48dc 100644 --- a/pkg/driver/node_test.go +++ b/pkg/driver/node_test.go @@ -1654,9 +1654,6 @@ func TestNodeGetInfo(t *testing.T) { if at.Segments[TopologyKey] != tc.availabilityZone { t.Fatalf("Expected topology %q, got %q", tc.availabilityZone, at.Segments[TopologyKey]) } - if at.Segments[WellKnownTopologyKey] != tc.availabilityZone { - t.Fatalf("Expected well-known topology %q, got %q", tc.availabilityZone, at.Segments[WellKnownTopologyKey]) - } if at.Segments[AwsAccountIDKey] != tc.outpostArn.AccountID { t.Fatalf("Expected AwsAccountId %q, got %q", tc.outpostArn.AccountID, at.Segments[AwsAccountIDKey])