Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit 2b2c88f
Author: weizhichen <weizhichen@microsoft.com>
Date:   Mon Jun 13 08:43:57 2022 +0000

    tgz

commit e387d7e
Merge: 6bceae1 44f646c
Author: weizhichen <weizhichen@microsoft.com>
Date:   Mon Jun 13 08:40:45 2022 +0000

    Merge branch 'master' of https://github.com/kubernetes-sigs/blob-csi-driver into prune-blobfuse-proxy

commit 6bceae1
Author: weizhichen <weizhichen@microsoft.com>
Date:   Thu Jun 9 09:14:11 2022 +0000

    change blobfuse-proxy from daemonset to initContainer

    feat: upgrade to blobfuse v1.4.4

    shellcheck

    shellcheck

    fix helm

    rm /tmp

    fix :
    1. do not RESTART blobfuse-proxy
    2. move dockerfile from build dir to pkg dir

    remove Restart=always from service file

    chore: combine case insensitive key/value setting in parameters

    fix

    feat: add runOnControlPlane in chart config

    Update driver-parameters.md

    Update driver-parameters.md

    generate tgz file for latest helm chart

    move blobfuse-proxy files to pkg dir

    fix

    fix test

    Squashed commit of the following:

    commit 44f646c
    Author: Andy Zhang <xiazhang@microsoft.com>
    Date:   Mon Jun 13 10:42:12 2022 +0800

        Update driver-parameters.md

    commit b98e5be
    Author: Andy Zhang <xiazhang@microsoft.com>
    Date:   Mon Jun 13 10:40:09 2022 +0800

        Update driver-parameters.md

    commit 7b3f56b
    Merge: 2832df4 ce77c0a
    Author: Andy Zhang <xiazhang@microsoft.com>
    Date:   Mon Jun 13 09:30:38 2022 +0800

        Merge pull request #694 from andyzhangx/runOnControlPlane

        feat: add runOnControlPlane in chart config

    commit ce77c0a
    Author: andyzhangx <xiazhang@microsoft.com>
    Date:   Sun Jun 12 11:50:24 2022 +0000

        feat: add runOnControlPlane in chart config

    commit 3c4b654
    Author: andyzhangx <xiazhang@microsoft.com>
    Date:   Sun Jun 12 11:50:03 2022 +0000

        chore: combine case insensitive key/value setting in parameters

        fix

    commit 2832df4
    Merge: 9e5ddf2 53fa9d3
    Author: Andy Zhang <xiazhang@microsoft.com>
    Date:   Wed Jun 8 18:58:38 2022 +0800

        Merge pull request #690 from andyzhangx/blobfuse-1.4.4

        feat: upgrade to blobfuse v1.4.4

    commit 53fa9d3
    Author: andyzhangx <xiazhang@microsoft.com>
    Date:   Wed Jun 8 07:46:06 2022 +0000

        feat: upgrade to blobfuse v1.4.4
  • Loading branch information
cvvz committed Jun 13, 2022
1 parent 44f646c commit 3f9576e
Show file tree
Hide file tree
Showing 17 changed files with 156 additions and 292 deletions.
1 change: 0 additions & 1 deletion .github/workflows/linux.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ jobs:
run: |
export PATH=$PATH:$HOME/.local/bin
make blobfuse-proxy
sudo dpkg -i _output/blobfuse-proxy.deb
- name: Get code coverage
env:
Expand Down
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -69,5 +69,3 @@ cscope.*
/bazel-*
*.pyc
profile.cov

pkg/blobfuse-proxy/debpackage/usr/
4 changes: 1 addition & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,4 @@ delete-metrics-svc:

.PHONY: blobfuse-proxy
blobfuse-proxy:
mkdir -p ./pkg/blobfuse-proxy/debpackage/usr/bin/ ./_output
CGO_ENABLED=0 GOOS=linux go build -mod vendor -ldflags="-s -w" -o ./pkg/blobfuse-proxy/debpackage/usr/bin/blobfuse-proxy ./pkg/blobfuse-proxy
$(DPKG_DEB) --build pkg/blobfuse-proxy/debpackage ./_output/blobfuse-proxy.deb
CGO_ENABLED=0 GOOS=linux go build -mod vendor -ldflags="-s -w" -o _output/${ARCH}/blobfuse-proxy ./pkg/blobfuse-proxy
Binary file modified charts/latest/blob-csi-driver-v1.14.0.tgz
Binary file not shown.
126 changes: 0 additions & 126 deletions charts/latest/blob-csi-driver/templates/blobfuse-proxy.yaml

This file was deleted.

