Skip to content

Commit a99867c

Browse files
umagnusumagnus
authored
Merge branch 'master' into add_volume_cloning
2 parents 0ed548d + fa9d017 commit a99867c

File tree

242 files changed

+8835
-2802
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

242 files changed

+8835
-2802
lines changed

‎.github/workflows/codespell.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
name: Check for spelling errors
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v2
11+
- uses: actions/checkout@v3
1212
- uses: codespell-project/actions-codespell@master
1313
with:
1414
check_filenames: true

‎.github/workflows/darwin.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
go-version: ^1.16
1414
id: go
1515
- name: Check out code into the Go module directory
16-
uses: actions/checkout@v2
16+
uses: actions/checkout@v3
1717
- name: Build Test
1818
run: |
1919
make azurefile-darwin

‎.github/workflows/linux.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
id: go
1919

2020
- name: Check out code into the Go module directory
21-
uses: actions/checkout@v2
21+
uses: actions/checkout@v3
2222

2323
- name: Build Test
2424
run: |

‎.github/workflows/pluto.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
steps:
1212

1313
- name: Checkout
14-
uses: actions/checkout@v2
14+
uses: actions/checkout@v3
1515

1616
- name: Download pluto
1717
uses: FairwindsOps/pluto/github-action@master

‎.github/workflows/shellcheck.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
name: Shellcheck
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: actions/checkout@v2
19+
- uses: actions/checkout@v3
2020
- name: Run ShellCheck
2121
uses: ludeeus/action-shellcheck@master
2222
env:

‎.github/workflows/trivy.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
id: go
1717

1818
- name: Checkout code
19-
uses: actions/checkout@v2
19+
uses: actions/checkout@v3
2020

2121
- name: Build an image from Dockerfile
2222
run: |

‎.github/workflows/windows.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
go-version: ^1.16
1919
id: go
2020
- name: Checkout code
21-
uses: actions/checkout@v2
21+
uses: actions/checkout@v3
2222
- name: Build
2323
run: |
2424
go build -a -o _output/azurefileplugin.exe ./pkg/azurefileplugin

‎Makefile

Lines changed: 8 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ GIT_COMMIT ?= $(shell git rev-parse HEAD)
1717
REGISTRY ?= andyzhangx
1818
REGISTRY_NAME ?= $(shell echo $(REGISTRY) | sed "s/.azurecr.io//g")
1919
IMAGE_NAME ?= azurefile-csi
20-
IMAGE_VERSION ?= v1.28.0
20+
IMAGE_VERSION ?= v1.29.0
2121
# Use a custom version for E2E tests if we are testing in CI
2222
ifdef CI
2323
ifndef PUBLISH
@@ -95,45 +95,27 @@ e2e-test:
9595
go test -v -timeout=0 ./test/e2e ${GINKGO_FLAGS};\
9696
fi
9797

98-
# In the scenario "host-process" and "csi-proxy", use the same daemonset name.
99-
# The command "helm install" would validate if the name is duplicated and return error or not.
100-
# So here we have to use flag "--disable-openapi-validation" to skip the validation.
10198
.PHONY: e2e-bootstrap
10299
e2e-bootstrap: install-helm
103100
ifdef WINDOWS_USE_HOST_PROCESS_CONTAINERS
104-
(docker pull $(CSI_IMAGE_TAG) && docker pull $(CSI_IMAGE_TAG)-windows-hp) || make container-all push-manifest
101+
(docker pull $(CSI_IMAGE_TAG) && docker pull $(CSI_IMAGE_TAG)-windows-hp) || make container-all push-manifest
105102
else
106103
docker pull $(CSI_IMAGE_TAG) || make container-all push-manifest
107104
endif
108105
ifdef TEST_WINDOWS
109-
ifdef WINDOWS_USE_HOST_PROCESS_CONTAINERS
110106
helm install azurefile-csi-driver charts/latest/azurefile-csi-driver --namespace kube-system --wait --timeout=15m -v=5 --debug \
111107
${E2E_HELM_OPTIONS} \
112108
--set windows.enabled=true \
113-
--set windows.hostprocess=true \
109+
--set windows.useHostProcessContainers=${WINDOWS_USE_HOST_PROCESS_CONTAINERS} \
114110
--set linux.enabled=false \
115111
--set driver.azureGoSDKLogLevel=INFO \
116112
--set controller.replicas=1 \
117113
--set controller.logLevel=6 \
118-
--set node.logLevel=6 \
119-
--disable-openapi-validation
114+
--set node.logLevel=10
120115
else
121116
helm install azurefile-csi-driver charts/latest/azurefile-csi-driver --namespace kube-system --wait --timeout=15m -v=5 --debug \
122117
${E2E_HELM_OPTIONS} \
123-
--set windows.enabled=true \
124-
--set windows.hostprocess=false \
125-
--set linux.enabled=false \
126-
--set driver.azureGoSDKLogLevel=INFO \
127-
--set controller.replicas=1 \
128-
--set controller.logLevel=6 \
129-
--set node.logLevel=6 \
130-
--disable-openapi-validation
131-
endif
132-
else
133-
helm install azurefile-csi-driver charts/latest/azurefile-csi-driver --namespace kube-system --wait --timeout=15m -v=5 --debug \
134-
${E2E_HELM_OPTIONS} \
135-
--set snapshot.enabled=true \
136-
--disable-openapi-validation
118+
--set snapshot.enabled=true
137119
endif
138120

