diff --git a/CHANGELOG.md b/CHANGELOG.md index 38a22d9d22..aaf177c58b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# v1.23.1 +### Bug Fixes +* Upgrade volume-modifier-for-k8s sidecar to 0.1.3 for Leader election conflict with csi-resizer bug fix ([#14](https://github.com/awslabs/volume-modifier-for-k8s/pull/14), [@torredil](https://github.com/torredil)) + # v1.23.0 ### Urgent Upgrade Notes *(No, really, you MUST read this before you upgrade)* @@ -17,6 +21,11 @@ As part of this change, e2fsprogs will be upgraded from `1.42.9` to `1.46.5` and ### Improvements * Dependancy upgrades ([#1743](https://github.com/kubernetes-sigs/aws-ebs-csi-driver/pull/1743), [@AndrewSirenko](https://github.com/AndrewSirenko)) +# v1.22.1 +### Bug Fixes +* Cherry-pick from v1.23.1: Do not call ModifyVolume if the volume is already in the desired state ([#1741](https://github.com/kubernetes-sigs/aws-ebs-csi-driver/pull/1741), [@ConnorJC3](https://github.com/ConnorJC3)) +* Upgrade volume-modifier-for-k8s sidecar to 0.1.3 for Leader election conflict with csi-resizer bug fix ([#14](https://github.com/awslabs/volume-modifier-for-k8s/pull/14), [@torredil](https://github.com/torredil)) + # 1.22.0 ### Urgent Upgrade Notes *(No, really, you MUST read this before you upgrade)* diff --git a/Makefile b/Makefile index 8d37e86445..666bfeb278 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -VERSION?=v1.23.0 +VERSION?=v1.23.1 PKG=github.com/kubernetes-sigs/aws-ebs-csi-driver GIT_COMMIT?=$(shell git rev-parse HEAD) diff --git a/README.md b/README.md index d5302865a1..c156d5f11b 100644 --- a/README.md +++ b/README.md @@ -19,13 +19,15 @@ The [Amazon Elastic Block Store](https://aws.amazon.com/ebs/) Container Storage | Driver Version | [registry.k8s.io](https://kubernetes.io/blog/2022/11/28/registry-k8s-io-faster-cheaper-ga/) Image | [ECR Public](https://gallery.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver) Image | |----------------|---------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------| -| v1.23.0 | registry.k8s.io/provider-aws/aws-ebs-csi-driver:v1.23.0 | public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.23.0 | +| v1.23.1 | registry.k8s.io/provider-aws/aws-ebs-csi-driver:v1.23.1 | public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.23.1 |
Previous Images | Driver Version | [registry.k8s.io](https://kubernetes.io/blog/2022/11/28/registry-k8s-io-faster-cheaper-ga/) Image | [ECR Public](https://gallery.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver) Image | |----------------|---------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------| +| v1.23.0 | registry.k8s.io/provider-aws/aws-ebs-csi-driver:v1.23.0 | public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.23.0 | +| v1.22.1 | registry.k8s.io/provider-aws/aws-ebs-csi-driver:v1.22.1 | public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.22.1 | | v1.22.0 | registry.k8s.io/provider-aws/aws-ebs-csi-driver:v1.22.0 | public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.22.0 | | v1.21.0 | registry.k8s.io/provider-aws/aws-ebs-csi-driver:v1.21.0 | public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.21.0 | | v1.20.0 | registry.k8s.io/provider-aws/aws-ebs-csi-driver:v1.20.0 | public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.20.0 | diff --git a/charts/aws-ebs-csi-driver/CHANGELOG.md b/charts/aws-ebs-csi-driver/CHANGELOG.md index 026aa2374e..0453ed293e 100644 --- a/charts/aws-ebs-csi-driver/CHANGELOG.md +++ b/charts/aws-ebs-csi-driver/CHANGELOG.md @@ -1,11 +1,17 @@ # Helm chart +## v2.23.1 +* Bump driver version to `v1.23.1` + ## v2.23.0 * Add `node.enableLinux` parameter ([#1732](https://github.com/kubernetes-sigs/aws-ebs-csi-driver/pull/1732), [@monicastanciu](https://github.com/monicastanciu)) * Additional Node DaemonSets bug fixes ([#1739](https://github.com/kubernetes-sigs/aws-ebs-csi-driver/pull/1739), [@monicastanciu](https://github.com/monicastanciu)) * Additional DaemonSets feature ([#1722](https://github.com/kubernetes-sigs/aws-ebs-csi-driver/pull/1722), [@ConnorJC3](https://github.com/ConnorJC3)) * Add doc of chart value additionalArgs ([#1697](https://github.com/kubernetes-sigs/aws-ebs-csi-driver/pull/1697), [@zitudu](https://github.com/zitudu)) +## v2.22.1 +* Bump driver version to `v1.22.1` + ## v2.22.0 * Default PodDisruptionBudget to policy/v1 ([#1707](https://github.com/kubernetes-sigs/aws-ebs-csi-driver/pull/1707), [@iNoahNothing](https://github.com/iNoahNothing)) diff --git a/charts/aws-ebs-csi-driver/Chart.yaml b/charts/aws-ebs-csi-driver/Chart.yaml index 68f0afb62d..2dc59f7760 100644 --- a/charts/aws-ebs-csi-driver/Chart.yaml +++ b/charts/aws-ebs-csi-driver/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 -appVersion: 1.23.0 +appVersion: 1.23.1 name: aws-ebs-csi-driver description: A Helm chart for AWS EBS CSI Driver -version: 2.23.0 +version: 2.23.1 kubeVersion: ">=1.17.0-0" home: https://github.com/kubernetes-sigs/aws-ebs-csi-driver sources: diff --git a/charts/aws-ebs-csi-driver/templates/controller.yaml b/charts/aws-ebs-csi-driver/templates/controller.yaml index 31f75b5c35..90db751206 100644 --- a/charts/aws-ebs-csi-driver/templates/controller.yaml +++ b/charts/aws-ebs-csi-driver/templates/controller.yaml @@ -344,6 +344,14 @@ spec: env: - name: ADDRESS value: /var/lib/csi/sockets/pluginproxy/csi.sock + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: POD_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace {{- if .Values.proxy.http_proxy }} {{- include "aws-ebs-csi-driver.http-proxy" . | nindent 12 }} {{- end }} diff --git a/charts/aws-ebs-csi-driver/values.yaml b/charts/aws-ebs-csi-driver/values.yaml index 6e95446134..ae08c5e201 100644 --- a/charts/aws-ebs-csi-driver/values.yaml +++ b/charts/aws-ebs-csi-driver/values.yaml @@ -135,7 +135,7 @@ sidecars: image: pullPolicy: IfNotPresent repository: public.ecr.aws/ebs-csi-driver/volume-modifier-for-k8s - tag: "v0.1.2" + tag: "v0.1.3" leaderElection: enabled: true # Optional values to tune lease behavior. diff --git a/deploy/kubernetes/base/controller.yaml b/deploy/kubernetes/base/controller.yaml index 720d15fd52..e9f847e583 100644 --- a/deploy/kubernetes/base/controller.yaml +++ b/deploy/kubernetes/base/controller.yaml @@ -61,7 +61,7 @@ spec: runAsUser: 1000 containers: - name: ebs-plugin - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.23.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.23.1 imagePullPolicy: IfNotPresent args: # - {all,controller,node} # specify the driver mode diff --git a/deploy/kubernetes/base/node.yaml b/deploy/kubernetes/base/node.yaml index 6d428f2fdf..8657c0be3a 100644 --- a/deploy/kubernetes/base/node.yaml +++ b/deploy/kubernetes/base/node.yaml @@ -44,7 +44,7 @@ spec: runAsUser: 0 containers: - name: ebs-plugin - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.23.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.23.1 imagePullPolicy: IfNotPresent args: - node