diff --git a/pkg/driver/node.go b/pkg/driver/node.go index 3a2415fa85..b5f50ef0cd 100644 --- a/pkg/driver/node.go +++ b/pkg/driver/node.go @@ -589,7 +589,8 @@ func (d *nodeService) NodeGetInfo(ctx context.Context, req *csi.NodeGetInfoReque zone := d.metadata.GetAvailabilityZone() segments := map[string]string{ - TopologyKey: zone, + TopologyKey: zone, + WellKnownTopologyKey: zone, } outpostArn := d.metadata.GetOutpostArn() diff --git a/pkg/driver/node_test.go b/pkg/driver/node_test.go index 3a9dfb41a5..0fcf67b504 100644 --- a/pkg/driver/node_test.go +++ b/pkg/driver/node_test.go @@ -2331,6 +2331,9 @@ 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])