Merge pull request #22 from cbws/tmpfs-fix

Marlinc · web-flow · commit 681c69ea9d6e · 2019-11-10T13:46:53.000+01:00
Fix creation of clusters without pod policy
diff --git a/pkg/cluster/cluster.go b/pkg/cluster/cluster.go
@@ -379,7 +379,11 @@ func (c *Cluster) createPod(members etcdutil.MemberSet, m *etcdutil.Member, stat
 		}
 		k8sutil.AddEtcdVolumeToPod(pod, pvc, false)
 	} else {
-		k8sutil.AddEtcdVolumeToPod(pod, nil, c.cluster.Spec.Pod.Tmpfs)
+		tmpfs := false
+		if podPolicy := c.cluster.Spec.Pod; podPolicy != nil {
+			tmpfs = podPolicy.Tmpfs
+		}
+		k8sutil.AddEtcdVolumeToPod(pod, nil, tmpfs)
 	}
 	_, err := c.config.KubeCli.CoreV1().Pods(c.cluster.Namespace).Create(pod)
 	return err

Original file line number	Diff line number	Diff line change
`@@ -379,7 +379,11 @@ func (c Cluster) createPod(members etcdutil.MemberSet, m etcdutil.Member, stat`
`379`	`379`	`}`
`380`	`380`	`k8sutil.AddEtcdVolumeToPod(pod, pvc, false)`
`381`	`381`	`} else {`
`382`		`- k8sutil.AddEtcdVolumeToPod(pod, nil, c.cluster.Spec.Pod.Tmpfs)`
	`382`	`+ tmpfs := false`
	`383`	`+ if podPolicy := c.cluster.Spec.Pod; podPolicy != nil {`
	`384`	`+ tmpfs = podPolicy.Tmpfs`
	`385`	`+ }`
	`386`	`+ k8sutil.AddEtcdVolumeToPod(pod, nil, tmpfs)`
`383`	`387`	`}`
`384`	`388`	`_, err := c.config.KubeCli.CoreV1().Pods(c.cluster.Namespace).Create(pod)`
`385`	`389`	`return err`