Skip to content

Commit 8173d01

Browse files
authored
Merge pull request #72 from segmentio/wbetts/aws-al2-migration
Fix test data and update lambda Docker run image to use provided.al2
2 parents 5b916ad + 5feeaf1 commit 8173d01

File tree

5 files changed

+11
-9
lines changed

5 files changed

+11
-9
lines changed

Dockerfile.lambda

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,15 @@ RUN make kubeapply-lambda VERSION_REF=${VERSION_REF} && \
2525
cp build/kubeapply-lambda /usr/local/bin
2626

2727
# Copy into final image
28-
FROM public.ecr.aws/lambda/go:1
28+
FROM public.ecr.aws/lambda/provided:al2
2929

30-
RUN yum install -y git && \
31-
python3 --version
30+
RUN yum install -y git unzip
3231

33-
RUN curl -O https://bootstrap.pypa.io/pip/3.6/get-pip.py && python3 get-pip.py
34-
RUN pip3 install awscli
32+
# Not sure if awscli is needed for running lambda, but keeping it here for now
33+
RUN curl https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip -o awscliv2.zip \
34+
&& unzip awscliv2.zip \
35+
&& ./aws/install \
36+
&& rm -rf aws awscliv2.zip
3537

3638
COPY --from=builder \
3739
/usr/local/bin/aws-iam-authenticator \

cmd/kubeapply/subcmd/testdata/clusters/expand-test/expanded/stage/us-west-2/kube-system/alb-ingress-controller/templates/alb-ingress-controller.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ kind: Deployment
66
metadata:
77
labels:
88
app: alb-ingress-controller
9-
name: alb-ingress-controller-RELEASE-NAME
9+
name: alb-ingress-controller-release-name
1010
namespace: kube-system
1111
spec:
1212
replicas: 1

cmd/kubeapply/subcmd/testdata/clusters/expand-test/expanded/stage/us-west-2/kube-system/alb-ingress-controller2/templates/alb-ingress-controller.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ kind: Deployment
66
metadata:
77
labels:
88
app: alb-ingress-controller
9-
name: alb-ingress-controller-RELEASE-NAME
9+
name: alb-ingress-controller-release-name
1010
namespace: kube-system
1111
spec:
1212
replicas: 1

cmd/kubeapply/subcmd/testdata/clusters/expand-test/expanded_expected/stage/us-west-2/kube-system/alb-ingress-controller/templates/alb-ingress-controller.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ kind: Deployment
66
metadata:
77
labels:
88
app: alb-ingress-controller
9-
name: alb-ingress-controller-RELEASE-NAME
9+
name: alb-ingress-controller-release-name
1010
namespace: kube-system
1111
spec:
1212
replicas: 1

cmd/kubeapply/subcmd/testdata/clusters/expand-test/expanded_expected/stage/us-west-2/kube-system/alb-ingress-controller2/templates/alb-ingress-controller.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ kind: Deployment
66
metadata:
77
labels:
88
app: alb-ingress-controller
9-
name: alb-ingress-controller-RELEASE-NAME
9+
name: alb-ingress-controller-release-name
1010
namespace: kube-system
1111
spec:
1212
replicas: 1

0 commit comments

Comments
 (0)