Merge remote-tracking branch 'github/master' into github_master

TencentBlueKing · Nov 18, 2024 · 2278849 · 2278849
2 parents e860c50 + b48dc27
commit 2278849
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 17 deletions.
diff --git a/helm-charts/core/codecc/Chart.lock b/helm-charts/core/codecc/Chart.lock
@@ -1,18 +1,18 @@
 dependencies:
 - name: common
-  repository: https://raw.githubusercontent.com/bitnami/charts/eb5f9a9513d987b519f0ecd732e7031241c50328/bitnami
-  version: 1.4.1
+  repository: https://charts.bitnami.com/bitnami
+  version: 2.19.1
 - name: nginx-ingress-controller
   repository: https://raw.githubusercontent.com/bitnami/charts/eb5f9a9513d987b519f0ecd732e7031241c50328/bitnami
   version: 7.4.8
 - name: mongodb
   repository: https://raw.githubusercontent.com/bitnami/charts/eb5f9a9513d987b519f0ecd732e7031241c50328/bitnami
   version: 10.30.6
 - name: rabbitmq
-  repository: https://raw.githubusercontent.com/bitnami/charts/eb5f9a9513d987b519f0ecd732e7031241c50328/bitnami
-  version: 8.20.1
+  repository: https://charts.bitnami.com/bitnami
+  version: 10.3.9
 - name: redis
-  repository: https://raw.githubusercontent.com/bitnami/charts/eb5f9a9513d987b519f0ecd732e7031241c50328/bitnami
-  version: 15.3.3
-digest: sha256:edfc26f766e663e1bbdf08ccb929b2ecc357ab73437d073f4d533cbe238b2b96
-generated: "2023-08-09T17:56:22.998034919+08:00"
+  repository: https://charts.bitnami.com/bitnami
+  version: 16.13.2
+digest: sha256:4ecf8bbd0883c364d6c73d72db9f6a3151e55a38c3a143d928add908239221fc
+generated: "2024-09-10T14:54:38.218662838+08:00"
diff --git a/helm-charts/core/codecc/Chart.yaml b/helm-charts/core/codecc/Chart.yaml
@@ -8,8 +8,8 @@ home: "https://github.com/Tencent/bk-ci"
 
 dependencies:
 - name: common
-  version: 1.4.1
-  repository: https://raw.githubusercontent.com/bitnami/charts/eb5f9a9513d987b519f0ecd732e7031241c50328/bitnami
+  version: 2.19.1
+  repository: https://charts.bitnami.com/bitnami
 - name: nginx-ingress-controller
   version: 7.4.8
   repository: https://raw.githubusercontent.com/bitnami/charts/eb5f9a9513d987b519f0ecd732e7031241c50328/bitnami
@@ -19,10 +19,10 @@ dependencies:
   repository: https://raw.githubusercontent.com/bitnami/charts/eb5f9a9513d987b519f0ecd732e7031241c50328/bitnami
   condition: mongodb.enabled
 - name: rabbitmq
-  version: 8.20.1
-  repository: https://raw.githubusercontent.com/bitnami/charts/eb5f9a9513d987b519f0ecd732e7031241c50328/bitnami
+  version: 10.3.9
+  repository: https://charts.bitnami.com/bitnami
   condition: rabbitmq.enabled
 - name: redis
-  version: 15.3.3
-  repository: https://raw.githubusercontent.com/bitnami/charts/eb5f9a9513d987b519f0ecd732e7031241c50328/bitnami
-  condition: redis.enabled
+  version: 16.13.2
+  repository: https://charts.bitnami.com/bitnami
+  condition: redis.enabled
diff --git a/helm-charts/core/codecc/build/values.yaml b/helm-charts/core/codecc/build/values.yaml
@@ -165,7 +165,7 @@ rabbitmq:
     password: codecc
     # 修改此选项必须删除rabbitmq的pvc , 否则会创建rabbitmq失败
     erlangCookie: cookie
-  communityPlugins: "https://github.com/rabbitmq/rabbitmq-delayed-message-exchange/releases/download/3.8.17/rabbitmq_delayed_message_exchange-3.8.17.8f537ac.ez"
+  communityPlugins: "https://bkopen-1252002024.file.myqcloud.com/ce7/files/rabbitmq_delayed_message_exchange-3.10.2.ez"
   extraPlugins: "rabbitmq_delayed_message_exchange"
   extraConfiguration: |-
     default_vhost = default-vhost
@@ -641,4 +641,4 @@ schedule:
   priorityClassName: ""
   config:
     server:
-      port: 8080
+      port: 8080
diff --git a/helm-charts/core/codecc/charts/common-1.8.0.tgz b/helm-charts/core/codecc/charts/common-1.8.0.tgz
diff --git a/helm-charts/core/codecc/charts/common-2.19.1.tgz b/helm-charts/core/codecc/charts/common-2.19.1.tgz
diff --git a/helm-charts/core/codecc/charts/rabbitmq-10.3.9.tgz b/helm-charts/core/codecc/charts/rabbitmq-10.3.9.tgz
diff --git a/helm-charts/core/codecc/charts/rabbitmq-8.20.1.tgz b/helm-charts/core/codecc/charts/rabbitmq-8.20.1.tgz
diff --git a/helm-charts/core/codecc/charts/redis-15.3.3.tgz b/helm-charts/core/codecc/charts/redis-15.3.3.tgz
diff --git a/helm-charts/core/codecc/charts/redis-16.13.2.tgz b/helm-charts/core/codecc/charts/redis-16.13.2.tgz
diff --git a/helm-charts/core/codecc/templates/_helpers.tpl b/helm-charts/core/codecc/templates/_helpers.tpl
@@ -261,11 +261,13 @@ codecc standard labels
 helm.sh/chart: {{ include "common.names.chart" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
+app.kubernetes.io/name: {{ .Release.Name }}
 {{- end -}}
 
 {{/*
 Labels to use on deploy.spec.selector.matchLabels and svc.spec.selector
 */}}
 {{- define "codecc.labels.matchLabels" -}}
 app.kubernetes.io/instance: {{ .Release.Name }}
+app.kubernetes.io/name: {{ .Release.Name }}
 {{- end -}}