Fix bug where parameters were not propagated.

This commit is contained in:
2023-02-21 21:19:52 +00:00
parent 8799456499
commit 0a062b6ad7
4 changed files with 5 additions and 4 deletions
+2 -2
View File
@@ -13,12 +13,12 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.0.19
version: 0.0.20
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
appVersion: "0.0.19"
appVersion: "0.0.20"
keywords:
- operator
- jobs
+1 -1
View File
@@ -13,7 +13,7 @@ controllerManager:
manager:
image:
repository: ghcr.io/lukaszraczylo/jobs-manager-operator
tag: 0.0.19
tag: {{ .Chart.AppVersion }}
resources:
limits:
cpu: 500m
+1 -1
View File
@@ -118,6 +118,7 @@ func (cp *connPackage) generateDependencyTree() {
groupTree := mainTree.Add(group.Name)
for _, job := range group.Jobs {
jobTree := groupTree.Add(job.Name)
job.CompiledParams = cp.compileParameters(cp.mj.Spec.Params, group.Params, job.Params)
if job.Parallel {
continue
} else {
@@ -130,7 +131,6 @@ func (cp *connPackage) generateDependencyTree() {
jobTree.Add("Depends on: " + generatedJobName)
if !cp.checkIfPresentInDependencies(job.Dependencies, generatedJobName) {
job.Dependencies = append(job.Dependencies, &jobsmanagerv1beta1.ManagedJobDependencies{Name: generatedJobName, Status: ExecutionStatusPending})
job.CompiledParams = cp.compileParameters(cp.mj.Spec.Params, group.Params, job.Params)
}
}
}
+1
View File
@@ -63,6 +63,7 @@ func (r *ManagedJobReconciler) Reconcile(ctx context.Context, req ctrl.Request)
_, theSame, _ := pandati.CompareStructsReplaced(originalMainJobDefinition, cp.mj)
if !theSame {
cp.updateCRDStatusDirectly()
return ctrl.Result{}, nil
}
originalMainJobDefinition = cp.mj.DeepCopy()