From 5aeae6a152791f5916f8ff402ab220274a558752 Mon Sep 17 00:00:00 2001 From: Moto Ishizawa Date: Sun, 15 Mar 2020 21:50:45 +0900 Subject: [PATCH] Fix generate name --- controllers/runnerdeployment_controller.go | 2 +- controllers/runnerreplicaset_controller.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/controllers/runnerdeployment_controller.go b/controllers/runnerdeployment_controller.go index 19654353..04bf289f 100644 --- a/controllers/runnerdeployment_controller.go +++ b/controllers/runnerdeployment_controller.go @@ -218,7 +218,7 @@ func (r *RunnerDeploymentReconciler) newRunnerReplicaSet(rd v1alpha1.RunnerDeplo rs := v1alpha1.RunnerReplicaSet{ TypeMeta: metav1.TypeMeta{}, ObjectMeta: metav1.ObjectMeta{ - GenerateName: rd.ObjectMeta.Name, + GenerateName: rd.ObjectMeta.Name + "-", Namespace: rd.ObjectMeta.Namespace, Labels: labels, }, diff --git a/controllers/runnerreplicaset_controller.go b/controllers/runnerreplicaset_controller.go index fa92172c..4fa2e4c8 100644 --- a/controllers/runnerreplicaset_controller.go +++ b/controllers/runnerreplicaset_controller.go @@ -141,7 +141,7 @@ func (r *RunnerReplicaSetReconciler) Reconcile(req ctrl.Request) (ctrl.Result, e func (r *RunnerReplicaSetReconciler) newRunner(rs v1alpha1.RunnerReplicaSet) (v1alpha1.Runner, error) { objectMeta := rs.Spec.Template.ObjectMeta.DeepCopy() - objectMeta.GenerateName = rs.ObjectMeta.Name + objectMeta.GenerateName = rs.ObjectMeta.Name + "-" objectMeta.Namespace = rs.ObjectMeta.Namespace runner := v1alpha1.Runner{