Skip to content

Commit 25ea869

Browse files
cescribanohscescribanohs
authored
Merge branch 'kubernetes-sigs:master' into add_portRangeUpperBound_helm_values
2 parents 266d0f9 + c620c05 commit 25ea869

File tree

11 files changed

+28
-22
lines changed

11 files changed

+28
-22
lines changed

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ jobs:
3535

3636
steps:
3737
- name: Checkout repository
38-
uses: actions/checkout@v2
38+
uses: actions/checkout@v3.0.0
3939

4040
# Initializes the CodeQL tools for scanning.
4141
- name: Initialize CodeQL
42-
uses: github/codeql-action/init@v1
42+
uses: github/codeql-action/init@v2
4343
with:
4444
languages: ${{ matrix.language }}
4545
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -50,7 +50,7 @@ jobs:
5050
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5151
# If this step fails, then you should remove it and run the build manually (see below)
5252
- name: Autobuild
53-
uses: github/codeql-action/autobuild@v1
53+
uses: github/codeql-action/autobuild@v2
5454

5555
# ℹ️ Command-line programs to run using the OS shell.
5656
# 📚 https://git.io/JvXDl
@@ -64,4 +64,4 @@ jobs:
6464
# make release
6565

6666
- name: Perform CodeQL Analysis
67-
uses: github/codeql-action/analyze@v1
67+
uses: github/codeql-action/analyze@v2

