2
0
Эх сурвалжийг харах

Merge branch '0.8.0-pod-events-managment' of github.com:porter-dev/porter into 0.8.0-pod-events-managment

jnfrati 4 жил өмнө
parent
commit
140f1fc079

+ 4 - 2
server/api/agent_handler.go

@@ -44,6 +44,8 @@ func (app *App) HandleDeployAgent(w http.ResponseWriter, r *http.Request) {
 		Form: &helm.Form{
 		Form: &helm.Form{
 			Repo:              app.Repo,
 			Repo:              app.Repo,
 			DigitalOceanOAuth: app.DOConf,
 			DigitalOceanOAuth: app.DOConf,
+			Storage:           "secret",
+			Namespace:         "porter-agent-system",
 		},
 		},
 	}
 	}
 
 
@@ -64,7 +66,7 @@ func (app *App) HandleDeployAgent(w http.ResponseWriter, r *http.Request) {
 	}
 	}
 
 
 	// create namespace if not exists
 	// create namespace if not exists
-	_, err = agent.K8sAgent.CreateNamespace("porter")
+	_, err = agent.K8sAgent.CreateNamespace("porter-agent-system")
 
 
 	if err != nil {
 	if err != nil {
 		app.handleErrorFormDecoding(err, ErrUserDecode, w)
 		app.handleErrorFormDecoding(err, ErrUserDecode, w)
@@ -104,7 +106,7 @@ func (app *App) HandleDeployAgent(w http.ResponseWriter, r *http.Request) {
 	conf := &helm.InstallChartConfig{
 	conf := &helm.InstallChartConfig{
 		Chart:     chart,
 		Chart:     chart,
 		Name:      "porter-agent",
 		Name:      "porter-agent",
-		Namespace: releaseForm.Form.Namespace,
+		Namespace: "porter-agent-system",
 		Cluster:   releaseForm.Cluster,
 		Cluster:   releaseForm.Cluster,
 		Repo:      *app.Repo,
 		Repo:      *app.Repo,
 		Values:    porterAgentValues,
 		Values:    porterAgentValues,