Ver Fonte

we wnt chart name not agent version

Mohammed Nafees há 4 anos atrás
pai
commit
51500e46ae

+ 0 - 11
api/server/handlers/cluster/get_incidents.go

@@ -57,11 +57,6 @@ func (c *GetIncidentsHandler) ServeHTTP(w http.ResponseWriter, r *http.Request)
 		return
 	}
 
-	agentVersion := agentSvc.Annotations["porter.run/agent-major-version"]
-	if agentVersion == "" {
-		agentVersion = "v1"
-	}
-
 	if incidentID != "" {
 		events, err := porter_agent.GetIncidentEventsByID(agent.Clientset, agentSvc, incidentID)
 
@@ -70,8 +65,6 @@ func (c *GetIncidentsHandler) ServeHTTP(w http.ResponseWriter, r *http.Request)
 			return
 		}
 
-		events.AgentVersion = agentVersion
-
 		c.WriteResult(w, r, events)
 		return
 	} else if releaseName != "" {
@@ -86,8 +79,6 @@ func (c *GetIncidentsHandler) ServeHTTP(w http.ResponseWriter, r *http.Request)
 			return
 		}
 
-		incidents.AgentVersion = agentVersion
-
 		c.WriteResult(w, r, incidents)
 		return
 	}
@@ -99,7 +90,5 @@ func (c *GetIncidentsHandler) ServeHTTP(w http.ResponseWriter, r *http.Request)
 		return
 	}
 
-	incidents.AgentVersion = agentVersion
-
 	c.WriteResult(w, r, incidents)
 }

+ 3 - 3
internal/kubernetes/porter_agent/v2/models.go

@@ -26,6 +26,7 @@ type PodEvent struct {
 type Incident struct {
 	ID            string `json:"id" form:"required"`
 	ReleaseName   string `json:"release_name" form:"required"`
+	ChartName     string `json:"chart_name"`
 	CreatedAt     int64  `json:"created_at" form:"required"`
 	UpdatedAt     int64  `json:"updated_at" form:"required"`
 	LatestState   string `json:"latest_state" form:"required"`
@@ -34,13 +35,12 @@ type Incident struct {
 }
 
 type IncidentsResponse struct {
-	AgentVersion string      `json:"agent_version"`
-	Incidents    []*Incident `json:"incidents" form:"required"`
+	Incidents []*Incident `json:"incidents" form:"required"`
 }
 
 type EventsResponse struct {
-	AgentVersion  string      `json:"agent_version"`
 	IncidentID    string      `json:"incident_id" form:"required"`
+	ChartName     string      `json:"chart_name"`
 	ReleaseName   string      `json:"release_name"`
 	CreatedAt     int64       `json:"created_at"`
 	UpdatedAt     int64       `json:"updated_at"`