From bd71fc3e14502be204ab32ad548945c246b9bf45 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 6 Oct 2024 01:22:27 +0000 Subject: [PATCH] Auto commit - CI build --- amazon-eks-ami/CHANGELOG.md | 1164 +++++++++++++++++ amazon-eks-ami/nodeadm/doc/examples.md | 2 +- .../node.eks.aws_v1alpha1_nodeconfig.yaml | 23 - amazon-eks-ami/nodeadm/go.mod | 14 +- amazon-eks-ami/nodeadm/go.sum | 28 +- .../nodeadm/internal/api/merge_test.go | 6 + .../internal/configprovider/encoding.go | 42 + .../nodeadm/internal/configprovider/file.go | 7 +- .../nodeadm/internal/configprovider/mime.go | 96 ++ .../internal/configprovider/userdata.go | 122 +- .../internal/configprovider/userdata_test.go | 9 +- .../nodeadm/internal/kubelet/config.go | 8 +- .../nodeadm/internal/system/resources.go | 22 +- .../aemm-inf1-config.json | 0 .../containerd-runtime-config-neuron/run.sh | 2 +- .../aemm-g5-config.json | 0 .../containerd-runtime-config-nvidia/run.sh | 2 +- .../e2e/cases/mime-userdata-merge/config.yaml | 41 + .../expected-kubelet-config.json | 70 + .../test/e2e/cases/mime-userdata-merge/run.sh | 17 + .../nodeadm/test/e2e/infra/Dockerfile | 2 - .../aws/aws-sdk-go-v2/config/CHANGELOG.md | 12 + .../config/go_module_metadata.go | 2 +- .../aws-sdk-go-v2/credentials/CHANGELOG.md | 12 + .../credentials/go_module_metadata.go | 2 +- .../aws-sdk-go-v2/service/ec2/CHANGELOG.md | 12 + .../aws-sdk-go-v2/service/ec2/api_client.go | 4 +- .../ec2/api_op_CancelConversionTask.go | 4 - .../api_op_DescribeCapacityBlockOfferings.go | 16 +- .../service/ec2/api_op_ImportInstance.go | 11 +- .../service/ec2/api_op_ImportVolume.go | 9 +- .../service/ec2/go_module_metadata.go | 2 +- .../aws-sdk-go-v2/service/ec2/types/enums.go | 20 + .../aws-sdk-go-v2/service/ec2/types/types.go | 98 +- .../aws-sdk-go-v2/service/ec2/validators.go | 6 - .../aws-sdk-go-v2/service/ecr/CHANGELOG.md | 12 + .../aws-sdk-go-v2/service/ecr/api_client.go | 4 +- .../service/ecr/go_module_metadata.go | 2 +- .../aws-sdk-go-v2/service/sso/CHANGELOG.md | 12 + .../aws-sdk-go-v2/service/sso/api_client.go | 4 +- .../service/sso/go_module_metadata.go | 2 +- .../service/ssooidc/CHANGELOG.md | 12 + .../service/ssooidc/api_client.go | 4 +- .../service/ssooidc/go_module_metadata.go | 2 +- .../aws-sdk-go-v2/service/sts/CHANGELOG.md | 12 + .../aws-sdk-go-v2/service/sts/api_client.go | 4 +- .../service/sts/go_module_metadata.go | 2 +- amazon-eks-ami/nodeadm/vendor/modules.txt | 14 +- 48 files changed, 1673 insertions(+), 300 deletions(-) delete mode 100644 amazon-eks-ami/nodeadm/example/node.eks.aws_v1alpha1_nodeconfig.yaml create mode 100644 amazon-eks-ami/nodeadm/internal/configprovider/encoding.go create mode 100644 amazon-eks-ami/nodeadm/internal/configprovider/mime.go rename amazon-eks-ami/nodeadm/test/e2e/{infra => cases/containerd-runtime-config-neuron}/aemm-inf1-config.json (100%) rename amazon-eks-ami/nodeadm/test/e2e/{infra => cases/containerd-runtime-config-nvidia}/aemm-g5-config.json (100%) create mode 100644 amazon-eks-ami/nodeadm/test/e2e/cases/mime-userdata-merge/config.yaml create mode 100644 amazon-eks-ami/nodeadm/test/e2e/cases/mime-userdata-merge/expected-kubelet-config.json create mode 100755 amazon-eks-ami/nodeadm/test/e2e/cases/mime-userdata-merge/run.sh diff --git a/amazon-eks-ami/CHANGELOG.md b/amazon-eks-ami/CHANGELOG.md index ae24086e..60f733c6 100644 --- a/amazon-eks-ami/CHANGELOG.md +++ b/amazon-eks-ami/CHANGELOG.md @@ -2,6 +2,1170 @@ +# AMI Release v20240928 + +> **Note** +> AWS is aware of the disclosed issues in nvidia-container-toolkit assigned CVE identifier CVE-2024-0132 relating to EKS GPU AMI (both AL2 and AL2023). +> +> Updated Amazon EKS AMIs will be made available by October 2, 2024. As a general security best practice, we recommend that EKS customers update their configurations to launch new worker nodes from the latest AMI version. Customers using Managed node groups can upgrade their node groups by referring to the EKS documentation [1]. Please refer to the EKS documentation to replace your existing instances with your self-managing worker nodes with the new AMI version [2]. +> +> [1] https://docs.aws.amazon.com/eks/latest/userguide/update-managed-node-group.html +> [2] https://docs.aws.amazon.com/eks/latest/userguide/update-workers.html + +## What's Changed +* Fix cn build by @Issacwww in https://github.com/awslabs/amazon-eks-ami/pull/1980 + + +**Full Changelog**: https://github.com/awslabs/amazon-eks-ami/compare/v20240924...v20240928 + +--- + +

