From 0a062b6ad7e570d0d88da30c7f5c00ee28359f13 Mon Sep 17 00:00:00 2001 From: Lukasz Raczylo Date: Tue, 21 Feb 2023 21:19:52 +0000 Subject: [PATCH] Fix bug where parameters were not propagated. --- charts/jobs-manager-operator/Chart.yaml | 4 ++-- charts/jobs-manager-operator/values.yaml | 2 +- controllers/crd_dependency_tree.go | 2 +- controllers/managedjob_controller.go | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/charts/jobs-manager-operator/Chart.yaml b/charts/jobs-manager-operator/Chart.yaml index eb9339d..6f3f891 100644 --- a/charts/jobs-manager-operator/Chart.yaml +++ b/charts/jobs-manager-operator/Chart.yaml @@ -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 diff --git a/charts/jobs-manager-operator/values.yaml b/charts/jobs-manager-operator/values.yaml index 9bab8a1..5e5f502 100644 --- a/charts/jobs-manager-operator/values.yaml +++ b/charts/jobs-manager-operator/values.yaml @@ -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 diff --git a/controllers/crd_dependency_tree.go b/controllers/crd_dependency_tree.go index 1cd350b..bfcf983 100644 --- a/controllers/crd_dependency_tree.go +++ b/controllers/crd_dependency_tree.go @@ -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) } } } diff --git a/controllers/managedjob_controller.go b/controllers/managedjob_controller.go index 14b626d..05aaff1 100644 --- a/controllers/managedjob_controller.go +++ b/controllers/managedjob_controller.go @@ -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()