diff --git a/helm-charts/core/codecc/Chart.lock b/helm-charts/core/codecc/Chart.lock index 117f7992..76c1fa5e 100644 --- a/helm-charts/core/codecc/Chart.lock +++ b/helm-charts/core/codecc/Chart.lock @@ -1,7 +1,7 @@ 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 @@ -9,10 +9,10 @@ dependencies: 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" \ No newline at end of file + 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 index f7789a11..fd23d81a 100644 --- 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 \ No newline at end of file + 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 index f438f916..020bf8d4 100644 --- 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 \ No newline at end of file + 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 deleted file mode 100644 index 730ce049..00000000 Binary files a/helm-charts/core/codecc/charts/common-1.8.0.tgz and /dev/null differ diff --git a/helm-charts/core/codecc/charts/common-2.19.1.tgz b/helm-charts/core/codecc/charts/common-2.19.1.tgz new file mode 100644 index 00000000..70d4aa59 Binary files /dev/null and b/helm-charts/core/codecc/charts/common-2.19.1.tgz differ diff --git a/helm-charts/core/codecc/charts/rabbitmq-10.3.9.tgz b/helm-charts/core/codecc/charts/rabbitmq-10.3.9.tgz new file mode 100644 index 00000000..3d8cba55 Binary files /dev/null and b/helm-charts/core/codecc/charts/rabbitmq-10.3.9.tgz differ diff --git a/helm-charts/core/codecc/charts/rabbitmq-8.20.1.tgz b/helm-charts/core/codecc/charts/rabbitmq-8.20.1.tgz deleted file mode 100644 index fb5f91e5..00000000 Binary files a/helm-charts/core/codecc/charts/rabbitmq-8.20.1.tgz and /dev/null differ diff --git a/helm-charts/core/codecc/charts/redis-15.3.3.tgz b/helm-charts/core/codecc/charts/redis-15.3.3.tgz deleted file mode 100644 index daba0897..00000000 Binary files a/helm-charts/core/codecc/charts/redis-15.3.3.tgz and /dev/null differ diff --git a/helm-charts/core/codecc/charts/redis-16.13.2.tgz b/helm-charts/core/codecc/charts/redis-16.13.2.tgz new file mode 100644 index 00000000..33b5e967 Binary files /dev/null and b/helm-charts/core/codecc/charts/redis-16.13.2.tgz differ diff --git a/helm-charts/core/codecc/templates/_helpers.tpl b/helm-charts/core/codecc/templates/_helpers.tpl index 04f3d8a4..9b6e60f5 100644 --- a/helm-charts/core/codecc/templates/_helpers.tpl +++ b/helm-charts/core/codecc/templates/_helpers.tpl @@ -261,6 +261,7 @@ 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 -}} {{/* @@ -268,4 +269,5 @@ 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 -}} \ No newline at end of file