Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/pipeline task container terminus define tag env #1585

Merged

Conversation

chengjoey
Copy link
Contributor

What type of this PR

Add one of the following kinds:
/kind feature

What this PR does / why we need it:

record container env for k8sjob,k8sflink

Which issue(s) this PR fixes:

Specified Reviewers:

/assign @your-reviewer

Language Changelog
🇺🇸 English record k8sjob,k8sflink container tag
🇨🇳 中文 记录k8sjob,k8sflink的容器tag用于监控日志

@chengjoey chengjoey added feature pipeline pipeline service labels Aug 28, 2021
@chengjoey chengjoey force-pushed the feature/pipeline-task-container-label branch from 1cd0482 to 1a41d1f Compare August 28, 2021 09:43
@codecov
Copy link

codecov bot commented Aug 28, 2021

Codecov Report

Merging #1585 (c4d50d9) into master (4d7ee2e) will increase coverage by 0.03%.
The diff coverage is 52.05%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1585      +/-   ##
==========================================
+ Coverage   12.62%   12.65%   +0.03%     
==========================================
  Files        1037     1038       +1     
  Lines      109279   109358      +79     
==========================================
+ Hits        13794    13844      +50     
- Misses      93909    93935      +26     
- Partials     1576     1579       +3     
Impacted Files Coverage Δ
apistructs/pipeline_task.go 70.27% <ø> (+6.09%) ⬆️
modules/dop/endpoints/cicd.go 0.00% <0.00%> (ø)
modules/pipeline/spec/pipeline_task.go 30.58% <0.00%> (+0.95%) ⬆️
modules/pipeline/pkg/containers/task_container.go 95.00% <95.00%> (ø)
pkg/parser/pipelineyml/visitor_ref_op.go 30.72% <0.00%> (+0.52%) ⬆️

@chengjoey chengjoey force-pushed the feature/pipeline-task-container-label branch 4 times, most recently from c3d1bb8 to 6821295 Compare August 30, 2021 03:38
@sfwn
Copy link
Member

sfwn commented Aug 30, 2021

fix conflict.

@chengjoey chengjoey force-pushed the feature/pipeline-task-container-label branch from 6821295 to be65fa0 Compare August 30, 2021 06:06
@chengjoey chengjoey force-pushed the feature/pipeline-task-container-label branch from be65fa0 to c4d50d9 Compare August 30, 2021 06:38
@sfwn
Copy link
Member

sfwn commented Aug 30, 2021

/approve

@erda-bot erda-bot merged commit 9b37c29 into erda-project:master Aug 30, 2021
@chengjoey
Copy link
Contributor Author

/cherry-pick release/1.2

@erda-bot
Copy link
Member

erda-bot commented Sep 9, 2021

Automated cherry pick failed, please resolve the confilcts and create PR manually.
Details:

Auto-merging modules/pipeline/spec/pipeline_task.go
Auto-merging modules/pipeline/pipengine/reconciler/taskrun/taskop/prepare.go
Auto-merging modules/pipeline/pipengine/actionexecutor/plugins/scheduler/logic/job.go
Auto-merging modules/pipeline/pipengine/actionexecutor/plugins/scheduler/executor/plugins/k8sjob/k8sjob.go
Auto-merging modules/pipeline/pipengine/actionexecutor/plugins/scheduler/executor/plugins/k8sflink/util.go
Auto-merging modules/dop/endpoints/cicd.go
Auto-merging modules/core/monitor/log/storage/provider_test.go
CONFLICT (content): Merge conflict in modules/core/monitor/log/storage/provider_test.go
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
Auto-merging apistructs/pipeline_task.go
Auto-merging apistructs/job.go
diff --cc go.sum
index 2cc51685,4bd21e77..00000000
--- a/go.sum
+++ b/go.sum
@@@ -432,10 -448,14 +432,21 @@@ github.com/envoyproxy/protoc-gen-valida
  github.com/erda-project/elastic v0.0.1-ex h1:5ajfxQ5S5YjpzFqY9LzL9hiKWCn6q/JDT4n8sNv7+pU=
  github.com/erda-project/elastic v0.0.1-ex/go.mod h1:iAVsas6fcmt9pxtge1+dErMhecv+RLSXlD4rnZRJVW0=
  github.com/erda-project/erda-infra v0.0.0-20210706133120-0a742437972c/go.mod h1:TUQYSZ60w9dk7m0q3U3AVg7U74APj/sdEVvRWR3wYv8=
