Merge pull request #18 from KubeLilin/dev

Dev
KubeLilin · Nov 8, 2022 · 3228362 · 3228362
2 parents 59b5406 + ea40dd5
commit 3228362
Show file tree

Hide file tree

Showing 11 changed files with 33 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -1,3 +1,8 @@
+# Kubelilin
+An Cloud-Native application platform for Kubernetes.
+![](https://mnur-prod-public.oss-cn-beijing.aliyuncs.com/0/tech/physical_architecture.png)
+![](https://mnur-prod-public.oss-cn-beijing.aliyuncs.com/0/tech/functional_architecture.png)
+
 # Kubelilin ApiServer
 Kubelilin cloud native backend .
 
@@ -21,23 +26,32 @@ npm run start
 ```
 
 # Todo:
+## v0.2.0
+1. [] 平台文档化
+
+## v0.1.9
+1. [] 服务治理 (注册中心，配置管理)
+
+## v0.1.5
+1. [] 完善应用和部署能力
+2. [] 应用：部署绑定数据卷(卷、configmap )
+3. [] 部署环境的健康检查功能
+
 ## v0.1.3
-1. [] 项目管理：替换现在的部署环境，将导入应用，并列出应用的所有流水线
-2. [] 网络中心:微服务网关集成 （apisix & service）
-3. [] 运维中心: 命名空间、卷、configmap 、 应用集成(维护到表里)：jenkins、git(gitlab,gogs)、harbor、
-4. [] 应用：部署绑定数据卷
-5. [] 服务治理 (注册中心，配置管理)
-
+1. [x] 项目管理：替换现在的部署环境，将导入应用，并列出应用的所有流水线并执行
+2. [x] 网络中心:微服务网关集成 （apisix & service）
+3. [x] 团队空间、应用集成(维护到表里)、服务连接器：jenkins、git(gitlab,gogs)、harbor
+4. [x] 发布通知钉钉机器人
 
 ## v0.1.2
 1. [X] 资源大盘
 2. [X] Pod列表监控(cpu,内存)
 3. [X] 发布通知企业微信机器人
 4. [X] 流水线：中止、删除
 5. [X] 应用中心：发布记录-> 回滚 | 发布接口
-6. [] 应用中心：发布接口-> 错误后应返回502(目前都是200状态) ; 发布记录不能记录成功还是失败.
-7. [] 资源中心：命名空间-> 变成团队空间(team space 用于按集群管理团队租户下的 k8s namespace) 部署、分配配额( cpu ,memory ,pods ,storage).
-8. [] 通用Git分支获取方式
+6. [X] 应用中心：发布接口-> 错误后应返回502(目前都是200状态) ; 发布记录不能记录成功还是失败.
+7. [X] 资源中心：命名空间-> 变成团队空间(team space 用于按集群管理团队租户下的 k8s namespace) 部署、分配配额( cpu ,memory ,pods ,storage).
+8. [X] 通用Git分支获取方式
 
 
 ## 0.1.1 fix bugs

diff --git a/docs/images/functional_architecture.png b/docs/images/functional_architecture.png
diff --git a/docs/images/physical_architecture.png b/docs/images/physical_architecture.png
diff --git a/scripts/apisix/apisix-dashboard.yaml b/scripts/apisix/apisix-dashboard.yaml
@@ -27,7 +27,7 @@ spec:
             defaultMode: 420
       containers:
         - name: apisix-dashboard
-          image: apache/apisix-dashboard:2.9.0
+          image: apache/apisix-dashboard:2.13-alpine
           ports:
             - name: http
               containerPort: 9000

diff --git a/scripts/apisix/apisix.yaml b/scripts/apisix/apisix.yaml
@@ -40,7 +40,7 @@ spec:
           imagePullPolicy: IfNotPresent
       containers:
         - name: apisix
-          image: apache/apisix:2.10.0-alpine
+          image: apache/apisix:2.13.3-alpine
           ports:
             - name: http
               containerPort: 9080

diff --git a/scripts/apisix/etcd.yaml b/scripts/apisix/etcd.yaml
@@ -21,7 +21,7 @@ spec:
     spec:
       containers:
         - name: apisix-etcd
-          image: docker.io/bitnami/etcd:3.5.1-debian-10-r31
+          image: docker.io/bitnami/etcd:3.5.5
           ports:
             - name: client
               containerPort: 2379

diff --git a/scripts/jenkins/README.md b/scripts/jenkins/README.md
@@ -21,8 +21,8 @@ a6f6d08fcc474178833001d1fc79be62
 
 # Jenkins for Kubernetes 部署
 # 镜像
-* Jenkins Server:  jenkins/jenkins:2.328
-* Jenkins Slave :  jenkins/inbound-agent:4.10-3
+* Jenkins Server:  kubelilin/jenkins:v2.361.3-lts-alpine
+* Jenkins Slave :  kubelilin/inbound-agent:v4.11-1-alpine-jdk11
 
 #2. 开启匿名用户的可读权限
 ``为了保证 流水线的 日志详情可以正常打开

diff --git a/src/go.mod b/src/go.mod
@@ -89,7 +89,7 @@ require (
 	golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
 	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd // indirect

diff --git a/src/pkg/pipeline/jenkins.go b/src/pkg/pipeline/jenkins.go
@@ -355,6 +355,7 @@ func buildNow(addr, user, token, crumbKey, crumbValue, jobName string, nextBuild
 }
 
 // GetCIPipelineXML ..
+// 默认
 func (buildflow *CIContext) GetCIPipelineXML(context CIContext) (string, error) {
 	pipelineTemplate := template.Must(template.New("pipline").Parse(templates.CIPipeline))
 	var pipelineBuf bytes.Buffer
@@ -373,6 +374,7 @@ func (buildflow *CIContext) GetCIPipelineXML(context CIContext) (string, error)
 }
 
 // GetDeployPipelineXML ..
+// 未使用
 func (deployflow *DeployContext) GetDeployPipelineXML(context DeployContext) (string, error) {
 	pipelineTemplate := template.Must(template.New("pipline").Parse(templates.DeployPipeline))
 	var pipelineBuf bytes.Buffer

diff --git a/src/pkg/pipeline/pipelinebuilder.go b/src/pkg/pipeline/pipelinebuilder.go
@@ -109,7 +109,7 @@ func (builder *Builder) CICDProcessor(inputParams []EnvItem, stages map[string]i
 	containerTemplates := []ContainerEnv{
 		{
 			Name:       "jnlp",
-			Image:      "jenkins/inbound-agent:4.10-3",
+			Image:      "kubelilin/inbound-agent:v4.11-1-alpine-jdk11",
 			WorkingDir: "/home/jenkins/agent",
 		},
 		{

diff --git a/src/pkg/pipeline/templates/cipipeline.go b/src/pkg/pipeline/templates/cipipeline.go
@@ -1,6 +1,6 @@
 package templates
 
-// CIPipeline defined default jenkins pipeline
+// CIPipeline defined default jenkins pipeline (default)
 const CIPipeline = `
 pipeline {
     agent {