Merge pull request #11451 from TencentBlueKing/changelog/v3.0.13

CHANGELOG: Update directory for v3.0.13 release
TencentBlueKing · Feb 20, 2025 · 949c02c · 949c02c
2 parents fc16ddb + 45ac646
commit 949c02c
Show file tree

Hide file tree

Showing 15 changed files with 2,633 additions and 1,136 deletions.
diff --git a/.github/workflows/agent.yml b/.github/workflows/agent.yml
@@ -21,7 +21,7 @@ on:
 jobs:
   build:
     name: Build agent
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
     - uses: actions/setup-go@v3

diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml
@@ -23,7 +23,7 @@ on:
 jobs:
   backend-jar:
     name: Build backend -- JAR
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     services:
       mysql:
         image: mysql:5.7
@@ -63,7 +63,7 @@ jobs:
 
   backend-docker:
     name: Build backend -- Docker
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     services:
       mysql:
         image: mysql:5.7

diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml
@@ -22,7 +22,7 @@ on:
 jobs:
   frontend:
     name: Build frontend
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
         with:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -25,7 +25,7 @@ jobs:
 
   package-zip:
     name: Package Zip
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     needs: [frontend, agent, backend]
     steps:
     - uses: actions/checkout@v3
@@ -56,7 +56,7 @@ jobs:
 
   package-docker:
     name: Package Docker
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     needs: [frontend, agent, backend]
     steps:
       - uses: actions/checkout@v3
@@ -80,8 +80,6 @@ jobs:
           version="$(basename $GITHUB_REF)"
           echo "version=$version" >> $GITHUB_OUTPUT
           ci_ms_wip="sign" ci_pkg_dir=/dev/shm/ci-docker ./scripts/packager-ci.sh "$version" bkci-docker.tar.gz
-      - name: Setup Docker -- CLOUD NATIVE
-        uses: docker-practice/actions-setup-docker@master
       - name: Create Docker Image -- CLOUD NATIVE
         working-directory: docker-images/core/ci
         run: |
@@ -94,14 +92,14 @@ jobs:
 
   package-helm:
     name: Package Helm
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     needs: [frontend, agent, backend]
     steps:
     - uses: actions/checkout@v3
     - name: Setup Python -- CLOUD NATIVE
       uses: actions/setup-python@v4
       with:
-        python-version: "3.7.15"
+        python-version: "3.13"
     - name: Generate Helm Chart -- CLOUD NATIVE
       working-directory: helm-charts/core/ci
       run: |
@@ -127,7 +125,7 @@ jobs:
 
   releaseAll:
     name: Release All
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     needs: [package-zip, package-helm]
     steps:
     - name: download bkci-slim

diff --git a/CHANGELOG/en/CHANGELOG-3.0.md b/CHANGELOG/en/CHANGELOG-3.0.md
@@ -1,4 +1,14 @@
 <!-- BEGIN MUNGE: GENERATED_TOC -->
