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

feat: update KubectlLayer with the latest security patches for Helm and remove deprecated python3.7 and nodejs14.x runtimes #623

Merged
merged 56 commits into from
Jun 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
ca5dc88
Helm Version: 3.14.2 Kubectl Version: 1.29.2 and deps update / remove…
awsdataarchitect Mar 8, 2024
9a78149
Merge branch 'kubectl-v29/main' into kubectl-v29/main
awsdataarchitect Mar 8, 2024
d1a96ad
Merge branch 'kubectl-v29/main' into kubectl-v29/main
awsdataarchitect Mar 9, 2024
803e462
Merge branch 'kubectl-v29/main' into kubectl-v29/main
awsdataarchitect Mar 10, 2024
f2e5a8f
Merge branch 'kubectl-v29/main' into kubectl-v29/main
awsdataarchitect Mar 11, 2024
419a919
Merge branch 'kubectl-v29/main' into kubectl-v29/main
awsdataarchitect Mar 12, 2024
e3f40d3
yarn resolve conflicts
awsdataarchitect Mar 12, 2024
5e6a835
Merge branch 'kubectl-v29/main' into kubectl-v29/main
awsdataarchitect Mar 13, 2024
5db7161
Merge branch 'kubectl-v29/main' into kubectl-v29/main
awsdataarchitect Mar 14, 2024
1dd796f
Merge branch 'kubectl-v29/main' into kubectl-v29/main
awsdataarchitect Mar 15, 2024
effa4f1
Merge branch 'kubectl-v29/main' into kubectl-v29/main
awsdataarchitect Mar 16, 2024
2afe1a6
Merge branch 'kubectl-v29/main' into kubectl-v29/main
awsdataarchitect Mar 18, 2024
64e5da7
Merge branch 'kubectl-v29/main' into kubectl-v29/main
awsdataarchitect Mar 19, 2024
2845c67
Merge branch 'kubectl-v29/main' into kubectl-v29/main
awsdataarchitect Mar 20, 2024
5e3bdf7
Merge branch 'kubectl-v29/main' into kubectl-v29/main
awsdataarchitect Mar 21, 2024
8170cbe
Merge branch 'kubectl-v29/main' into kubectl-v29/main
awsdataarchitect Mar 24, 2024
283f333
pull yarn.lock from fork
awsdataarchitect Mar 24, 2024
92da15f
removed yarn.lock
awsdataarchitect Mar 24, 2024
062344a
Merge branch 'kubectl-v29/main' into kubectl-v29/main
awsdataarchitect Mar 25, 2024
0cd3cd8
Merge branch 'kubectl-v29/main' into kubectl-v29/main
awsdataarchitect Mar 26, 2024
a87075a
Merge branch 'kubectl-v29/main' into kubectl-v29/main
awsdataarchitect Mar 27, 2024
1f53098
Merge branch 'kubectl-v29/main' into kubectl-v29/main
awsdataarchitect Mar 28, 2024
a4da422
Merge branch 'kubectl-v29/main' into kubectl-v29/main
awsdataarchitect Mar 30, 2024
d3191f8
Merge branch 'kubectl-v29/main' into kubectl-v29/main
awsdataarchitect Mar 31, 2024
5a48eef
Merge branch 'kubectl-v29/main' into kubectl-v29/main
awsdataarchitect Apr 1, 2024
32d2d1c
Merge branch 'kubectl-v29/main' into kubectl-v29/main
awsdataarchitect Apr 2, 2024
17d7779
Merge branch 'kubectl-v29/main' into kubectl-v29/main
awsdataarchitect Apr 4, 2024
637a537
Merge branch 'kubectl-v29/main' into kubectl-v29/main
awsdataarchitect Apr 5, 2024
abf820f
Merge branch 'kubectl-v29/main' into kubectl-v29/main
awsdataarchitect Apr 7, 2024
4d7f346
Merge branch 'kubectl-v29/main' into kubectl-v29/main
awsdataarchitect Apr 9, 2024
9f1018d
Merge branch 'kubectl-v29/main' into kubectl-v29/main
awsdataarchitect Apr 10, 2024
68a0b46
Merge branch 'kubectl-v29/main' into kubectl-v29/main
awsdataarchitect Apr 11, 2024
2fccb7b
Merge branch 'kubectl-v29/main' into kubectl-v29/main
awsdataarchitect Apr 12, 2024
db539a9
Merge branch 'kubectl-v29/main' into kubectl-v29/main
awsdataarchitect Apr 13, 2024
9cb1056
Merge branch 'kubectl-v29/main' into kubectl-v29/main
awsdataarchitect Apr 16, 2024
dc4af95
Merge branch 'kubectl-v29/main' into kubectl-v29/main
awsdataarchitect Apr 17, 2024
d16ba1f
Merge branch 'kubectl-v29/main' into kubectl-v29/main
awsdataarchitect Apr 18, 2024
1214cdf
Merge branch 'kubectl-v29/main' into kubectl-v29/main
awsdataarchitect Apr 19, 2024
168d5f2
Merge branch 'kubectl-v29/main' into kubectl-v29/main
awsdataarchitect Apr 20, 2024
8edcaa0
Merge branch 'kubectl-v29/main' into kubectl-v29/main
awsdataarchitect Apr 23, 2024
889d3d4
Merge branch 'kubectl-v29/main' into kubectl-v29/main
awsdataarchitect Apr 24, 2024
3cc89b6
Merge branch 'kubectl-v29/main' into kubectl-v29/main
awsdataarchitect Apr 27, 2024
6021dce
sync yarn.lock
awsdataarchitect Apr 30, 2024
8d2b37f
resolved comments
awsdataarchitect May 4, 2024
43c4ae5
Merge branch 'kubectl-v29/main' into kubectl-v29/main
awsdataarchitect May 4, 2024
bf52ec4
Merge branch 'kubectl-v29/main' into kubectl-v29/main
awsdataarchitect May 5, 2024
b4367fc
Merge branch 'kubectl-v29/main' into kubectl-v29/main
awsdataarchitect May 7, 2024
4187707
Merge branch 'kubectl-v29/main' into kubectl-v29/main
awsdataarchitect Jun 5, 2024
7d255be
fix typo in yarn.lock resolve conflict
awsdataarchitect Jun 5, 2024
2cee62a
copy yarn.lock from main
awsdataarchitect Jun 5, 2024
00ad88f
fix yarn.lock \ No newline at end of file
awsdataarchitect Jun 5, 2024
4587688
fix yarn.lock \ No newline at end of file
awsdataarchitect Jun 5, 2024
9f9715a
push the package.json and worflow changes it is complaining
awsdataarchitect Jun 5, 2024
c290772
try again yarn.lock
awsdataarchitect Jun 5, 2024
50a5026
try again
awsdataarchitect Jun 5, 2024
01617ad
try again
awsdataarchitect Jun 5, 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
2 changes: 1 addition & 1 deletion .github/workflows/build.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .github/workflows/release-kubectl-v29.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .projen/deps.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .projenrc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const project = new awscdk.AwsCdkConstructLibrary({
projenrcTs: true,
author: 'Amazon Web Services',
authorAddress: '[email protected]',
cdkVersion: '2.28.0',
cdkVersion: '2.94.0',
name: `@aws-cdk/lambda-layer-kubectl-v${SPEC_VERSION}`,
description: `A Lambda Layer that contains kubectl v1.${SPEC_VERSION}`,
repositoryUrl: 'https://github.com/cdklabs/awscdk-asset-kubectl.git',
Expand Down
21 changes: 19 additions & 2 deletions API.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ This module exports a single class called `KubectlV29Layer` which is a `lambda.L
bundles the [`kubectl`](https://kubernetes.io/docs/reference/kubectl/kubectl/) and the
[`helm`](https://helm.sh/) command line.

> - Helm Version: 3.14.0
> - Kubectl Version: 1.29.1
> - Helm Version: 3.14.4
> - Kubectl Version: 1.29.4
>

Usage:
Expand Down
4 changes: 2 additions & 2 deletions layer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ FROM public.ecr.aws/lambda/provided:latest
# versions
#

ARG KUBECTL_VERSION=1.29.1
ARG HELM_VERSION=3.14.0
ARG KUBECTL_VERSION=1.29.4
ARG HELM_VERSION=3.14.4

USER root
RUN mkdir -p /opt
Expand Down
4 changes: 2 additions & 2 deletions package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion projenrc/workflow-no-docker-patch.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export class WorkflowNoDockerPatch {
JsonPatch.add(`/jobs/${workflow}/steps/`, {
name: 'Setup Node.js',
uses: 'actions/setup-node@v3',
with: { 'node-version': project.minNodeVersion ?? '14.x' },
with: { 'node-version': project.minNodeVersion ?? '16.x' },
awsdataarchitect marked this conversation as resolved.
Show resolved Hide resolved
}),
JsonPatch.remove(`/jobs/${workflow}/container`),
);
Expand Down
2 changes: 1 addition & 1 deletion src/kubectl-layer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export class KubectlV29Layer extends lambda.LayerVersion {
code: lambda.Code.fromAsset(ASSET_FILE, {
assetHash: assetHash(),
}),
description: '/opt/kubectl/kubectl 1.29; /opt/helm/helm 3.14',
description: '/opt/kubectl/kubectl 1.29.4; /opt/helm/helm 3.14.4',
license: 'Apache-2.0',
});
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"version": "20.0.0",
"version": "34.0.0",
"files": {
"b5925bba477fd1ac27c3a695a9f6ece293bd0ae6940bc65a5b99008ab54f60f7": {
"2266ac05f7e1f3dbecd7349c1f994abb28703d561d08d58f559927e0d31817d4": {
"source": {
"path": "asset.b5925bba477fd1ac27c3a695a9f6ece293bd0ae6940bc65a5b99008ab54f60f7.zip",
"path": "asset.2266ac05f7e1f3dbecd7349c1f994abb28703d561d08d58f559927e0d31817d4.zip",
"packaging": "file"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "b5925bba477fd1ac27c3a695a9f6ece293bd0ae6940bc65a5b99008ab54f60f7.zip",
"objectKey": "2266ac05f7e1f3dbecd7349c1f994abb28703d561d08d58f559927e0d31817d4.zip",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
Expand All @@ -27,28 +27,28 @@
}
}
},
"eaeb69bc290b516fe3b049f89d6118b22249df682fbabf56af300cf345198574": {
"f2d30cfc360482320a52a4fcde8a70f3569df79ab30be24650fda58eb60052cf": {
"source": {
"path": "asset.eaeb69bc290b516fe3b049f89d6118b22249df682fbabf56af300cf345198574",
"path": "asset.f2d30cfc360482320a52a4fcde8a70f3569df79ab30be24650fda58eb60052cf",
"packaging": "zip"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "eaeb69bc290b516fe3b049f89d6118b22249df682fbabf56af300cf345198574.zip",
"objectKey": "f2d30cfc360482320a52a4fcde8a70f3569df79ab30be24650fda58eb60052cf.zip",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
},
"7793bea638b52e9d8f5e0c5a129f4337959bf7bdf7408d2035cc2ddfdf4f7d56": {
"11baabd2ea39a92e958855fe9d0e2c549a83bc8710379d8695623383d256922f": {
"source": {
"path": "lambda-layer-kubectl-integ-stack.template.json",
"packaging": "file"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "7793bea638b52e9d8f5e0c5a129f4337959bf7bdf7408d2035cc2ddfdf4f7d56.json",
"objectKey": "11baabd2ea39a92e958855fe9d0e2c549a83bc8710379d8695623383d256922f.json",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
Expand Down
Loading
Loading