From 71d91614d163f0c8d5723241b5bbad8865b7ba67 Mon Sep 17 00:00:00 2001 From: Mathieu Perochon Date: Fri, 10 Nov 2023 18:31:35 +0100 Subject: [PATCH 1/3] feat : upgrade helm and kubectl version --- README.md | 4 ++-- layer/Dockerfile | 4 ++-- yarn.lock | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 2ccf155a..805b7694 100644 --- a/README.md +++ b/README.md @@ -13,8 +13,8 @@ This module exports a single class called `KubectlV28Layer` 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.13.1 -> - Kubectl Version: 1.28.2 +> - Helm Version: 3.13.2 +> - Kubectl Version: 1.28.3 > Usage: diff --git a/layer/Dockerfile b/layer/Dockerfile index 63ea9e22..33bf700a 100644 --- a/layer/Dockerfile +++ b/layer/Dockerfile @@ -5,8 +5,8 @@ FROM public.ecr.aws/lambda/provided:latest # versions # -ARG KUBECTL_VERSION=1.28.2 -ARG HELM_VERSION=3.13.1 +ARG KUBECTL_VERSION=1.28.3 +ARG HELM_VERSION=3.13.2 USER root RUN mkdir -p /opt diff --git a/yarn.lock b/yarn.lock index 909dd09f..c428a9de 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6239,7 +6239,7 @@ ts-jest@^27: ts-node@^10.9.1: version "10.9.1" - resolved "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz" + resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.1.tgz#e73de9102958af9e1f0b168a6ff320e25adcff4b" integrity sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw== dependencies: "@cspotcode/source-map-support" "^0.8.0" From 938c165c0ff4e5ac23cdeab1d55e3b4d8e0898c4 Mon Sep 17 00:00:00 2001 From: Mathieu Perochon Date: Fri, 10 Nov 2023 19:01:37 +0100 Subject: [PATCH 2/3] fix build step --- API.md | 4 ++-- layer/Dockerfile | 2 +- .../lambda-layer-kubectl-integ-stack.assets.json | 10 +++++----- .../lambda-layer-kubectl-integ-stack.template.json | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/API.md b/API.md index 9c12f395..44480480 100644 --- a/API.md +++ b/API.md @@ -13,8 +13,8 @@ This module exports a single class called `KubectlV28Layer` 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.13.1 -> - Kubectl Version: 1.28.2 +> - Helm Version: 3.13.2 +> - Kubectl Version: 1.28.3 > Usage: diff --git a/layer/Dockerfile b/layer/Dockerfile index 33bf700a..4c623a63 100644 --- a/layer/Dockerfile +++ b/layer/Dockerfile @@ -1,5 +1,5 @@ # base lambda image -FROM public.ecr.aws/lambda/provided:latest +FROM public.ecr.aws/lambda/provided:alami.2023.11.09.14 # # versions diff --git a/test/kubectl-layer.integ.snapshot/lambda-layer-kubectl-integ-stack.assets.json b/test/kubectl-layer.integ.snapshot/lambda-layer-kubectl-integ-stack.assets.json index be7224da..af697b89 100644 --- a/test/kubectl-layer.integ.snapshot/lambda-layer-kubectl-integ-stack.assets.json +++ b/test/kubectl-layer.integ.snapshot/lambda-layer-kubectl-integ-stack.assets.json @@ -1,15 +1,15 @@ { "version": "20.0.0", "files": { - "b4d47e4f1c5e8fc2df2cd474ede548de153300d332ba8d582b7c1193e61cbe1e": { + "b625bce57e1a801394f7c510607e7bb0e164cb12f4c72e6a29efe31388378674": { "source": { - "path": "asset.b4d47e4f1c5e8fc2df2cd474ede548de153300d332ba8d582b7c1193e61cbe1e.zip", + "path": "asset.b625bce57e1a801394f7c510607e7bb0e164cb12f4c72e6a29efe31388378674.zip", "packaging": "file" }, "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "b4d47e4f1c5e8fc2df2cd474ede548de153300d332ba8d582b7c1193e61cbe1e.zip", + "objectKey": "b625bce57e1a801394f7c510607e7bb0e164cb12f4c72e6a29efe31388378674.zip", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } @@ -40,7 +40,7 @@ } } }, - "5405b8f41c7ac8bf9cc30f0efbaf976a3e59e61336a33aa6b2fdf5fe592803d8": { + "3907ec3ebdc392c9449caabedd4a58f6345c6c9d29ca176e7b3f23560adea812": { "source": { "path": "lambda-layer-kubectl-integ-stack.template.json", "packaging": "file" @@ -48,7 +48,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "5405b8f41c7ac8bf9cc30f0efbaf976a3e59e61336a33aa6b2fdf5fe592803d8.json", + "objectKey": "3907ec3ebdc392c9449caabedd4a58f6345c6c9d29ca176e7b3f23560adea812.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/test/kubectl-layer.integ.snapshot/lambda-layer-kubectl-integ-stack.template.json b/test/kubectl-layer.integ.snapshot/lambda-layer-kubectl-integ-stack.template.json index f82dd042..95137d72 100644 --- a/test/kubectl-layer.integ.snapshot/lambda-layer-kubectl-integ-stack.template.json +++ b/test/kubectl-layer.integ.snapshot/lambda-layer-kubectl-integ-stack.template.json @@ -7,7 +7,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "b4d47e4f1c5e8fc2df2cd474ede548de153300d332ba8d582b7c1193e61cbe1e.zip" + "S3Key": "b625bce57e1a801394f7c510607e7bb0e164cb12f4c72e6a29efe31388378674.zip" }, "Description": "/opt/kubectl/kubectl 1.28; /opt/helm/helm 3.13", "LicenseInfo": "Apache-2.0" From 07882ddbda92e2553a085a049759c851fb72add5 Mon Sep 17 00:00:00 2001 From: Mathieu Perochon Date: Tue, 14 Nov 2023 21:30:18 +0100 Subject: [PATCH 3/3] move yum to dnf since the base image is updated --- layer/Dockerfile | 6 +++--- .../lambda-layer-kubectl-integ-stack.assets.json | 10 +++++----- .../lambda-layer-kubectl-integ-stack.template.json | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/layer/Dockerfile b/layer/Dockerfile index 4c623a63..b122e589 100644 --- a/layer/Dockerfile +++ b/layer/Dockerfile @@ -1,5 +1,5 @@ # base lambda image -FROM public.ecr.aws/lambda/provided:alami.2023.11.09.14 +FROM public.ecr.aws/lambda/provided:latest # # versions @@ -16,8 +16,8 @@ WORKDIR /tmp # tools # -RUN yum update -y \ - && yum install -y zip unzip wget tar gzip +RUN dnf update -y \ + && dnf install -y zip unzip wget tar gzip # # kubectl diff --git a/test/kubectl-layer.integ.snapshot/lambda-layer-kubectl-integ-stack.assets.json b/test/kubectl-layer.integ.snapshot/lambda-layer-kubectl-integ-stack.assets.json index af697b89..4add83ce 100644 --- a/test/kubectl-layer.integ.snapshot/lambda-layer-kubectl-integ-stack.assets.json +++ b/test/kubectl-layer.integ.snapshot/lambda-layer-kubectl-integ-stack.assets.json @@ -1,15 +1,15 @@ { "version": "20.0.0", "files": { - "b625bce57e1a801394f7c510607e7bb0e164cb12f4c72e6a29efe31388378674": { + "86f05776482372fd66a81138275ca1022ffed8dd49d94a7043447e754005e700": { "source": { - "path": "asset.b625bce57e1a801394f7c510607e7bb0e164cb12f4c72e6a29efe31388378674.zip", + "path": "asset.86f05776482372fd66a81138275ca1022ffed8dd49d94a7043447e754005e700.zip", "packaging": "file" }, "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "b625bce57e1a801394f7c510607e7bb0e164cb12f4c72e6a29efe31388378674.zip", + "objectKey": "86f05776482372fd66a81138275ca1022ffed8dd49d94a7043447e754005e700.zip", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } @@ -40,7 +40,7 @@ } } }, - "3907ec3ebdc392c9449caabedd4a58f6345c6c9d29ca176e7b3f23560adea812": { + "86e18474711dc6dbd3f6177635ac32b37d05874c66fb96820dbe2f2a63462017": { "source": { "path": "lambda-layer-kubectl-integ-stack.template.json", "packaging": "file" @@ -48,7 +48,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "3907ec3ebdc392c9449caabedd4a58f6345c6c9d29ca176e7b3f23560adea812.json", + "objectKey": "86e18474711dc6dbd3f6177635ac32b37d05874c66fb96820dbe2f2a63462017.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/test/kubectl-layer.integ.snapshot/lambda-layer-kubectl-integ-stack.template.json b/test/kubectl-layer.integ.snapshot/lambda-layer-kubectl-integ-stack.template.json index 95137d72..f82e9acc 100644 --- a/test/kubectl-layer.integ.snapshot/lambda-layer-kubectl-integ-stack.template.json +++ b/test/kubectl-layer.integ.snapshot/lambda-layer-kubectl-integ-stack.template.json @@ -7,7 +7,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "b625bce57e1a801394f7c510607e7bb0e164cb12f4c72e6a29efe31388378674.zip" + "S3Key": "86f05776482372fd66a81138275ca1022ffed8dd49d94a7043447e754005e700.zip" }, "Description": "/opt/kubectl/kubectl 1.28; /opt/helm/helm 3.13", "LicenseInfo": "Apache-2.0"