++<<<<<<< HEAD
 +github.com/erda-project/erda-infra v0.0.0-20210729162038-a2e798d921de h1:jI4eyZ0bMf0UmEeZY8yJBnetcSICpH8M6+FEEKadTjc=
 +github.com/erda-project/erda-infra v0.0.0-20210729162038-a2e798d921de/go.mod h1:L+fFQghY2po2P3H9pzwEOufDLAhL+mRRhPGdZ7vFnAw=
 +github.com/erda-project/erda-proto-go v1.2.0 h1:dVqEL7w8NkvU454BNeJ5gCfEKvNd9iAsfn/fTPD1bUI=
 +github.com/erda-project/erda-proto-go v1.2.0/go.mod h1:rSETXX3nKxxIhgrVn7fKDM3mla1nNlWcPz4AkepixaU=
++=======
+ github.com/erda-project/erda-infra v0.0.0-20210824080310-eb60ec8285b0/go.mod h1:YpMIFoipL7XardYV3C58qx9fm74JM5QK/E3kd/t1CJU=
+ github.com/erda-project/erda-infra v0.0.0-20210830020850-d53df158bcd0 h1:ru8QQDXj73Z3LWFa7EpGmCqbumQeOvCErRPlf26bGGc=
+ github.com/erda-project/erda-infra v0.0.0-20210830020850-d53df158bcd0/go.mod h1:s+eRB6K6ixC+mmhKAUiL3vHolDH1PRDyXwzCJei/hqA=
+ github.com/erda-project/erda-proto-go v0.0.0-20210820073528-bcd612c2efb7/go.mod h1:rSETXX3nKxxIhgrVn7fKDM3mla1nNlWcPz4AkepixaU=
+ github.com/erda-project/erda-proto-go v0.0.0-20210829160214-5c23017d6f89 h1:PW9q+paIbAWKVwZ1/hw1rGbEtoiteuok1HkaRReuKMk=
+ github.com/erda-project/erda-proto-go v0.0.0-20210829160214-5c23017d6f89/go.mod h1:G5C43mj+aCGsYlB/KsjYL/S8UIfU8XHBaJoG83GRP7g=
+ github.com/erda-project/flink-on-k8s-operator v0.0.0-20210828094530-28e003581cf2 h1:5QKXIq0yTPulGqXzEQx96fLK6HDCb8xC1H6kOjj4hsk=
+ github.com/erda-project/flink-on-k8s-operator v0.0.0-20210828094530-28e003581cf2/go.mod h1:QbDTwfKi8Nd8VR7cdOqRyWM2Ymul7m0hzSaoC3xSho8=
++>>>>>>> 9b37c29b (Feature/pipeline task container terminus define tag env (#1585))
  github.com/erda-project/influxql v1.1.0-ex h1:NgP5+S5Qo234IVSIJ3N/egvzCNYJURfMAett3e8a9LE=
  github.com/erda-project/influxql v1.1.0-ex/go.mod h1:gHp9y86a/pxhjJ+zMjNXiQAA197Xk9wLxaz+fGG+kWk=
  github.com/erda-project/remotedialer v0.2.6-0.20210713103000-da03eb9e4b23 h1:NaKo6voQVqZM6DMBVhcTT4gjd+lr1C3zE17RROspfg0=
diff --cc modules/core/monitor/log/storage/provider_test.go
index 521f97da,8615ec69..00000000
--- a/modules/core/monitor/log/storage/provider_test.go
+++ b/modules/core/monitor/log/storage/provider_test.go
@@@ -40,6 -43,7 +40,10 @@@ func Test_provider_Init(t *testing.T) 
  }
  
  type mockContext struct {
++<<<<<<< HEAD
++=======
+ 	servicehub.Context
++>>>>>>> 9b37c29b (Feature/pipeline task container terminus define tag env (#1585))
  	l logs.Logger
  }
  

@chengjoey chengjoey deleted the feature/pipeline-task-container-label branch November 15, 2021 08:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Development

Successfully merging this pull request may close these issues.

None yet

3 participants