From 79b3401b66824e85c1a185692e476fec5b451b70 Mon Sep 17 00:00:00 2001 From: andyzhangx Date: Fri, 8 Nov 2024 06:11:32 +0000 Subject: [PATCH 1/2] fix: don't install blobfuse v1 by default since it's deprecated --- charts/latest/blob-csi-driver-v0.0.0.tgz | Bin 6124 -> 6125 bytes charts/latest/blob-csi-driver/values.yaml | 2 +- deploy/csi-blob-node.yaml | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/latest/blob-csi-driver-v0.0.0.tgz b/charts/latest/blob-csi-driver-v0.0.0.tgz index 44dfd85d589d1c22669f1cb96985c81d27ffa88f..7ffae382253c849ac8919ecd2be6177dfe2a0e2f 100644 GIT binary patch delta 4580 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 diff --git a/charts/latest/blob-csi-driver/values.yaml b/charts/latest/blob-csi-driver/values.yaml index 8a280a342..809387645 100644 --- a/charts/latest/blob-csi-driver/values.yaml +++ b/charts/latest/blob-csi-driver/values.yaml @@ -120,7 +120,7 @@ node: logLevel: 5 enableBlobfuseProxy: true blobfuseProxy: - installBlobfuse: true + installBlobfuse: false blobfuseVersion: "1.4.5" installBlobfuse2: true blobfuse2Version: "2.3.2" diff --git a/deploy/csi-blob-node.yaml b/deploy/csi-blob-node.yaml index f41d838f4..89611ebd4 100644 --- a/deploy/csi-blob-node.yaml +++ b/deploy/csi-blob-node.yaml @@ -55,7 +55,7 @@ spec: - name: INSTALL_BLOBFUSE_PROXY value: "true" - name: INSTALL_BLOBFUSE - value: "true" + value: "false" - name: BLOBFUSE_VERSION value: "1.4.5" - name: INSTALL_BLOBFUSE2 From 7defa64a8e7349f86542a32580517d1241564abc Mon Sep 17 00:00:00 2001 From: andyzhangx Date: Fri, 8 Nov 2024 13:04:23 +0000 Subject: [PATCH 2/2] fix: migrate k8s package key issue fix: migrate k8s repo on Ubuntu node fix --- Makefile | 4 ++-- charts/latest/blob-csi-driver-v0.0.0.tgz | Bin 6125 -> 6161 bytes .../templates/csi-blob-node.yaml | 2 ++ charts/latest/blob-csi-driver/values.yaml | 1 + pkg/blobfuse-proxy/init.sh | 1 + pkg/blobfuse-proxy/install-proxy.sh | 8 ++++++++ 6 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index d26d36cbe..d96d7bacd 100644 --- a/Makefile +++ b/Makefile @@ -30,9 +30,9 @@ CSI_IMAGE_TAG_LATEST = $(REGISTRY)/$(IMAGE_NAME):latest BUILD_DATE ?= $(shell date -u +"%Y-%m-%dT%H:%M:%SZ") LDFLAGS ?= "-X ${PKG}/pkg/blob.driverVersion=${IMAGE_VERSION} -X ${PKG}/pkg/blob.gitCommit=${GIT_COMMIT} -X ${PKG}/pkg/blob.buildDate=${BUILD_DATE} -s -w -extldflags '-static'" ifdef ENABLE_BLOBFUSE_PROXY -E2E_HELM_OPTIONS ?= --set image.blob.pullPolicy=Always --set image.blob.repository=$(REGISTRY)/$(IMAGE_NAME) --set image.blob.tag=$(IMAGE_VERSION) --set driver.userAgentSuffix="e2e-test" --set controller.logLevel=6 --set node.logLevel=6 --set node.enableBlobfuseProxy=true +E2E_HELM_OPTIONS ?= --set image.blob.pullPolicy=Always --set image.blob.repository=$(REGISTRY)/$(IMAGE_NAME) --set image.blob.tag=$(IMAGE_VERSION) --set driver.userAgentSuffix="e2e-test" --set controller.logLevel=6 --set node.logLevel=6 --set node.enableBlobfuseProxy=true --set node.blobfuseProxy.migrateK8sRepo=true else -E2E_HELM_OPTIONS ?= --set image.blob.pullPolicy=Always --set image.blob.repository=$(REGISTRY)/$(IMAGE_NAME) --set image.blob.tag=$(IMAGE_VERSION) --set driver.userAgentSuffix="e2e-test" +E2E_HELM_OPTIONS ?= --set image.blob.pullPolicy=Always --set image.blob.repository=$(REGISTRY)/$(IMAGE_NAME) --set image.blob.tag=$(IMAGE_VERSION) --set driver.userAgentSuffix="e2e-test" --set node.blobfuseProxy.migrateK8sRepo=true endif E2E_HELM_OPTIONS += ${EXTRA_HELM_OPTIONS} GO111MODULE = on diff --git a/charts/latest/blob-csi-driver-v0.0.0.tgz b/charts/latest/blob-csi-driver-v0.0.0.tgz index 7ffae382253c849ac8919ecd2be6177dfe2a0e2f..e3fea2a719db95e7c6905be83e931cc46c2d4cef 100644 GIT binary patch delta 5949 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 delta 5891 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 Z>u?>e!}ZM9{{;X5|NlwA5#a!?005U*kM#fm diff --git a/charts/latest/blob-csi-driver/templates/csi-blob-node.yaml b/charts/latest/blob-csi-driver/templates/csi-blob-node.yaml index 863e90ed3..762886d21 100644 --- a/charts/latest/blob-csi-driver/templates/csi-blob-node.yaml +++ b/charts/latest/blob-csi-driver/templates/csi-blob-node.yaml @@ -102,6 +102,8 @@ spec: value: "{{ .Values.node.blobfuseProxy.disableUpdateDB }}" - name: KUBELET_PATH value: "{{ .Values.linux.kubelet }}" + - name: MIGRATE_K8S_REPO + value: "{{ .Values.node.blobfuseProxy.migrateK8sRepo }}" volumeMounts: - name: host-usr mountPath: /host/usr diff --git a/charts/latest/blob-csi-driver/values.yaml b/charts/latest/blob-csi-driver/values.yaml index 809387645..fc74895d9 100644 --- a/charts/latest/blob-csi-driver/values.yaml +++ b/charts/latest/blob-csi-driver/values.yaml @@ -127,6 +127,7 @@ node: setMaxOpenFileNum: true maxOpenFileNum: "9000000" disableUpdateDB: true + migrateK8sRepo: false blobfuseCachePath: /mnt appendTimeStampInCacheDir: false mountPermissions: 0777 diff --git a/pkg/blobfuse-proxy/init.sh b/pkg/blobfuse-proxy/init.sh index c0cefe953..003d3b7e9 100755 --- a/pkg/blobfuse-proxy/init.sh +++ b/pkg/blobfuse-proxy/init.sh @@ -20,6 +20,7 @@ INSTALL_BLOBFUSE_PROXY=${INSTALL_BLOBFUSE_PROXY:-true} DISABLE_UPDATEDB=${DISABLE_UPDATEDB:-true} SET_MAX_OPEN_FILE_NUM=${SET_MAX_OPEN_FILE_NUM:-true} SET_READ_AHEAD_SIZE=${SET_READ_AHEAD_SIZE:-true} +MIGRATE_K8S_REPO=${MIGRATE_K8S_REPO:-false} READ_AHEAD_KB=${READ_AHEAD_KB:-15380} KUBELET_PATH=${KUBELET_PATH:-/var/lib/kubelet} if [ "$KUBELET_PATH" != "/var/lib/kubelet" ];then diff --git a/pkg/blobfuse-proxy/install-proxy.sh b/pkg/blobfuse-proxy/install-proxy.sh index fb2559c11..12b871acf 100644 --- a/pkg/blobfuse-proxy/install-proxy.sh +++ b/pkg/blobfuse-proxy/install-proxy.sh @@ -33,6 +33,14 @@ then else cp /blobfuse-proxy/packages-microsoft-prod-22.04.deb /host/etc/packages-microsoft-prod.deb fi + + if [ "${MIGRATE_K8S_REPO}" = "true" ] + then + # https://kubernetes.io/blog/2023/08/15/pkgs-k8s-io-introduction/#how-to-migrate + echo "deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.30/deb/ /" | tee /host/etc/apt/sources.list.d/kubernetes.list + $HOST_CMD curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.30/deb/Release.key | $HOST_CMD gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg + fi + # when running dpkg -i /etc/packages-microsoft-prod.deb, need to enter y to continue. # refer to https://stackoverflow.com/questions/45349571/how-to-install-deb-with-dpkg-non-interactively yes | $HOST_CMD dpkg -i /etc/packages-microsoft-prod.deb && $HOST_CMD apt update