mirror of
https://github.com/lukaszraczylo/jobs-manager-operator.git
synced 2026-07-06 06:15:41 +00:00
Bugfix - chicken or egg situation.
This commit is contained in:
@@ -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.17
|
version: 0.0.19
|
||||||
# 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.17"
|
appVersion: "0.0.19"
|
||||||
keywords:
|
keywords:
|
||||||
- operator
|
- operator
|
||||||
- jobs
|
- jobs
|
||||||
|
|||||||
@@ -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.17
|
tag: 0.0.19
|
||||||
resources:
|
resources:
|
||||||
limits:
|
limits:
|
||||||
cpu: 500m
|
cpu: 500m
|
||||||
|
|||||||
@@ -60,12 +60,17 @@ func (r *ManagedJobReconciler) Reconcile(ctx context.Context, req ctrl.Request)
|
|||||||
|
|
||||||
originalMainJobDefinition := cp.mj.DeepCopy()
|
originalMainJobDefinition := cp.mj.DeepCopy()
|
||||||
cp.generateDependencyTree()
|
cp.generateDependencyTree()
|
||||||
|
_, theSame, _ := pandati.CompareStructsReplaced(originalMainJobDefinition, cp.mj)
|
||||||
|
if !theSame {
|
||||||
|
cp.updateCRDStatusDirectly()
|
||||||
|
}
|
||||||
|
originalMainJobDefinition = cp.mj.DeepCopy()
|
||||||
|
|
||||||
// TODO: Re-enable after testing
|
// TODO: Re-enable after testing
|
||||||
cp.checkRunningJobsStatus()
|
cp.checkRunningJobsStatus()
|
||||||
cp.runPendingJobs()
|
cp.runPendingJobs()
|
||||||
|
|
||||||
_, theSame, _ := pandati.CompareStructsReplaced(originalMainJobDefinition, cp.mj)
|
_, theSame, _ = pandati.CompareStructsReplaced(originalMainJobDefinition, cp.mj)
|
||||||
if !theSame {
|
if !theSame {
|
||||||
cp.updateCRDStatusDirectly()
|
cp.updateCRDStatusDirectly()
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user