Skip to content

Commit

Permalink
Cleanup references to master branch (#1710)
Browse files Browse the repository at this point in the history
  • Loading branch information
cartermckinnon authored Mar 6, 2024
1 parent 628f96b commit abb29f9
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy-docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on:
workflow_dispatch:
push:
branches:
- 'master'
- 'main'
jobs:
mkdocs:
permissions:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-changelog.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- uses: actions/checkout@v3
with:
repository: awslabs/amazon-eks-ami
ref: refs/heads/master
ref: refs/heads/main
path: amazon-eks-ami/
- uses: actions/github-script@v6
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/update-dependency.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ jobs:
author: github-actions <actions@github.com>
branch: dependencies/update
branch-suffix: timestamp
base: master
base: main
delete-branch: true
labels: |
changelog/exclude
body: |
Updating go.mod with latest dependencies.
Updating go.mod with latest dependencies.
5 changes: 2 additions & 3 deletions nodeadm/internal/kubelet/eni_max_pods.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,10 @@ func init() {
}

// CalcMaxPods handle the edge case when instance type is not present in MaxPodsPerInstanceType
// The behavior should align with AL2:
// https://github.com/awslabs/amazon-eks-ami/blob/master/files/bootstrap.sh#L514
// which essentially is
// The behavior should align with AL2, which essentially is:
//
// # of ENI * (# of IPv4 per ENI - 1) + 2
//
func CalcMaxPods(awsRegion string, instanceType string) int32 {
zap.L().Info("calculate the max pod for instance type", zap.String("instanceType", instanceType))
cfg, err := config.LoadDefaultConfig(context.Background(), config.WithRegion(awsRegion))
Expand Down

0 comments on commit abb29f9

Please sign in to comment.