Skip to content

Commit 5e726a0

Browse files
authored
Fix PE cleaning (#781)
* Update cleanup-all.yml * Update azure cleaning
1 parent f392310 commit 5e726a0

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

.github/workflows/cleanup-all.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
go-version: '1.19'
4646

4747
- name: Run cleanup VPC
48-
if: always() && github.event.inputs.cleanVPC == 'true'
48+
if: github.event_name == 'schedule' || github.event.inputs.cleanVPC == 'true'
4949
env:
5050
AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
5151
AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
@@ -55,7 +55,7 @@ jobs:
5555
run: (cd .github/actions/clean-vpc && go run .)
5656

5757
- name: Run cleanup PE
58-
if: always() && github.event.inputs.cleanPE == 'true'
58+
if: github.event_name == 'schedule' || github.event.inputs.cleanPE == 'true'
5959
env:
6060
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
6161
AWS_ACCOUNT_ARN_LIST: ${{ secrets.AWS_ACCOUNT_ARN_LIST }}

test/e2e/actions/serverlessprivateendpoint/spe.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,14 @@ func ConnectSPE(spe []v1.ServerlessPrivateEndpoint, peStatuses []status.Serverle
5151
return err
5252
}
5353
for _, peStatus := range peStatuses {
54-
peID, peIP, err := sessionAzure.CreatePrivateEndpoint(config.AzureRegionEU, cloud.ResourceGroup, peStatus.EndpointServiceName, peStatus.PrivateLinkServiceResourceID)
54+
var peID, peIP string
55+
peID, peIP, err = sessionAzure.CreatePrivateEndpoint(config.AzureRegionEU, cloud.ResourceGroup, peStatus.EndpointServiceName, peStatus.PrivateLinkServiceResourceID)
5556
if err != nil {
57+
// try to delete endpoint
58+
errDelete := sessionAzure.DeletePrivateEndpoint(cloud.ResourceGroup, peStatus.EndpointServiceName)
59+
if errDelete != nil {
60+
return errDelete
61+
}
5662
return err
5763
}
5864
for i, specPE := range spe {

0 commit comments

Comments
 (0)