From 105d31785cfcd52df8b6dd2c68673dd9ece4444f Mon Sep 17 00:00:00 2001 From: Hao Zhou Date: Fri, 29 May 2020 10:39:42 -0700 Subject: [PATCH] Updated image version in config files. --- CHANGELOG.md | 2 +- config/v1.6/aws-k8s-cni-cn.yaml | 2 +- config/v1.6/aws-k8s-cni-us-gov-east-1.yaml | 2 +- config/v1.6/aws-k8s-cni-us-gov-west-1.yaml | 2 +- config/v1.6/aws-k8s-cni.yaml | 2 +- config/v1.6/cni-metrics-helper-cn.yaml | 2 +- config/v1.6/cni-metrics-helper-us-east-1.yaml | 2 +- config/v1.6/cni-metrics-helper-us-gov-west-1.yaml | 2 +- config/v1.6/cni-metrics-helper.yaml | 2 +- scripts/run-integration-tests.sh | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5a1babaf4c..cd8c335a93 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## v1.6.2-rc1 +## v1.6.2 * Bug - [Add WithNoProxy to ignore proxies in gRPC connections when using unix sockets](https://github.com/aws/amazon-vpc-cni-k8s/pull/980) (#980, @nithu0115) * Improvement - [Fix order of file copies in entrypoint.sh](https://github.com/aws/amazon-vpc-cni-k8s/pull/935) (#935, @dthorsen) * Improvement - [Check all errors and log appropriately](https://github.com/aws/amazon-vpc-cni-k8s/pull/939) (#939, @mogren) diff --git a/config/v1.6/aws-k8s-cni-cn.yaml b/config/v1.6/aws-k8s-cni-cn.yaml index 7041cb9feb..6563963b92 100644 --- a/config/v1.6/aws-k8s-cni-cn.yaml +++ b/config/v1.6/aws-k8s-cni-cn.yaml @@ -86,7 +86,7 @@ spec: tolerations: - operator: Exists containers: - - image: 961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni:v1.6.1 + - image: 961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni:v1.6.2 imagePullPolicy: Always ports: - containerPort: 61678 diff --git a/config/v1.6/aws-k8s-cni-us-gov-east-1.yaml b/config/v1.6/aws-k8s-cni-us-gov-east-1.yaml index b5aec5b332..ac88ada2ca 100644 --- a/config/v1.6/aws-k8s-cni-us-gov-east-1.yaml +++ b/config/v1.6/aws-k8s-cni-us-gov-east-1.yaml @@ -99,7 +99,7 @@ spec: tolerations: - operator: Exists containers: - - image: 151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon-k8s-cni:v1.6.1 + - image: 151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon-k8s-cni:v1.6.2 imagePullPolicy: Always ports: - containerPort: 61678 diff --git a/config/v1.6/aws-k8s-cni-us-gov-west-1.yaml b/config/v1.6/aws-k8s-cni-us-gov-west-1.yaml index 266b035937..0348db98aa 100644 --- a/config/v1.6/aws-k8s-cni-us-gov-west-1.yaml +++ b/config/v1.6/aws-k8s-cni-us-gov-west-1.yaml @@ -99,7 +99,7 @@ spec: tolerations: - operator: Exists containers: - - image: 013241004608.dkr.ecr.us-gov-west-1.amazonaws.com/amazon-k8s-cni:v1.6.1 + - image: 013241004608.dkr.ecr.us-gov-west-1.amazonaws.com/amazon-k8s-cni:v1.6.2 imagePullPolicy: Always ports: - containerPort: 61678 diff --git a/config/v1.6/aws-k8s-cni.yaml b/config/v1.6/aws-k8s-cni.yaml index 3eb0df3a4c..a82d22894d 100644 --- a/config/v1.6/aws-k8s-cni.yaml +++ b/config/v1.6/aws-k8s-cni.yaml @@ -99,7 +99,7 @@ spec: tolerations: - operator: Exists containers: - - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.6.2-rc1 + - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.6.2 imagePullPolicy: Always ports: - containerPort: 61678 diff --git a/config/v1.6/cni-metrics-helper-cn.yaml b/config/v1.6/cni-metrics-helper-cn.yaml index 508b178ba5..e855188057 100644 --- a/config/v1.6/cni-metrics-helper-cn.yaml +++ b/config/v1.6/cni-metrics-helper-cn.yaml @@ -75,7 +75,7 @@ spec: spec: serviceAccountName: cni-metrics-helper containers: - - image: 961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/cni-metrics-helper:v1.6.1 + - image: 961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/cni-metrics-helper:v1.6.2 imagePullPolicy: Always name: cni-metrics-helper env: diff --git a/config/v1.6/cni-metrics-helper-us-east-1.yaml b/config/v1.6/cni-metrics-helper-us-east-1.yaml index 3640d402a1..3c0f3c5666 100644 --- a/config/v1.6/cni-metrics-helper-us-east-1.yaml +++ b/config/v1.6/cni-metrics-helper-us-east-1.yaml @@ -75,7 +75,7 @@ spec: spec: serviceAccountName: cni-metrics-helper containers: - - image: 151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/cni-metrics-helper:v1.6.1 + - image: 151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/cni-metrics-helper:v1.6.2 imagePullPolicy: Always name: cni-metrics-helper env: diff --git a/config/v1.6/cni-metrics-helper-us-gov-west-1.yaml b/config/v1.6/cni-metrics-helper-us-gov-west-1.yaml index 49450512fd..f8932da4a2 100644 --- a/config/v1.6/cni-metrics-helper-us-gov-west-1.yaml +++ b/config/v1.6/cni-metrics-helper-us-gov-west-1.yaml @@ -75,7 +75,7 @@ spec: spec: serviceAccountName: cni-metrics-helper containers: - - image: 013241004608.dkr.ecr.us-gov-west-1.amazonaws.com/cni-metrics-helper:v1.6.1 + - image: 013241004608.dkr.ecr.us-gov-west-1.amazonaws.com/cni-metrics-helper:v1.6.2 imagePullPolicy: Always name: cni-metrics-helper env: diff --git a/config/v1.6/cni-metrics-helper.yaml b/config/v1.6/cni-metrics-helper.yaml index b864c6020d..dd08bac467 100644 --- a/config/v1.6/cni-metrics-helper.yaml +++ b/config/v1.6/cni-metrics-helper.yaml @@ -75,7 +75,7 @@ spec: spec: serviceAccountName: cni-metrics-helper containers: - - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/cni-metrics-helper:v1.6.2-rc1 + - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/cni-metrics-helper:v1.6.2 imagePullPolicy: Always name: cni-metrics-helper env: diff --git a/scripts/run-integration-tests.sh b/scripts/run-integration-tests.sh index bbb19b1d40..a752b755d0 100755 --- a/scripts/run-integration-tests.sh +++ b/scripts/run-integration-tests.sh @@ -56,7 +56,7 @@ KUBECTL_PATH=${KUBECTL_PATH:-$TESTER_DIR/kubectl} LOCAL_GIT_VERSION=$(git describe --tags --always --dirty) # The stable image version is the image tag used in the latest stable # aws-k8s-cni.yaml manifest -STABLE_IMAGE_VERSION=${STABLE_IMAGE_VERSION:-v1.6.1} +STABLE_IMAGE_VERSION=${STABLE_IMAGE_VERSION:-v1.6.2} TEST_IMAGE_VERSION=${IMAGE_VERSION:-$LOCAL_GIT_VERSION} # The CNI version we will start our k8s clusters with. We will then perform an # upgrade from this CNI to the CNI being tested (TEST_IMAGE_VERSION)