Merge pull request #8490 from stubenhuang/issue-ipv6-turbo-8488

feat: turbo 服务支持IPv6 #8488

helm-charts/core/ci/.helmignore

@@ -22,5 +22,7 @@
 *.tmproj
 .vscode/
 bk*.tgz
-build/
+base/
 build_chart.py
+local_chart
+kubernetes-manager部署文档.md

helm-charts/core/ci/Chart.lock

@@ -1,27 +1,30 @@
 dependencies:
 - name: common
-  repository: https://charts.bitnami.com/bitnami
+  repository: https://raw.githubusercontent.com/bitnami/charts/eb5f9a9513d987b519f0ecd732e7031241c50328/bitnami
   version: 1.10.0
 - name: mysql
-  repository: https://charts.bitnami.com/bitnami
+  repository: https://raw.githubusercontent.com/bitnami/charts/eb5f9a9513d987b519f0ecd732e7031241c50328/bitnami
   version: 8.8.3
 - name: redis
-  repository: https://charts.bitnami.com/bitnami
+  repository: https://raw.githubusercontent.com/bitnami/charts/eb5f9a9513d987b519f0ecd732e7031241c50328/bitnami
   version: 14.8.8
 - name: elasticsearch
-  repository: https://charts.bitnami.com/bitnami
+  repository: https://raw.githubusercontent.com/bitnami/charts/eb5f9a9513d987b519f0ecd732e7031241c50328/bitnami
   version: 17.5.2
 - name: rabbitmq
-  repository: https://charts.bitnami.com/bitnami
+  repository: https://raw.githubusercontent.com/bitnami/charts/eb5f9a9513d987b519f0ecd732e7031241c50328/bitnami
   version: 8.20.1
 - name: influxdb
-  repository: https://charts.bitnami.com/bitnami
+  repository: https://raw.githubusercontent.com/bitnami/charts/eb5f9a9513d987b519f0ecd732e7031241c50328/bitnami
   version: 2.3.7
 - name: nginx-ingress-controller
-  repository: https://charts.bitnami.com/bitnami
+  repository: https://raw.githubusercontent.com/bitnami/charts/eb5f9a9513d987b519f0ecd732e7031241c50328/bitnami
   version: 7.6.21
 - name: mongodb
-  repository: https://charts.bitnami.com/bitnami
-  version: 10.10.2
-digest: sha256:fa218488738d77fec69f3b95a20323964c10b8bc82ae0daeb4ae02c65514e4ee
-generated: "2022-02-23T11:17:26.380277102+08:00"
+  repository: https://raw.githubusercontent.com/bitnami/charts/eb5f9a9513d987b519f0ecd732e7031241c50328/bitnami
+  version: 10.30.6
+- name: kubernetes-manager
+  repository: file://./local_chart/kubernetes-management
+  version: 0.0.36
+digest: sha256:521a93d5e92e46288b16ef26391656c9a7041dd880a01cf5c04389f1bb4f4186
+generated: "2023-03-14T17:35:25.523011238+08:00"

helm-charts/core/ci/Chart.yaml

@@ -9,36 +9,36 @@ home: "https://github.com/Tencent/bk-ci"
 dependencies:
 - name: common
   version: 1.10.0
-  repository: https://charts.bitnami.com/bitnami
+  repository: https://raw.githubusercontent.com/bitnami/charts/eb5f9a9513d987b519f0ecd732e7031241c50328/bitnami
 - name: mysql
   version: 8.8.3
-  repository: https://charts.bitnami.com/bitnami
+  repository: https://raw.githubusercontent.com/bitnami/charts/eb5f9a9513d987b519f0ecd732e7031241c50328/bitnami
   condition: mysql.enabled
 - name: redis
   version: 14.8.8
-  repository: https://charts.bitnami.com/bitnami
+  repository: https://raw.githubusercontent.com/bitnami/charts/eb5f9a9513d987b519f0ecd732e7031241c50328/bitnami
   condition: redis.enabled
 - name: elasticsearch
   version: 17.5.2
-  repository: https://charts.bitnami.com/bitnami
+  repository: https://raw.githubusercontent.com/bitnami/charts/eb5f9a9513d987b519f0ecd732e7031241c50328/bitnami
   condition: elasticsearch.enabled
 - name: rabbitmq
   version: 8.20.1
