Skip to content
This repository has been archived by the owner on Apr 7, 2022. It is now read-only.

Commit

Permalink
bump 2.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
pahud committed Jun 24, 2020
1 parent bc7c958 commit ee00edb
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 26 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ RUN wget https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64 \


# download kubectl
ADD https://amazon-eks.s3.us-west-2.amazonaws.com/1.15.10/2020-02-22/bin/linux/amd64/kubectl /opt/kubectl/
ADD https://amazon-eks.s3.us-west-2.amazonaws.com/1.16.8/2020-04-16/bin/linux/amd64/kubectl /opt/kubectl/
RUN chmod +x /opt/kubectl/kubectl

# download helm v3
RUN mkdir -p /opt/helm && wget -qO- https://get.helm.sh/helm-v3.1.2-linux-amd64.tar.gz | tar -xz -C /opt/helm/
RUN mkdir -p /opt/helm && wget -qO- https://get.helm.sh/helm-v3.2.4-linux-amd64.tar.gz | tar -xz -C /opt/helm/

#
# prepare the runtime at /opt/kubectl
Expand Down
11 changes: 1 addition & 10 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ ifdef INPUT_YAML
INPUT_JSON = event.json
endif
AWS_PROFILE ?= default
SEMANTIC_VERSION ?= 2.0.0-beta3
SEMANTIC_VERSION ?= 2.0.0


.PHONY: build
Expand All @@ -39,15 +39,6 @@ sam-layer-package:
--region $(LAMBDA_REGION)
@echo "[OK] Now type 'make sam-layer-deploy' to deploy your Lambda layer with SAM or 'make publish-new-version-to-sar' to publish to SAR"

# .PHONY: sam-layer-publish
# sam-layer-publish:
# @docker run -ti \
# -v $(PWD):/home/samcli/workdir \
# -v $(HOME)/.aws:/home/samcli/.aws \
# -w /home/samcli/workdir \
# -e AWS_DEFAULT_REGION=$(LAMBDA_REGION) \
# pahud/aws-sam-cli:latest sam publish --region $(LAMBDA_REGION) --template sam-layer-packaged.yaml

.PHONY: sam-layer-publish
sam-layer-publish:
@docker run -i $(EXTRA_DOCKER_ARGS) \
Expand Down
28 changes: 14 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@

## Current Version

| kubectl | v1.15.10-eks-bac369 |
| kubectl | v1.16.8-eks-e16311 |
| :----------- | :----------- |
| **awscli** | **1.18.37** |
| **helm** | **3.1.2** |
| **awscli** | **1.18.86** |
| **helm** | **3.2.4** |
| **jq** | **1.6** |
| **GNU Make** | **3.82** |

Expand All @@ -34,15 +34,15 @@ You got the layer structure as below under `/opt` in lambda custom runtime:
```
.
├── awscli
│ ├── PyYAML-5.1.2-py2.7.egg-info
│ ├── PyYAML-5.3.1-py2.7.egg-info
│ ├── aws
│ ├── awscli
│ ├── awscli-1.16.292-py2.7.egg-info
│ ├── awscli-1.18.86-py2.7.egg-info
│ ├── bin
│ ├── botocore
│ ├── botocore-1.13.28-py2.7.egg-info
│ ├── botocore-1.17.9-py2.7.egg-info
│ ├── colorama
│ ├── colorama-0.4.1-py2.7.egg-info
│ ├── colorama-0.4.3-py2.7.egg-info
│ ├── concurrent
│ ├── dateutil
│ ├── docutils
Expand All @@ -51,24 +51,24 @@ You got the layer structure as below under `/opt` in lambda custom runtime:
│ ├── easy_install.pyc
│ ├── futures-3.3.0-py2.7.egg-info
│ ├── jmespath
│ ├── jmespath-0.9.4-py2.7.egg-info
│ ├── jmespath-0.10.0-py2.7.egg-info
│ ├── jq
│ ├── make
│ ├── pkg_resources
│ ├── pyasn1
│ ├── pyasn1-0.4.8-py2.7.egg-info
│ ├── python_dateutil-2.8.0-py2.7.egg-info
│ ├── python_dateutil-2.8.0.dist-info
│ ├── rsa
│ ├── rsa-3.4.2-py2.7.egg-info
│ ├── s3transfer
│ ├── s3transfer-0.2.1-py2.7.egg-info
│ ├── six-1.13.0-py2.7.egg-info
│ ├── s3transfer-0.3.3-py2.7.egg-info
│ ├── six-1.15.0-py2.7.egg-info
│ ├── six.py
│ ├── six.pyc
│ ├── urllib3
│ ├── urllib3-1.25.7-py2.7.egg-info
│ ├── urllib3-1.25.9-py2.7.egg-info
│ ├── wheel
│ ├── wheel-0.29.0.dist-info
│ ├── wheel-0.33.6-py2.7.egg-info
│ └── yaml
├── helm
│ └── helm
Expand Down Expand Up @@ -145,7 +145,7 @@ export class AppStack extends cdk.Stack {
const samApp = new sam.CfnApplication(this, 'SamLayer', {
location: {
applicationId: 'arn:aws:serverlessrepo:us-east-1:903779448426:applications/lambda-layer-kubectl',
semanticVersion: '2.0.0-beta3'
semanticVersion: '2.0.0'
},
parameters: {
LayerName: `${this.stackName}-kubectl-layer`
Expand Down

0 comments on commit ee00edb

Please sign in to comment.