Merge branch 'main' of https://cloud.o-forge.io/core/oc-datacenter into main

controllers/admiralty.go

@@ -484,7 +484,7 @@ func (c *AdmiraltyController) GetAdmiraltyKubeconfig() {
 		return
 	}
 
-	b, err := yaml.Marshal(kubeconfig)
+	b, err := json.Marshal(kubeconfig)
 	if err != nil {
 		fmt.Println("Error while marshalling kubeconfig")
 		c.Ctx.Output.SetStatus(500)
@@ -517,7 +517,7 @@ func NewHostKubeWithToken(token string) (*models.KubeConfigValue, error){
 			{
 				Name: "default",
 				Cluster: models.KubeconfigCluster{
-					Server: conf.GetConfig().KubeHost,
+					Server: "https://" + conf.GetConfig().KubeHost + ":6443",
 					CertificateAuthorityData: encodedCA,
 				},
 			},