Skip to content

Commit

Permalink
Merge pull request #539 from leakingtapan/changelog
Browse files Browse the repository at this point in the history
Update test cluster version
  • Loading branch information
Cheng Pan authored Aug 8, 2020
2 parents 44ec7de + d383495 commit 0fc4cc5
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 47 deletions.
12 changes: 0 additions & 12 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -327,18 +327,6 @@ linters-settings:
# by default
extra-rules: false

# The custom section can be used to define linter plugins to be loaded at runtime. See README doc
# for more info.
custom:
# Each custom linter should have a unique name.
example:
# The path to the plugin *.so. Can be absolute or local. Required for each custom linter
path: /path/to/example.so
# The description of the linter. Optional, just for documentation purposes.
description: This is an example usage of a plugin linter.
# Intended to point to the repo location of the linter. Optional, just for documentation purposes.
original-url: github.com/golangci/example-linter

linters:
enable:
- megacheck
Expand Down
16 changes: 8 additions & 8 deletions docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,14 @@ There are several optional parameters that could be passed into `CreateVolumeReq
Following sections are Kubernetes specific. If you are Kubernetes user, use followings for driver features, installation steps and examples.

## Kubernetes Version Compability Matrix
| AWS EBS CSI Driver \ Kubernetes Version| v1.12 | v1.13 | v1.14 | v1.15 |
|----------------------------------------|-------|-------|-------|-------|
| master branch | no | no+ | yes | yes |
| v0.5.0 | no | no+ | yes | yes |
| v0.4.0 | no | no+ | yes | yes |
| v0.3.0 | no | no+ | yes | no |
| v0.2.0 | no | yes | yes | no |
| v0.1.0 | yes | yes | yes | no |
| AWS EBS CSI Driver \ Kubernetes Version| v1.12 | v1.13 | v1.14 | v1.15 | v1.16 |
|----------------------------------------|-------|-------|-------|-------|-------|
| master branch | no | no+ | yes | yes | yes |
| v0.5.0 | no | no+ | yes | yes | yes |
| v0.4.0 | no | no+ | yes | yes | no |
| v0.3.0 | no | no+ | yes | no | no |
| v0.2.0 | no | yes | yes | no | no |
| v0.1.0 | yes | yes | yes | no | no |

**Note**: for the entry with `+` sign, it means the driver's default released manifest doesn't work with corresponding Kubernetes version, but the driver container image is compatiable with the Kubernetes version if an older version's manifest is used.

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module github.com/kubernetes-sigs/aws-ebs-csi-driver

require (
github.com/aws/aws-k8s-tester/e2e/tester v0.0.0-20191204032858-d97ad2e4255e // indirect
github.com/aws/aws-k8s-tester/e2e/tester v0.0.0-20200731204948-ad5df86f9de5 // indirect
github.com/aws/aws-sdk-go v1.29.11
github.com/container-storage-interface/spec v1.2.0
github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f // indirect
Expand Down
3 changes: 3 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,10 @@ github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5
github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
github.com/auth0/go-jwt-middleware v0.0.0-20170425171159-5493cabe49f7/go.mod h1:LWMyo4iOLWXHGdBki7NIht1kHru/0wM179h+d3g8ATM=
github.com/aws/aws-k8s-tester v1.4.9-0.20200731204948-ad5df86f9de5 h1:Lilhaqs+T5ptd/kJJ6KflWMnXMhqmphQbMQsWkjYaSo=
github.com/aws/aws-k8s-tester/e2e/tester v0.0.0-20191204032858-d97ad2e4255e/go.mod h1:DJkIJa8BA0LCJWjl01jsEl8vm/fjei0uWJFzZol0KUI=
github.com/aws/aws-k8s-tester/e2e/tester v0.0.0-20200731204948-ad5df86f9de5 h1:+PxFKs2lkJ1sSxjCksGOqhgjdF9qK8Fd40u5+p19pbI=
github.com/aws/aws-k8s-tester/e2e/tester v0.0.0-20200731204948-ad5df86f9de5/go.mod h1:DJkIJa8BA0LCJWjl01jsEl8vm/fjei0uWJFzZol0KUI=
github.com/aws/aws-sdk-go v1.16.26/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
github.com/aws/aws-sdk-go v1.23.21 h1:eVJT2C99cAjZlBY8+CJovf6AwrSANzAcYNuxdCB+SPk=
github.com/aws/aws-sdk-go v1.23.21/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
Expand Down
19 changes: 6 additions & 13 deletions tester/multi-az-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ cluster:
zones: us-west-2a,us-west-2b,us-west-2c
nodeCount: 3
nodeSize: c5.large
kubernetesVersion: 1.15.3
kubernetesVersion: 1.16.0
featureGates: |2
kubeAPIServer:
featureGates:
Expand Down Expand Up @@ -71,32 +71,25 @@ build: |
install: |
echo "Deploying driver"
# install helm
OS_ARCH=$(go env GOOS)-amd64
helm_name=helm-v2.14.1-$OS_ARCH.tar.gz
wget https://get.helm.sh/$helm_name
tar xvzf $helm_name
mv $OS_ARCH/helm /usr/local/bin/helm
make bin/helm
AWS_ACCOUNT_ID=$(aws sts get-caller-identity --query Account --output text)
IMAGE_TAG={{TEST_ID}}
IMAGE_NAME=$AWS_ACCOUNT_ID.dkr.ecr.us-west-2.amazonaws.com/aws-ebs-csi-driver
# install tiller
kubectl apply -f ./hack/utils/tiller-rbac.yaml
helm init --service-account tiller --history-max 200 --wait
kubectl get po -n kube-system
helm install --name aws-ebs-csi-driver \
bin/helm install aws-ebs-csi-driver \
--set enableVolumeScheduling=true \
--set enableVolumeResizing=true \
--set enableVolumeSnapshot=true \
--set image.repository=$IMAGE_NAME \
--set image.tag=$IMAGE_TAG \
./aws-ebs-csi-driver
kubectl get po -n kube-system
uninstall: |
echo "Removing driver"
helm del --purge aws-ebs-csi-driver
bin/helm del --purge aws-ebs-csi-driver
test: |
go get github.com/onsi/ginkgo/ginkgo
Expand Down
19 changes: 6 additions & 13 deletions tester/single-az-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ cluster:
zones: us-west-2a
nodeCount: 3
nodeSize: c5.large
kubernetesVersion: 1.15.3
kubernetesVersion: 1.16.0
featureGates: |2
kubeAPIServer:
featureGates:
Expand Down Expand Up @@ -71,35 +71,28 @@ build: |
install: |
echo "Deploying driver"
# install helm
OS_ARCH=$(go env GOOS)-amd64
helm_name=helm-v2.14.1-$OS_ARCH.tar.gz
wget https://get.helm.sh/$helm_name
tar xvzf $helm_name
mv $OS_ARCH/helm /usr/local/bin/helm
make bin/helm
AWS_ACCOUNT_ID=$(aws sts get-caller-identity --query Account --output text)
IMAGE_TAG={{TEST_ID}}
IMAGE_NAME=$AWS_ACCOUNT_ID.dkr.ecr.us-west-2.amazonaws.com/aws-ebs-csi-driver
# install tiller
kubectl apply -f ./hack/utils/tiller-rbac.yaml
helm init --service-account tiller --history-max 200 --wait
kubectl get po -n kube-system
# install snapshot CRD
kubectl apply -f deploy/kubernetes/cluster/
helm install --name aws-ebs-csi-driver \
bin/helm install aws-ebs-csi-driver \
--set enableVolumeScheduling=true \
--set enableVolumeResizing=true \
--set enableVolumeSnapshot=true \
--set image.repository=$IMAGE_NAME \
--set image.tag=$IMAGE_TAG \
./aws-ebs-csi-driver
kubectl get po -n kube-system
uninstall: |
echo "Removing driver"
helm del --purge aws-ebs-csi-driver
bin/helm del --purge aws-ebs-csi-driver
test: |
go get github.com/onsi/ginkgo/ginkgo
Expand Down

0 comments on commit 0fc4cc5

Please sign in to comment.