Skip to content

Fix PE cleaning #781

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Sugar-pack merged 3 commits into from
Dec 1, 2022
Merged

Fix PE cleaning #781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a227ff8
Update cleanup-all.yml
Sugar-pack Dec 1, 2022
8972b15
Update azure cleaning
Sugar-pack Dec 1, 2022
cd9bb41
Update cleanup-all.yml
Sugar-pack Dec 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/cleanup-all.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
go-version: '1.19'

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

- name: Run cleanup PE
if: always() && github.event.inputs.cleanPE == 'true'
if: github.event_name == 'schedule' || github.event.inputs.cleanPE == 'true'
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_ACCOUNT_ARN_LIST: ${{ secrets.AWS_ACCOUNT_ARN_LIST }}
Expand Down
8 changes: 7 additions & 1 deletion test/e2e/actions/serverlessprivateendpoint/spe.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,14 @@ func ConnectSPE(spe []v1.ServerlessPrivateEndpoint, peStatuses []status.Serverle
return err
}
for _, peStatus := range peStatuses {
peID, peIP, err := sessionAzure.CreatePrivateEndpoint(config.AzureRegionEU, cloud.ResourceGroup, peStatus.EndpointServiceName, peStatus.PrivateLinkServiceResourceID)
var peID, peIP string
peID, peIP, err = sessionAzure.CreatePrivateEndpoint(config.AzureRegionEU, cloud.ResourceGroup, peStatus.EndpointServiceName, peStatus.PrivateLinkServiceResourceID)
if err != nil {
// try to delete endpoint
errDelete := sessionAzure.DeletePrivateEndpoint(cloud.ResourceGroup, peStatus.EndpointServiceName)
if errDelete != nil {
return errDelete
}
return err
}
for i, specPE := range spe {
Expand Down