Correct the contianer name in BluePrint and Cassandra app (#624)

kanisterio · Mar 16, 2020 · 0c500ac · 0c500ac
1 parent fe3641c
commit 0c500ac
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/examples/stable/cassandra/cassandra-blueprint.yaml b/examples/stable/cassandra/cassandra-blueprint.yaml
@@ -19,7 +19,7 @@ actions:
       args:
         namespace: "{{ .StatefulSet.Namespace }}"
         pods: "{{ range .StatefulSet.Pods }} {{.}}{{end}}"
-        containers: cassandra
+        containers: "{{ .StatefulSet.Name }}"
         command:
           - bash
           - -o
@@ -40,7 +40,7 @@ actions:
       args:
         namespace: "{{ .StatefulSet.Namespace }}"
         pods: "{{ range .StatefulSet.Pods }} {{.}}{{end}}"
-        containers: "cassandra"
+        containers: "{{ .StatefulSet.Name }}"
         command:
           - bash
           - -o
@@ -69,15 +69,15 @@ actions:
       args:
         namespace: "{{ .StatefulSet.Namespace }}"
         pods: "{{ range .StatefulSet.Pods }} {{.}}{{end}}"
-        container: cassandra
+        container: "{{ .StatefulSet.Name }}"
         includePath: "{{ .Phases.getBackupPrefixLocation.Output.localSnapshotPrefixLocation }}"
         backupArtifactPrefix: "{{ .Phases.getBackupPrefixLocation.Output.backupPrefixLocation }}"
     - func: KubeExec
       name: deleteLocalBackup
       args:
         namespace: "{{ .StatefulSet.Namespace }}"
         pod: "{{ index .StatefulSet.Pods 0}}"
-        containers: "cassandra"
+        containers: "{{ .StatefulSet.Name }}"
         command:
           - bash
           - -o
@@ -122,7 +122,7 @@ actions:
       args:
         namespace: "{{ .StatefulSet.Namespace }}"
         pod: "{{ index .StatefulSet.Pods 0 }}"
-        containers: "cassandra"
+        containers: "{{ .StatefulSet.Name }}"
         command:
           - bash
           - -o

diff --git a/pkg/app/cassandra.go b/pkg/app/cassandra.go
@@ -209,7 +209,7 @@ func (cas *CassandraInstance) Reset(ctx context.Context) error {
 }
 
 func (cas *CassandraInstance) execCommand(ctx context.Context, command []string) (string, string, error) {
-	podname, containername, err := kube.GetPodContainerFromStatefulSet(ctx, cas.cli, cas.namespace, "cassandra")
+	podname, containername, err := kube.GetPodContainerFromStatefulSet(ctx, cas.cli, cas.namespace, cas.chart.Release)
 	if err != nil || podname == "" {
 		return "", "", errors.Wrapf(err, "Error getting the pod and container name %s.", cas.name)
 	}