43 changes: 43 additions & 0 deletions charts/latest/blob-csi-driver/templates/csi-blob-node.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ spec:
imagePullSecrets:
{{ toYaml .Values.imagePullSecrets | indent 8 }}
{{- end }}
{{- if .Values.node.enableBlobfuseProxy }}
hostPID: true
{{- end }}
hostNetwork: true
dnsPolicy: Default
serviceAccountName: {{ .Values.serviceAccount.node }}
Expand All @@ -56,6 +59,38 @@ spec:
{{- with .Values.node.tolerations }}
tolerations:
{{ toYaml . | indent 8 }}
{{- end }}
{{- if .Values.node.enableBlobfuseProxy }}
initContainers:
- name: install-blobfuse-proxy
{{- if hasPrefix "/" .Values.image.blob.repository }}
image: "{{ .Values.image.baseRepo }}{{ .Values.image.blob.repository }}:{{ .Values.image.blob.tag }}"
{{- else }}
image: "{{ .Values.image.blob.repository }}:{{ .Values.image.blob.tag }}"
{{- end }}
imagePullPolicy: IfNotPresent
command:
- "/blobfuse-proxy/init.sh"
securityContext:
privileged: true
env:
- name: DEBIAN_FRONTEND
value: "noninteractive"
- name: INSTALL_BLOBFUSE
value: "{{ .Values.node.blobfuseProxy.installBlobfuse }}"
- name: BLOBFUSE_VERSION
value: "{{ .Values.node.blobfuseProxy.blobfuseVersion }}"
- name: SET_MAX_OPEN_FILE_NUM
value: "{{ .Values.node.blobfuseProxy.setMaxOpenFileNum }}"
- name: MAX_FILE_NUM
value: "{{ .Values.node.blobfuseProxy.maxOpenFileNum }}"
- name: DISABLE_UPDATEDB
value: "{{ .Values.node.blobfuseProxy.disableUpdateDB }}"
volumeMounts:
- name: host-usr
mountPath: /host/usr
- name: host-etc
mountPath: /host/etc
{{- end }}
containers:
- name: liveness-probe
Expand Down Expand Up @@ -188,6 +223,14 @@ spec:
{{- end }}
resources: {{- toYaml .Values.node.resources.blob | nindent 12 }}
volumes:
{{- if .Values.node.enableBlobfuseProxy }}
- name: host-usr
hostPath:
path: /usr
- name: host-etc
hostPath:
path: /etc
{{- end }}
- hostPath:
path: {{ .Values.linux.kubelet }}/plugins/{{ .Values.driver.name }}
type: DirectoryOrCreate
Expand Down
2 changes: 0 additions & 2 deletions charts/latest/blob-csi-driver/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,6 @@ node:
nodeSelector: {}
tolerations:
- operator: "Exists"
livenessProbe:
healthPort: 29633

feature:
enableFSGroupPolicy: false
Expand Down
115 changes: 0 additions & 115 deletions deploy/blobfuse-proxy.yaml

This file was deleted.

33 changes: 33 additions & 0 deletions deploy/csi-blob-node.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ spec:
app: csi-blob-node
spec:
hostNetwork: true
hostPID: true
dnsPolicy: Default
serviceAccountName: csi-blob-node-sa
nodeSelector:
Expand All @@ -34,6 +35,32 @@ spec:
priorityClassName: system-node-critical
tolerations:
- operator: "Exists"
initContainers:
- name: install-blobfuse-proxy
image: mcr.microsoft.com/k8s/csi/blob-csi:latest
imagePullPolicy: IfNotPresent
command:
- "/blobfuse-proxy/init.sh"
securityContext:
privileged: true
env:
- name: DEBIAN_FRONTEND
value: "noninteractive"
- name: INSTALL_BLOBFUSE
value: "true"
- name: BLOBFUSE_VERSION
value: 1.4.4
- name: SET_MAX_OPEN_FILE_NUM
value: "true"
- name: MAX_FILE_NUM
value: "9000000"
- name: DISABLE_UPDATEDB
value: "true"
volumeMounts:
- name: host-usr
mountPath: /host/usr
- name: host-etc
mountPath: /host/etc
containers:
- name: liveness-probe
volumeMounts:
Expand Down Expand Up @@ -139,6 +166,12 @@ spec:
cpu: 10m
memory: 20Mi
volumes:
- name: host-usr
hostPath:
path: /usr
- name: host-etc
hostPath:
path: /etc
- hostPath:
path: /var/lib/kubelet/plugins/blob.csi.azure.com
type: DirectoryOrCreate
Expand Down
1 change: 0 additions & 1 deletion deploy/install-driver.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ kubectl apply -f $repo/csi-blob-controller.yaml
if [[ "$#" -gt 1 ]]; then
if [[ "$2" == *"blobfuse-proxy"* ]]; then
echo "set enable-blobfuse-proxy as true ..."
kubectl apply -f $repo/blobfuse-proxy.yaml
if [[ "$2" == *"local"* ]]; then
cat $repo/csi-blob-node.yaml | sed 's/enable-blobfuse-proxy=false/enable-blobfuse-proxy=true/g' | kubectl apply -f -
else
Expand Down
Loading

0 comments on commit 3f9576e

Please sign in to comment.