SNRGY-1931 fix rancher 2 deploy mode

SENERGY-Platform · Apr 13, 2022 · bff5e2d · bff5e2d
1 parent a71cc42
commit bff5e2d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/pkg/deploy/rancher2-api/api.go b/pkg/deploy/rancher2-api/api.go
@@ -49,13 +49,20 @@ func (r *Rancher2) UpdateContainer(id string, name string, image string, env map
 
 func (r *Rancher2) CreateContainer(name string, image string, env map[string]string, restart bool) (id string, err error) {
 	request := gorequest.New().SetBasicAuth(r.accessKey, r.secretKey).TLSClientConfig(&tls.Config{InsecureSkipVerify: true})
+	r2Env := []Env{}
+	for k, v := range env {
+		r2Env = append(r2Env, Env{
+			Name:  k,
+			Value: v,
+		})
+	}
 	reqBody := &Request{
 		Name:        name,
 		NamespaceId: r.namespaceId,
 		Containers: []Container{{
 			Image:           image,
 			Name:            name,
-			Environment:     env,
+			Env:             r2Env,
 			ImagePullPolicy: "Always",
 		}},
 		Scheduling: Scheduling{Scheduler: "default-scheduler", Node: Node{RequireAll: []string{"role=worker"}}},

diff --git a/pkg/deploy/rancher2-api/entities.go b/pkg/deploy/rancher2-api/entities.go
@@ -26,12 +26,17 @@ type Request struct {
 }
 
 type Container struct {
-	Image           string            `json:"image,omitempty"`
-	Name            string            `json:"name,omitempty"`
-	Environment     map[string]string `json:"environment,omitempty"`
-	ImagePullPolicy string            `json:"imagePullPolicy,omitempty"`
-	Resources       Resources         `json:"resources,omitempty"`
+	Image           string    `json:"image,omitempty"`
+	Name            string    `json:"name,omitempty"`
+	Env             []Env     `json:"env,omitempty"`
+	ImagePullPolicy string    `json:"imagePullPolicy,omitempty"`
+	Resources       Resources `json:"resources,omitempty"`
 }
+type Env struct {
+	Name  string `json:"name"`
+	Value string `json:"value"`
+}
+
 type Resources struct {
 	Limits Limits `json:"limits,omitempty"`
 }