feat: 新增status字段逻辑

README.md

@@ -12,7 +12,7 @@ metadata:
 spec:
   # 设置多个 step 步骤，会按照填入的 container 顺序执行
   steps:
-    # 每项都是一个 container 对象
+    # 每项都是一个 container 对象，每个 container 都会顺序执行
     - name: step1
       image: busybox:1.28
       command: [ "sh","-c" ]
@@ -23,12 +23,27 @@ spec:
       args: [ "echo step2" ]
     - name: step3
       image: devopscube/kubernetes-job-demo:latest
-      args: [ "100" ]
+      args: [ "10" ]
 ```
 
 
 ### 项目功能
 1. 支持任务中的 container 顺序执行
+2. 查看任务流状态
+```bash
+[root@VM-0-16-centos yaml]# kubectl get tasks.api.practice.com
+NAME                          STATUS       START                 DURATION   AGE
+example-taskflow              Successful   2024-01-06 22:19:24   31s        80s
+example-taskflow-error-test   Running      2024-01-06 22:20:36              6s
+[root@VM-0-16-centos yaml]# kubectl get tasks.api.practice.com
+NAME                          STATUS       START                 DURATION   AGE
+example-taskflow              Successful   2024-01-06 22:19:24   31s        84s
+example-taskflow-error-test   Failure      2024-01-06 22:20:36   6s         10s
+[root@VM-0-16-centos yaml]# kubectl get tasks.api.practice.com
+NAME                          STATUS       START                 DURATION   AGE
+example-taskflow              Successful   2024-01-06 22:19:24   31s        86s
+example-taskflow-error-test   Failure      2024-01-06 22:20:36   6s         12s
+```
 
 ### 项目部署与使用
 1. 打成镜像或是使用编译二进制。
@@ -131,6 +146,6 @@ I0101 05:17:12.141048       1 helper.go:242] annotation order:  2
 I0101 05:17:12.141057       1 task_controller.go:49] successful reconcile
 I0101 05:17:12.141302       1 helper.go:241] pod status: Running
 ```
-
+6. 使用 资源对象
 
 ### RoadMap

container-agent/cmd/helper.go

@@ -17,7 +17,7 @@ import (
 // ValidateFlags 检查参数
 func ValidateFlags() {
 	if encodeFile == "" {
-		if waitFile == "" || out == "" || command == "" {
+		if waitFile == "" || out == "" {
 			log.Println("error input param...")
 			os.Exit(1)
 		}
@@ -119,6 +119,9 @@ func ExecCmdAndArgs(args []string) {
 	cmd := ""
 	// 非加密文件模式
 	if encodeFile == "" {
+		if command == "" {
+			command = "sh"
+		}
 		cmdList := strings.Split(command, " ") // 如 sh -c 这种字符串，要切割,取出第一个作为command
 		cmd = cmdList[0]                       //肯定有值 ，所以不用判断
 		if len(cmdList) > 1 {                  //把剩余的合并到argList 前面

deploy/task.yaml

@@ -13,6 +13,19 @@ spec:
       served: true
       #是否是存储版本
       storage: true
+      additionalPrinterColumns:
+        - name: Status
+          type: string
+          jsonPath: .status.status
+        - name: Start
+          type: string
+          jsonPath: .status.startAt
+        - name: Duration
+          type: string
+          jsonPath: .status.duration
+        - name: Age
+          type: date
+          jsonPath: .metadata.creationTimestamp
       schema:
         openAPIV3Schema:
           type: object

docker_build.sh

@@ -10,15 +10,7 @@ IMAGE_NAME="docker.io/taskflow/agent" # 镜像名称
 TAG="v1.0"                                      # 镜像标签
 
 
-# 检查镜像是否已经存在
-if docker inspect "${IMAGE_NAME}:${TAG}" &> /dev/null; then
-  echo "镜像 ${IMAGE_NAME}:${TAG} 已存在，无需构建。"
-else
-  echo "镜像 ${IMAGE_NAME}:${TAG} 不存在，开始构建..."
-  # 执行 Docker build 命令
-  docker build -t "${IMAGE_NAME}:${TAG}" -f "${DOCKERFILE_PATH}" .
-  echo "镜像构建完成。"
-
-  # 可选：推送镜像到 Docker 镜像仓库
-  # docker push "${IMAGE_NAME}:${TAG}"
-fi
+echo "镜像 ${IMAGE_NAME}:${TAG} 开始构建..."
+# 执行 Docker build 命令
+docker build -t "${IMAGE_NAME}:${TAG}" -f "${DOCKERFILE_PATH}" .
+echo "镜像构建完成。"

go.mod

@@ -1,4 +1,4 @@
-module github.com/myoperator/cicdoperator
+module github.com/myoperator/taskflowoperator
 
 go 1.18
 

main.go

@@ -1,10 +1,10 @@
 package main
 
 import (
-	taskv1alpha1 "github.com/myoperator/cicdoperator/pkg/apis/task/v1alpha1"
-	"github.com/myoperator/cicdoperator/pkg/controller"
-	builder2 "github.com/myoperator/cicdoperator/pkg/image"
-	"github.com/myoperator/cicdoperator/pkg/k8sconfig"
+	taskv1alpha1 "github.com/myoperator/taskflowoperator/pkg/apis/task/v1alpha1"
+	"github.com/myoperator/taskflowoperator/pkg/controller"
+	builder2 "github.com/myoperator/taskflowoperator/pkg/image"
+	"github.com/myoperator/taskflowoperator/pkg/k8sconfig"
 	corev1 "k8s.io/api/core/v1"
 	_ "k8s.io/code-generator"
 	"log"

pkg/apis/task/v1alpha1/types.go

@@ -18,6 +18,7 @@ type Task struct {
 	// TODO: 加入 TaskStatus 用于查看每个工作流的状态 Running Complete Failed ...
 	// TODO: 记录运行时间，需要在 status加入一个时间值字段 开始时记录时间  结束或错误退出时记录时间
 	// 在调协中修改 status
+	Status TaskStatus `json:"status,omitempty"`
 }
 
 type TaskSpec struct {
@@ -30,6 +31,15 @@ type TaskStep struct {
 	Script string `json:"script,omitempty"`
 }
 
+type TaskStatus struct {
+	// Status 任务状态
+	Status string `json:"status"`
+	// StartAt 任务起始时间
+	StartAt string `json:"startAt"`
+	// Duration 任务执行多久
+	Duration string `json:"duration"`
+}
+
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
 // TaskList ..