Skip to content
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.

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

Artex v2 1.30 #8

Merged
merged 32 commits into from
Oct 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
fbfa1bc
Update eni-max-pods.txt (#1788)
github-actions[bot] May 8, 2024
1954595
Update CHANGELOG.md (#1778)
github-actions[bot] May 9, 2024
9535535
rework containerd config merging (#1780)
ndbaker1 May 10, 2024
669ac3c
Handle existing `nerdctl` installations (#1786)
ricomasgu May 10, 2024
0794b14
Use go-version defined in nodeadm/go.mod (#1796)
cartermckinnon May 10, 2024
8758b99
Update eni-max-pods.txt (#1802)
github-actions[bot] May 14, 2024
f5111dd
Update CHANGELOG.md for release v20240514 (#1809)
github-actions[bot] May 16, 2024
f59dfbd
update and remove unused tools (#1812)
ndbaker1 May 17, 2024
e6266d4
log any processes with large environments (#1807)
tzneal May 17, 2024
f0c103c
split lines before applying regex (#1811)
ndbaker1 May 17, 2024
2400df9
fix shell default variable expansion for cache images (#1810)
ndbaker1 May 17, 2024
ab1a93f
Update actions workflows (#1813)
guikcd May 17, 2024
1d17930
Bump peter-evans/create-pull-request from 5 to 6 (#1814)
dependabot[bot] May 17, 2024
a75805f
Add labels to github-action dependabot PR's (#1815)
cartermckinnon May 17, 2024
c5132e9
chore: fix lint on log collector (#1816)
cartermckinnon May 17, 2024
25b6f34
Collect Network Policy ebpf data from log collector script (#1805)
jaydeokar May 17, 2024
d87c6c4
Decompress GZIP'd user data (#1762)
cartermckinnon May 23, 2024
1f7679d
Update eni-max-pods.txt (#1822)
github-actions[bot] May 29, 2024
0fdc793
Update CHANGELOG.md for release v20240522 (#1824)
github-actions[bot] May 30, 2024
98120de
move gpu boost clock to gpu boostrap helper (#1827)
wwvela May 31, 2024
75747c2
Remove sudo from bootstrap.sh (#1773)
zhuoweilee May 31, 2024
b15c2b7
al2023: Use base_runtime_spec to set default rlimits (#1794)
cartermckinnon May 31, 2024
a8b48f6
Clarify InstanceIdNodeName docs (#1831)
cartermckinnon Jun 4, 2024
2e6bb9e
Update CHANGELOG.md for release v20240531 (#1832)
github-actions[bot] Jun 5, 2024
e50acfb
Fix misc docs, links, and formatting (#1835)
ndbaker1 Jun 6, 2024
f509713
Update CHANGELOG.md for release v20240605 (#1840)
github-actions[bot] Jun 7, 2024
7770212
Add ListBucket action in IAM permissions. (#1844)
YngveMolnes Jun 14, 2024
5e0f781
Include /etc/fstab in log collection (#1836)
JoeNorth Jun 14, 2024
49d7354
Update eni-max-pods.txt (#1847)
github-actions[bot] Jun 17, 2024
4297a70
Update dependency workflow to reuse branch, detect go version from go…
cartermckinnon Jun 17, 2024
e260033
Pin github action versions (#1850)
cartermckinnon Jun 17, 2024
67e7c2b
Update eks to v1.30
nicolartex Jun 18, 2024
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/actions/bot/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ description: "🤖 beep boop"
runs:
using: "composite"
steps:
- uses: "actions/checkout@v3"
- uses: "actions/github-script@v6"
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # 4.1.7
- uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # 7.0.1
with:
script: |
const crypto = require('crypto');
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/ci/build/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ outputs:
runs:
using: "composite"
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # 4.1.7
with:
ref: ${{ inputs.git_sha }}
- id: build
Expand All @@ -31,7 +31,7 @@ runs:
AMI_NAME="amazon-eks-node-${{ inputs.os_distro }}-${{ inputs.k8s_version }}-${{ inputs.build_id }}"
make k8s=${{ inputs.k8s_version }} os_distro=${{ inputs.os_distro }} ami_name=${AMI_NAME} ${{ inputs.additional_arguments }}
echo "ami_id=$(jq -r .builds[0].artifact_id "${AMI_NAME}-manifest.json" | cut -d ':' -f 2)" >> $GITHUB_OUTPUT
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # 4.3.3
with:
name: version-info
path: "*-version-info.json"
9 changes: 9 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
labels:
- "dependencies"
- "changelog/exclude"
2 changes: 1 addition & 1 deletion .github/workflows/bot-trigger.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ jobs:
runs-on: ubuntu-latest
permissions: write-all
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # 4.1.7
- uses: ./.github/actions/bot
14 changes: 7 additions & 7 deletions .github/workflows/ci-auto.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,37 +9,37 @@ jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # 4.1.7
- run: echo "$(go env GOPATH)/bin" >> $GITHUB_PATH
- run: go install mvdan.cc/sh/v3/cmd/shfmt@latest
- run: make lint
templates-test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # 4.1.7
- run: make test
nodeadm-build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # 4.1.7
- run: cd nodeadm && make build
nodeadm-check-generate:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # 4.1.7
- run: hack/nodeadm-check-generate.sh
nodeadm-check-vendor:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # 4.1.7
- run: hack/nodeadm-check-vendor.sh
nodeadm-test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # 4.1.7
- run: cd nodeadm && make test
nodeadm-test-e2e:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # 4.1.7
- run: cd nodeadm && make test-e2e
8 changes: 4 additions & 4 deletions .github/workflows/ci-manual.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
needs:
- setup
steps:
- uses: actions/github-script@v6
- uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # 7.0.1
with:
script: |
github.rest.issues.createComment({
Expand Down Expand Up @@ -95,10 +95,10 @@ jobs:
- os_distro: al2023
k8s_version: 1.22
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # 4.1.7
with:
ref: 'main'
- uses: aws-actions/configure-aws-credentials@v2
- uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # 4.0.2
with:
aws-region: ${{ secrets.AWS_REGION }}
role-to-assume: ${{ secrets.AWS_ROLE_ARN_CI }}
Expand Down Expand Up @@ -130,7 +130,7 @@ jobs:
- setup
- kubernetes-versions
steps:
- uses: actions/github-script@v6
- uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # 7.0.1
with:
script: |
const { data } = await github.rest.actions.listJobsForWorkflowRun({
Expand Down
17 changes: 8 additions & 9 deletions .github/workflows/dependency-review.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,26 +9,25 @@ jobs:
dependency-review:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/dependency-review-action@v4
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # 4.1.7
- uses: actions/dependency-review-action@72eb03d02c7872a771aacd928f3123ac62ad6d3a # 4.3.3
gosec:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v5
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # 4.1.7
- uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # 5.0.1
with:
go-version: '1.21.8'
go-version-file: 'nodeadm/go.mod'
- run: go install github.com/securego/gosec/v2/cmd/gosec@latest
- run: gosec -exclude-generated ./...
working-directory: nodeadm
govulncheck:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: golang/govulncheck-action@v1
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # 4.1.7
- uses: golang/govulncheck-action@dd0578b371c987f96d1185abb54344b44352bd58 # 1.0.3
with:
go-version-input: 1.21.8
work-dir: ./nodeadm
go-version-file: nodeadm/go.mod
cache: false
repo-checkout: false
repo-checkout: false
2 changes: 1 addition & 1 deletion .github/workflows/deploy-docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ jobs:
contents: write
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # 4.1.7
- run: pip install mkdocs mkdocs-material
- run: mkdocs gh-deploy --strict --no-history --force
8 changes: 4 additions & 4 deletions .github/workflows/janitor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ jobs:
if: github.repository == 'awslabs/amazon-eks-ami'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: aws-actions/configure-aws-credentials@v2
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # 4.1.7
- uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # 4.0.2
with:
aws-region: ${{ secrets.AWS_REGION }}
role-to-assume: ${{ secrets.AWS_ROLE_ARN_JANITOR }}
Expand All @@ -26,8 +26,8 @@ jobs:
if: github.repository == 'awslabs/amazon-eks-ami'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: aws-actions/configure-aws-credentials@v2
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # 4.1.7
- uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # 4.0.2
with:
aws-region: ${{ secrets.AWS_REGION }}
role-to-assume: ${{ secrets.AWS_ROLE_ARN_JANITOR }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/sync-eni-max-pods.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@ jobs:
if: github.repository == 'awslabs/amazon-eks-ami'
runs-on: ubuntu-latest
steps:
- uses: aws-actions/configure-aws-credentials@v2
- uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # 4.0.2
with:
aws-region: ${{ secrets.AWS_REGION }}
role-to-assume: ${{ secrets.AWS_ROLE_ARN_SYNC_ENI_MAX_PODS }}
- uses: actions/checkout@v3
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # 4.1.7
with:
repository: awslabs/amazon-eks-ami
ref: refs/heads/main
path: amazon-eks-ami/
- uses: actions/checkout@v3
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # 4.1.7
with:
repository: aws/amazon-vpc-cni-k8s
ref: refs/heads/master
Expand All @@ -35,7 +35,7 @@ jobs:
make generate-limits
cp misc/eni-max-pods.txt ../amazon-eks-ami/templates/shared/runtime/eni-max-pods.txt
cp misc/eni-max-pods.txt ../amazon-eks-ami/nodeadm/internal/kubelet/eni-max-pods.txt
- uses: peter-evans/create-pull-request@v4
- uses: peter-evans/create-pull-request@6d6857d36972b65feb161a90e484f2984215f83e # 6.0.5
with:
branch: update-eni-max-pods
path: amazon-eks-ami/
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sync-to-codecommit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ jobs:
id-token: write
contents: read
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # 4.1.7
with:
# fetch complete history
fetch-depth: 0
- uses: aws-actions/configure-aws-credentials@v1
- uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # 4.0.2
with:
aws-region: ${{ secrets.AWS_REGION }}
role-to-assume: ${{ secrets.AWS_ROLE_ARN_SYNC_TO_CODECOMMIT }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/update-changelog.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ jobs:
needs:
- setup
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # 4.1.7
with:
repository: awslabs/amazon-eks-ami
ref: refs/heads/main
path: amazon-eks-ami/
- uses: actions/github-script@v6
- uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # 7.0.1
with:
script: |
const fs = require('fs');
Expand All @@ -45,9 +45,9 @@ jobs:
const newEntry = `# ${release.data.name}\n${release.data.body}`;
let updatedChangelog = changelog.replace(placeholder, placeholder + '\n\n' + newEntry + '\n---\n');
// if the release notes are modified in the GitHub web editor, trailing spaces can be added accidentally
updatedChangelog = updatedChangelog.replace(/\s+$/, '');
updatedChangelog = updatedChangelog.split('\n').map(s => s.replace(/\s+$/, '')).join('\n');
fs.writeFileSync(changelogPath, updatedChangelog);
- uses: peter-evans/create-pull-request@v4
- uses: peter-evans/create-pull-request@6d6857d36972b65feb161a90e484f2984215f83e # 6.0.5
with:
branch: update-changelog
path: amazon-eks-ami/
Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/update-dependency.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:
contents: write
pull-requests: write
steps:
- uses: actions/setup-go@v5
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # 4.1.7
- uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # 5.0.1
with:
go-version: '1.21.8'
- uses: actions/checkout@v4
go-version-file: 'nodeadm/go.mod'
- name: Update Nodeadm Dependencies
id: update_deps
run: |
Expand All @@ -31,14 +31,13 @@ jobs:
echo 'EOF' >> $GITHUB_OUTPUT
- name: Create PR
if: ${{ steps.update_deps.outputs.changes != '' }}
uses: peter-evans/create-pull-request@v5
uses: peter-evans/create-pull-request@6d6857d36972b65feb161a90e484f2984215f83e # 6.0.5
with:
title: 'Update dependencies'
commit-message: Update dependencies
committer: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
branch: dependencies/update
branch-suffix: timestamp
base: main
delete-branch: true
labels: |
Expand Down
Loading
Loading