139121
.PHONY: install-helm
@@ -172,9 +154,12 @@ container-windows:
172154
-t $(CSI_IMAGE_TAG)-windows-$(OSVERSION)-$(ARCH) --build-arg OSVERSION=$(OSVERSION) \
173155
--provenance=false --sbom=false \
174156
--build-arg ARCH=${ARCH} -f ./pkg/azurefileplugin/Windows.Dockerfile .
157+
# workaround: only build hostprocess image once
175158
ifdef WINDOWS_USE_HOST_PROCESS_CONTAINERS
159+
ifeq ($(OSVERSION),ltsc2022)
176160
$(MAKE) container-windows-hostprocess
177161
endif
162+
endif
178163

179164
# Set --provenance=false to not generate the provenance (which is what causes the multi-platform index to be generated, even for a single platform).
180165
.PHONY: container-windows-hostprocess

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ Disclaimer: Deploying this driver manually is not an officially supported Micros
1515
|Driver Version |Image | supported k8s version |
1616
|----------------|---------------------------------------------------------- |-----------------------|
1717
|master branch |mcr.microsoft.com/k8s/csi/azurefile-csi:latest | 1.21+ |
18+
|v1.28.0 |mcr.microsoft.com/oss/kubernetes-csi/azurefile-csi:v1.28.0 | 1.21+ |
1819
|v1.27.0 |mcr.microsoft.com/oss/kubernetes-csi/azurefile-csi:v1.27.0 | 1.21+ |
1920
|v1.26.3 |mcr.microsoft.com/oss/kubernetes-csi/azurefile-csi:v1.26.3 | 1.21+ |
20-
|v1.25.1 |mcr.microsoft.com/oss/kubernetes-csi/azurefile-csi:v1.25.1 | 1.21+ |
2121

2222
### Driver parameters
2323
Please refer to [driver parameters](./docs/driver-parameters.md)

‎charts/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
### install a specific version
1717
```console
1818
helm repo add azurefile-csi-driver https://raw.githubusercontent.com/kubernetes-sigs/azurefile-csi-driver/master/charts
19-
helm install azurefile-csi-driver azurefile-csi-driver/azurefile-csi-driver --namespace kube-system --version v1.27.0
19+
helm install azurefile-csi-driver azurefile-csi-driver/azurefile-csi-driver --namespace kube-system --version v1.28.0
2020
```
2121

2222
### install on RedHat/CentOS
@@ -128,10 +128,10 @@ The following table lists the configurable parameters of the latest Azure File C
128128
| `node.logLevel` | node driver log level |`5` |
129129
| `snapshot.enabled` | whether enable snapshot feature | `false` |
130130
| `snapshot.image.csiSnapshotter.repository` | csi-snapshotter docker image | `/oss/kubernetes-csi/csi-snapshotter` |
131-
| `snapshot.image.csiSnapshotter.tag` | csi-snapshotter docker image tag | `v6.2.1` |
131+
| `snapshot.image.csiSnapshotter.tag` | csi-snapshotter docker image tag | `v6.2.2` |
132132
| `snapshot.image.csiSnapshotter.pullPolicy` | csi-snapshotter image pull policy | `IfNotPresent` |
133133
| `snapshot.image.csiSnapshotController.repository` | snapshot-controller docker image | `/oss/kubernetes-csi/snapshot-controller` |
134-
| `snapshot.image.csiSnapshotController.tag` | snapshot-controller docker image tag | `v6.2.1` |
134+
| `snapshot.image.csiSnapshotController.tag` | snapshot-controller docker image tag | `v6.2.2` |
135135
| `snapshot.image.csiSnapshotController.pullPolicy` | snapshot-controller image pull policy | `IfNotPresent` |
136136
| `snapshot.snapshotController.name` | snapshot controller name | `csi-snapshot-controller` |
137137
| `snapshot.snapshotController.replicas` | the replicas of snapshot-controller | `2` |
@@ -168,7 +168,7 @@ The following table lists the configurable parameters of the latest Azure File C
168168
| `linux.resources.azurefile.requests.memory` | azurefile memory requests | 20Mi |
169169
| `windows.enabled` | whether enable windows feature | `true` |
170170
| `windows.dsName` | name of driver daemonset on windows |`csi-azurefile-node-win` |
171-
| `windows.hostprocess` | whether deploy driver daemonset with host process containers on windows | `false` |
171+
| `windows.useHostProcessContainers` | whether deploy driver daemonset with host process containers on windows | `false` |
172172
| `windows.kubelet` | configure kubelet directory path on Windows agent node | `'C:\var\lib\kubelet'` |
173173
| `windows.kubeconfig` | configure kubeconfig path on Windows agent node | `'C:\k\config'` |
174174
| `windows.enableRegistrationProbe` | enable [kubelet-registration-probe](https://github.com/kubernetes-csi/node-driver-registrar#health-check-with-an-exec-probe) on windows driver config | `true`

0 commit comments

Comments
 (0)