Skip to content

Commit

Permalink
Merge pull request #189 from uselagoon/buildstatus
Browse files Browse the repository at this point in the history
  • Loading branch information
@shreddedbacon
shreddedbacon authored Nov 10, 2022
2 parents b0daee2 + a1b00fd commit ebc182b
Show file tree
Hide file tree
Showing 3 changed files with 93 additions and 53 deletions.
114 changes: 75 additions & 39 deletions controllers/v1beta1/podmonitor_buildhandlers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ func (r *LagoonMonitorReconciler) buildLogsToLagoonLogs(ctx context.Context,
opLog logr.Logger,
lagoonBuild *lagoonv1beta1.LagoonBuild,
jobPod *corev1.Pod,
namespace *corev1.Namespace,
condition string,
logs []byte,
) (bool, lagoonv1beta1.LagoonLog) {
Expand All @@ -139,16 +140,27 @@ func (r *LagoonMonitorReconciler) buildLogsToLagoonLogs(ctx context.Context,
if value, ok := jobPod.Labels["lagoon.sh/buildStep"]; ok {
buildStep = value
}
envName := lagoonBuild.Spec.Project.Environment
envID := lagoonBuild.Spec.Project.EnvironmentID
projectName := lagoonBuild.Spec.Project.Name
projectID := lagoonBuild.Spec.Project.ID
if lagoonBuild == nil {
envName = namespace.ObjectMeta.Labels["lagoon.sh/environment"]
eID, _ := strconv.Atoi(namespace.ObjectMeta.Labels["lagoon.sh/environment"])
envID = helpers.UintPtr(uint(eID))
projectName = namespace.ObjectMeta.Labels["lagoon.sh/environment"]
pID, _ := strconv.Atoi(namespace.ObjectMeta.Labels["lagoon.sh/environment"])
projectID = helpers.UintPtr(uint(pID))
}
msg := lagoonv1beta1.LagoonLog{
Severity: "info",
Project: lagoonBuild.Spec.Project.Name,
Event: "build-logs:builddeploy-kubernetes:" + lagoonBuild.ObjectMeta.Name,
Project: projectName,
Event: "build-logs:builddeploy-kubernetes:" + jobPod.ObjectMeta.Name,
Meta: &lagoonv1beta1.LagoonLogMeta{
EnvironmentID: lagoonBuild.Spec.Project.EnvironmentID,
ProjectID: lagoonBuild.Spec.Project.ID,
JobName: lagoonBuild.ObjectMeta.Name, // @TODO: remove once lagoon is corrected in controller-handler
BuildName: lagoonBuild.ObjectMeta.Name,
BranchName: lagoonBuild.Spec.Project.Environment,
EnvironmentID: envID,
ProjectID: projectID,
BuildName: jobPod.ObjectMeta.Name,
BranchName: envName,
BuildPhase: condition, // @TODO: same as buildstatus label, remove once lagoon is corrected in controller-handler
BuildStatus: condition, // same as buildstatus label
BuildStep: buildStep,
Expand Down Expand Up @@ -177,8 +189,8 @@ Logs on pod %s
opLog.Info(
fmt.Sprintf(
"Published event %s for %s to lagoon-logs exchange",
fmt.Sprintf("build-logs:builddeploy-kubernetes:%s", lagoonBuild.ObjectMeta.Name),
lagoonBuild.ObjectMeta.Name,
fmt.Sprintf("build-logs:builddeploy-kubernetes:%s", jobPod.ObjectMeta.Name),
jobPod.ObjectMeta.Name,
),
)
}
Expand All @@ -195,16 +207,9 @@ func (r *LagoonMonitorReconciler) updateDeploymentAndEnvironmentTask(ctx context
lagoonBuild *lagoonv1beta1.LagoonBuild,
jobPod *corev1.Pod,
lagoonEnv *corev1.ConfigMap,
namespace *corev1.Namespace,
condition string,
) (bool, lagoonv1beta1.LagoonMessage) {
namespace := helpers.GenerateNamespaceName(
lagoonBuild.Spec.Project.NamespacePattern, // the namespace pattern or `openshiftProjectPattern` from Lagoon is never received by the controller
lagoonBuild.Spec.Project.Environment,
lagoonBuild.Spec.Project.Name,
r.NamespacePrefix,
r.ControllerNamespace,
r.RandomNamespacePrefix,
)
if r.EnableMQ {
buildStep := "running"
if value, ok := jobPod.Labels["lagoon.sh/buildStep"]; ok {
Expand All @@ -218,15 +223,27 @@ func (r *LagoonMonitorReconciler) updateDeploymentAndEnvironmentTask(ctx context
})
})
}
envName := lagoonBuild.Spec.Project.Environment
envID := lagoonBuild.Spec.Project.EnvironmentID
projectName := lagoonBuild.Spec.Project.Name
projectID := lagoonBuild.Spec.Project.ID
if lagoonBuild == nil {
envName = namespace.ObjectMeta.Labels["lagoon.sh/environment"]
eID, _ := strconv.Atoi(namespace.ObjectMeta.Labels["lagoon.sh/environment"])
envID = helpers.UintPtr(uint(eID))
projectName = namespace.ObjectMeta.Labels["lagoon.sh/environment"]
pID, _ := strconv.Atoi(namespace.ObjectMeta.Labels["lagoon.sh/environment"])
projectID = helpers.UintPtr(uint(pID))
}
msg := lagoonv1beta1.LagoonMessage{
Type: "build",
Namespace: namespace,
Namespace: namespace.ObjectMeta.Name,
Meta: &lagoonv1beta1.LagoonLogMeta{
Environment: lagoonBuild.Spec.Project.Environment,
EnvironmentID: lagoonBuild.Spec.Project.EnvironmentID,
Project: lagoonBuild.Spec.Project.Name,
ProjectID: lagoonBuild.Spec.Project.ID,
BuildName: lagoonBuild.ObjectMeta.Name,
Environment: envName,
EnvironmentID: envID,
Project: projectName,
ProjectID: projectID,
BuildName: jobPod.ObjectMeta.Name,
BuildPhase: condition, // @TODO: same as buildstatus label, remove once lagoon is corrected in controller-handler
BuildStatus: condition, // same as buildstatus label
BuildStep: buildStep,
Expand All @@ -237,7 +254,7 @@ func (r *LagoonMonitorReconciler) updateDeploymentAndEnvironmentTask(ctx context
}
labelRequirements1, _ := labels.NewRequirement("lagoon.sh/service", selection.NotIn, []string{"faketest"})
listOption := (&client.ListOptions{}).ApplyOptions([]client.ListOption{
client.InNamespace(lagoonBuild.ObjectMeta.Namespace),
client.InNamespace(jobPod.ObjectMeta.Namespace),
client.MatchingLabelsSelector{
Selector: labels.NewSelector().Add(*labelRequirements1),
},
Expand Down Expand Up @@ -298,14 +315,13 @@ func (r *LagoonMonitorReconciler) updateDeploymentAndEnvironmentTask(ctx context
// if we can't publish the message, set it as a pending message
// overwrite whatever is there as these are just current state messages so it doesn't
// really matter if we don't smootly transition in what we send back to lagoon
// r.updateEnvironmentMessage(ctx, lagoonBuild, msg)
return true, msg
}
if r.EnableDebug {
opLog.Info(
fmt.Sprintf(
"Published build update message for %s to lagoon-tasks:controller queue",
lagoonBuild.ObjectMeta.Name,
jobPod.ObjectMeta.Name,
),
)
}
Expand All @@ -321,23 +337,36 @@ func (r *LagoonMonitorReconciler) buildStatusLogsToLagoonLogs(ctx context.Contex
lagoonBuild *lagoonv1beta1.LagoonBuild,
jobPod *corev1.Pod,
lagoonEnv *corev1.ConfigMap,
namespace *corev1.Namespace,
condition string,
) (bool, lagoonv1beta1.LagoonLog) {
if r.EnableMQ {
buildStep := "running"
if value, ok := jobPod.Labels["lagoon.sh/buildStep"]; ok {
buildStep = value
}
envName := lagoonBuild.Spec.Project.Environment
envID := lagoonBuild.Spec.Project.EnvironmentID
projectName := lagoonBuild.Spec.Project.Name
projectID := lagoonBuild.Spec.Project.ID
if lagoonBuild == nil {
envName = namespace.ObjectMeta.Labels["lagoon.sh/environment"]
eID, _ := strconv.Atoi(namespace.ObjectMeta.Labels["lagoon.sh/environment"])
envID = helpers.UintPtr(uint(eID))
projectName = namespace.ObjectMeta.Labels["lagoon.sh/environment"]
pID, _ := strconv.Atoi(namespace.ObjectMeta.Labels["lagoon.sh/environment"])
projectID = helpers.UintPtr(uint(pID))
}
msg := lagoonv1beta1.LagoonLog{
Severity: "info",
Project: lagoonBuild.Spec.Project.Name,
Project: projectName,
Event: "task:builddeploy-kubernetes:" + condition, //@TODO: this probably needs to be changed to a new task event for the controller
Meta: &lagoonv1beta1.LagoonLogMeta{
EnvironmentID: lagoonBuild.Spec.Project.EnvironmentID,
ProjectID: lagoonBuild.Spec.Project.ID,
ProjectName: lagoonBuild.Spec.Project.Name,
BranchName: lagoonBuild.Spec.Project.Environment,
BuildName: lagoonBuild.ObjectMeta.Name,
EnvironmentID: envID,
ProjectID: projectID,
ProjectName: projectName,
BranchName: envName,
BuildName: jobPod.ObjectMeta.Name,
BuildPhase: condition, // @TODO: same as buildstatus label, remove once lagoon is corrected in controller-handler
BuildStatus: condition, // same as buildstatus label
BuildStep: buildStep,
Expand All @@ -364,9 +393,9 @@ func (r *LagoonMonitorReconciler) buildStatusLogsToLagoonLogs(ctx context.Contex
}
}
msg.Message = fmt.Sprintf("*[%s]* `%s` Build `%s` %s <%s|Logs>%s%s",
lagoonBuild.Spec.Project.Name,
lagoonBuild.Spec.Project.Environment,
lagoonBuild.ObjectMeta.Name,
projectName,
envName,
jobPod.ObjectMeta.Name,
string(jobPod.Status.Phase),
lagoonBuild.Spec.Project.UILink,
addRoute,
Expand All @@ -387,7 +416,7 @@ func (r *LagoonMonitorReconciler) buildStatusLogsToLagoonLogs(ctx context.Contex
fmt.Sprintf(
"Published event %s for %s to lagoon-logs exchange",
fmt.Sprintf("task:builddeploy-kubernetes:%s", condition),
lagoonBuild.ObjectMeta.Name,
jobPod.ObjectMeta.Name,
),
)
}
Expand Down Expand Up @@ -431,6 +460,13 @@ func (r *LagoonMonitorReconciler) updateDeploymentWithLogs(
if value, ok := jobPod.Labels["lagoon.sh/buildStep"]; ok {
buildStep = value
}

namespace := &corev1.Namespace{}
if err := r.Get(ctx, types.NamespacedName{Name: jobPod.ObjectMeta.Namespace}, namespace); err != nil {
if helpers.IgnoreNotFound(err) != nil {
return err
}
}
// if the buildstatus is pending or running, or the cancel flag is provided
// send the update status to lagoon
if helpers.ContainsString(
Expand Down Expand Up @@ -511,14 +547,14 @@ Build %s
}

// do any message publishing here, and update any pending messages if needed
pendingStatus, pendingStatusMessage := r.buildStatusLogsToLagoonLogs(ctx, opLog, &lagoonBuild, &jobPod, &lagoonEnv, strings.ToLower(string(buildCondition)))
pendingEnvironment, pendingEnvironmentMessage := r.updateDeploymentAndEnvironmentTask(ctx, opLog, &lagoonBuild, &jobPod, &lagoonEnv, strings.ToLower(string(buildCondition)))
pendingStatus, pendingStatusMessage := r.buildStatusLogsToLagoonLogs(ctx, opLog, &lagoonBuild, &jobPod, &lagoonEnv, namespace, strings.ToLower(string(buildCondition)))
pendingEnvironment, pendingEnvironmentMessage := r.updateDeploymentAndEnvironmentTask(ctx, opLog, &lagoonBuild, &jobPod, &lagoonEnv, namespace, strings.ToLower(string(buildCondition)))
var pendingBuildLog bool
var pendingBuildLogMessage lagoonv1beta1.LagoonLog
// if the container logs can't be retrieved, we don't want to send any build logs back, as this will nuke
// any previously received logs
if !strings.Contains(string(allContainerLogs), "unable to retrieve container logs for containerd") {
pendingBuildLog, pendingBuildLogMessage = r.buildLogsToLagoonLogs(ctx, opLog, &lagoonBuild, &jobPod, strings.ToLower(string(buildCondition)), allContainerLogs)
pendingBuildLog, pendingBuildLogMessage = r.buildLogsToLagoonLogs(ctx, opLog, &lagoonBuild, &jobPod, namespace, strings.ToLower(string(buildCondition)), allContainerLogs)
}
if pendingStatus || pendingEnvironment || pendingBuildLog {
mergeMap["metadata"].(map[string]interface{})["labels"].(map[string]interface{})["lagoon.sh/pendingMessages"] = "true"
Expand Down
20 changes: 6 additions & 14 deletions controllers/v1beta1/podmonitor_taskhandlers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ func (r *LagoonMonitorReconciler) taskLogsToLagoonLogs(opLog logr.Logger,
condition string,
logs []byte,
) (bool, lagoonv1beta1.LagoonLog) {
if r.EnableMQ {
if r.EnableMQ && lagoonTask != nil {
msg := lagoonv1beta1.LagoonLog{
Severity: "info",
Project: lagoonTask.Spec.Project.Name,
Expand Down Expand Up @@ -141,20 +141,12 @@ Logs on pod %s

// updateLagoonTask sends the status of the task and deployment to the controllerhandler message queue in lagoon,
// this is for the handler in lagoon to process.
func (r *LagoonMonitorReconciler) updateLagoonTask(opLog logr.Logger,
func (r *LagoonMonitorReconciler) updateLagoonTask(ctx context.Context, opLog logr.Logger,
lagoonTask *lagoonv1beta1.LagoonTask,
jobPod *corev1.Pod,
condition string,
) (bool, lagoonv1beta1.LagoonMessage) {
namespace := helpers.GenerateNamespaceName(
lagoonTask.Spec.Project.NamespacePattern, // the namespace pattern or `openshiftProjectPattern` from Lagoon is never received by the controller
lagoonTask.Spec.Environment.Name,
lagoonTask.Spec.Project.Name,
r.NamespacePrefix,
r.ControllerNamespace,
r.RandomNamespacePrefix,
)
if r.EnableMQ {
if r.EnableMQ && lagoonTask != nil {
if condition == "failed" || condition == "complete" || condition == "cancelled" {
time.AfterFunc(31*time.Second, func() {
taskRunningStatus.Delete(prometheus.Labels{
Expand All @@ -165,7 +157,7 @@ func (r *LagoonMonitorReconciler) updateLagoonTask(opLog logr.Logger,
}
msg := lagoonv1beta1.LagoonMessage{
Type: "task",
Namespace: namespace,
Namespace: lagoonTask.ObjectMeta.Namespace,
Meta: &lagoonv1beta1.LagoonLogMeta{
Task: &lagoonTask.Spec.Task,
Environment: lagoonTask.Spec.Environment.Name,
Expand Down Expand Up @@ -217,7 +209,7 @@ func (r *LagoonMonitorReconciler) taskStatusLogsToLagoonLogs(opLog logr.Logger,
jobPod *corev1.Pod,
condition string,
) (bool, lagoonv1beta1.LagoonLog) {
if r.EnableMQ {
if r.EnableMQ && lagoonTask != nil {
msg := lagoonv1beta1.LagoonLog{
Severity: "info",
Project: lagoonTask.Spec.Project.Name,
Expand Down Expand Up @@ -352,7 +344,7 @@ Task %s
// send any messages to lagoon message queues
// update the deployment with the status
pendingStatus, pendingStatusMessage := r.taskStatusLogsToLagoonLogs(opLog, &lagoonTask, &jobPod, strings.ToLower(string(taskCondition)))
pendingEnvironment, pendingEnvironmentMessage := r.updateLagoonTask(opLog, &lagoonTask, &jobPod, strings.ToLower(string(taskCondition)))
pendingEnvironment, pendingEnvironmentMessage := r.updateLagoonTask(ctx, opLog, &lagoonTask, &jobPod, strings.ToLower(string(taskCondition)))
var pendingTaskLog bool
var pendingTaskLogMessage lagoonv1beta1.LagoonLog
// if the container logs can't be retrieved, we don't want to send any task logs back, as this will nuke
Expand Down
12 changes: 12 additions & 0 deletions internal/helpers/helpers_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,18 @@ func TestGenerateNamespaceName(t *testing.T) {
},
want: "this-is-my-project-feature-branch",
},
{
name: "missing environment and project name",
args: args{
pattern: "",
environmentName: "",
projectname: "",
prefix: "",
controllerNamespace: "lagoon",
randomPrefix: false,
},
want: "-",
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
Expand Down

0 comments on commit ebc182b

Please sign in to comment.