Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: use canary-windows-hp image for host process deployment #897

Merged
merged 2 commits into from
Jan 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions charts/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ The following table lists the configurable parameters of the latest SMB CSI Driv
| `windows.kubelet` | configure kubelet directory path on Windows agent node | `'C:\var\lib\kubelet'` |

### Csi Proxy support on windows
> if you have set `windows.useHostProcessContainers` as `true`, csi-proxy is not needed by CSI driver.

The helm can setup the host-process deamonset for the csi proxy, by setting windows.csiproxy.enabled to true.

Expand Down
Binary file modified charts/latest/csi-driver-smb-v0.0.0.tgz
Binary file not shown.
2 changes: 1 addition & 1 deletion charts/latest/csi-driver-smb/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ windows:
cpu: 10m
memory: 40Mi
csiproxy:
enabled: false # required if windows.enabled is true, but may be installed manually also
enabled: false # required if windows.enabled is true and useHostProcessContainers is false, but may be installed manually also
dsName: csi-proxy-win # daemonset name
tolerations: {}
affinity: {}
Expand Down
4 changes: 2 additions & 2 deletions deploy/csi-smb-node-windows-hostprocess.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ spec:
hostNetwork: true
initContainers:
- name: init
image: mcr.microsoft.com/k8s/csi/smb-csi:latest-windows-hp
image: gcr.io/k8s-staging-sig-storage/smbplugin:canary-windows-hp
imagePullPolicy: IfNotPresent
command:
- "powershell.exe"
Expand Down Expand Up @@ -69,7 +69,7 @@ spec:
cpu: 30m
memory: 40Mi
- name: smb
image: mcr.microsoft.com/k8s/csi/smb-csi:latest-windows-hp
image: gcr.io/k8s-staging-sig-storage/smbplugin:canary-windows-hp
imagePullPolicy: IfNotPresent
command:
- "smbplugin.exe"
Expand Down
13 changes: 6 additions & 7 deletions deploy/example/smb-provisioner/smb-server-lb.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,23 +34,22 @@ spec:
"kubernetes.io/os": linux
containers:
- name: smb-server
image: andyzhangx/samba:win-fix
image: dockurr/samba
env:
- name: PERMISSIONS
value: "0777"
- name: USERNAME
- name: NAME
value: share
- name: USER
valueFrom:
secretKeyRef:
name: smbcreds
key: username
- name: PASSWORD
- name: PASS
valueFrom:
secretKeyRef:
name: smbcreds
key: password
args: ["-u", "$(USERNAME);$(PASSWORD)", "-s", "share;/smbshare/;yes;no;no;all;none", "-p"]
volumeMounts:
- mountPath: /smbshare
- mountPath: /storage
name: data-volume
ports:
- containerPort: 445
Expand Down
1 change: 1 addition & 0 deletions deploy/example/windows/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
## Feature Status: GA

## Prerequisite
> if you have set `windows.useHostProcessContainers` as `true`, csi-proxy is not needed by CSI driver.
- [Install CSI-Proxy on Windows Node](https://github.com/kubernetes-csi/csi-proxy#installation)
- install csi-proxy on k8s 1.23+ Windows node using host process daemonset directly
```console
Expand Down
Loading