Merge pull request #11180 from stubenhuang/issue-imageRegistry-11171

feat: 调整helm的镜像使其支持配置imageRegistry #11171
TencentBlueKing · Nov 1, 2024 · 4d07110 · 4d07110
2 parents 3ac218d + 847a8b0
commit 4d07110
Show file tree

Hide file tree

Showing 15 changed files with 6 additions and 39 deletions.
diff --git a/helm-charts/core/ci/Chart.lock b/helm-charts/core/ci/Chart.lock
diff --git a/helm-charts/core/ci/build_chart.py b/helm-charts/core/ci/build_chart.py
@@ -151,3 +151,6 @@
             default_value = '80'
         value = str(default_value_dict.get(camelize, default_value))
         value_file.write('  '+camelize+': '+value+'\n')
+
+# 更新依赖
+os.system("/bin/bash -c ./dependencyBuild.sh")
diff --git a/helm-charts/core/ci/charts/common-2.19.1.tgz b/helm-charts/core/ci/charts/common-2.19.1.tgz
diff --git a/helm-charts/core/ci/charts/elasticsearch-17.5.4.tgz b/helm-charts/core/ci/charts/elasticsearch-17.5.4.tgz
diff --git a/helm-charts/core/ci/charts/influxdb-5.3.1.tgz b/helm-charts/core/ci/charts/influxdb-5.3.1.tgz
diff --git a/helm-charts/core/ci/charts/kubernetes-manager-0.0.45.tgz b/helm-charts/core/ci/charts/kubernetes-manager-0.0.45.tgz
diff --git a/helm-charts/core/ci/charts/mongodb-10.30.6.tgz b/helm-charts/core/ci/charts/mongodb-10.30.6.tgz
diff --git a/helm-charts/core/ci/charts/mysql-10.3.0.tgz b/helm-charts/core/ci/charts/mysql-10.3.0.tgz
diff --git a/helm-charts/core/ci/charts/nginx-ingress-controller-7.6.21.tgz b/helm-charts/core/ci/charts/nginx-ingress-controller-7.6.21.tgz
diff --git a/helm-charts/core/ci/charts/rabbitmq-10.3.9.tgz b/helm-charts/core/ci/charts/rabbitmq-10.3.9.tgz
diff --git a/helm-charts/core/ci/charts/redis-16.13.2.tgz b/helm-charts/core/ci/charts/redis-16.13.2.tgz
diff --git a/helm-charts/core/ci/dependencyBuild.sh b/helm-charts/core/ci/dependencyBuild.sh
@@ -1,10 +1,13 @@
 #!/bin/bash
 
 # 先处理kubernetes-manager的chart
+echo "update kubernetes-management dependencies"
 cd local_chart/kubernetes-management
 rm -f Chart.lock
 helm dependency build
 cd ../..
 
 # 再处理根chart
+echo "update root dependencies"
+rm -f Chart.lock
 helm dependency build
diff --git a/helm-charts/core/ci/local_chart/kubernetes-management/Chart.lock b/helm-charts/core/ci/local_chart/kubernetes-management/Chart.lock
diff --git a/helm-charts/core/ci/local_chart/kubernetes-management/charts/mysql-10.3.0.tgz b/helm-charts/core/ci/local_chart/kubernetes-management/charts/mysql-10.3.0.tgz
diff --git a/helm-charts/core/ci/local_chart/kubernetes-management/charts/redis-16.13.2.tgz b/helm-charts/core/ci/local_chart/kubernetes-management/charts/redis-16.13.2.tgz