fix(assets): update some helm repo urls

cnrancher · Aug 25, 2022 · 3bed5ea · 3bed5ea
1 parent b753419
commit 3bed5ea
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 14 deletions.
diff --git a/assets/rancher-setup/pandaria-l4.sh b/assets/rancher-setup/pandaria-l4.sh
@@ -3,15 +3,24 @@
 curl https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | bash
 export KUBECONFIG=/etc/rancher/k3s/k3s.yaml
 
-# helm repo add pandaria http://pandaria-releases.cnrancher.com/server-charts/latest
-helm repo add pandaria http://pandaria-releases.cnrancher.com/2.6-charts/dev
-# helm repo add pandaria http://pandaria-releases.cnrancher.com/2.6-charts/latest
+PANDARIA_VERSION=""
+
+# REPO_BASE="http://pandaria-releases.cnrancher.com"
+REPO_BASE="https://pandaria-releases.oss-cn-beijing.aliyuncs.com"
+
+# 2.0-2.5 repo for prd
+# helm repo add pandaria ${REPO_BASE}/server-charts/latest
+
+# 2.6 repo for dev
+helm repo add pandaria ${REPO_BASE}/2.6-charts/dev
+
+# 2.6 repo for prd
+# helm repo add pandaria ${REPO_BASE}/2.6-charts/latest
+
 helm repo update
 
 # no effect, just for compatibility with rancher helm template
-kubectl apply -f https://github.com/jetstack/cert-manager/releases/download/v1.7.1/cert-manager.crds.yaml
-
-PANDARIA_VERSION=""
+kubectl apply -f https://github.com/cert-manager/cert-manager/releases/download/v1.7.1/cert-manager.crds.yaml
 
 #docker login -u xxx -p xxx
 #docker pull cnrancher/rancher:$PANDARIA_VERSION

diff --git a/assets/rancher-setup/pandaria-l7.sh b/assets/rancher-setup/pandaria-l7.sh
@@ -3,22 +3,30 @@
 curl https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | bash
 export KUBECONFIG=/etc/rancher/k3s/k3s.yaml
 
-# helm repo add pandaria http://pandaria-releases.cnrancher.com/server-charts/latest
-helm repo add pandaria http://pandaria-releases.cnrancher.com/2.6-charts/dev
-# helm repo add pandaria http://pandaria-releases.cnrancher.com/2.6-charts/latest
+PANDARIA_VERSION=""
+
+# REPO_BASE="http://pandaria-releases.cnrancher.com"
+REPO_BASE="https://pandaria-releases.oss-cn-beijing.aliyuncs.com"
+
+# 2.0-2.5 repo for prd
+# helm repo add pandaria ${REPO_BASE}/server-charts/latest
+
+# 2.6 repo for dev
+helm repo add pandaria ${REPO_BASE}/2.6-charts/dev
+
+# 2.6 repo for prd
+# helm repo add pandaria ${REPO_BASE}/2.6-charts/latest
 
 helm repo add jetstack https://charts.jetstack.io
 helm repo update
 
-kubectl apply -f https://github.com/jetstack/cert-manager/releases/download/v1.7.1/cert-manager.crds.yaml
+kubectl apply -f https://github.com/cert-manager/cert-manager/releases/download/v1.7.1/cert-manager.crds.yaml
 
 helm install cert-manager jetstack/cert-manager \
   --namespace cert-manager \
   --create-namespace \
   --version v1.7.1
 
-PANDARIA_VERSION=""
-
 #docker login -u xxx -p xxx
 #docker pull cnrancher/rancher:$PANDARIA_VERSION
 

diff --git a/assets/rancher-setup/rancher-l4.sh b/assets/rancher-setup/rancher-l4.sh
@@ -8,7 +8,7 @@ helm repo add jetstack https://charts.jetstack.io
 helm repo update
 
 # no effect, just for compatibility with rancher helm template
-kubectl apply -f https://github.com/jetstack/cert-manager/releases/download/v1.7.1/cert-manager.crds.yaml
+kubectl apply -f https://github.com/cert-manager/cert-manager/releases/download/v1.7.1/cert-manager.crds.yaml
 
 kubectl create namespace cattle-system
 ec2_ip=$(curl -s http://169.254.169.254/latest/meta-data/public-ipv4)

diff --git a/assets/rancher-setup/rancher-l7.sh b/assets/rancher-setup/rancher-l7.sh
@@ -7,7 +7,7 @@ helm repo add rancher-latest https://releases.rancher.com/server-charts/latest
 helm repo add jetstack https://charts.jetstack.io
 helm repo update
 
-kubectl apply -f https://github.com/jetstack/cert-manager/releases/download/v1.7.1/cert-manager.crds.yaml
+kubectl apply -f https://github.com/cert-manager/cert-manager/releases/download/v1.7.1/cert-manager.crds.yaml
 
 helm install cert-manager jetstack/cert-manager \
   --namespace cert-manager \