[fixup] set service account, fix MedusaTask building string

k8ssandra · Jan 11, 2024 · 525d089 · 525d089
1 parent 64e3c4b
commit 525d089
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/pkg/medusa/reconcile.go b/pkg/medusa/reconcile.go
@@ -540,6 +540,7 @@ func PurgeCronJob(dcConfig *cassandra.DatacenterConfig, medusaSpec *api.MedusaCl
 							TerminationGracePeriodSeconds: pointer.Int64(30),
 							DNSPolicy:                     corev1.DNSClusterFirst,
 							SchedulerName:                 "default-scheduler",
+							ServiceAccountName:            "k8ssandra-operator",
 							Containers: []corev1.Container{
 								{
 									Name:                     "k8ssandra-purge-backups",
@@ -550,7 +551,6 @@ func PurgeCronJob(dcConfig *cassandra.DatacenterConfig, medusaSpec *api.MedusaCl
 									Command: []string{
 										"/bin/bash",
 										"-c",
-										">-",
 										createPurgeTaskStr(dcConfig, namespace),
 									},
 								},
@@ -599,5 +599,5 @@ func defaultMedusaProbe() *corev1.Probe {
 }
 
 func createPurgeTaskStr(dcConfig *cassandra.DatacenterConfig, namespace string) string {
-	return fmt.Sprintf("printf \"apiVersion: medusa.k8ssandra.io/v1alpha1\nkind:MedusaTask\nmetadata:\n  name: purge-backups-timestamp\nnamespace: %s\nspec:\n  cassandraDatacenter: %s\n  operation: purge\" | sed \"s/timestamp/$(date+%%Y%%m%%d%%H%%M%%S)/g\" | kubectl apply -f -", namespace, dcConfig.CassDcName())
+	return fmt.Sprintf("printf \"apiVersion: medusa.k8ssandra.io/v1alpha1\\nkind: MedusaTask\\nmetadata:\\n  name: purge-backups-timestamp\\n  namespace: %s\\nspec:\\n  cassandraDatacenter: %s\\n  operation: purge\" | sed \"s/timestamp/$(date +%%Y%%m%%d%%H%%M%%S)/g\" | kubectl apply -f -", namespace, dcConfig.CassDcName())
 }