From cb2e4f60286f64fe35f431a22b8490e3f4347242 Mon Sep 17 00:00:00 2001
From: pb <pierre.bayle@irt-stexupery.com>
Date: Thu, 15 May 2025 09:37:35 +0200
Subject: [PATCH] added the right naming convention to kubeConfigSecret in
 target

---
 infrastructure/kubernetes.go |  2 +-
 routers/commentsRouter.go    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/infrastructure/kubernetes.go b/infrastructure/kubernetes.go
index fa25ee4..6b6226b 100644
--- a/infrastructure/kubernetes.go
+++ b/infrastructure/kubernetes.go
@@ -305,7 +305,7 @@ func (k *KubernetesService) CreateAdmiraltyTarget(context context.Context, execu
         },
         "spec": map[string]interface{}{
             "kubeconfigSecret": map[string]string{
-				"name" : "kube-secret-"+executionId,
+				"name" : "kube-secret-"+ getConcatenatedName(peerId, executionId),
 			},
         },
     }
diff --git a/routers/commentsRouter.go b/routers/commentsRouter.go
index d06faeb..a0854a9 100644
--- a/routers/commentsRouter.go
+++ b/routers/commentsRouter.go
@@ -19,7 +19,7 @@ func init() {
     beego.GlobalControllerRouter["oc-datacenter/controllers:AdmiraltyController"] = append(beego.GlobalControllerRouter["oc-datacenter/controllers:AdmiraltyController"],
         beego.ControllerComments{
             Method: "GetNodeReady",
-            Router: `/node/:execution`,
+            Router: `/node/:execution/:peer`,
             AllowHTTPMethods: []string{"get"},
             MethodParams: param.Make(),
             Filters: nil,
@@ -28,7 +28,7 @@ func init() {
     beego.GlobalControllerRouter["oc-datacenter/controllers:AdmiraltyController"] = append(beego.GlobalControllerRouter["oc-datacenter/controllers:AdmiraltyController"],
         beego.ControllerComments{
             Method: "GetKubeSecret",
-            Router: `/secret/:execution`,
+            Router: `/secret/:execution/:peer`,
             AllowHTTPMethods: []string{"get"},
             MethodParams: param.Make(),
             Filters: nil,
@@ -37,7 +37,7 @@ func init() {
     beego.GlobalControllerRouter["oc-datacenter/controllers:AdmiraltyController"] = append(beego.GlobalControllerRouter["oc-datacenter/controllers:AdmiraltyController"],
         beego.ControllerComments{
             Method: "CreateKubeSecret",
-            Router: `/secret/:execution`,
+            Router: `/secret/:execution/:peer`,
             AllowHTTPMethods: []string{"post"},
             MethodParams: param.Make(),
             Filters: nil,
@@ -45,7 +45,7 @@ func init() {
 
     beego.GlobalControllerRouter["oc-datacenter/controllers:AdmiraltyController"] = append(beego.GlobalControllerRouter["oc-datacenter/controllers:AdmiraltyController"],
         beego.ControllerComments{
-            Method: "CreateSource",
+            Method: "CreateAdmiraltySource",
             Router: `/source/:execution`,
             AllowHTTPMethods: []string{"post"},
             MethodParams: param.Make(),
@@ -55,7 +55,7 @@ func init() {
     beego.GlobalControllerRouter["oc-datacenter/controllers:AdmiraltyController"] = append(beego.GlobalControllerRouter["oc-datacenter/controllers:AdmiraltyController"],
         beego.ControllerComments{
             Method: "CreateAdmiraltyTarget",
-            Router: `/target/:execution`,
+            Router: `/target/:execution/:peer`,
             AllowHTTPMethods: []string{"post"},
             MethodParams: param.Make(),
             Filters: nil,