Support the restart policy for pod

linkernetworks · Jul 25, 2018 · 602918e · 602918e
1 parent e355d85
commit 602918e
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 17 deletions.
diff --git a/src/entity/pod.go b/src/entity/pod.go
@@ -28,22 +28,23 @@ type PodNetwork struct {
 	BridgeName string `bson:"bridgeName" json:"bridgeName"` //its from the entity.Network entity
 }
 
-// PodVolume is the structure for pof volume info 
+// PodVolume is the structure for pof volume info
 type PodVolume struct {
 	Name      string `bson:"name" json:"name" validate:"required"`
 	MountPath string `bson:"mountPath" json:"mountPath" validate:"required"`
 }
 
 // Pod is the structure for pod info
 type Pod struct {
-	ID         bson.ObjectId     `bson:"_id,omitempty" json:"id" validate:"-"`
-	Name       string            `bson:"name" json:"name" validate:"required,k8sname"`
-	Namespace  string            `bson:"namespace" json:"namespace" validate:"required"`
-	Labels     map[string]string `bson:"labels,omitempty" json:"labels" validate:"required,dive,keys,alphanum,endkeys,required,alphanum"`
-	Containers []Container       `bson:"containers" json:"containers" validate:"required,dive,required"`
-	CreatedAt  *time.Time        `bson:"createdAt,omitempty" json:"createdAt,omitempty" validate:"-"`
-	Volumes    []PodVolume       `bson:"volumes,omitempty" json:"volumes" validate:"required,dive,required"`
-	Networks   []PodNetwork      `bson:"networks,omitempty" json:"networks" validate:"required,dive,required"`
+	ID            bson.ObjectId     `bson:"_id,omitempty" json:"id" validate:"-"`
+	Name          string            `bson:"name" json:"name" validate:"required,k8sname"`
+	Namespace     string            `bson:"namespace" json:"namespace" validate:"required"`
+	Labels        map[string]string `bson:"labels,omitempty" json:"labels" validate:"required,dive,keys,alphanum,endkeys,required,alphanum"`
+	Containers    []Container       `bson:"containers" json:"containers" validate:"required,dive,required"`
+	CreatedAt     *time.Time        `bson:"createdAt,omitempty" json:"createdAt,omitempty" validate:"-"`
+	Volumes       []PodVolume       `bson:"volumes,omitempty" json:"volumes" validate:"required,dive,required"`
+	Networks      []PodNetwork      `bson:"networks,omitempty" json:"networks" validate:"required,dive,required"`
+	RestartPolicy string            `bson:"restartPolicy" json:"restartPolicy" validate:"required,eq=Always|eq=OnFailure|eq=Never`
 }
 
 // GetCollection - get model mongo collection name.

diff --git a/src/pod/pod.go b/src/pod/pod.go
@@ -241,7 +241,7 @@ func CreatePod(sp *serviceprovider.Container, pod *entity.Pod) error {
 			Containers:     containers,
 			Volumes:        volumes,
 			Affinity:       generateAffinity(nodeNames),
-			RestartPolicy:  corev1.RestartPolicyOnFailure,
+			RestartPolicy:  corev1.RestartPolicy(pod.RestartPolicy),
 		},
 	}
 

diff --git a/src/server/handler_pod_test.go b/src/server/handler_pod_test.go
@@ -61,14 +61,14 @@ func (suite *PodTestSuite) TestCreatePod() {
 	}
 	tName := namesgenerator.GetRandomName(0)
 	pod := entity.Pod{
-		Name:       tName,
-		Namespace:  namespace,
-		Labels:     map[string]string{},
-		Containers: containers,
-		Volumes:    []entity.PodVolume{},
-		Networks:   []entity.PodNetwork{},
+		Name:          tName,
+		Namespace:     namespace,
+		Labels:        map[string]string{},
+		Containers:    containers,
+		Volumes:       []entity.PodVolume{},
+		Networks:      []entity.PodNetwork{},
+		RestartPolicy: "Never",
 	}
-
 	bodyBytes, err := json.MarshalIndent(pod, "", "  ")
 	suite.NoError(err)