Skip to content

Commit

Permalink
update gke networking to select the default network by default (#13030)
Browse files Browse the repository at this point in the history 
add unit test for gke default network selection
  • Loading branch information
@mantis-toboggan-md
mantis-toboggan-md authored Jan 9, 2025
1 parent b4f3939 commit 4085c86
Show file tree
Hide file tree
Showing 3 changed files with 93 additions and 6 deletions.
10 changes: 8 additions & 2 deletions pkg/gke/components/Networking.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,9 +203,15 @@ export default defineComponent({
networkOptions(neu) {
if (neu && neu.length && !this.network) {
const firstnetwork = neu.find((network: GKENetwork) => network.kind !== 'group');
const defaultNetwork = neu.find((network: GKENetwork) => network?.name === 'default');
this.$emit('update:network', firstnetwork?.name);
if (defaultNetwork) {
this.$emit('update:network', defaultNetwork.name);
} else {
const firstnetwork = neu.find((network: GKENetwork) => network.kind !== 'group');
this.$emit('update:network', firstnetwork?.name);
}
}
},
Expand Down
6 changes: 3 additions & 3 deletions pkg/gke/components/__tests__/Networking.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ describe('gke Networking', () => {
expect(spy).toHaveBeenCalledTimes(4);
});

it('should populate network dropdown and select the first option after loading gcp data', async() => {
it('should populate network dropdown and select the default network after loading gcp data', async() => {
const setup = requiredSetup();

const wrapper = shallowMount(Networking, {
Expand All @@ -85,8 +85,8 @@ describe('gke Networking', () => {

const networksDropdown = wrapper.getComponent('[data-testid="gke-networks-dropdown"]');

expect(networksDropdown.props().options).toHaveLength(4);
expect(wrapper.emitted('update:network')?.[0]?.[0]).toBe('host-shared-vpc');
expect(networksDropdown.props().options).toHaveLength(5);
expect(wrapper.emitted('update:network')?.[0]?.[0]).toBe('default');
});

it('should populate subnetworks dropdown dependent on network selection', async() => {
Expand Down
83 changes: 82 additions & 1 deletion pkg/gke/util/__mocks__/gcp.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,64 @@ const mockedGKENetworksResponse = {
'https://www.googleapis.com/compute/v1/projects/test-project/regions/me-central1/subnetworks/test-network',
'https://www.googleapis.com/compute/v1/projects/test-project/regions/asia-east2/subnetworks/test-network',
'https://www.googleapis.com/compute/v1/projects/test-project/regions/me-central2/subnetworks/test-network']
},
{
autoCreateSubnetworks: true,
creationTimestamp: '2022-10-26T14:50:30.702-07:00',
id: '11111111',
kind: 'compute#network',
mtu: 1460,
name: 'default',
networkFirewallPolicyEnforcementOrder: 'AFTER_CLASSIC_FIREWALL',
routingConfig: { routingMode: 'REGIONAL' },
selfLink: 'https://www.googleapis.com/compute/v1/projects/test-data-project/global/networks/default',
selfLinkWithId: 'https://www.googleapis.com/compute/v1/projects/test-data-project/global/networks/11111111',
subnetworks: [
'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/africa-south1/subnetworks/default',
'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/us-west8/subnetworks/default',
'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/asia-northeast3/subnetworks/default',
'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/asia-northeast2/subnetworks/default',
'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/asia-south2/subnetworks/default',
'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/europe-west3/subnetworks/default',
'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/us-west3/subnetworks/default',
'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/us-west2/subnetworks/default',
'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/asia-northeast1/subnetworks/default',
'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/europe-west12/subnetworks/default',
'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/asia-southeast1/subnetworks/default',
'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/us-south1/subnetworks/default',
'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/southamerica-west1/subnetworks/default',
'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/asia-southeast2/subnetworks/default',
'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/me-west1/subnetworks/default',
'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/us-east7/subnetworks/default',
'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/us-central1/subnetworks/default',
'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/southamerica-east1/subnetworks/default',
'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/europe-west9/subnetworks/default',
'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/europe-north1/subnetworks/default',
'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/us-east4/subnetworks/default',
'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/asia-east1/subnetworks/default',
'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/europe-west10/subnetworks/default',
'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/europe-central2/subnetworks/default',
'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/europe-north2/subnetworks/default',
'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/asia-south1/subnetworks/default',
'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/northamerica-south1/subnetworks/default',
'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/us-east5/subnetworks/default',
'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/us-east1/subnetworks/default',
'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/europe-west4/subnetworks/default',
'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/europe-west2/subnetworks/default',
'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/europe-west8/subnetworks/default',
'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/northamerica-northeast1/subnetworks/default',
'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/australia-southeast2/subnetworks/default',
'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/us-west4/subnetworks/default',
'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/europe-west6/subnetworks/default',
'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/northamerica-northeast2/subnetworks/default',
'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/europe-southwest1/subnetworks/default',
'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/us-west1/subnetworks/default',
'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/australia-southeast1/subnetworks/default',
'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/europe-west1/subnetworks/default',
'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/me-central1/subnetworks/default',
'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/asia-east2/subnetworks/default',
'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/me-central2/subnetworks/default'
]
}]
};

Expand All @@ -267,7 +325,30 @@ const mockedGKESubnetworksResponse = {
secondaryIpRanges: [{ ipCidrRange: '10.0.1.0/24', rangeName: 'range-1' }],
selfLink: 'https://www.googleapis.com/compute/v1/projects/test-project/regions/us-central1/subnetworks/test-network',
stackType: 'IPV4_ONLY',
}]
},
{
creationTimestamp: '2022-10-26T14:50:38.688-07:00',
fingerprint: '3456',
gatewayAddress: '10.128.0.1',
id: '1234',
ipCidrRange: '10.128.0.0/20',
kind: 'compute#subnetwork',
name: 'default',
network: 'https://www.googleapis.com/compute/v1/projects/test-data-project/global/networks/default',
privateIpGoogleAccess: true,
privateIpv6GoogleAccess: 'DISABLE_GOOGLE_ACCESS',
purpose: 'PRIVATE',
region: 'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/us-central1',
secondaryIpRanges: [
{
ipCidrRange: '10.0.1.0/24',
rangeName: 'range-1'
}
],
selfLink: 'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/us-central1/subnetworks/default',
stackType: 'IPV4_ONLY'
},
]
};

const mockedGKESharedSubnetworksResponse = {
Expand Down

0 comments on commit 4085c86

Please sign in to comment.