‎CHANGELOG-2.x.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# V2.1.0
2+
* Update CodeQL workflow to v2. ([#1485](https://github.com/kubernetes-sigs/aws-efs-csi-driver/pull/1485),[@mskanth972](https://github.com/mskanth972))
3+
* Bump side-cars to the latest. ([#1484](https://github.com/kubernetes-sigs/aws-efs-csi-driver/pull/1484),[@mskanth972](https://github.com/mskanth972))
4+
* Update kubernetes to version 1.27.16 to patch CVE-2024-5321. ([#1475](https://github.com/kubernetes-sigs/aws-efs-csi-driver/pull/1475),[@mselim00](https://github.com/mselim00))
15
# V2.0.9
26
* Upgrade AL2 version and address CVEs (CVE-2024-34156, CVE-2024-34158)
37
* Fix controller template to support replicaCount, resources, topologySpreadConstraints

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414
#
1515

16-
VERSION=v2.0.9
16+
VERSION=v2.1.0
1717

1818
PKG=github.com/kubernetes-sigs/aws-efs-csi-driver
1919
GIT_COMMIT?=$(shell git rev-parse HEAD)

‎charts/aws-efs-csi-driver/values.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ sidecars:
1818
livenessProbe:
1919
image:
2020
repository: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe
21-
tag: v2.13.0-eks-1-30-8
21+
tag: v2.14.0-eks-1-31-5
2222
pullPolicy: IfNotPresent
2323
resources: {}
2424
securityContext:
@@ -27,7 +27,7 @@ sidecars:
2727
nodeDriverRegistrar:
2828
image:
2929
repository: public.ecr.aws/eks-distro/kubernetes-csi/node-driver-registrar
30-
tag: v2.11.0-eks-1-30-8
30+
tag: v2.12.0-eks-1-31-5
3131
pullPolicy: IfNotPresent
3232
resources: {}
3333
securityContext:
@@ -36,7 +36,7 @@ sidecars:
3636
csiProvisioner:
3737
image:
3838
repository: public.ecr.aws/eks-distro/kubernetes-csi/external-provisioner
39-
tag: v5.0.1-eks-1-30-8
39+
tag: v5.1.0-eks-1-31-5
4040
pullPolicy: IfNotPresent
4141
resources: {}
4242
securityContext:

‎deploy/kubernetes/base/controller-deployment.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ spec:
6767
periodSeconds: 10
6868
failureThreshold: 5
6969
- name: csi-provisioner
70-
image: public.ecr.aws/eks-distro/kubernetes-csi/external-provisioner:v5.0.1-eks-1-30-8
70+
image: public.ecr.aws/eks-distro/kubernetes-csi/external-provisioner:v5.1.0-eks-1-31-5
7171
imagePullPolicy: IfNotPresent
7272
args:
7373
- --csi-address=$(ADDRESS)
@@ -85,7 +85,7 @@ spec:
8585
allowPrivilegeEscalation: false
8686
readOnlyRootFilesystem: true
8787
- name: liveness-probe
88-
image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-8
88+
image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.14.0-eks-1-31-5
8989
imagePullPolicy: IfNotPresent
9090
args:
9191
- --csi-address=/csi/csi.sock

‎deploy/kubernetes/base/node-daemonset.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ spec:
8989
periodSeconds: 2
9090
failureThreshold: 5
9191
- name: csi-driver-registrar
92-
image: public.ecr.aws/eks-distro/kubernetes-csi/node-driver-registrar:v2.11.0-eks-1-30-8
92+
image: public.ecr.aws/eks-distro/kubernetes-csi/node-driver-registrar:v2.12.0-eks-1-31-5
9393
imagePullPolicy: IfNotPresent
9494
args:
9595
- --csi-address=$(ADDRESS)
@@ -113,7 +113,7 @@ spec:
113113
allowPrivilegeEscalation: false
114114
readOnlyRootFilesystem: true
115115
- name: liveness-probe
116-
image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-8
116+
image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.14.0-eks-1-31-5
117117
imagePullPolicy: IfNotPresent
118118
args:
119119
- --csi-address=/csi/csi.sock

‎deploy/kubernetes/overlays/stable/ecr/kustomization.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ images:
88
newTag: v2.0.9
99
- name: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe
1010
newName: 602401143452.dkr.ecr.us-west-2.amazonaws.com/eks/livenessprobe
11-
newTag: v2.13.0-eks-1-30-8
11+
newTag: v2.14.0-eks-1-31-5
1212
- name: public.ecr.aws/eks-distro/kubernetes-csi/node-driver-registrar
1313
newName: 602401143452.dkr.ecr.us-west-2.amazonaws.com/eks/csi-node-driver-registrar
14-
newTag: v2.11.0-eks-1-30-8
14+
newTag: v2.12.0-eks-1-31-5
1515
- name: public.ecr.aws/eks-distro/kubernetes-csi/external-provisioner
1616
newName: 602401143452.dkr.ecr.us-west-2.amazonaws.com/eks/csi-provisioner
17-
newTag: v5.0.1-eks-1-30-8
17+
newTag: v5.1.0-eks-1-31-5

‎deploy/kubernetes/overlays/stable/kustomization.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ images:
66
- name: public.ecr.aws/efs-csi-driver/amazon/aws-efs-csi-driver
77
newTag: v2.0.9
88
- name: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe
9-
newTag: v2.13.0-eks-1-30-8
9+
newTag: v2.14.0-eks-1-31-5
1010
- name: public.ecr.aws/eks-distro/kubernetes-csi/node-driver-registrar
11-
newTag: v2.11.0-eks-1-30-8
11+
newTag: v2.12.0-eks-1-31-5
1212
- name: public.ecr.aws/eks-distro/kubernetes-csi/external-provisioner
13-
newTag: v5.0.1-eks-1-30-8
13+
newTag: v5.1.0-eks-1-31-5

‎docs/README.md‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ The following sections are Kubernetes specific. If you are a Kubernetes user, us
7171
| Amazon EFS CSI Driver \ Kubernetes Version | maturity | v1.11 | v1.12 | v1.13 | v1.14 | v1.15 | v1.16 | v1.17+ |
7272
|--------------------------------------------|----------|-------|-------|-------|-------|-------|-------|--------|
7373
| master branch | GA | no | no | no | no | no | no | yes |
74+
| v2.1.x | GA | no | no | no | no | no | no | yes |
7475
| v2.0.x | GA | no | no | no | no | no | no | yes |
7576
| v1.7.x | GA | no | no | no | no | no | no | yes |
7677
| v1.6.x | GA | no | no | no | no | no | no | yes |
@@ -88,6 +89,7 @@ The following sections are Kubernetes specific. If you are a Kubernetes user, us
8889
| Amazon EFS CSI Driver Version | Image |
8990
|-------------------------------|----------------------------------|
9091
| master branch | amazon/aws-efs-csi-driver:master |
92+
| v2.1.0 | amazon/aws-efs-csi-driver:v2.1.0 |
9193
| v2.0.9 | amazon/aws-efs-csi-driver:v2.0.9 |
9294
| v2.0.8 | amazon/aws-efs-csi-driver:v2.0.8 |
9395
| v2.0.7 | amazon/aws-efs-csi-driver:v2.0.7 |
@@ -148,7 +150,7 @@ The following sections are Kubernetes specific. If you are a Kubernetes user, us
148150
### ECR Image
149151
| Driver Version | [ECR](https://gallery.ecr.aws/efs-csi-driver/amazon/aws-efs-csi-driver) Image |
150152
|----------------|-------------------------------------------------------------------------------|
151-
| v2.0.9 | public.ecr.aws/efs-csi-driver/amazon/aws-efs-csi-driver:v2.0.9 |
153+
| v2.1.0 | public.ecr.aws/efs-csi-driver/amazon/aws-efs-csi-driver:v2.1.0 |
152154

153155
**Note**
154156
You can find previous efs-csi-driver versions' images from [here](https://gallery.ecr.aws/efs-csi-driver/amazon/aws-efs-csi-driver)
@@ -367,7 +369,7 @@ If you want to update to a specific version, first customize the driver yaml fil
367369
kubectl kustomize "github.com/kubernetes-sigs/aws-efs-csi-driver/deploy/kubernetes/overlays/stable/?ref=release-2.0" > driver.yaml
368370
```
369371

370-
Then, update all lines referencing `image: amazon/aws-efs-csi-driver` to the desired version (e.g., to `image: amazon/aws-efs-csi-driver:v2.0.9`) in the yaml file, and deploy driver yaml again:
372+
Then, update all lines referencing `image: amazon/aws-efs-csi-driver` to the desired version (e.g., to `image: amazon/aws-efs-csi-driver:v2.1.0`) in the yaml file, and deploy driver yaml again:
371373
```sh
372374
kubectl apply -f driver.yaml
373375
```

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ require (
2222
k8s.io/apimachinery v0.26.15
2323
k8s.io/client-go v0.26.15
2424
k8s.io/klog/v2 v2.90.1
25-
k8s.io/kubernetes v1.26.15
25+
k8s.io/kubernetes v1.27.16
2626
k8s.io/mount-utils v0.26.15
2727
k8s.io/pod-security-admission v0.26.15
2828
)

0 commit comments

Comments
 (0)