+- [v3.0.13](#v3013)
+  - [Changelog since v3.0.12](#changelog-since-v3012)
+
+- [v3.0.12](#v3012)
+  - [Changelog since v3.0.11](#changelog-since-v3011)
+
+- [v3.0.11](#v3011)
+  - [Changelog since v3.0.0](#changelog-since-v300)
+- [v3.0.1-v3.0.10]
+  - 因镜像版本与仓库版本没有统一,v3.0.1-v3.0.10已有镜像版本,但没有仓库版本,所以仓库这些版本直接跳过
 - [v3.0.0](#v300)
   - [Changelog since v2.1.0](#changelog-since-v210)
 - [v3.0.0-rc.1](#v300-rc1)
@@ -9,6 +19,48 @@
 
 
 <!-- NEW RELEASE NOTES ENTRY -->
+# v3.0.13
+## 2025-02-12
+### Changelog since v3.0.12
+#### Added
+
+##### Uncategorized
+- [Added] feat: chart package issue that needs to be fixed [link](http://github.com/TencentBlueKing/bk-ci/issues/11105)
+
+# v3.0.12
+## 2025-01-08
+### Changelog since v3.0.11
+#### Fix
+
+##### Uncategorized
+- [Fixed] bug: fix the error when installing helm chart package in v3.0 version [link](http://github.com/TencentBlueKing/bk-ci/issues/11391)
+
+# v3.0.11
+## 2024-12-05
+### Changelog since v3.0.0
+#### New
+
+##### Uncategorized
+- [New] feat: Adjust the image of helm to support imageRegistry configuration [link](http://github.com/TencentBlueKing/bk-ci/issues/11171)
+- [New] feat: Interaction optimization when dependent services are not deployed [link](http://github.com/TencentBlueKing/bk-ci/issues/10612)
+- [New] feat: Support viewing version logs [link](http://github.com/TencentBlueKing/bk-ci/issues/10938)
+- [New] feat: Changes in Blue Whale 7.2 version [link](http://github.com/TencentBlueKing/bk-ci/issues/10558)
+- [New] Unify the style and content of the top bar drop-down box of the product [Link](http://github.com/TencentBlueKing/bk-ci/issues/10939)
+- [Added] feat: Remove the config ns configuration of the docker build plugin [Link](http://github.com/TencentBlueKing/bk-ci/issues/10926)
+- [Added] feat: Newly started PODs need to be warmed up [Link](http://github.com/TencentBlueKing/bk-ci/issues/10887)
+- [Added] feat: Allow workers to run in JDK17 [Link](http://github.com/TencentBlueKing/bk-ci/issues/10412)
+
+#### Fix
+
+##### Pipeline
+- [Fixed] [Devops - Review Committee has reviewed] [PAC] feat: Create/edit pipelines to support arranging pipelines in Code [Link](http://github.com/TencentBlueKing/bk-ci/issues/8125)
+
+##### Permission Center
+- [Fix] bug: Permission Management-Permission Renewal Data Synchronization [Link](http://github.com/TencentBlueKing/bk-ci/issues/11271)
+
+##### Uncategorized
+- [Fix] fix UnreachableCode [Link](http://github.com/TencentBlueKing/bk-ci/issues/11172)
+
 # v3.0.0
 ## 2024-09-10
 ### Changelog since v2.1.0

diff --git a/CHANGELOG/zh_CN/CHANGELOG-3.0.md b/CHANGELOG/zh_CN/CHANGELOG-3.0.md
@@ -1,4 +1,7 @@
 <!-- BEGIN MUNGE: GENERATED_TOC -->
+- [v3.0.13](#v3013)
+   - [Changelog since v3.0.12](#changelog-since-v3012)
+
 - [v3.0.12](#v3012)
    - [Changelog since v3.0.11](#changelog-since-v3011)
 
@@ -16,6 +19,14 @@
 
 
 <!-- NEW RELEASE NOTES ENTRY -->
+# v3.0.13
+## 2025-02-12
+### Changelog since v3.0.12
+#### 新增
+
+##### 未分类
+- [新增] feat: 需要修复的chart包问题 [链接](http://github.com/TencentBlueKing/bk-ci/issues/11105)
+
 # v3.0.12
 ## 2025-01-08
 ### Changelog since v3.0.11

diff --git a/helm-charts/core/ci/base/values.yaml b/helm-charts/core/ci/base/values.yaml
@@ -156,7 +156,7 @@ mysql:
 redis:
   enabled: true
   auth:
-    password: bluking
+    password: blueking
   replica:
     replicaCount: 1
     persistence: 
@@ -295,68 +295,21 @@ kubernetes-manager:
 
   # 内部数据源配置
   mysql:
-    enabled: true
-    nameOverride: kubernetes-manager-mysql
-    image:
-      tag: 8.0.37-debian-12-r2
-    auth:
-      # 修改此选项必须删除mysql的pvc , 否则会创建mysql失败
-      rootPassword: blueking
-    primary:
-      persistence:
-        size: 10Gi
-      configuration: |-
-        [mysqld]
-        default_authentication_plugin=mysql_native_password
-        skip-name-resolve
-        explicit_defaults_for_timestamp
-        basedir=/opt/bitnami/mysql
-        plugin_dir=/opt/bitnami/mysql/lib/plugin
-        port=3306
-        socket=/opt/bitnami/mysql/tmp/mysql.sock
-        datadir=/bitnami/mysql/data
-        tmpdir=/opt/bitnami/mysql/tmp
-        max_allowed_packet=16M
-        bind-address=*
-        pid-file=/opt/bitnami/mysql/tmp/mysqld.pid
-        log-error=/opt/bitnami/mysql/logs/mysqld.log
-        character-set-server=UTF8
-        collation-server=utf8_general_ci
-        max_connections=2000
-        default-time-zone='+08:00'
-        [client]
-        port=3306
-        socket=/opt/bitnami/mysql/tmp/mysql.sock
-        default-character-set=UTF8
-        plugin_dir=/opt/bitnami/mysql/lib/plugin
-        [manager]
-        port=3306
-        socket=/opt/bitnami/mysql/tmp/mysql.sock
-        pid-file=/opt/bitnami/mysql/tmp/mysqld.pid
+    enabled: false
 
   redis:
-    enabled: true
-    nameOverride: kubernetes-manager-redis
-    auth:
-      password: bluking
-    replica:
-      replicaCount: 1
-      persistence:
-        size: 10Gi
-    master:
-      persistence:
-        size: 10Gi
+    enabled: false
 
   #外部数据库
   externalMysql:
-    host: localhost
+    host: "" #为空时使用bkci的mysql
     port: 3306
-    username: bkci
-    password: bkci
+    username: root
+    password: blueking
   externalRedis:
-    host: localhost
+    host: "" #为空时使用bkci的redis
     port: 6379
-    password: bkci
+    password: blueking
 
   # kubernetesManager service
   service:

diff --git a/helm-charts/core/ci/local_chart/kubernetes-management/templates/_helpers.tpl b/helm-charts/core/ci/local_chart/kubernetes-management/templates/_helpers.tpl
@@ -1,7 +1,7 @@
 {{/*
 Return the mysql fullname
 */}}
-{{- define "bkci.mysql.fullname" -}}
+{{- define "k8sm.mysql.fullname" -}}
 {{- if .Values.mysql.fullnameOverride -}}
 {{- .Values.mysql.fullnameOverride | trunc 63 | trimSuffix "-" -}}
 {{- else -}}
@@ -13,7 +13,7 @@ Return the mysql fullname
 {{/*
 Return the redis fullname
 */}}
-{{- define "bkci.redis.fullname" -}}
+{{- define "k8sm.redis.fullname" -}}
 {{- if .Values.redis.fullnameOverride -}}
 {{ $name := .Values.redis.fullnameOverride | trunc 63 | trimSuffix "-"}}
 {{- list $name "master" | join "-" -}}
@@ -26,18 +26,22 @@ Return the redis fullname
 {{/*
 MySQL addr
 */}}
-{{- define "bkci.mysqlAddr" -}}
+{{- define "k8sm.mysqlAddr" -}}
 {{- if eq .Values.mysql.enabled true -}}
-{{- include "bkci.mysql.fullname" . -}}:3306
+{{- include "k8sm.mysql.fullname" . -}}:3306
 {{- else -}}
-{{- .Values.externalMysql.host -}}:{{- .Values.externalMysql.port -}}
+  {{- if ne .Values.externalMysql.host "" }}
+    {{- .Values.externalMysql.host -}}:{{- .Values.externalMysql.port }}
+  {{- else -}}
+    {{- printf "%s-%s" .Release.Name "mysql" | trunc 63 | trimSuffix "-" -}}:3306
+  {{- end -}}
 {{- end -}}
 {{- end -}}
 
 {{/*
 MySQL username
 */}}
-{{- define "bkci.mysqlUsername" -}}
+{{- define "k8sm.mysqlUsername" -}}
 {{- if eq .Values.mysql.enabled true -}}
 root
 {{- else -}}
@@ -48,7 +52,7 @@ root
 {{/*
 MySQL password
 */}}
-{{- define "bkci.mysqlPassword" -}}
+{{- define "k8sm.mysqlPassword" -}}
 {{- if eq .Values.mysql.enabled true -}}
 {{- .Values.mysql.auth.rootPassword -}}
 {{- else -}}
@@ -59,18 +63,22 @@ MySQL password
 {{/*
 Redis host
 */}}
-{{- define "bkci.redisHost" -}}
+{{- define "k8sm.redisHost" -}}
 {{- if eq .Values.redis.enabled true -}}
-{{- include "bkci.redis.fullname" . -}}
+{{- include "k8sm.redis.fullname" . -}}
 {{- else -}}
-{{- .Values.externalRedis.host -}}
+  {{- if ne .Values.externalRedis.host "" }}
+    {{- .Values.externalRedis.host -}}
+  {{- else -}}
+    {{- printf "%s-%s-master" .Release.Name "redis" | trunc 63 | trimSuffix "-" -}}
+  {{- end -}}
 {{- end -}}
 {{- end -}}
 
 {{/*
 Redis port
 */}}
-{{- define "bkci.redisPort" -}}
+{{- define "k8sm.redisPort" -}}
 {{- if eq .Values.redis.enabled true -}}
 6379
 {{- else -}}
@@ -81,7 +89,7 @@ Redis port
 {{/*
 Redis password
 */}}
-{{- define "bkci.redisPassword" -}}
+{{- define "k8sm.redisPassword" -}}
 {{- if eq .Values.redis.enabled true -}}
 {{- .Values.redis.auth.password -}}
 {{- else -}}

diff --git a/helm-charts/core/ci/local_chart/kubernetes-management/templates/init/init.sql.yaml b/helm-charts/core/ci/local_chart/kubernetes-management/templates/init/init.sql.yaml
@@ -25,9 +25,9 @@ spec:
             - "/bin/sh"
             - "-c"
             - |
-              until getent hosts {{ include "bkci.mysql.fullname" . }}
+              until getent hosts {{ include "k8sm.mysql.fullname" . }}
               do 
-                echo waiting for {{ include "bkci.mysql.fullname" . }};
+                echo waiting for {{ include "k8sm.mysql.fullname" . }};
                 sleep 2;
               done
               echo "MySQL is available";
@@ -37,11 +37,11 @@ spec:
           image: {{ include "common.images.image" ( dict "imageRoot" .Values.backendImage "global" .Values.global) }}
           imagePullPolicy: {{ .Values.backendImage.pullPolicy }}
           workingDir: /data/workspace/support-files/sql
-          {{ $mysqlData := split ":" (include "bkci.mysqlAddr" .) }}
+          {{ $mysqlData := split ":" (include "k8sm.mysqlAddr" .) }}
           command:
             - "/bin/sh"
             - "-c"
             - |
-              for SQL in *.sql; do mysql -u{{- include "bkci.mysqlUsername" . }} -p{{- include "bkci.mysqlPassword" . }} -h{{ $mysqlData._0 }} -P{{ $mysqlData._1 }}< $SQL; done ;
+              for SQL in *.sql; do mysql -u{{- include "k8sm.mysqlUsername" . }} -p{{- include "k8sm.mysqlPassword" . }} -h{{ $mysqlData._0 }} -P{{ $mysqlData._1 }}< $SQL; done ;
       restartPolicy: OnFailure
 {{- end -}}
diff --git a/...rts/core/ci/local_chart/kubernetes-management/templates/kubernetes-manager-configmap.yaml b/...rts/core/ci/local_chart/kubernetes-management/templates/kubernetes-manager-configmap.yaml
@@ -19,14 +19,14 @@ data:
       port: 80
     
     mysql:
-      dataSourceName: {{ include "bkci.mysqlUsername" . }}:{{- include "bkci.mysqlPassword" . }}@tcp({{- include "bkci.mysqlAddr" . }})/devops_ci_kubernetes_manager?parseTime=true&loc=Local
+      dataSourceName: {{ include "k8sm.mysqlUsername" . }}:{{- include "k8sm.mysqlPassword" . }}@tcp({{- include "k8sm.mysqlAddr" . }})/devops_ci_kubernetes_manager?parseTime=true&loc=Local
       connMaxLifetime: 3
       maxOpenConns: 10
       maxIdleConns: 10
     
     redis:
-      addr: {{ include "bkci.redisHost" . }}:{{ include "bkci.redisPort" . }}
-      password: {{ include "bkci.redisPassword" . }}
+      addr: {{ include "k8sm.redisHost" . }}:{{ include "k8sm.redisPort" . }}
+      password: {{ include "k8sm.redisPassword" . }}
       db: {{ .Values.kubernetesManager.redis.db }}
     
     kubernetes: