Merge pull request #285 from vshn/fix/collabora/-deployment-name

fixing name for nextcloud deployment in collabora install script
vshn · Dec 16, 2024 · 2609178 · 2609178
2 parents 93a71c4 + 77497b7
commit 2609178
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/apis/vshn/v1/vshn_nextcloud.go b/apis/vshn/v1/vshn_nextcloud.go
@@ -329,8 +329,10 @@ func (v *VSHNNextcloud) GetWorkloadPodTemplateLabelsManager() PodTemplateLabelsM
 	return &DeploymentManager{}
 }
 
+// This method returns the main workload name of the VSHNExtcloud.
+// In this particular case it's deployment name, generated by helm chart.
 func (v *VSHNNextcloud) GetWorkloadName() string {
-	return v.GetName()
+	return v.GetName() + "-nextcloud"
 }
 
 func (v *VSHNNextcloud) GetBillingName() string {

diff --git a/pkg/comp-functions/functions/vshnnextcloud/collabora.go b/pkg/comp-functions/functions/vshnnextcloud/collabora.go
@@ -540,7 +540,7 @@ func createInstallCollaboraJob(comp *vshnv1.VSHNNextcloud, svc *runtime.ServiceR
 							Command: []string{
 								"bash",
 								"-cefx",
-								fmt.Sprintf("oc exec -i deployments/%s -- /install-collabora.sh \"%s\" \"%s\" \"%s\"", comp.GetName(), svc.Config.Data["isOpenshift"], comp.GetName(), comp.Spec.Parameters.Service.Collabora.FQDN),
+								fmt.Sprintf("oc exec -i deployments/%s -- /install-collabora.sh \"%s\" \"%s\" \"%s\"", comp.GetWorkloadName(), svc.Config.Data["isOpenshift"], comp.GetName(), comp.Spec.Parameters.Service.Collabora.FQDN),
 							},
 						},
 					},