Skip to content

Commit

Permalink
Merge branch 'main' into rakechill/nodeclaim-e2e
Browse files Browse the repository at this point in the history
  • Loading branch information
rakechill authored Nov 8, 2023
2 parents 8828ca2 + 19d06fd commit 22cee60
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 17 deletions.
13 changes: 13 additions & 0 deletions .github/workflows/approval-comment.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: ApprovalComment
on:
pull_request_review:
types: [submitted]

jobs:
approval-comment:
if: startsWith(github.event.review.body, '/e2e')
runs-on: ubuntu-latest
steps:
- name: run e2e
run: |
echo "run e2e"
2 changes: 1 addition & 1 deletion .github/workflows/e2e-matrix-trigger.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ jobs:
secrets:
E2E_CLIENT_ID: ${{ secrets.E2E_CLIENT_ID }}
E2E_TENANT_ID: ${{ secrets.E2E_TENANT_ID }}
E2E_SUBSCRIPTION_ID: ${{ secrets.E2E_SUBSCRIPTION_ID }}
E2E_SUBSCRIPTION_ID: ${{ secrets.E2E_SUBSCRIPTION_ID }}
21 changes: 5 additions & 16 deletions pkg/utils/opts/armopts.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ package opts

import (
"net/http"
"time"

"github.com/Azure/azure-sdk-for-go/sdk/azcore/arm"
"github.com/Azure/azure-sdk-for-go/sdk/azcore/policy"
Expand All @@ -35,21 +34,11 @@ func DefaultArmOpts() *arm.ClientOptions {

func DefaultRetryOpts() policy.RetryOptions {
return policy.RetryOptions{
MaxRetries: 20,
// Note the default retry behavior is exponential backoff
RetryDelay: time.Second * 5,
// TODO: bsoghigian: Investigate if we want to leverage some of the status codes other than the defaults.
// the defaults are // StatusCodes specifies the HTTP status codes that indicate the operation should be retried.
// A nil slice will use the following values.
// http.StatusRequestTimeout 408
// http.StatusTooManyRequests 429
// http.StatusInternalServerError 500
// http.StatusBadGateway 502
// http.StatusServiceUnavailable 503
// http.StatusGatewayTimeout 504
// Specifying values will replace the default values.
// Specifying an empty slice will disable retries for HTTP status codes.
// StatusCodes: nil,
// MaxRetries specifies the maximum number of attempts a failed operation will be retried
// before producing an error.
// The default value is three. A value less than zero means one try and no retries.
// See Reference here: https://github.com/Azure/azure-sdk-for-go/blob/v61.4.0/sdk/azcore/policy/policy.go#L73
MaxRetries: -1,
}
}

Expand Down

0 comments on commit 22cee60

Please sign in to comment.