AMI Details

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
AMI TypeSource AMI Name
AL2023_ARM_64_STANDARDal2023-ami-minimal-2023.5.20240916.0-kernel-6.1-arm64
AL2023_x86_64_NEURONal2023-ami-minimal-2023.5.20240916.0-kernel-6.1-x86_64
AL2023_x86_64_NVIDIAal2023-ami-minimal-2023.5.20240916.0-kernel-6.1-x86_64
AL2023_x86_64_STANDARDal2023-ami-minimal-2023.5.20240916.0-kernel-6.1-x86_64
AL2_ARM_64amzn2-ami-minimal-hvm-2.0.20240916.0-arm64-ebs
AL2_x86_64amzn2-ami-minimal-hvm-2.0.20240916.0-x86_64-ebs
AL2_x86_64_GPUamzn2-ami-minimal-hvm-2.0.20240916.0-x86_64-ebs
+ +
+Kubernetes 1.31 + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
AMI NamesRelease versionIncluded artifacts
amazon-eks-node-al2023-x86_64-nvidia-560-1.31-v202409281.31.0-20240928s3://amazon-eks/1.31.0/2024-09-12/
amazon-eks-node-al2023-x86_64-neuron-1.31-v20240928
amazon-eks-node-al2023-x86_64-standard-1.31-v20240928
amazon-eks-node-1.31-v20240928
amazon-eks-node-al2023-arm64-standard-1.31-v20240928
amazon-eks-arm64-node-1.31-v20240928
amazon-eks-gpu-node-1.31-v20240928
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PackageAL2_x86_64AL2_ARM_64AL2_x86_64_GPU
amazon-ssm-agent3.3.380.0-1.amzn2
aws-neuronx-dkms—2.18.12.0-dkms
containerd1.7.11-1.amzn2.0.1
cuda-12-2—12.2.2-1
efa—2.10.0-1.amzn2
kernel5.10.225-213.878.amzn2
kmod-nvidia-latest-dkms—550.90.12-1.el7
nvidia-driver-latest-dkms—550.90.12-1.el7
runc1.1.13-1.amzn2
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PackageAL2023_x86_64_NVIDIAAL2023_x86_64_NEURONAL2023_x86_64_STANDARDAL2023_ARM_64_STANDARD
amazon-ssm-agent3.3.380.0-1.amzn2023
aws-neuronx-dkms—2.18.12.0-dkms—
containerd1.7.11-1.amzn2023.0.1
efa2.10.0-1.amzn2023—
kernel6.1.109-118.189.amzn2023
kmod-nvidia-latest-dkms560.35.03-1.amzn2023—
runc1.1.13-1.amzn2023.0.1
+
+ +
+Kubernetes 1.30 + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
AMI NamesRelease versionIncluded artifacts
amazon-eks-node-al2023-x86_64-nvidia-560-1.30-v202409281.30.4-20240928s3://amazon-eks/1.30.4/2024-09-11/
amazon-eks-node-al2023-x86_64-neuron-1.30-v20240928
amazon-eks-node-al2023-x86_64-standard-1.30-v20240928
amazon-eks-node-1.30-v20240928
amazon-eks-node-al2023-arm64-standard-1.30-v20240928
amazon-eks-arm64-node-1.30-v20240928
amazon-eks-gpu-node-1.30-v20240928
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PackageAL2_x86_64AL2_ARM_64AL2_x86_64_GPU
amazon-ssm-agent3.3.380.0-1.amzn2
aws-neuronx-dkms—2.18.12.0-dkms
containerd1.7.11-1.amzn2.0.1
cuda-12-2—12.2.2-1
efa—2.10.0-1.amzn2
kernel5.10.225-213.878.amzn2
kmod-nvidia-latest-dkms—550.90.12-1.el7
nvidia-driver-latest-dkms—550.90.12-1.el7
runc1.1.13-1.amzn2
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PackageAL2023_x86_64_NVIDIAAL2023_x86_64_NEURONAL2023_x86_64_STANDARDAL2023_ARM_64_STANDARD
amazon-ssm-agent3.3.380.0-1.amzn2023
aws-neuronx-dkms—2.18.12.0-dkms—
containerd1.7.11-1.amzn2023.0.1
efa2.10.0-1.amzn2023—
kernel6.1.109-118.189.amzn2023
kmod-nvidia-latest-dkms560.35.03-1.amzn2023—
runc1.1.13-1.amzn2023.0.1
+
+ +
+Kubernetes 1.29 + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
AMI NamesRelease versionIncluded artifacts
amazon-eks-node-al2023-x86_64-nvidia-560-1.29-v202409281.29.8-20240928s3://amazon-eks/1.29.8/2024-09-11/
amazon-eks-node-al2023-x86_64-neuron-1.29-v20240928
amazon-eks-node-al2023-x86_64-standard-1.29-v20240928
amazon-eks-node-1.29-v20240928
amazon-eks-node-al2023-arm64-standard-1.29-v20240928
amazon-eks-arm64-node-1.29-v20240928
amazon-eks-gpu-node-1.29-v20240928
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PackageAL2_x86_64AL2_ARM_64AL2_x86_64_GPU
amazon-ssm-agent3.3.380.0-1.amzn2
aws-neuronx-dkms—2.18.12.0-dkms
containerd1.7.11-1.amzn2.0.1
cuda-12-2—12.2.2-1
efa—2.10.0-1.amzn2
kernel5.10.225-213.878.amzn2
kmod-nvidia-latest-dkms—550.90.12-1.el7
nvidia-driver-latest-dkms—550.90.12-1.el7
runc1.1.13-1.amzn2
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PackageAL2023_x86_64_NVIDIAAL2023_x86_64_NEURONAL2023_x86_64_STANDARDAL2023_ARM_64_STANDARD
amazon-ssm-agent3.3.380.0-1.amzn2023
aws-neuronx-dkms—2.18.12.0-dkms—
containerd1.7.11-1.amzn2023.0.1
efa2.10.0-1.amzn2023—
kernel6.1.109-118.189.amzn2023
kmod-nvidia-latest-dkms560.35.03-1.amzn2023—
runc1.1.13-1.amzn2023.0.1
+
+ +
+Kubernetes 1.28 + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
AMI NamesRelease versionIncluded artifacts
amazon-eks-node-al2023-x86_64-nvidia-560-1.28-v202409281.28.13-20240928s3://amazon-eks/1.28.13/2024-09-11/
amazon-eks-node-al2023-x86_64-neuron-1.28-v20240928
amazon-eks-node-al2023-x86_64-standard-1.28-v20240928
amazon-eks-node-1.28-v20240928
amazon-eks-node-al2023-arm64-standard-1.28-v20240928
amazon-eks-arm64-node-1.28-v20240928
amazon-eks-gpu-node-1.28-v20240928
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PackageAL2_x86_64AL2_ARM_64AL2_x86_64_GPU
amazon-ssm-agent3.3.380.0-1.amzn2
aws-neuronx-dkms—2.18.12.0-dkms
containerd1.7.11-1.amzn2.0.1
cuda-12-2—12.2.2-1
efa—2.10.0-1.amzn2
kernel5.10.225-213.878.amzn2
kmod-nvidia-latest-dkms—550.90.12-1.el7
nvidia-driver-latest-dkms—550.90.12-1.el7
runc1.1.13-1.amzn2
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PackageAL2023_x86_64_NVIDIAAL2023_x86_64_NEURONAL2023_x86_64_STANDARDAL2023_ARM_64_STANDARD
amazon-ssm-agent3.3.380.0-1.amzn2023
aws-neuronx-dkms—2.18.12.0-dkms—
containerd1.7.11-1.amzn2023.0.1
efa2.10.0-1.amzn2023—
kernel6.1.109-118.189.amzn2023
kmod-nvidia-latest-dkms560.35.03-1.amzn2023—
runc1.1.13-1.amzn2023.0.1
+
+ +
+Kubernetes 1.27 + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
AMI NamesRelease versionIncluded artifacts
amazon-eks-node-al2023-x86_64-nvidia-560-1.27-v202409281.27.16-20240928s3://amazon-eks/1.27.16/2024-09-11/
amazon-eks-node-al2023-x86_64-neuron-1.27-v20240928
amazon-eks-node-al2023-x86_64-standard-1.27-v20240928
amazon-eks-node-1.27-v20240928
amazon-eks-node-al2023-arm64-standard-1.27-v20240928
amazon-eks-arm64-node-1.27-v20240928
amazon-eks-gpu-node-1.27-v20240928
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PackageAL2_x86_64AL2_ARM_64AL2_x86_64_GPU
amazon-ssm-agent3.3.380.0-1.amzn2
aws-neuronx-dkms—2.18.12.0-dkms
containerd1.7.11-1.amzn2.0.1
cuda-12-2—12.2.2-1
efa—2.10.0-1.amzn2
kernel5.10.225-213.878.amzn2
kmod-nvidia-latest-dkms—550.90.12-1.el7
nvidia-driver-latest-dkms—550.90.12-1.el7
runc1.1.13-1.amzn2
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PackageAL2023_x86_64_NVIDIAAL2023_x86_64_NEURONAL2023_x86_64_STANDARDAL2023_ARM_64_STANDARD
amazon-ssm-agent3.3.380.0-1.amzn2023
aws-neuronx-dkms—2.18.12.0-dkms—
containerd1.7.11-1.amzn2023.0.1
efa2.10.0-1.amzn2023—
kernel6.1.109-118.189.amzn2023
kmod-nvidia-latest-dkms560.35.03-1.amzn2023—
runc1.1.13-1.amzn2023.0.1
+
+ +
+Kubernetes 1.26 + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
AMI NamesRelease versionIncluded artifacts
amazon-eks-node-al2023-x86_64-nvidia-560-1.26-v202409281.26.15-20240928s3://amazon-eks/1.26.15/2024-09-11/
amazon-eks-node-al2023-x86_64-neuron-1.26-v20240928
amazon-eks-node-al2023-x86_64-standard-1.26-v20240928
amazon-eks-node-1.26-v20240928
amazon-eks-node-al2023-arm64-standard-1.26-v20240928
amazon-eks-arm64-node-1.26-v20240928
amazon-eks-gpu-node-1.26-v20240928
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PackageAL2_x86_64AL2_ARM_64AL2_x86_64_GPU
amazon-ssm-agent3.3.380.0-1.amzn2
aws-neuronx-dkms—2.18.12.0-dkms
containerd1.7.11-1.amzn2.0.1
cuda-12-2—12.2.2-1
efa—2.10.0-1.amzn2
kernel5.10.225-213.878.amzn2
kmod-nvidia-latest-dkms—550.90.12-1.el7
nvidia-driver-latest-dkms—550.90.12-1.el7
runc1.1.13-1.amzn2
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PackageAL2023_x86_64_NVIDIAAL2023_x86_64_NEURONAL2023_x86_64_STANDARDAL2023_ARM_64_STANDARD
amazon-ssm-agent3.3.380.0-1.amzn2023
aws-neuronx-dkms—2.18.12.0-dkms—
containerd1.7.11-1.amzn2023.0.1
efa2.10.0-1.amzn2023—
kernel6.1.109-118.189.amzn2023
kmod-nvidia-latest-dkms560.35.03-1.amzn2023—
runc1.1.13-1.amzn2023.0.1
+
+ +
+Kubernetes 1.25 + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
AMI NamesRelease versionIncluded artifacts
amazon-eks-node-al2023-x86_64-nvidia-560-1.25-v202409281.25.16-20240928s3://amazon-eks/1.25.16/2024-09-11/
amazon-eks-node-al2023-x86_64-neuron-1.25-v20240928
amazon-eks-node-al2023-x86_64-standard-1.25-v20240928
amazon-eks-node-1.25-v20240928
amazon-eks-node-al2023-arm64-standard-1.25-v20240928
amazon-eks-arm64-node-1.25-v20240928
amazon-eks-gpu-node-1.25-v20240928
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PackageAL2_x86_64AL2_ARM_64AL2_x86_64_GPU
amazon-ssm-agent3.3.380.0-1.amzn2
aws-neuronx-dkms—2.18.12.0-dkms
containerd1.7.11-1.amzn2.0.1
cuda-12-2—12.2.2-1
efa—2.10.0-1.amzn2
kernel5.10.225-213.878.amzn2
kmod-nvidia-latest-dkms—550.90.12-1.el7
nvidia-driver-latest-dkms—550.90.12-1.el7
runc1.1.13-1.amzn2
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PackageAL2023_x86_64_NVIDIAAL2023_x86_64_NEURONAL2023_x86_64_STANDARDAL2023_ARM_64_STANDARD
amazon-ssm-agent3.3.380.0-1.amzn2023
aws-neuronx-dkms—2.18.12.0-dkms—
containerd1.7.11-1.amzn2023.0.1
efa2.10.0-1.amzn2023—
kernel6.1.109-118.189.amzn2023
kmod-nvidia-latest-dkms560.35.03-1.amzn2023—
runc1.1.13-1.amzn2023.0.1
+
+ +
+Kubernetes 1.24 + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
AMI NamesRelease versionIncluded artifacts
amazon-eks-node-al2023-x86_64-nvidia-560-1.24-v202409281.24.17-20240928s3://amazon-eks/1.24.17/2024-09-11/
amazon-eks-node-al2023-x86_64-neuron-1.24-v20240928
amazon-eks-node-al2023-x86_64-standard-1.24-v20240928
amazon-eks-node-1.24-v20240928
amazon-eks-node-al2023-arm64-standard-1.24-v20240928
amazon-eks-arm64-node-1.24-v20240928
amazon-eks-gpu-node-1.24-v20240928
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PackageAL2_x86_64AL2_ARM_64AL2_x86_64_GPU
amazon-ssm-agent3.3.380.0-1.amzn2
aws-neuronx-dkms—2.18.12.0-dkms
containerd1.7.11-1.amzn2.0.1
cuda-12-2—12.2.2-1
docker25.0.6-1.amzn2.0.2
kernel5.10.225-213.878.amzn2
kmod-nvidia-latest-dkms—550.90.12-1.el7
nvidia-driver-latest-dkms—550.90.12-1.el7
runc1.1.13-1.amzn2
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PackageAL2023_x86_64_NVIDIAAL2023_x86_64_NEURONAL2023_x86_64_STANDARDAL2023_ARM_64_STANDARD
amazon-ssm-agent3.3.380.0-1.amzn2023
aws-neuronx-dkms—2.18.12.0-dkms—
containerd1.7.11-1.amzn2023.0.1
efa2.10.0-1.amzn2023—
kernel6.1.109-118.189.amzn2023
kmod-nvidia-latest-dkms560.35.03-1.amzn2023—
runc1.1.13-1.amzn2023.0.1
+
+ +
+Kubernetes 1.23 + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
AMI NamesRelease versionIncluded artifacts
amazon-eks-node-al2023-x86_64-nvidia-560-1.23-v202409281.23.17-20240928s3://amazon-eks/1.23.17/2024-09-11/
amazon-eks-node-al2023-x86_64-neuron-1.23-v20240928
amazon-eks-node-al2023-x86_64-standard-1.23-v20240928
amazon-eks-node-1.23-v20240928
amazon-eks-node-al2023-arm64-standard-1.23-v20240928
amazon-eks-arm64-node-1.23-v20240928
amazon-eks-gpu-node-1.23-v20240928
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PackageAL2_x86_64AL2_ARM_64AL2_x86_64_GPU
amazon-ssm-agent3.3.380.0-1.amzn2
aws-neuronx-dkms—2.18.12.0-dkms
containerd1.7.11-1.amzn2.0.1
cuda-12-2—12.2.2-1
docker25.0.6-1.amzn2.0.2
kernel5.10.225-213.878.amzn2
kmod-nvidia-latest-dkms—550.90.12-1.el7
nvidia-driver-latest-dkms—550.90.12-1.el7
runc1.1.13-1.amzn2
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PackageAL2023_x86_64_NVIDIAAL2023_x86_64_NEURONAL2023_x86_64_STANDARDAL2023_ARM_64_STANDARD
amazon-ssm-agent3.3.380.0-1.amzn2023
aws-neuronx-dkms—2.18.12.0-dkms—
containerd1.7.11-1.amzn2023.0.1
efa2.10.0-1.amzn2023—
kernel6.1.109-118.189.amzn2023
kmod-nvidia-latest-dkms560.35.03-1.amzn2023—
runc1.1.13-1.amzn2023.0.1
+
+ + +--- + + # AMI Release v20240924 diff --git a/amazon-eks-ami/nodeadm/doc/examples.md b/amazon-eks-ami/nodeadm/doc/examples.md index 7ebbaedc..3623ffc8 100644 --- a/amazon-eks-ami/nodeadm/doc/examples.md +++ b/amazon-eks-ami/nodeadm/doc/examples.md @@ -25,7 +25,7 @@ spec: certificateAuthority: Y2VydGlmaWNhdGVBdXRob3JpdHk= cidr: 10.100.0.0/16 ---BOUNDARY-- +--BOUNDARY Content-Type: application/node.eks.aws --- diff --git a/amazon-eks-ami/nodeadm/example/node.eks.aws_v1alpha1_nodeconfig.yaml b/amazon-eks-ami/nodeadm/example/node.eks.aws_v1alpha1_nodeconfig.yaml deleted file mode 100644 index 300fcf2e..00000000 --- a/amazon-eks-ami/nodeadm/example/node.eks.aws_v1alpha1_nodeconfig.yaml +++ /dev/null @@ -1,23 +0,0 @@ ---- -apiVersion: node.eks.aws/v1alpha1 -kind: NodeConfig -metadata: - name: example -spec: - cluster: - name: my-cluster - apiServerEndpoint: https://example.com - certificateAuthority: Y2VydGlmaWNhdGVBdXRob3JpdHk= - cidr: 10.100.0.0/16 - kubelet: - config: - kind: KubeletConfiguration - apiVersion: kubelet.config.k8s.io/v1beta1 - maxPods: 42 - clusterDNS: - - 0.0.0.0 - - 1.1.1.1 - flags: - - --v=2 - - --register-with-taints=foo=bar:NoSchedule - - --node-labels=foo=bar diff --git a/amazon-eks-ami/nodeadm/go.mod b/amazon-eks-ami/nodeadm/go.mod index 495bbbe7..b0d18deb 100644 --- a/amazon-eks-ami/nodeadm/go.mod +++ b/amazon-eks-ami/nodeadm/go.mod @@ -3,10 +3,10 @@ module github.com/awslabs/amazon-eks-ami/nodeadm go 1.22.5 require ( - github.com/aws/aws-sdk-go-v2/config v1.27.36 + github.com/aws/aws-sdk-go-v2/config v1.27.39 github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.14 - github.com/aws/aws-sdk-go-v2/service/ec2 v1.178.0 - github.com/aws/aws-sdk-go-v2/service/ecr v1.35.0 + github.com/aws/aws-sdk-go-v2/service/ec2 v1.179.2 + github.com/aws/aws-sdk-go-v2/service/ecr v1.35.3 github.com/aws/smithy-go v1.21.0 github.com/containerd/containerd v1.7.22 github.com/coreos/go-systemd/v22 v22.5.0 @@ -37,15 +37,15 @@ require dario.cat/mergo v1.0.1 // direct require ( github.com/aws/aws-sdk-go-v2 v1.31.0 - github.com/aws/aws-sdk-go-v2/credentials v1.17.34 // indirect + github.com/aws/aws-sdk-go-v2/credentials v1.17.37 // indirect github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.18 // indirect github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.18 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.5 // indirect github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.20 // indirect - github.com/aws/aws-sdk-go-v2/service/sso v1.23.0 // indirect - github.com/aws/aws-sdk-go-v2/service/ssooidc v1.27.0 // indirect - github.com/aws/aws-sdk-go-v2/service/sts v1.31.0 // indirect + github.com/aws/aws-sdk-go-v2/service/sso v1.23.3 // indirect + github.com/aws/aws-sdk-go-v2/service/ssooidc v1.27.3 // indirect + github.com/aws/aws-sdk-go-v2/service/sts v1.31.3 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/blang/semver/v4 v4.0.0 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect diff --git a/amazon-eks-ami/nodeadm/go.sum b/amazon-eks-ami/nodeadm/go.sum index 43076feb..912a375a 100644 --- a/amazon-eks-ami/nodeadm/go.sum +++ b/amazon-eks-ami/nodeadm/go.sum @@ -4,10 +4,10 @@ github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERo github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= github.com/aws/aws-sdk-go-v2 v1.31.0 h1:3V05LbxTSItI5kUqNwhJrrrY1BAXxXt0sN0l72QmG5U= github.com/aws/aws-sdk-go-v2 v1.31.0/go.mod h1:ztolYtaEUtdpf9Wftr31CJfLVjOnD/CVRkKOOYgF8hA= -github.com/aws/aws-sdk-go-v2/config v1.27.36 h1:4IlvHh6Olc7+61O1ktesh0jOcqmq/4WG6C2Aj5SKXy0= -github.com/aws/aws-sdk-go-v2/config v1.27.36/go.mod h1:IiBpC0HPAGq9Le0Xxb1wpAKzEfAQ3XlYgJLYKEVYcfw= -github.com/aws/aws-sdk-go-v2/credentials v1.17.34 h1:gmkk1l/cDGSowPRzkdxYi8edw+gN4HmVK151D/pqGNc= -github.com/aws/aws-sdk-go-v2/credentials v1.17.34/go.mod h1:4R9OEV3tgFMsok4ZeFpExn7zQaZRa9MRGFYnI/xC/vs= +github.com/aws/aws-sdk-go-v2/config v1.27.39 h1:FCylu78eTGzW1ynHcongXK9YHtoXD5AiiUqq3YfJYjU= +github.com/aws/aws-sdk-go-v2/config v1.27.39/go.mod h1:wczj2hbyskP4LjMKBEZwPRO1shXY+GsQleab+ZXT2ik= +github.com/aws/aws-sdk-go-v2/credentials v1.17.37 h1:G2aOH01yW8X373JK419THj5QVqu9vKEwxSEsGxihoW0= +github.com/aws/aws-sdk-go-v2/credentials v1.17.37/go.mod h1:0ecCjlb7htYCptRD45lXJ6aJDQac6D2NlKGpZqyTG6A= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.14 h1:C/d03NAmh8C4BZXhuRNboF/DqhBkBCeDiJDcaqIT5pA= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.14/go.mod h1:7I0Ju7p9mCIdlrfS+JCgqcYD0VXz/N4yozsox+0o078= github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.18 h1:kYQ3H1u0ANr9KEKlGs/jTLrBFPo8P8NaH/w7A01NeeM= @@ -16,20 +16,20 @@ github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.18 h1:Z7IdFUONvTcvS7Yuht github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.18/go.mod h1:DkKMmksZVVyat+Y+r1dEOgJEfUeA7UngIHWeKsi0yNc= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 h1:VaRN3TlFdd6KxX1x3ILT5ynH6HvKgqdiXoTxAF4HQcQ= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1/go.mod h1:FbtygfRFze9usAadmnGJNc8KsP346kEe+y2/oyhGAGc= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.178.0 h1:yCVmlqH1bWVmdS/oFyyM+hbe2c+tKGPo6r0BHhTpn1U= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.178.0/go.mod h1:W6sNzs5T4VpZn1Vy+FMKw8s24vt5k6zPJXcNOK0asBo= -github.com/aws/aws-sdk-go-v2/service/ecr v1.35.0 h1:92Ck3zrJpZB6kae8ixF2zKkAFtURWg+KfLE1UiB9QHc= -github.com/aws/aws-sdk-go-v2/service/ecr v1.35.0/go.mod h1:oRaGEExKI6Pqcow+Tt7wpJf73/Srcj/CUJv5Eb9QFhg= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.179.2 h1:rGBv2N0zWvNTKnxOfbBH4mNM8WMdDNkaxdqtz152G40= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.179.2/go.mod h1:W6sNzs5T4VpZn1Vy+FMKw8s24vt5k6zPJXcNOK0asBo= +github.com/aws/aws-sdk-go-v2/service/ecr v1.35.3 h1:8/vARxqd0Pn2Gqhp+8PxxTm3HttUMR1i1vBBj7MNFfc= +github.com/aws/aws-sdk-go-v2/service/ecr v1.35.3/go.mod h1:oRaGEExKI6Pqcow+Tt7wpJf73/Srcj/CUJv5Eb9QFhg= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.5 h1:QFASJGfT8wMXtuP3D5CRmMjARHv9ZmzFUMJznHDOY3w= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.5/go.mod h1:QdZ3OmoIjSX+8D1OPAzPxDfjXASbBMDsz9qvtyIhtik= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.20 h1:Xbwbmk44URTiHNx6PNo0ujDE6ERlsCKJD3u1zfnzAPg= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.20/go.mod h1:oAfOFzUB14ltPZj1rWwRc3d/6OgD76R8KlvU3EqM9Fg= -github.com/aws/aws-sdk-go-v2/service/sso v1.23.0 h1:fHySkG0IGj2nepgGJPmmhZYL9ndnsq1Tvc6MeuVQCaQ= -github.com/aws/aws-sdk-go-v2/service/sso v1.23.0/go.mod h1:XRlMvmad0ZNL+75C5FYdMvbbLkd6qiqz6foR1nA1PXY= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.27.0 h1:cU/OeQPNReyMj1JEBgjE29aclYZYtXcsPMXbTkVGMFk= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.27.0/go.mod h1:FnvDM4sfa+isJ3kDXIzAB9GAwVSzFzSy97uZ3IsHo4E= -github.com/aws/aws-sdk-go-v2/service/sts v1.31.0 h1:GNVxIHBTi2EgwCxpNiozhNasMOK+ROUA2Z3X+cSBX58= -github.com/aws/aws-sdk-go-v2/service/sts v1.31.0/go.mod h1:yMWe0F+XG0DkRZK5ODZhG7BEFYhLXi2dqGsv6tX0cgI= +github.com/aws/aws-sdk-go-v2/service/sso v1.23.3 h1:rs4JCczF805+FDv2tRhZ1NU0RB2H6ryAvsWPanAr72Y= +github.com/aws/aws-sdk-go-v2/service/sso v1.23.3/go.mod h1:XRlMvmad0ZNL+75C5FYdMvbbLkd6qiqz6foR1nA1PXY= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.27.3 h1:S7EPdMVZod8BGKQQPTBK+FcX9g7bKR7c4+HxWqHP7Vg= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.27.3/go.mod h1:FnvDM4sfa+isJ3kDXIzAB9GAwVSzFzSy97uZ3IsHo4E= +github.com/aws/aws-sdk-go-v2/service/sts v1.31.3 h1:VzudTFrDCIDakXtemR7l6Qzt2+JYsVqo2MxBPt5k8T8= +github.com/aws/aws-sdk-go-v2/service/sts v1.31.3/go.mod h1:yMWe0F+XG0DkRZK5ODZhG7BEFYhLXi2dqGsv6tX0cgI= github.com/aws/smithy-go v1.21.0 h1:H7L8dtDRk0P1Qm6y0ji7MCYMQObJ5R9CRpyPhRUkLYA= github.com/aws/smithy-go v1.21.0/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= diff --git a/amazon-eks-ami/nodeadm/internal/api/merge_test.go b/amazon-eks-ami/nodeadm/internal/api/merge_test.go index a5910557..ee2b8207 100644 --- a/amazon-eks-ami/nodeadm/internal/api/merge_test.go +++ b/amazon-eks-ami/nodeadm/internal/api/merge_test.go @@ -95,6 +95,9 @@ func TestMerge(t *testing.T) { "verbosity": 5, }, "podsPerCore": 20, + "systemReserved": map[string]interface{}{ + "cpu": "150m", + }, }), Flags: []string{ "--node-labels=nodegroup=example", @@ -167,6 +170,9 @@ discard_unpacked_layers = false`), }, "maxPods": 150, "podsPerCore": 20, + "systemReserved": map[string]interface{}{ + "cpu": "150m", + }, }), Flags: []string{ "--node-labels=nodegroup=example", diff --git a/amazon-eks-ami/nodeadm/internal/configprovider/encoding.go b/amazon-eks-ami/nodeadm/internal/configprovider/encoding.go new file mode 100644 index 00000000..73ad4e51 --- /dev/null +++ b/amazon-eks-ami/nodeadm/internal/configprovider/encoding.go @@ -0,0 +1,42 @@ +package configprovider + +import ( + "bytes" + "compress/gzip" + "encoding/base64" + "fmt" + "io" +) + +func decodeIfBase64(data []byte) ([]byte, error) { + e := base64.StdEncoding + maxDecodedLen := e.DecodedLen(len(data)) + decodedData := make([]byte, maxDecodedLen) + decodedLen, err := e.Decode(decodedData, data) + if err != nil { + return data, nil + } + return decodedData[:decodedLen], nil +} + +// https://en.wikipedia.org/wiki/Gzip +const gzipMagicNumber = uint16(0x1f8b) + +func decompressIfGZIP(data []byte) ([]byte, error) { + if len(data) < 2 { + return data, nil + } + preamble := uint16(data[0])<<8 | uint16(data[1]) + if preamble == gzipMagicNumber { + reader, err := gzip.NewReader(bytes.NewReader(data)) + if err != nil { + return nil, fmt.Errorf("failed to create GZIP reader: %v", err) + } + if decompressed, err := io.ReadAll(reader); err != nil { + return nil, fmt.Errorf("failed to read from GZIP reader: %v", err) + } else { + return decompressed, nil + } + } + return data, nil +} diff --git a/amazon-eks-ami/nodeadm/internal/configprovider/file.go b/amazon-eks-ami/nodeadm/internal/configprovider/file.go index b4ed0989..3d8fb441 100644 --- a/amazon-eks-ami/nodeadm/internal/configprovider/file.go +++ b/amazon-eks-ami/nodeadm/internal/configprovider/file.go @@ -6,7 +6,6 @@ import ( "os" internalapi "github.com/awslabs/amazon-eks-ami/nodeadm/internal/api" - apibridge "github.com/awslabs/amazon-eks-ami/nodeadm/internal/api/bridge" ) type fileConfigProvider struct { @@ -36,9 +35,5 @@ func (fcs *fileConfigProvider) Provide() (*internalapi.NodeConfig, error) { if err != nil { return nil, err } - config, err := apibridge.DecodeNodeConfig(data) - if err != nil { - return nil, err - } - return config, nil + return parseMaybeMultipart(data) } diff --git a/amazon-eks-ami/nodeadm/internal/configprovider/mime.go b/amazon-eks-ami/nodeadm/internal/configprovider/mime.go new file mode 100644 index 00000000..8fbc4faf --- /dev/null +++ b/amazon-eks-ami/nodeadm/internal/configprovider/mime.go @@ -0,0 +1,96 @@ +package configprovider + +import ( + "bytes" + "fmt" + "io" + "mime" + "mime/multipart" + "net/mail" + "strings" + + internalapi "github.com/awslabs/amazon-eks-ami/nodeadm/internal/api" + apibridge "github.com/awslabs/amazon-eks-ami/nodeadm/internal/api/bridge" +) + +func parseMaybeMultipart(data []byte) (*internalapi.NodeConfig, error) { + // if the MIME data fails to parse as a multipart document, then fall back + // to parsing the entire userdata as the node config. + if multipartReader, err := getMultipartReader(data); err == nil { + config, err := parseMultipart(multipartReader) + if err != nil { + return nil, err + } + return config, nil + } else { + config, err := apibridge.DecodeNodeConfig(data) + if err != nil { + return nil, err + } + return config, nil + } +} + +func parseMultipart(userDataReader *multipart.Reader) (*internalapi.NodeConfig, error) { + var nodeConfigs []*internalapi.NodeConfig + for { + part, err := userDataReader.NextPart() + if err == io.EOF { + break + } + if err != nil { + return nil, err + } + if partHeader := part.Header.Get(contentTypeHeader); len(partHeader) > 0 { + mediaType, _, err := mime.ParseMediaType(partHeader) + if err != nil { + return nil, err + } + if mediaType == nodeConfigMediaType { + nodeConfigPart, err := io.ReadAll(part) + if err != nil { + return nil, err + } + nodeConfigPart, err = decodeIfBase64(nodeConfigPart) + if err != nil { + return nil, err + } + nodeConfigPart, err = decompressIfGZIP(nodeConfigPart) + if err != nil { + return nil, err + } + decodedConfig, err := apibridge.DecodeNodeConfig(nodeConfigPart) + if err != nil { + return nil, err + } + nodeConfigs = append(nodeConfigs, decodedConfig) + } + } + } + if len(nodeConfigs) > 0 { + var config = nodeConfigs[0] + for _, nodeConfig := range nodeConfigs[1:] { + if err := config.Merge(nodeConfig); err != nil { + return nil, err + } + } + return config, nil + } else { + return nil, fmt.Errorf("could not find NodeConfig within UserData") + } +} + +func getMultipartReader(data []byte) (*multipart.Reader, error) { + msg, err := mail.ReadMessage(bytes.NewReader(data)) + if err != nil { + return nil, err + } + mediaType, params, err := mime.ParseMediaType(msg.Header.Get(contentTypeHeader)) + if err != nil { + return nil, err + } + if !strings.HasPrefix(mediaType, multipartContentTypePrefix) { + return nil, fmt.Errorf("MIME type is not multipart") + } + return multipart.NewReader(msg.Body, params[mimeBoundaryParam]), nil +} diff --git a/amazon-eks-ami/nodeadm/internal/configprovider/userdata.go b/amazon-eks-ami/nodeadm/internal/configprovider/userdata.go index 671f8881..55f1ebce 100644 --- a/amazon-eks-ami/nodeadm/internal/configprovider/userdata.go +++ b/amazon-eks-ami/nodeadm/internal/configprovider/userdata.go @@ -1,19 +1,10 @@ package configprovider import ( - "bytes" - "compress/gzip" - "encoding/base64" "fmt" - "io" - "mime" - "mime/multipart" - "net/mail" - "strings" "github.com/awslabs/amazon-eks-ami/nodeadm/api" internalapi "github.com/awslabs/amazon-eks-ami/nodeadm/internal/api" - apibridge "github.com/awslabs/amazon-eks-ami/nodeadm/internal/api/bridge" imds "github.com/awslabs/amazon-eks-ami/nodeadm/internal/aws/imds" ) @@ -57,116 +48,5 @@ func (p *userDataConfigProvider) Provide() (*internalapi.NodeConfig, error) { if err != nil { return nil, fmt.Errorf("failed to decompress user data: %v", err) } - // if the MIME data fails to parse as a multipart document, then fall back - // to parsing the entire userdata as the node config. - if multipartReader, err := getMIMEMultipartReader(userData); err == nil { - config, err := parseMultipart(multipartReader) - if err != nil { - return nil, err - } - return config, nil - } else { - config, err := apibridge.DecodeNodeConfig(userData) - if err != nil { - return nil, err - } - return config, nil - } -} - -func getMIMEMultipartReader(data []byte) (*multipart.Reader, error) { - msg, err := mail.ReadMessage(bytes.NewReader(data)) - if err != nil { - return nil, err - } - mediaType, params, err := mime.ParseMediaType(msg.Header.Get(contentTypeHeader)) - if err != nil { - return nil, err - } - if !strings.HasPrefix(mediaType, multipartContentTypePrefix) { - return nil, fmt.Errorf("MIME type is not multipart") - } - return multipart.NewReader(msg.Body, params[mimeBoundaryParam]), nil -} - -func parseMultipart(userDataReader *multipart.Reader) (*internalapi.NodeConfig, error) { - var nodeConfigs []*internalapi.NodeConfig - for { - part, err := userDataReader.NextPart() - if err == io.EOF { - break - } - if err != nil { - return nil, err - } - if partHeader := part.Header.Get(contentTypeHeader); len(partHeader) > 0 { - mediaType, _, err := mime.ParseMediaType(partHeader) - if err != nil { - return nil, err - } - if mediaType == nodeConfigMediaType { - nodeConfigPart, err := io.ReadAll(part) - if err != nil { - return nil, err - } - nodeConfigPart, err = decodeIfBase64(nodeConfigPart) - if err != nil { - return nil, err - } - nodeConfigPart, err = decompressIfGZIP(nodeConfigPart) - if err != nil { - return nil, err - } - decodedConfig, err := apibridge.DecodeNodeConfig(nodeConfigPart) - if err != nil { - return nil, err - } - nodeConfigs = append(nodeConfigs, decodedConfig) - } - } - } - if len(nodeConfigs) > 0 { - var config = nodeConfigs[0] - for _, nodeConfig := range nodeConfigs[1:] { - if err := config.Merge(nodeConfig); err != nil { - return nil, err - } - } - return config, nil - } else { - return nil, fmt.Errorf("could not find NodeConfig within UserData") - } -} - -func decodeIfBase64(data []byte) ([]byte, error) { - e := base64.StdEncoding - maxDecodedLen := e.DecodedLen(len(data)) - decodedData := make([]byte, maxDecodedLen) - decodedLen, err := e.Decode(decodedData, data) - if err != nil { - return data, nil - } - return decodedData[:decodedLen], nil -} - -// https://en.wikipedia.org/wiki/Gzip -const gzipMagicNumber = uint16(0x1f8b) - -func decompressIfGZIP(data []byte) ([]byte, error) { - if len(data) < 2 { - return data, nil - } - preamble := uint16(data[0])<<8 | uint16(data[1]) - if preamble == gzipMagicNumber { - reader, err := gzip.NewReader(bytes.NewReader(data)) - if err != nil { - return nil, fmt.Errorf("failed to create GZIP reader: %v", err) - } - if decompressed, err := io.ReadAll(reader); err != nil { - return nil, fmt.Errorf("failed to read from GZIP reader: %v", err) - } else { - return decompressed, nil - } - } - return data, nil + return parseMaybeMultipart(userData) } diff --git a/amazon-eks-ami/nodeadm/internal/configprovider/userdata_test.go b/amazon-eks-ami/nodeadm/internal/configprovider/userdata_test.go index 60eadc6d..3e948554 100644 --- a/amazon-eks-ami/nodeadm/internal/configprovider/userdata_test.go +++ b/amazon-eks-ami/nodeadm/internal/configprovider/userdata_test.go @@ -101,6 +101,8 @@ func Test_Provide(t *testing.T) { " config:", " maxPods: 150", " podsPerCore: 20", + " systemReserved:", + " cpu: 150m", " flags:", " - --v=5", " - --node-labels=foo=baz", @@ -117,9 +119,10 @@ func Test_Provide(t *testing.T) { }, Kubelet: api.KubeletOptions{ Config: api.InlineDocument{ - "maxPods": runtime.RawExtension{Raw: []byte("150")}, - "podsPerCore": runtime.RawExtension{Raw: []byte("20")}, - "port": runtime.RawExtension{Raw: []byte("1010")}, + "maxPods": runtime.RawExtension{Raw: []byte("150")}, + "podsPerCore": runtime.RawExtension{Raw: []byte("20")}, + "port": runtime.RawExtension{Raw: []byte("1010")}, + "systemReserved": runtime.RawExtension{Raw: []byte(`{"cpu":"150m"}`)}, }, Flags: []string{ "--v=2", diff --git a/amazon-eks-ami/nodeadm/internal/kubelet/config.go b/amazon-eks-ami/nodeadm/internal/kubelet/config.go index 978a2b24..cb607382 100644 --- a/amazon-eks-ami/nodeadm/internal/kubelet/config.go +++ b/amazon-eks-ami/nodeadm/internal/kubelet/config.go @@ -262,11 +262,11 @@ func (ksc *kubeletConfig) withCloudProvider(kubeletVersion string, cfg *api.Node func (ksc *kubeletConfig) withDefaultReservedResources(cfg *api.NodeConfig) { ksc.SystemReservedCgroup = ptr.String("/system") ksc.KubeReservedCgroup = ptr.String("/runtime") - maxPods, ok := MaxPodsPerInstanceType[cfg.Status.Instance.Type] - if !ok { - ksc.MaxPods = CalcMaxPods(cfg.Status.Instance.Region, cfg.Status.Instance.Type) - } else { + if maxPods, ok := MaxPodsPerInstanceType[cfg.Status.Instance.Type]; ok { + // #nosec G115 // known source from ec2 apis within int32 range ksc.MaxPods = int32(maxPods) + } else { + ksc.MaxPods = CalcMaxPods(cfg.Status.Instance.Region, cfg.Status.Instance.Type) } ksc.KubeReserved = map[string]string{ "cpu": fmt.Sprintf("%dm", getCPUMillicoresToReserve()), diff --git a/amazon-eks-ami/nodeadm/internal/system/resources.go b/amazon-eks-ami/nodeadm/internal/system/resources.go index 6e6c34a6..3bcbe40b 100644 --- a/amazon-eks-ami/nodeadm/internal/system/resources.go +++ b/amazon-eks-ami/nodeadm/internal/system/resources.go @@ -27,9 +27,9 @@ const ( ) type core struct { - Id int `json:"core_id"` - Threads []int `json:"thread_ids"` - SocketID int `json:"socket_id"` + Id int `json:"core_id"` + Threads []uint64 `json:"thread_ids"` + SocketID int `json:"socket_id"` } func init() { @@ -168,7 +168,7 @@ func getCoresInfo(cpuDirs []string) ([]core, error) { desiredCore.SocketID = physicalPackageID if len(desiredCore.Threads) == 0 { - desiredCore.Threads = []int{cpuID} + desiredCore.Threads = []uint64{cpuID} } else { desiredCore.Threads = append(desiredCore.Threads, cpuID) } @@ -177,12 +177,12 @@ func getCoresInfo(cpuDirs []string) ([]core, error) { return cores, nil } -func getCPUID(str string) (int, error) { +func getCPUID(str string) (uint64, error) { matches := cpuDirRegExp.FindStringSubmatch(str) if len(matches) != 2 { return 0, fmt.Errorf("failed to match regexp, str: %s", str) } - valInt, err := strconv.Atoi(matches[1]) + valInt, err := strconv.ParseUint(matches[1], 10, 16) if err != nil { return 0, err } @@ -199,7 +199,7 @@ func getCoreID(cpuPath string) (string, error) { return strings.TrimSpace(string(coreID)), err } -func IsCPUOnline(cpuID int) bool { +func IsCPUOnline(cpuID uint64) bool { cpuOnlinePath, err := filepath.Abs(cpusPath + "/online") if err != nil { zap.L().Info("Unable to get absolute path", zap.String("absolutPath", cpusPath+"/online")) @@ -217,7 +217,7 @@ func IsCPUOnline(cpuID int) bool { zap.Error(err)) } - isOnline, err := isCpuOnline(cpuOnlinePath, uint16(cpuID)) + isOnline, err := isCpuOnline(cpuOnlinePath, cpuID) if err != nil { zap.L().Error("Unable to get online CPUs list", zap.Error(err)) return false @@ -225,7 +225,7 @@ func IsCPUOnline(cpuID int) bool { return isOnline } -func isCpuOnline(path string, cpuID uint16) (bool, error) { +func isCpuOnline(path string, cpuID uint64) (bool, error) { // #nosec G304 // This path is cpuOnlinePath from isCPUOnline fileContent, err := os.ReadFile(path) if err != nil { @@ -254,7 +254,7 @@ func isCpuOnline(path string, cpuID uint16) (bool, error) { return false, fmt.Errorf("invalid values in %s", path) } // Return true, if the CPU under consideration is in the range of online CPUs. - if cpuID >= uint16(min) && cpuID <= uint16(max) { + if cpuID >= min && cpuID <= max { return true, nil } case 1: @@ -262,7 +262,7 @@ func isCpuOnline(path string, cpuID uint16) (bool, error) { if err != nil { return false, err } - if uint16(value) == cpuID { + if value == cpuID { return true, nil } } diff --git a/amazon-eks-ami/nodeadm/test/e2e/infra/aemm-inf1-config.json b/amazon-eks-ami/nodeadm/test/e2e/cases/containerd-runtime-config-neuron/aemm-inf1-config.json similarity index 100% rename from amazon-eks-ami/nodeadm/test/e2e/infra/aemm-inf1-config.json rename to amazon-eks-ami/nodeadm/test/e2e/cases/containerd-runtime-config-neuron/aemm-inf1-config.json diff --git a/amazon-eks-ami/nodeadm/test/e2e/cases/containerd-runtime-config-neuron/run.sh b/amazon-eks-ami/nodeadm/test/e2e/cases/containerd-runtime-config-neuron/run.sh index 61d12930..b19de301 100755 --- a/amazon-eks-ami/nodeadm/test/e2e/cases/containerd-runtime-config-neuron/run.sh +++ b/amazon-eks-ami/nodeadm/test/e2e/cases/containerd-runtime-config-neuron/run.sh @@ -6,7 +6,7 @@ set -o pipefail source /helpers.sh -mock::aws /etc/aemm-inf1-config.json +mock::aws aemm-inf1-config.json mock::kubelet 1.27.0 wait::dbus-ready diff --git a/amazon-eks-ami/nodeadm/test/e2e/infra/aemm-g5-config.json b/amazon-eks-ami/nodeadm/test/e2e/cases/containerd-runtime-config-nvidia/aemm-g5-config.json similarity index 100% rename from amazon-eks-ami/nodeadm/test/e2e/infra/aemm-g5-config.json rename to amazon-eks-ami/nodeadm/test/e2e/cases/containerd-runtime-config-nvidia/aemm-g5-config.json diff --git a/amazon-eks-ami/nodeadm/test/e2e/cases/containerd-runtime-config-nvidia/run.sh b/amazon-eks-ami/nodeadm/test/e2e/cases/containerd-runtime-config-nvidia/run.sh index 758b8305..98ed4c2d 100755 --- a/amazon-eks-ami/nodeadm/test/e2e/cases/containerd-runtime-config-nvidia/run.sh +++ b/amazon-eks-ami/nodeadm/test/e2e/cases/containerd-runtime-config-nvidia/run.sh @@ -6,7 +6,7 @@ set -o pipefail source /helpers.sh -mock::aws /etc/aemm-g5-config.json +mock::aws aemm-g5-config.json mock::kubelet 1.27.0 wait::dbus-ready diff --git a/amazon-eks-ami/nodeadm/test/e2e/cases/mime-userdata-merge/config.yaml b/amazon-eks-ami/nodeadm/test/e2e/cases/mime-userdata-merge/config.yaml new file mode 100644 index 00000000..a8af6cfc --- /dev/null +++ b/amazon-eks-ami/nodeadm/test/e2e/cases/mime-userdata-merge/config.yaml @@ -0,0 +1,41 @@ +MIME-Version: 1.0 +Content-Type: multipart/mixed; boundary="//" + +--// +Content-Type: application/node.eks.aws + +--- +apiVersion: node.eks.aws/v1alpha1 +kind: NodeConfig +spec: + cluster: + name: my-cluster + apiServerEndpoint: https://example.com + certificateAuthority: Y2VydGlmaWNhdGVBdXRob3JpdHk= + cidr: 10.100.0.0/16 + kubelet: + config: + maxPods: 58 + clusterDNS: + - 10.100.0.10 + +--// +Content-Type: application/node.eks.aws + +--- +apiVersion: node.eks.aws/v1alpha1 +kind: NodeConfig +spec: + kubelet: + config: + systemReserved: + cpu: 150m + +--// +Content-Type: text/x-shellscript; charset="us-ascii" + +#!/bin/bash + +echo "hello!" + +--//-- diff --git a/amazon-eks-ami/nodeadm/test/e2e/cases/mime-userdata-merge/expected-kubelet-config.json b/amazon-eks-ami/nodeadm/test/e2e/cases/mime-userdata-merge/expected-kubelet-config.json new file mode 100644 index 00000000..f3b61437 --- /dev/null +++ b/amazon-eks-ami/nodeadm/test/e2e/cases/mime-userdata-merge/expected-kubelet-config.json @@ -0,0 +1,70 @@ +{ + "kind": "KubeletConfiguration", + "apiVersion": "kubelet.config.k8s.io/v1beta1", + "address": "0.0.0.0", + "authentication": { + "x509": { + "clientCAFile": "/etc/kubernetes/pki/ca.crt" + }, + "webhook": { + "enabled": true, + "cacheTTL": "2m0s" + }, + "anonymous": { + "enabled": false + } + }, + "authorization": { + "mode": "Webhook", + "webhook": { + "cacheAuthorizedTTL": "5m0s", + "cacheUnauthorizedTTL": "30s" + } + }, + "cgroupDriver": "systemd", + "cgroupRoot": "/", + "clusterDomain": "cluster.local", + "containerRuntimeEndpoint": "unix:///run/containerd/containerd.sock", + "featureGates": { + "KubeletCredentialProviders": true, + "RotateKubeletServerCertificate": true + }, + "hairpinMode": "hairpin-veth", + "protectKernelDefaults": true, + "readOnlyPort": 0, + "logging": { + "verbosity": 2 + }, + "serializeImagePulls": false, + "serverTLSBootstrap": true, + "tlsCipherSuites": [ + "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256", + "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384", + "TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305", + "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256", + "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384", + "TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305", + "TLS_RSA_WITH_AES_128_GCM_SHA256", + "TLS_RSA_WITH_AES_256_GCM_SHA384" + ], + "clusterDNS": [ + "10.100.0.10" + ], + "maxPods": 58, + "evictionHard": { + "memory.available": "100Mi", + "nodefs.available": "10%", + "nodefs.inodesFree": "5%" + }, + "kubeReserved": { + "cpu": "70m", + "ephemeral-storage": "1Gi", + "memory": "893Mi" + }, + "systemReserved": { + "cpu": "150m" + }, + "systemReservedCgroup": "/system", + "kubeReservedCgroup": "/runtime", + "providerID": "aws:///us-west-2f/i-1234567890abcdef0" +} diff --git a/amazon-eks-ami/nodeadm/test/e2e/cases/mime-userdata-merge/run.sh b/amazon-eks-ami/nodeadm/test/e2e/cases/mime-userdata-merge/run.sh new file mode 100755 index 00000000..b09bb8e9 --- /dev/null +++ b/amazon-eks-ami/nodeadm/test/e2e/cases/mime-userdata-merge/run.sh @@ -0,0 +1,17 @@ +#!/usr/bin/env bash + +set -o errexit +set -o nounset +set -o pipefail + +source /helpers.sh + +mock::aws +# NOTE: test uses a kubelet version lower than 1.30, since the additional +# config will be written to a drop-in file in 1.30+ +mock::kubelet 1.27.0 +wait::dbus-ready + +nodeadm init --skip run --config-source file://config.yaml + +assert::json-files-equal /etc/kubernetes/kubelet/config.json expected-kubelet-config.json diff --git a/amazon-eks-ami/nodeadm/test/e2e/infra/Dockerfile b/amazon-eks-ami/nodeadm/test/e2e/infra/Dockerfile index 31a917c3..3983893e 100644 --- a/amazon-eks-ami/nodeadm/test/e2e/infra/Dockerfile +++ b/amazon-eks-ami/nodeadm/test/e2e/infra/Dockerfile @@ -34,8 +34,6 @@ COPY --from=imds-mock-build /imds-mock /usr/local/bin/imds-mock # certificateAuthority: Y2VydGlmaWNhdGVBdXRob3JpdHk= # cidr: 10.100.0.0/16 COPY test/e2e/infra/aemm-default-config.json /etc/aemm-default-config.json -COPY test/e2e/infra/aemm-inf1-config.json /etc/aemm-inf1-config.json -COPY test/e2e/infra/aemm-g5-config.json /etc/aemm-g5-config.json COPY test/e2e/infra/nvidia-ctk /usr/bin/nvidia-ctk COPY --from=nodeadm-build /nodeadm /usr/local/bin/nodeadm COPY test/e2e/infra/systemd/kubelet.service /usr/lib/systemd/system/kubelet.service diff --git a/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/config/CHANGELOG.md b/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/config/CHANGELOG.md index 9e405046..d6653fc7 100644 --- a/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/config/CHANGELOG.md +++ b/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/config/CHANGELOG.md @@ -1,3 +1,15 @@ +# v1.27.39 (2024-09-27) + +* **Dependency Update**: Updated to the latest SDK module versions + +# v1.27.38 (2024-09-25) + +* **Dependency Update**: Updated to the latest SDK module versions + +# v1.27.37 (2024-09-23) + +* **Dependency Update**: Updated to the latest SDK module versions + # v1.27.36 (2024-09-20) * **Dependency Update**: Updated to the latest SDK module versions diff --git a/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/config/go_module_metadata.go b/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/config/go_module_metadata.go index d8228498..eaa7298f 100644 --- a/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/config/go_module_metadata.go +++ b/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/config/go_module_metadata.go @@ -3,4 +3,4 @@ package config // goModuleVersion is the tagged release for this module -const goModuleVersion = "1.27.36" +const goModuleVersion = "1.27.39" diff --git a/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/credentials/CHANGELOG.md b/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/credentials/CHANGELOG.md index eb7c3fe6..dfb2bd85 100644 --- a/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/credentials/CHANGELOG.md +++ b/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/credentials/CHANGELOG.md @@ -1,3 +1,15 @@ +# v1.17.37 (2024-09-27) + +* **Dependency Update**: Updated to the latest SDK module versions + +# v1.17.36 (2024-09-25) + +* **Dependency Update**: Updated to the latest SDK module versions + +# v1.17.35 (2024-09-23) + +* **Dependency Update**: Updated to the latest SDK module versions + # v1.17.34 (2024-09-20) * **Dependency Update**: Updated to the latest SDK module versions diff --git a/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/credentials/go_module_metadata.go b/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/credentials/go_module_metadata.go index 99ec3eb5..96dba57c 100644 --- a/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/credentials/go_module_metadata.go +++ b/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/credentials/go_module_metadata.go @@ -3,4 +3,4 @@ package credentials // goModuleVersion is the tagged release for this module -const goModuleVersion = "1.17.34" +const goModuleVersion = "1.17.37" diff --git a/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/CHANGELOG.md b/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/CHANGELOG.md index aa9d7433..b4ff4ae7 100644 --- a/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/CHANGELOG.md +++ b/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/CHANGELOG.md @@ -1,3 +1,15 @@ +# v1.179.2 (2024-09-27) + +* No change notes available for this release. + +# v1.179.1 (2024-09-25) + +* **Documentation**: Updates to documentation for the transit gateway security group referencing feature. + +# v1.179.0 (2024-09-23) + +* **Feature**: Amazon EC2 G6e instances powered by NVIDIA L40S Tensor Core GPUs are the most cost-efficient GPU instances for deploying generative AI models and the highest performance GPU instances for spatial computing workloads. + # v1.178.0 (2024-09-20) * **Feature**: Add tracing and metrics support to service clients. diff --git a/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/api_client.go b/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/api_client.go index 27a7afc0..02cd2943 100644 --- a/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/api_client.go +++ b/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/api_client.go @@ -194,10 +194,10 @@ func New(options Options, optFns ...func(*Options)) *Client { resolveEndpointResolverV2(&options) - resolveTracerProvider(&options) - resolveMeterProvider(&options) + resolveTracerProvider(&options) + resolveAuthSchemeResolver(&options) for _, fn := range optFns { diff --git a/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/api_op_CancelConversionTask.go b/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/api_op_CancelConversionTask.go index 7e8249ad..81fc8747 100644 --- a/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/api_op_CancelConversionTask.go +++ b/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/api_op_CancelConversionTask.go @@ -15,10 +15,6 @@ import ( // partially uploaded volume or instance. If the conversion is complete or is in // the process of transferring the final disk image, the command fails and returns // an exception. -// -// For more information, see [Importing a Virtual Machine Using the Amazon EC2 CLI]. -// -// [Importing a Virtual Machine Using the Amazon EC2 CLI]: https://docs.aws.amazon.com/AWSEC2/latest/CommandLineReference/ec2-cli-vmimport-export.html func (c *Client) CancelConversionTask(ctx context.Context, params *CancelConversionTaskInput, optFns ...func(*Options)) (*CancelConversionTaskOutput, error) { if params == nil { params = &CancelConversionTaskInput{} diff --git a/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/api_op_DescribeCapacityBlockOfferings.go b/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/api_op_DescribeCapacityBlockOfferings.go index dbe60aa7..716140f3 100644 --- a/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/api_op_DescribeCapacityBlockOfferings.go +++ b/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/api_op_DescribeCapacityBlockOfferings.go @@ -37,16 +37,6 @@ type DescribeCapacityBlockOfferingsInput struct { // This member is required. CapacityDurationHours *int32 - // The number of instances for which to reserve capacity. - // - // This member is required. - InstanceCount *int32 - - // The type of instance for which the Capacity Block offering reserves capacity. - // - // This member is required. - InstanceType *string - // Checks whether you have the required permissions for the action, without // actually making the request, and provides an error response. If you have the // required permissions, the error response is DryRunOperation . Otherwise, it is @@ -56,6 +46,12 @@ type DescribeCapacityBlockOfferingsInput struct { // The latest end date for the Capacity Block offering. EndDateRange *time.Time + // The number of instances for which to reserve capacity. + InstanceCount *int32 + + // The type of instance for which the Capacity Block offering reserves capacity. + InstanceType *string + // The maximum number of items to return for this request. To get the next page of // items, make another request with the token returned in the output. For more // information, see [Pagination]. diff --git a/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/api_op_ImportInstance.go b/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/api_op_ImportInstance.go index f67313a0..596353d4 100644 --- a/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/api_op_ImportInstance.go +++ b/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/api_op_ImportInstance.go @@ -11,22 +11,19 @@ import ( smithyhttp "github.com/aws/smithy-go/transport/http" ) -// We recommend that you use the [ImportImage]ImportImage API. For more information, see [Importing a VM as an image using VM Import/Export] in -// the VM Import/Export User Guide. +// We recommend that you use the [ImportImage]ImportImage API instead. For more information, +// see [Importing a VM as an image using VM Import/Export]in the VM Import/Export User Guide. // // Creates an import instance task using metadata from the specified disk image. // -// This API action is not supported by the Command Line Interface (CLI). For -// information about using the Amazon EC2 CLI, which is deprecated, see [Importing a VM to Amazon EC2]in the -// Amazon EC2 CLI Reference PDF file. -// // This API action supports only single-volume VMs. To import multi-volume VMs, // use ImportImageinstead. // // For information about the import manifest referenced by this API action, see [VM Import Manifest]. // +// This API action is not supported by the Command Line Interface (CLI). +// // [Importing a VM as an image using VM Import/Export]: https://docs.aws.amazon.com/vm-import/latest/userguide/vmimport-image-import.html -// [Importing a VM to Amazon EC2]: https://awsdocs.s3.amazonaws.com/EC2/ec2-clt.pdf#UsingVirtualMachinesinAmazonEC2 // [ImportImage]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_ImportImage.html // [VM Import Manifest]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/manifest.html func (c *Client) ImportInstance(ctx context.Context, params *ImportInstanceInput, optFns ...func(*Options)) (*ImportInstanceOutput, error) { diff --git a/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/api_op_ImportVolume.go b/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/api_op_ImportVolume.go index bba19174..bd688e6a 100644 --- a/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/api_op_ImportVolume.go +++ b/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/api_op_ImportVolume.go @@ -11,18 +11,15 @@ import ( smithyhttp "github.com/aws/smithy-go/transport/http" ) -// Creates an import volume task using metadata from the specified disk image. -// // This API action supports only single-volume VMs. To import multi-volume VMs, // use ImportImageinstead. To import a disk to a snapshot, use ImportSnapshot instead. // -// This API action is not supported by the Command Line Interface (CLI). For -// information about using the Amazon EC2 CLI, which is deprecated, see [Importing Disks to Amazon EBS]in the -// Amazon EC2 CLI Reference PDF file. +// Creates an import volume task using metadata from the specified disk image. // // For information about the import manifest referenced by this API action, see [VM Import Manifest]. // -// [Importing Disks to Amazon EBS]: https://awsdocs.s3.amazonaws.com/EC2/ec2-clt.pdf#importing-your-volumes-into-amazon-ebs +// This API action is not supported by the Command Line Interface (CLI). +// // [VM Import Manifest]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/manifest.html func (c *Client) ImportVolume(ctx context.Context, params *ImportVolumeInput, optFns ...func(*Options)) (*ImportVolumeOutput, error) { if params == nil { diff --git a/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/go_module_metadata.go b/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/go_module_metadata.go index 7ad52309..e162742e 100644 --- a/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/go_module_metadata.go +++ b/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/go_module_metadata.go @@ -3,4 +3,4 @@ package ec2 // goModuleVersion is the tagged release for this module -const goModuleVersion = "1.178.0" +const goModuleVersion = "1.179.2" diff --git a/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/types/enums.go b/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/types/enums.go index b9e3846f..88df06df 100644 --- a/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/types/enums.go +++ b/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/types/enums.go @@ -2210,6 +2210,8 @@ type FleetCapacityReservationUsageStrategy string // Enum values for FleetCapacityReservationUsageStrategy const ( FleetCapacityReservationUsageStrategyUseCapacityReservationsFirst FleetCapacityReservationUsageStrategy = "use-capacity-reservations-first" + FleetCapacityReservationUsageStrategyUseCapacityReservationsOnly FleetCapacityReservationUsageStrategy = "use-capacity-reservations-only" + FleetCapacityReservationUsageStrategyNone FleetCapacityReservationUsageStrategy = "none" ) // Values returns all known values for FleetCapacityReservationUsageStrategy. Note @@ -2220,6 +2222,8 @@ const ( func (FleetCapacityReservationUsageStrategy) Values() []FleetCapacityReservationUsageStrategy { return []FleetCapacityReservationUsageStrategy{ "use-capacity-reservations-first", + "use-capacity-reservations-only", + "none", } } @@ -3963,6 +3967,14 @@ const ( InstanceTypeR8gMetal24xl InstanceType = "r8g.metal-24xl" InstanceTypeR8gMetal48xl InstanceType = "r8g.metal-48xl" InstanceTypeMac2M1ultraMetal InstanceType = "mac2-m1ultra.metal" + InstanceTypeG6eXlarge InstanceType = "g6e.xlarge" + InstanceTypeG6e2xlarge InstanceType = "g6e.2xlarge" + InstanceTypeG6e4xlarge InstanceType = "g6e.4xlarge" + InstanceTypeG6e8xlarge InstanceType = "g6e.8xlarge" + InstanceTypeG6e12xlarge InstanceType = "g6e.12xlarge" + InstanceTypeG6e16xlarge InstanceType = "g6e.16xlarge" + InstanceTypeG6e24xlarge InstanceType = "g6e.24xlarge" + InstanceTypeG6e48xlarge InstanceType = "g6e.48xlarge" ) // Values returns all known values for InstanceType. Note that this can be @@ -4791,6 +4803,14 @@ func (InstanceType) Values() []InstanceType { "r8g.metal-24xl", "r8g.metal-48xl", "mac2-m1ultra.metal", + "g6e.xlarge", + "g6e.2xlarge", + "g6e.4xlarge", + "g6e.8xlarge", + "g6e.12xlarge", + "g6e.16xlarge", + "g6e.24xlarge", + "g6e.48xlarge", } } diff --git a/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/types/types.go b/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/types/types.go index cff88a1d..973381e4 100644 --- a/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/types/types.go +++ b/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/types/types.go @@ -2478,19 +2478,19 @@ type CreateTransitGatewayVpcAttachmentRequestOptions struct { // Enable or disable IPv6 support. The default is disable . Ipv6Support Ipv6SupportValue - // This parameter is in preview and may not be available for your account. - // // Enables you to reference a security group across VPCs attached to a transit - // gateway. Use this option to simplify security group management and control of - // instance-to-instance traffic across VPCs that are connected by transit gateway. - // You can also use this option to migrate from VPC peering (which was the only - // option that supported security group referencing) to transit gateways (which now - // also support security group referencing). This option is disabled by default and - // there are no additional costs to use this feature. + // gateway to simplify security group management. + // + // This option is disabled by default. // // If you don't enable or disable SecurityGroupReferencingSupport in the request, // the attachment will inherit the security group referencing support setting on // the transit gateway. + // + // For more information about security group referencing, see [Security group referencing] in the Amazon Web + // Services Transit Gateways Guide. + // + // [Security group referencing]: https://docs.aws.amazon.com/vpc/latest/tgw/tgw-vpc-attachments.html#vpc-attachment-security SecurityGroupReferencingSupport SecurityGroupReferencingSupportValue noSmithyDocumentSerde @@ -11333,15 +11333,15 @@ type ModifyTransitGatewayOptions struct { // Removes CIDR blocks for the transit gateway. RemoveTransitGatewayCidrBlocks []string - // This parameter is in preview and may not be available for your account. - // // Enables you to reference a security group across VPCs attached to a transit - // gateway. Use this option to simplify security group management and control of - // instance-to-instance traffic across VPCs that are connected by transit gateway. - // You can also use this option to migrate from VPC peering (which was the only - // option that supported security group referencing) to transit gateways (which now - // also support security group referencing). This option is disabled by default and - // there are no additional costs to use this feature. + // gateway to simplify security group management. + // + // This option is disabled by default. + // + // For more information about security group referencing, see [Security group referencing] in the Amazon Web + // Services Transit Gateways Guide. + // + // [Security group referencing]: https://docs.aws.amazon.com/vpc/latest/tgw/tgw-vpc-attachments.html#vpc-attachment-security SecurityGroupReferencingSupport SecurityGroupReferencingSupportValue // Enable or disable Equal Cost Multipath Protocol support. @@ -11364,15 +11364,15 @@ type ModifyTransitGatewayVpcAttachmentRequestOptions struct { // Enable or disable IPv6 support. The default is enable . Ipv6Support Ipv6SupportValue - // This parameter is in preview and may not be available for your account. - // // Enables you to reference a security group across VPCs attached to a transit - // gateway. Use this option to simplify security group management and control of - // instance-to-instance traffic across VPCs that are connected by transit gateway. - // You can also use this option to migrate from VPC peering (which was the only - // option that supported security group referencing) to transit gateways (which now - // also support security group referencing). This option is disabled by default and - // there are no additional costs to use this feature. + // gateway to simplify security group management. + // + // This option is disabled by default. + // + // For more information about security group referencing, see [Security group referencing] in the Amazon Web + // Services Transit Gateways Guide. + // + // [Security group referencing]: https://docs.aws.amazon.com/vpc/latest/tgw/tgw-vpc-attachments.html#vpc-attachment-security SecurityGroupReferencingSupport SecurityGroupReferencingSupportValue noSmithyDocumentSerde @@ -15761,7 +15761,7 @@ type SnapshotRecycleBinInfo struct { // Details about the import snapshot task. type SnapshotTaskDetail struct { - // The description of the snapshot. + // The description of the disk image being imported. Description *string // The size of the disk in the snapshot, in GiB. @@ -18081,15 +18081,15 @@ type TransitGatewayOptions struct { // The ID of the default propagation route table. PropagationDefaultRouteTableId *string - // This parameter is in preview and may not be available for your account. - // // Enables you to reference a security group across VPCs attached to a transit - // gateway. Use this option to simplify security group management and control of - // instance-to-instance traffic across VPCs that are connected by transit gateway. - // You can also use this option to migrate from VPC peering (which was the only - // option that supported security group referencing) to transit gateways (which now - // also support security group referencing). This option is disabled by default and - // there are no additional costs to use this feature. + // gateway to simplify security group management. + // + // This option is enabled by default. + // + // For more information about security group referencing, see [Security group referencing] in the Amazon Web + // Services Transit Gateways Guide. + // + // [Security group referencing]: https://docs.aws.amazon.com/vpc/latest/tgw/tgw-vpc-attachments.html#vpc-attachment-security SecurityGroupReferencingSupport SecurityGroupReferencingSupportValue // The transit gateway CIDR blocks. @@ -18329,15 +18329,15 @@ type TransitGatewayRequestOptions struct { // Indicates whether multicast is enabled on the transit gateway MulticastSupport MulticastSupportValue - // This parameter is in preview and may not be available for your account. - // // Enables you to reference a security group across VPCs attached to a transit - // gateway. Use this option to simplify security group management and control of - // instance-to-instance traffic across VPCs that are connected by transit gateway. - // You can also use this option to migrate from VPC peering (which was the only - // option that supported security group referencing) to transit gateways (which now - // also support security group referencing). This option is disabled by default and - // there are no additional costs to use this feature. + // gateway to simplify security group management. + // + // This option is disabled by default. + // + // For more information about security group referencing, see [Security group referencing] in the Amazon Web + // Services Transit Gateways Guide. + // + // [Security group referencing]: https://docs.aws.amazon.com/vpc/latest/tgw/tgw-vpc-attachments.html#vpc-attachment-security SecurityGroupReferencingSupport SecurityGroupReferencingSupportValue // One or more IPv4 or IPv6 CIDR blocks for the transit gateway. Must be a size @@ -18574,15 +18574,15 @@ type TransitGatewayVpcAttachmentOptions struct { // Indicates whether IPv6 support is disabled. Ipv6Support Ipv6SupportValue - // This parameter is in preview and may not be available for your account. - // // Enables you to reference a security group across VPCs attached to a transit - // gateway. Use this option to simplify security group management and control of - // instance-to-instance traffic across VPCs that are connected by transit gateway. - // You can also use this option to migrate from VPC peering (which was the only - // option that supported security group referencing) to transit gateways (which now - // also support security group referencing). This option is disabled by default and - // there are no additional costs to use this feature. + // gateway to simplify security group management. + // + // This option is disabled by default. + // + // For more information about security group referencing, see [Security group referencing] in the Amazon Web + // Services Transit Gateways Guide. + // + // [Security group referencing]: https://docs.aws.amazon.com/vpc/latest/tgw/tgw-vpc-attachments.html#vpc-attachment-security SecurityGroupReferencingSupport SecurityGroupReferencingSupportValue noSmithyDocumentSerde diff --git a/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/validators.go b/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/validators.go index 52999d8f..70cf387e 100644 --- a/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/validators.go +++ b/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/validators.go @@ -14834,12 +14834,6 @@ func validateOpDescribeCapacityBlockOfferingsInput(v *DescribeCapacityBlockOffer return nil } invalidParams := smithy.InvalidParamsError{Context: "DescribeCapacityBlockOfferingsInput"} - if v.InstanceType == nil { - invalidParams.Add(smithy.NewErrParamRequired("InstanceType")) - } - if v.InstanceCount == nil { - invalidParams.Add(smithy.NewErrParamRequired("InstanceCount")) - } if v.CapacityDurationHours == nil { invalidParams.Add(smithy.NewErrParamRequired("CapacityDurationHours")) } diff --git a/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/ecr/CHANGELOG.md b/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/ecr/CHANGELOG.md index 81e09e5f..df1b6ba4 100644 --- a/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/ecr/CHANGELOG.md +++ b/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/ecr/CHANGELOG.md @@ -1,3 +1,15 @@ +# v1.35.3 (2024-09-27) + +* No change notes available for this release. + +# v1.35.2 (2024-09-25) + +* No change notes available for this release. + +# v1.35.1 (2024-09-23) + +* No change notes available for this release. + # v1.35.0 (2024-09-20) * **Feature**: Add tracing and metrics support to service clients. diff --git a/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/ecr/api_client.go b/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/ecr/api_client.go index 66983e1c..189109eb 100644 --- a/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/ecr/api_client.go +++ b/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/ecr/api_client.go @@ -187,10 +187,10 @@ func New(options Options, optFns ...func(*Options)) *Client { resolveEndpointResolverV2(&options) - resolveTracerProvider(&options) - resolveMeterProvider(&options) + resolveTracerProvider(&options) + resolveAuthSchemeResolver(&options) for _, fn := range optFns { diff --git a/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/ecr/go_module_metadata.go b/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/ecr/go_module_metadata.go index 9658365c..3a3a1c35 100644 --- a/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/ecr/go_module_metadata.go +++ b/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/ecr/go_module_metadata.go @@ -3,4 +3,4 @@ package ecr // goModuleVersion is the tagged release for this module -const goModuleVersion = "1.35.0" +const goModuleVersion = "1.35.3" diff --git a/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/sso/CHANGELOG.md b/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/sso/CHANGELOG.md index 4d7a71c1..354e7da5 100644 --- a/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/sso/CHANGELOG.md +++ b/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/sso/CHANGELOG.md @@ -1,3 +1,15 @@ +# v1.23.3 (2024-09-27) + +* No change notes available for this release. + +# v1.23.2 (2024-09-25) + +* No change notes available for this release. + +# v1.23.1 (2024-09-23) + +* No change notes available for this release. + # v1.23.0 (2024-09-20) * **Feature**: Add tracing and metrics support to service clients. diff --git a/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/sso/api_client.go b/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/sso/api_client.go index fe8e4676..274b1527 100644 --- a/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/sso/api_client.go +++ b/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/sso/api_client.go @@ -186,10 +186,10 @@ func New(options Options, optFns ...func(*Options)) *Client { resolveEndpointResolverV2(&options) - resolveTracerProvider(&options) - resolveMeterProvider(&options) + resolveTracerProvider(&options) + resolveAuthSchemeResolver(&options) for _, fn := range optFns { diff --git a/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/sso/go_module_metadata.go b/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/sso/go_module_metadata.go index 69b4efcc..b1adc4d0 100644 --- a/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/sso/go_module_metadata.go +++ b/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/sso/go_module_metadata.go @@ -3,4 +3,4 @@ package sso // goModuleVersion is the tagged release for this module -const goModuleVersion = "1.23.0" +const goModuleVersion = "1.23.3" diff --git a/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/ssooidc/CHANGELOG.md b/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/ssooidc/CHANGELOG.md index 474e7f7f..f8e6d7b3 100644 --- a/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/ssooidc/CHANGELOG.md +++ b/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/ssooidc/CHANGELOG.md @@ -1,3 +1,15 @@ +# v1.27.3 (2024-09-27) + +* No change notes available for this release. + +# v1.27.2 (2024-09-25) + +* No change notes available for this release. + +# v1.27.1 (2024-09-23) + +* No change notes available for this release. + # v1.27.0 (2024-09-20) * **Feature**: Add tracing and metrics support to service clients. diff --git a/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/ssooidc/api_client.go b/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/ssooidc/api_client.go index aa1f3ab3..16c90821 100644 --- a/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/ssooidc/api_client.go +++ b/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/ssooidc/api_client.go @@ -186,10 +186,10 @@ func New(options Options, optFns ...func(*Options)) *Client { resolveEndpointResolverV2(&options) - resolveTracerProvider(&options) - resolveMeterProvider(&options) + resolveTracerProvider(&options) + resolveAuthSchemeResolver(&options) for _, fn := range optFns { diff --git a/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/ssooidc/go_module_metadata.go b/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/ssooidc/go_module_metadata.go index ba33b37e..e31a28ff 100644 --- a/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/ssooidc/go_module_metadata.go +++ b/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/ssooidc/go_module_metadata.go @@ -3,4 +3,4 @@ package ssooidc // goModuleVersion is the tagged release for this module -const goModuleVersion = "1.27.0" +const goModuleVersion = "1.27.3" diff --git a/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/sts/CHANGELOG.md b/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/sts/CHANGELOG.md index 82ff30c3..d7151090 100644 --- a/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/sts/CHANGELOG.md +++ b/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/sts/CHANGELOG.md @@ -1,3 +1,15 @@ +# v1.31.3 (2024-09-27) + +* No change notes available for this release. + +# v1.31.2 (2024-09-25) + +* No change notes available for this release. + +# v1.31.1 (2024-09-23) + +* No change notes available for this release. + # v1.31.0 (2024-09-20) * **Feature**: Add tracing and metrics support to service clients. diff --git a/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/sts/api_client.go b/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/sts/api_client.go index 0df1bddf..4425ba95 100644 --- a/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/sts/api_client.go +++ b/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/sts/api_client.go @@ -190,10 +190,10 @@ func New(options Options, optFns ...func(*Options)) *Client { resolveEndpointResolverV2(&options) - resolveTracerProvider(&options) - resolveMeterProvider(&options) + resolveTracerProvider(&options) + resolveAuthSchemeResolver(&options) for _, fn := range optFns { diff --git a/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/sts/go_module_metadata.go b/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/sts/go_module_metadata.go index 8b3c0056..0f759930 100644 --- a/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/sts/go_module_metadata.go +++ b/amazon-eks-ami/nodeadm/vendor/github.com/aws/aws-sdk-go-v2/service/sts/go_module_metadata.go @@ -3,4 +3,4 @@ package sts // goModuleVersion is the tagged release for this module -const goModuleVersion = "1.31.0" +const goModuleVersion = "1.31.3" diff --git a/amazon-eks-ami/nodeadm/vendor/modules.txt b/amazon-eks-ami/nodeadm/vendor/modules.txt index ee55b7fa..940a2947 100644 --- a/amazon-eks-ami/nodeadm/vendor/modules.txt +++ b/amazon-eks-ami/nodeadm/vendor/modules.txt @@ -36,10 +36,10 @@ github.com/aws/aws-sdk-go-v2/internal/shareddefaults github.com/aws/aws-sdk-go-v2/internal/strings github.com/aws/aws-sdk-go-v2/internal/sync/singleflight github.com/aws/aws-sdk-go-v2/internal/timeconv -# github.com/aws/aws-sdk-go-v2/config v1.27.36 +# github.com/aws/aws-sdk-go-v2/config v1.27.39 ## explicit; go 1.21 github.com/aws/aws-sdk-go-v2/config -# github.com/aws/aws-sdk-go-v2/credentials v1.17.34 +# github.com/aws/aws-sdk-go-v2/credentials v1.17.37 ## explicit; go 1.21 github.com/aws/aws-sdk-go-v2/credentials github.com/aws/aws-sdk-go-v2/credentials/ec2rolecreds @@ -61,12 +61,12 @@ github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 # github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 ## explicit; go 1.21 github.com/aws/aws-sdk-go-v2/internal/ini -# github.com/aws/aws-sdk-go-v2/service/ec2 v1.178.0 +# github.com/aws/aws-sdk-go-v2/service/ec2 v1.179.2 ## explicit; go 1.21 github.com/aws/aws-sdk-go-v2/service/ec2 github.com/aws/aws-sdk-go-v2/service/ec2/internal/endpoints github.com/aws/aws-sdk-go-v2/service/ec2/types -# github.com/aws/aws-sdk-go-v2/service/ecr v1.35.0 +# github.com/aws/aws-sdk-go-v2/service/ecr v1.35.3 ## explicit; go 1.21 github.com/aws/aws-sdk-go-v2/service/ecr github.com/aws/aws-sdk-go-v2/service/ecr/internal/endpoints @@ -77,17 +77,17 @@ github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding # github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.20 ## explicit; go 1.21 github.com/aws/aws-sdk-go-v2/service/internal/presigned-url -# github.com/aws/aws-sdk-go-v2/service/sso v1.23.0 +# github.com/aws/aws-sdk-go-v2/service/sso v1.23.3 ## explicit; go 1.21 github.com/aws/aws-sdk-go-v2/service/sso github.com/aws/aws-sdk-go-v2/service/sso/internal/endpoints github.com/aws/aws-sdk-go-v2/service/sso/types -# github.com/aws/aws-sdk-go-v2/service/ssooidc v1.27.0 +# github.com/aws/aws-sdk-go-v2/service/ssooidc v1.27.3 ## explicit; go 1.21 github.com/aws/aws-sdk-go-v2/service/ssooidc github.com/aws/aws-sdk-go-v2/service/ssooidc/internal/endpoints github.com/aws/aws-sdk-go-v2/service/ssooidc/types -# github.com/aws/aws-sdk-go-v2/service/sts v1.31.0 +# github.com/aws/aws-sdk-go-v2/service/sts v1.31.3 ## explicit; go 1.21 github.com/aws/aws-sdk-go-v2/service/sts github.com/aws/aws-sdk-go-v2/service/sts/internal/endpoints