lukaszraczylo/jobs-manager-operator
1
0
Fork 0
mirror of https://github.com/lukaszraczylo/jobs-manager-operator.git synced 2026-07-13 07:47:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug where parameters were not propagated.

Browse Source
This commit is contained in:
Lukasz Raczylo
2023-02-21 21:19:52 +00:00
parent 8799456499
commit 0a062b6ad7
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
charts/jobs-manager-operator/Chart.yaml
+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 # 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. # to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/) # 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 # 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 # 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. # follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes. # It is recommended to use it with quotes.
appVersion: "0.0.19" appVersion: "0.0.20"
keywords: keywords:
- operator - operator
- jobs - jobs
charts/jobs-manager-operator/values.yaml
+1 -1
View File
@@ -13,7 +13,7 @@ controllerManager:
manager: manager:
image: image:
repository: ghcr.io/lukaszraczylo/jobs-manager-operator repository: ghcr.io/lukaszraczylo/jobs-manager-operator
tag: 0.0.19 tag: {{ .Chart.AppVersion }}
resources: resources:
limits: limits:
cpu: 500m cpu: 500m
controllers/crd_dependency_tree.go
+1 -1
View File
@@ -118,6 +118,7 @@ func (cp *connPackage) generateDependencyTree() {
groupTree := mainTree.Add(group.Name) groupTree := mainTree.Add(group.Name)
for _, job := range group.Jobs { for _, job := range group.Jobs {
jobTree := groupTree.Add(job.Name) jobTree := groupTree.Add(job.Name)
job.CompiledParams = cp.compileParameters(cp.mj.Spec.Params, group.Params, job.Params)
if job.Parallel { if job.Parallel {
continue continue
} else { } else {
@@ -130,7 +131,6 @@ func (cp *connPackage) generateDependencyTree() {
jobTree.Add("Depends on: " + generatedJobName) jobTree.Add("Depends on: " + generatedJobName)
if !cp.checkIfPresentInDependencies(job.Dependencies, generatedJobName) { if !cp.checkIfPresentInDependencies(job.Dependencies, generatedJobName) {
job.Dependencies = append(job.Dependencies, &jobsmanagerv1beta1.ManagedJobDependencies{Name: generatedJobName, Status: ExecutionStatusPending}) job.Dependencies = append(job.Dependencies, &jobsmanagerv1beta1.ManagedJobDependencies{Name: generatedJobName, Status: ExecutionStatusPending})
job.CompiledParams = cp.compileParameters(cp.mj.Spec.Params, group.Params, job.Params)
} }
} }
} }
controllers/managedjob_controller.go
+1
View File
@@ -63,6 +63,7 @@ func (r *ManagedJobReconciler) Reconcile(ctx context.Context, req ctrl.Request)
_, theSame, _ := pandati.CompareStructsReplaced(originalMainJobDefinition, cp.mj) _, theSame, _ := pandati.CompareStructsReplaced(originalMainJobDefinition, cp.mj)
if !theSame { if !theSame {
cp.updateCRDStatusDirectly() cp.updateCRDStatusDirectly()
return ctrl.Result{}, nil
} }
originalMainJobDefinition = cp.mj.DeepCopy() originalMainJobDefinition = cp.mj.DeepCopy()