From 4d66fc926dcb2196e78212d6ac4c55b13f2e7a4a Mon Sep 17 00:00:00 2001 From: wuhuizuo Date: Thu, 22 Feb 2024 14:01:25 +0800 Subject: [PATCH 1/2] fix(pacakges): update the downloading url for etcd binary It supports darwin arm64 buiding from v3.5.5 by etcd-io office source. Ref: https://github.com/etcd-io/etcd/issues/14001 Signed-off-by: wuhuizuo --- packages/packages.yaml.tmpl | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/packages/packages.yaml.tmpl b/packages/packages.yaml.tmpl index a7579e1c..dde34f45 100644 --- a/packages/packages.yaml.tmpl +++ b/packages/packages.yaml.tmpl @@ -77,7 +77,17 @@ components: - name: etcdctl src: type: http + {{- if eq .Release.os "darwin" }} + # ${FILE_SERVER_URL}/download/pingcap/etcd-${ETCDCTL_VERSION}-${os}-${arch}.tar.gz + # Notice: it only support darwin arm64 platform from [v3.5.5](https://github.com/etcd-io/etcd/releases/tag/v3.5.5) in office artifacts. + # When we upgrade to 3.5.x, we should replace it with the following url: + # "https://github.com/etcd-io/etcd/releases/download/v3.4.21/etcd-v3.4.21-{{ .Release.os }}-{{ .Release.arch }}.zip" + # Also we need support extract from zip archive. + url: "http://fileserver.pingcap.net/download/pingcap/etcd-v3.4.21-{{ .Release.os }}-{{ .Release.arch }}.tar.gz" + {{- else }} url: "https://github.com/etcd-io/etcd/releases/download/v3.4.21/etcd-v3.4.21-{{ .Release.os }}-{{ .Release.arch }}.tar.gz" + {{- end }} + url: "http://fileserver.pingcap.net/download/pingcap/etcd-v3.4.21-{{ .Release.os }}-{{ .Release.arch }}.tar.gz" extract: true extract_inner_path: etcd-v3.4.21-{{ .Release.os }}-{{ .Release.arch }}/etcdctl - name: pd-ctl From e31a80b09ea508889ff6ec96f3d5a5835e70b321 Mon Sep 17 00:00:00 2001 From: wuhuizuo Date: Thu, 22 Feb 2024 14:12:01 +0800 Subject: [PATCH 2/2] Update packages/packages.yaml.tmpl --- packages/packages.yaml.tmpl | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/packages.yaml.tmpl b/packages/packages.yaml.tmpl index dde34f45..30160328 100644 --- a/packages/packages.yaml.tmpl +++ b/packages/packages.yaml.tmpl @@ -87,7 +87,6 @@ components: {{- else }} url: "https://github.com/etcd-io/etcd/releases/download/v3.4.21/etcd-v3.4.21-{{ .Release.os }}-{{ .Release.arch }}.tar.gz" {{- end }} - url: "http://fileserver.pingcap.net/download/pingcap/etcd-v3.4.21-{{ .Release.os }}-{{ .Release.arch }}.tar.gz" extract: true extract_inner_path: etcd-v3.4.21-{{ .Release.os }}-{{ .Release.arch }}/etcdctl - name: pd-ctl