From 5feeaf179c352c445d810308014dbf1c302ed236 Mon Sep 17 00:00:00 2001 From: David Betts Date: Tue, 19 Sep 2023 15:16:52 +0000 Subject: [PATCH] Fix test data and update lambda Docker run image to use provided.al2 --- Dockerfile.lambda | 12 +++++++----- .../templates/alb-ingress-controller.yaml | 2 +- .../templates/alb-ingress-controller.yaml | 2 +- .../templates/alb-ingress-controller.yaml | 2 +- .../templates/alb-ingress-controller.yaml | 2 +- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Dockerfile.lambda b/Dockerfile.lambda index e20644f..c6f79ff 100644 --- a/Dockerfile.lambda +++ b/Dockerfile.lambda @@ -25,13 +25,15 @@ RUN make kubeapply-lambda VERSION_REF=${VERSION_REF} && \ cp build/kubeapply-lambda /usr/local/bin # Copy into final image -FROM public.ecr.aws/lambda/go:1 +FROM public.ecr.aws/lambda/provided:al2 -RUN yum install -y git && \ - python3 --version +RUN yum install -y git unzip -RUN curl -O https://bootstrap.pypa.io/pip/3.6/get-pip.py && python3 get-pip.py -RUN pip3 install awscli +# Not sure if awscli is needed for running lambda, but keeping it here for now +RUN curl https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip -o awscliv2.zip \ + && unzip awscliv2.zip \ + && ./aws/install \ + && rm -rf aws awscliv2.zip COPY --from=builder \ /usr/local/bin/aws-iam-authenticator \ diff --git a/cmd/kubeapply/subcmd/testdata/clusters/expand-test/expanded/stage/us-west-2/kube-system/alb-ingress-controller/templates/alb-ingress-controller.yaml b/cmd/kubeapply/subcmd/testdata/clusters/expand-test/expanded/stage/us-west-2/kube-system/alb-ingress-controller/templates/alb-ingress-controller.yaml index 5951253..5ccc0ef 100644 --- a/cmd/kubeapply/subcmd/testdata/clusters/expand-test/expanded/stage/us-west-2/kube-system/alb-ingress-controller/templates/alb-ingress-controller.yaml +++ b/cmd/kubeapply/subcmd/testdata/clusters/expand-test/expanded/stage/us-west-2/kube-system/alb-ingress-controller/templates/alb-ingress-controller.yaml @@ -6,7 +6,7 @@ kind: Deployment metadata: labels: app: alb-ingress-controller - name: alb-ingress-controller-RELEASE-NAME + name: alb-ingress-controller-release-name namespace: kube-system spec: replicas: 1 diff --git a/cmd/kubeapply/subcmd/testdata/clusters/expand-test/expanded/stage/us-west-2/kube-system/alb-ingress-controller2/templates/alb-ingress-controller.yaml b/cmd/kubeapply/subcmd/testdata/clusters/expand-test/expanded/stage/us-west-2/kube-system/alb-ingress-controller2/templates/alb-ingress-controller.yaml index 93967d0..4314f18 100644 --- a/cmd/kubeapply/subcmd/testdata/clusters/expand-test/expanded/stage/us-west-2/kube-system/alb-ingress-controller2/templates/alb-ingress-controller.yaml +++ b/cmd/kubeapply/subcmd/testdata/clusters/expand-test/expanded/stage/us-west-2/kube-system/alb-ingress-controller2/templates/alb-ingress-controller.yaml @@ -6,7 +6,7 @@ kind: Deployment metadata: labels: app: alb-ingress-controller - name: alb-ingress-controller-RELEASE-NAME + name: alb-ingress-controller-release-name namespace: kube-system spec: replicas: 1 diff --git a/cmd/kubeapply/subcmd/testdata/clusters/expand-test/expanded_expected/stage/us-west-2/kube-system/alb-ingress-controller/templates/alb-ingress-controller.yaml b/cmd/kubeapply/subcmd/testdata/clusters/expand-test/expanded_expected/stage/us-west-2/kube-system/alb-ingress-controller/templates/alb-ingress-controller.yaml index 5951253..5ccc0ef 100644 --- a/cmd/kubeapply/subcmd/testdata/clusters/expand-test/expanded_expected/stage/us-west-2/kube-system/alb-ingress-controller/templates/alb-ingress-controller.yaml +++ b/cmd/kubeapply/subcmd/testdata/clusters/expand-test/expanded_expected/stage/us-west-2/kube-system/alb-ingress-controller/templates/alb-ingress-controller.yaml @@ -6,7 +6,7 @@ kind: Deployment metadata: labels: app: alb-ingress-controller - name: alb-ingress-controller-RELEASE-NAME + name: alb-ingress-controller-release-name namespace: kube-system spec: replicas: 1 diff --git a/cmd/kubeapply/subcmd/testdata/clusters/expand-test/expanded_expected/stage/us-west-2/kube-system/alb-ingress-controller2/templates/alb-ingress-controller.yaml b/cmd/kubeapply/subcmd/testdata/clusters/expand-test/expanded_expected/stage/us-west-2/kube-system/alb-ingress-controller2/templates/alb-ingress-controller.yaml index 93967d0..4314f18 100644 --- a/cmd/kubeapply/subcmd/testdata/clusters/expand-test/expanded_expected/stage/us-west-2/kube-system/alb-ingress-controller2/templates/alb-ingress-controller.yaml +++ b/cmd/kubeapply/subcmd/testdata/clusters/expand-test/expanded_expected/stage/us-west-2/kube-system/alb-ingress-controller2/templates/alb-ingress-controller.yaml @@ -6,7 +6,7 @@ kind: Deployment metadata: labels: app: alb-ingress-controller - name: alb-ingress-controller-RELEASE-NAME + name: alb-ingress-controller-release-name namespace: kube-system spec: replicas: 1