fix: Merge branch 'master'

Signed-off-by: maybaby <[email protected]>

Author: whybeyoung

.gitignore

@@ -0,0 +1,2 @@
+    bin/
+    .kube/

.gitlab-ci.yml

@@ -0,0 +1,36 @@
+# 定义docker_tag镜像版本号
+# 研测基于CI_PIPELINE_ID
+# 上线基于branch日期版本
+variables:
+  docker_tag : v$CI_PIPELINE_ID
+
+# 定义Pipeline过程
+stages:
+- build
+before_script:
+  - docker info
+  - docker login -u $CI_DOCKER_USERNAME -p $CI_DOCKER_PASSWORD artifacts.iflytek.com/docker-private
+
+
+# 研测环境基于develop分支自动CI
+tag-release:
+  stage: build
+  script:
+    - docker build  -t artifacts.iflytek.com/docker-private/atp/argo-volcano-executor-plugin:"$CI_COMMIT_TAG" . -f Dockerfile_iflytek
+    - docker push artifacts.iflytek.com/docker-private/atp/argo-volcano-executor-plugin:"$CI_COMMIT_TAG"
+  only:
+    - tags
+  tags:
+    - atp
+# 研测环境基于develop分支自动CI
+test-build-dev:
+  stage: build
+  script:
+    - docker build  -t artifacts.iflytek.com/docker-private/atp/argo-volcano-executor-plugin:"$docker_tag" . -f Dockerfile_iflytek
+    - docker push artifacts.iflytek.com/docker-private/atp/argo-volcano-executor-plugin:"$docker_tag"
+  only:
+    - master
+  tags:
+  - atp
+
+

Dockerfile

@@ -1,6 +1,6 @@
 FROM  golang:1.17.7 as builder
 
-
+MAINTAINER [email protected]
 WORKDIR /workspace
 
 COPY . .
@@ -16,4 +16,6 @@ RUN apk add tzdata && cp /usr/share/zoneinfo/${TZ} /etc/localtime \
 WORKDIR /root/
 COPY --from=0 /workspace/bin/linux .
 #COPY --from=docbuilder /workspace/website/public ./website/public
-CMD ["/root/${BIN_NAME}"]
+RUN chmod +x /root/${BIN_NAME}
+ENTRYPOINT ["/root/avp_linux_amd64"]
+CMD ["server"]

Dockerfile_iflytek

@@ -0,0 +1,22 @@
+FROM  artifacts.iflytek.com/docker-private/atp/golang:1.17.7 as builder
+
+MAINTAINER [email protected]
+WORKDIR /workspace
+
+COPY . .
+
+RUN make
+
+FROM artifacts.iflytek.com/docker-private/atp/alpine:latest as prod
+ENV TZ Asia/Shanghai
+ENV BIN_NAME avp_linux_amd64
+RUN set -eux && sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositories
+RUN apk add tzdata && cp /usr/share/zoneinfo/${TZ} /etc/localtime \
+    && echo ${TZ} > /etc/timezone
+WORKDIR /root/
+COPY --from=0 /workspace/bin/linux .
+#COPY --from=docbuilder /workspace/website/public ./website/public
+RUN chmod +x /root/${BIN_NAME}
+ENTRYPOINT ["/root/avp_linux_amd64"]
+CMD ["server"]
+

README.md

@@ -14,7 +14,7 @@ As  [issue-7860](https://github.com/argoproj/argo-workflows/issues/7860) says:
 
 * Resources are strings, not structured YAML
 
-### 补充背景with volcano
+### Why this plugin?
 
 当前和volcano CRD JOB结合时有以下问题:
 
@@ -24,10 +24,7 @@ As  [issue-7860](https://github.com/argoproj/argo-workflows/issues/7860) says:
 * If volcano job status is success or failed, the success condition  or failedCondition is not
   very flexible in argo.
 
-
 So I have make this project:
-
-
 A specified Plugin for Volcano Job
 
 ### Built with
@@ -36,8 +33,12 @@ Open Source software stands on the shoulders of giants. It wouldn't have been po
 
 * [Gin](https://github.com/gin-gonic/gin) Golang HTTP FrameWork
 * [Volcano API]
+
+
 ## Getting Started
 
+Todo here
+
 ### Prerequisites
 
 * This guide assumes you have a working Argo Workflows installation with v3.3.0 or newer.
@@ -145,11 +146,6 @@ spec:
 
 The `volcano` template will produce vcjob that you can use command `kubect get vcjob ` to browse them .
 
-
-
-### Module Development
-
-
 ```
 invoke: function(ctx: invocation) -> node
 ```
@@ -170,21 +166,9 @@ Right now, all Wasm modules run in the plugin context -- in a single container T
 
 ### :construction: Module Source
 
-
-```yaml
-- name: wasm
-  plugin:
-    wasm:
-      module:
-        # you would use one of these options
-        oci: ghcr.io/someone/somemodule:latest    # already supported
-        wapm: syrusakbary/[email protected]           # on the roadmap
-        bindle: example.com/stuff/mybindle/v1.2.3 # on the roadmap
-```
-
 ## Roadmap
 
-- [ ] Support config sa
+- [ ] Support config service account
 
 
 ## Contributing