You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by ch...@apache.org on 2022/09/20 03:44:06 UTC
[dolphinscheduler-operator] 29/44: fix(master.worker): merge the labelversion
This is an automated email from the ASF dual-hosted git repository.
chufenggao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler-operator.git
commit ae158807ab220b0baf97e32d0eac4f01c7fc2ed3
Author: nobolity <no...@gmail.com>
AuthorDate: Tue Jun 21 22:27:59 2022 +0800
fix(master.worker): merge the labelversion
---
controllers/master_reconcile.go | 2 +-
controllers/worker_reconcile.go | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/controllers/master_reconcile.go b/controllers/master_reconcile.go
index f11a464..94122cf 100644
--- a/controllers/master_reconcile.go
+++ b/controllers/master_reconcile.go
@@ -65,7 +65,7 @@ func newDSMasterPod(cr *dsv1alpha1.DSMaster) *corev1.Pod {
Name: podName,
Namespace: cr.Namespace,
Labels: map[string]string{dsv1alpha1.DsAppName: dsv1alpha1.DsMasterLabel,
- dsv1alpha1.DsVersionLabel: cr.Spec.Version,
+ dsv1alpha1.DsVersionLabel: ImageName(cr.Spec.Repository, cr.Spec.Version),
dsv1alpha1.DsServiceLabel: dsv1alpha1.DsServiceLabelValue},
},
Spec: corev1.PodSpec{
diff --git a/controllers/worker_reconcile.go b/controllers/worker_reconcile.go
index d0ce14e..3eb40e8 100644
--- a/controllers/worker_reconcile.go
+++ b/controllers/worker_reconcile.go
@@ -60,7 +60,7 @@ func newDSWorkerPod(cr *dsv1alpha1.DSWorker) *corev1.Pod {
Name: podName,
Namespace: cr.Namespace,
Labels: map[string]string{dsv1alpha1.DsAppName: dsv1alpha1.DsWorkerLabel,
- dsv1alpha1.DsVersionLabel: cr.Spec.Version,
+ dsv1alpha1.DsVersionLabel: ImageName(cr.Spec.Repository, cr.Spec.Version),
dsv1alpha1.DsServiceLabel: dsv1alpha1.DsServiceLabelValue,
},
},