-  repository: https://charts.bitnami.com/bitnami
+  repository: https://raw.githubusercontent.com/bitnami/charts/eb5f9a9513d987b519f0ecd732e7031241c50328/bitnami
   condition: rabbitmq.enabled
 - name: influxdb
   version: 2.3.7
-  repository: https://charts.bitnami.com/bitnami
+  repository: https://raw.githubusercontent.com/bitnami/charts/eb5f9a9513d987b519f0ecd732e7031241c50328/bitnami
   condition: influxdb.enabled
 - name: nginx-ingress-controller
   version: 7.6.21
-  repository: https://charts.bitnami.com/bitnami
+  repository: https://raw.githubusercontent.com/bitnami/charts/eb5f9a9513d987b519f0ecd732e7031241c50328/bitnami
   condition: nginx-ingress-controller.enabled
 - name: mongodb
-  version: 10.10.2
-  repository: https://charts.bitnami.com/bitnami
+  version: 10.30.6
+  repository: https://raw.githubusercontent.com/bitnami/charts/eb5f9a9513d987b519f0ecd732e7031241c50328/bitnami
   condition: mongodb.enabled
 - name: kubernetes-manager
   version: 0.0.36
-  repository: https://charts.bitnami.com/bitnami
+  repository: "file://./local_chart/kubernetes-management"
   condition: kubernetes-manager.enabled

helm-charts/core/ci/base/values.yaml

@@ -168,6 +168,10 @@ rabbitmq:
   communityPlugins: "https://github.com/rabbitmq/rabbitmq-delayed-message-exchange/releases/download/3.8.17/rabbitmq_delayed_message_exchange-3.8.17.8f537ac.ez"
   extraPlugins: "rabbitmq_delayed_message_exchange"
   extraConfiguration: |-
+    # ipv6 , 需要开启这些选项
+    # management.tcp.port = 15672
+    # management.tcp.ip  = ::
+    # 默认账户
     default_vhost = default-vhost
     default_permissions.configure = .*
     default_permissions.read = .*
@@ -215,7 +219,8 @@ influxdb:
 mongodb:
   # 是否部署mongodb
   # 如果需要使用外部数据库，设置为false并配置external.mongodb
-  enabled: true
+  enabled: false
+  # enableIPv6: true # ipv6 环境需要开启
   useStatefulSet: true
   auth:
     enabled: true
@@ -234,6 +239,16 @@ mongodb:
       use db_quartz
       db.createUser({ user: "$MONGODB_USERNAME" , pwd: "$MONGODB_PASSWORD" , roles: [{role: "dbOwner" , db:"db_quartz"}]})
       EOF
+  # 如果想在ipv6环境中运行, 则不用上面的脚本 , 注释掉上面的脚本并使用下面
+  #     $MONGODB_BIN_DIR/mongo admin --host localhost --port $MONGODB_PORT_NUMBER -u root -p $MONGODB_ROOT_PASSWORD << EOF
+  #     use db_turbo
+  #     db.createUser({ user: "$MONGODB_USERNAME" , pwd: "$MONGODB_PASSWORD" , roles: [{role: "dbOwner" , db:"db_turbo"}]})
+  #     use db_quartz
+  #     db.createUser({ user: "$MONGODB_USERNAME" , pwd: "$MONGODB_PASSWORD" , roles: [{role: "dbOwner" , db:"db_quartz"}]})
+  #     EOF
+  # extraEnvVars:
+  # - name: MONGODB_CLIENT_EXTRA_FLAGS
+  #   value: "--ipv6"
 kubernetes-manager:
   # 是否部署kubernetes-manager
   enabled: true
@@ -1405,9 +1420,9 @@ angetless:
 turbo:
   enabled: false
   image:
-    registry: mirrors.tencent.com/bkce
+    registry: registry-1.docker.io/bkci
     repository: bkci-turbo
-    tag: 0.0.16
+    tag: 0.0.18
     pullPolicy: IfNotPresent
     pullSecrets: []
   replicaCount: 1

src/backend/ci/core/common/common-archive/src/main/kotlin/com/tencent/devops/common/archive/config/BkRepoClientConfig.kt

@@ -58,6 +58,6 @@ class BkRepoClientConfig {
     @Value("\${bkrepo.staticPassword:}")
     val bkRepoStaticPassword: String = ""
 
-    @Value("\${bkrepo.bkrepoUrl}")
+    @Value("\${bkrepo.bkrepoUrl:}")
     val bkRepoIdcHost: String? = null
 }