You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by as...@apache.org on 2020/11/10 10:20:04 UTC
[camel-k] 04/25: chore: Add BuildPhase.String() helper method
This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 5a6dcef6740a5e51c8e8ea12b770c10d98dd9df5
Author: Antonin Stefanutti <an...@stefanutti.fr>
AuthorDate: Tue Oct 13 12:13:44 2020 +0200
chore: Add BuildPhase.String() helper method
---
pkg/apis/camel/v1/build_types_support.go | 4 ++++
pkg/controller/build/monitor_pod.go | 8 ++++----
pkg/controller/build/monitor_routine.go | 2 +-
pkg/controller/build/recovery.go | 2 +-
pkg/controller/build/schedule_routine.go | 8 ++++----
5 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/pkg/apis/camel/v1/build_types_support.go b/pkg/apis/camel/v1/build_types_support.go
index 2c8243b..a1519b0 100644
--- a/pkg/apis/camel/v1/build_types_support.go
+++ b/pkg/apis/camel/v1/build_types_support.go
@@ -56,6 +56,10 @@ func NewBuildList() BuildList {
}
}
+func(buildPhase *BuildPhase) String() string {
+ return string(*buildPhase)
+}
+
// SetIntegrationPlatform --
func (in *Build) SetIntegrationPlatform(platform *IntegrationPlatform) {
cs := corev1.ConditionTrue
diff --git a/pkg/controller/build/monitor_pod.go b/pkg/controller/build/monitor_pod.go
index 15b3f87..cead6f4 100644
--- a/pkg/controller/build/monitor_pod.go
+++ b/pkg/controller/build/monitor_pod.go
@@ -70,8 +70,8 @@ func (action *monitorPodAction) Handle(ctx context.Context, build *v1.Build) (*v
duration := metav1.Now().Sub(build.Status.StartedAt.Time)
build.Status.Duration = duration.String()
// Account for the Build metrics
- buildAttempt.WithLabelValues(string(build.Status.Phase)).Inc()
- buildDuration.WithLabelValues(string(build.Status.Phase)).Observe(duration.Seconds())
+ buildAttempt.WithLabelValues(build.Status.Phase.String()).Inc()
+ buildDuration.WithLabelValues(build.Status.Phase.String()).Observe(duration.Seconds())
for _, task := range build.Spec.Tasks {
if task.Image != nil {
build.Status.Image = task.Image.BuiltImage
@@ -91,8 +91,8 @@ func (action *monitorPodAction) Handle(ctx context.Context, build *v1.Build) (*v
duration := metav1.Now().Sub(build.Status.StartedAt.Time)
build.Status.Duration = duration.String()
// Account for the Build metrics
- buildAttempt.WithLabelValues(string(build.Status.Phase)).Inc()
- buildDuration.WithLabelValues(string(build.Status.Phase)).Observe(duration.Seconds())
+ buildAttempt.WithLabelValues(build.Status.Phase.String()).Inc()
+ buildDuration.WithLabelValues(build.Status.Phase.String()).Observe(duration.Seconds())
}
return build, nil
diff --git a/pkg/controller/build/monitor_routine.go b/pkg/controller/build/monitor_routine.go
index c0ccd65..8d15aa9 100644
--- a/pkg/controller/build/monitor_routine.go
+++ b/pkg/controller/build/monitor_routine.go
@@ -53,7 +53,7 @@ func (action *monitorRoutineAction) Handle(ctx context.Context, build *v1.Build)
// and recover the build if it's missing. This can happen when the operator
// stops abruptly and restarts or the build status update fails.
build.Status.Phase = v1.BuildPhaseFailed
- buildAttempt.WithLabelValues(string(build.Status.Phase)).Inc()
+ buildAttempt.WithLabelValues(build.Status.Phase.String()).Inc()
return build, nil
}
diff --git a/pkg/controller/build/recovery.go b/pkg/controller/build/recovery.go
index b8d7bb8..5320809 100644
--- a/pkg/controller/build/recovery.go
+++ b/pkg/controller/build/recovery.go
@@ -69,7 +69,7 @@ func (action *errorRecoveryAction) Handle(ctx context.Context, build *v1.Build)
if build.Status.Failure.Recovery.Attempt >= build.Status.Failure.Recovery.AttemptMax {
build.Status.Phase = v1.BuildPhaseError
- buildAttempt.WithLabelValues(string(build.Status.Phase)).Inc()
+ buildAttempt.WithLabelValues(build.Status.Phase.String()).Inc()
return build, nil
}
diff --git a/pkg/controller/build/schedule_routine.go b/pkg/controller/build/schedule_routine.go
index f0e22a0..eccddbf 100644
--- a/pkg/controller/build/schedule_routine.go
+++ b/pkg/controller/build/schedule_routine.go
@@ -129,8 +129,8 @@ func (action *scheduleRoutineAction) runBuild(ctx context.Context, build *v1.Bui
Duration: duration.String(),
}
// Account for the Build metrics
- buildAttempt.WithLabelValues(string(status.Phase)).Inc()
- buildDuration.WithLabelValues(string(status.Phase)).Observe(duration.Seconds())
+ buildAttempt.WithLabelValues(status.Phase.String()).Inc()
+ buildDuration.WithLabelValues(status.Phase.String()).Observe(duration.Seconds())
_ = action.updateBuildStatus(ctx, build, status)
break
}
@@ -145,8 +145,8 @@ func (action *scheduleRoutineAction) runBuild(ctx context.Context, build *v1.Bui
duration := metav1.Now().Sub(build.Status.StartedAt.Time)
status.Duration = duration.String()
// Account for the Build metrics
- buildAttempt.WithLabelValues(string(status.Phase)).Inc()
- buildDuration.WithLabelValues(string(status.Phase)).Observe(duration.Seconds())
+ buildAttempt.WithLabelValues(status.Phase.String()).Inc()
+ buildDuration.WithLabelValues(status.Phase.String()).Observe(duration.Seconds())
}
err := action.updateBuildStatus(ctx, build, status)
if err != nil || taskFailed {