Merge pull request #77 from xuzhu-591/main

bump appVersion to v2.6.0
horizoncd · Sep 22, 2023 · 49cfaad · 49cfaad
2 parents c802520 + fb54618
commit 49cfaad
Show file tree

Hide file tree

Showing 3 changed files with 109 additions and 4 deletions.
diff --git a/charts/horizon/Chart.yaml b/charts/horizon/Chart.yaml
@@ -4,8 +4,8 @@ description: A CICD DevOps Platform
 
 type: application
 
-version: 2.2.17
-appVersion: v2.5.2
+version: 2.2.18
+appVersion: v2.6.0
 dependencies:
   - name: common
     repository: https://charts.bitnami.com/bitnami

diff --git a/charts/horizon/files/db-init.sql b/charts/horizon/files/db-init.sql
@@ -607,6 +607,57 @@ create index idx_event_id
 create index idx_webhook_id_status
     on tb_webhook_log (webhook_id, status);
 
+CREATE TABLE if not exists `tb_check`
+(
+    `id`            bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+    `resource_type` varchar(64)         NOT NULL DEFAULT '' COMMENT 'resource type',
+    `resource_id`   bigint(20) unsigned NOT NULL COMMENT 'resource id',
+    `created_at`    datetime            NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    `updated_at`    datetime            NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    `deleted_ts`    bigint(20)                   DEFAULT '0' COMMENT 'deleted timestamp, 0 means not deleted',
+    `created_by`    bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT 'creator',
+    `updated_by`    bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT 'updater',
+    PRIMARY KEY (`id`),
+    UNIQUE KEY `uk_resource_deleted` (`resource_type`, `resource_id`, `deleted_ts`)
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 1
+  DEFAULT CHARSET = utf8mb4;
+
+CREATE TABLE if not exists `tb_checkrun`
+(
+  `id`              bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+  `name`            varchar(256)        NOT NULL DEFAULT '' COMMENT 'the name of check run',
+  `status`          varchar(64)         NOT NULL DEFAULT '' COMMENT 'the status of check run',
+  `pipeline_run_id` bigint(20) unsigned NOT NULL COMMENT 'pipeline run id',
+  `check_id`        bigint(20) unsigned NOT NULL COMMENT 'check id',
+  `message`         varchar(256)        NOT NULL DEFAULT '',
+  `detail_url`      varchar(256)        NOT NULL DEFAULT '' COMMENT 'the detail url of check run',
+  `created_at`      datetime            NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `updated_at`      datetime            NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `deleted_ts`      bigint(20)                   DEFAULT '0' COMMENT 'deleted timestamp, 0 means not deleted',
+  `created_by`      bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT 'creator',
+  `updated_by`      bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT 'updater',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uk_pipeline_run_id_check_id_deleted` (`pipeline_run_id`, `check_id`, `deleted_ts`)
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 1
+  DEFAULT CHARSET = utf8mb4;
+
+CREATE TABLE if not exists `tb_pr_msg`
+(
+  `id`              bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+  `pipeline_run_id` bigint(20) unsigned NOT NULL COMMENT 'pipeline run id',
+  `content`         text                NOT NULL COMMENT 'content of message',
+  `created_at`      datetime            NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `updated_at`      datetime            NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `created_by`      bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT 'creator',
+  `updated_by`      bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT 'updater',
+  `deleted_ts`      bigint(20)                   DEFAULT '0' COMMENT 'deleted timestamp, 0 means not deleted',
+  PRIMARY KEY (`id`)
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 1
+  DEFAULT CHARSET = utf8mb4;
+
 -- init data
 insert into tb_user (name, full_name, email, oidc_id, oidc_type, admin, banned, password)
 values ('admin', 'admin', 'admin@cloudnative.com', 0, 0, 1, 0,

diff --git a/charts/horizon/values.yaml b/charts/horizon/values.yaml
@@ -2110,7 +2110,7 @@ web:
   replicas: 1
   image:
     repository: horizoncd/horizon-web
-    tag: v2.3.6
+    tag: v2.4.0
   securityContext:
     runAsUser: 10001
     fsGroup: 10001
@@ -2130,7 +2130,7 @@ nameOverride: ""
 fullnameOverride: ""
 
 roles:
-  RolePriorityRankDesc: [pe,owner,maintainer,tagger,guest]
+  RolePriorityRankDesc: [pe, owner, maintainer, tagger, guest]
   DefaultRole: guest
   Roles:
     - name: owner
@@ -2208,6 +2208,11 @@ roles:
             - pipelineruns/stop
             - pipelineruns/log
             - pipelineruns/diffs
+            - pipelineruns/cancel
+            - pipelineruns/run
+            - pipelineruns/messages
+            - pipelineruns/checkruns
+            - checkruns
             - clusters/dashboards
             - clusters/pods
             - clusters/pod
@@ -2357,6 +2362,11 @@ roles:
             - pipelineruns/stop
             - pipelineruns/log
             - pipelineruns/diffs
+            - pipelineruns/cancel
+            - pipelineruns/run
+            - pipelineruns/messages
+            - pipelineruns/checkruns
+            - checkruns
             - clusters/dashboards
             - clusters/pods
             - clusters/pod
@@ -2557,6 +2567,12 @@ roles:
             - pipelineruns/stop
             - pipelineruns/log
             - pipelineruns/diffs
+            - pipelineruns/cancel
+            - pipelineruns/run
+            - pipelineruns/forcerun
+            - pipelineruns/messages
+            - pipelineruns/checkruns
+            - checkruns
             - clusters/dashboards
             - clusters/pods
             - clusters/pod
@@ -2669,6 +2685,9 @@ roles:
             - pipelineruns
             - pipelineruns/log
             - pipelineruns/diffs
+            - pipelineruns/messages
+            - pipelineruns/checkruns
+            - checkruns
             - clusters/dashboards
             - clusters/pods
             - clusters/pod
@@ -2842,6 +2861,9 @@ scopes:
             - pipelineruns
             - pipelineruns/log
             - pipelineruns/diffs
+            - pipelineruns/messages
+            - pipelineruns/checkruns
+            - checkruns
             - clusters/events
             - clusters/outputs
             - clusters/containers
@@ -2882,6 +2904,12 @@ scopes:
             - pipelineruns/stop
             - pipelineruns/log
             - pipelineruns/diffs
+            - pipelineruns/cancel
+            - pipelineruns/run
+            - pipelineruns/forcerun
+            - pipelineruns/messages
+            - pipelineruns/checkruns
+            - checkruns
             - clusters/dashboards
             - clusters/pods
             - clusters/pod
@@ -2904,6 +2932,32 @@ scopes:
             - "*"
           nonResourceURLs:
             - "*"
+    - name: checks:read-write
+      desc: 检查(check)及其相关子资源的读写删权限
+      rules:
+        - apiGroups:
+            - core
+          resources:
+            - pipelineruns/checkruns
+            - checkruns
+          verbs:
+            - "*"
+          scopes:
+            - "*"
+          nonResourceURLs:
+            - "*"
+        - apiGroups:
+            - core
+          resources:
+            - applications
+            - clusters
+            - pipelineruns
+          verbs:
+            - get
+          scopes:
+            - "*"
+          nonResourceURLs:
+            - "*"
 
 authhtml: |
   <!DOCTYPE html>