Jelajahi Sumber

remove feature flag for live deploy events (#3434)

Feroze Mohideen 2 tahun lalu
induk
melakukan
53b29bf475

+ 2 - 3
api/server/handlers/porter_app/create.go

@@ -50,7 +50,6 @@ func (c *CreatePorterAppHandler) ServeHTTP(w http.ResponseWriter, r *http.Reques
 	ctx := r.Context()
 	project, _ := ctx.Value(types.ProjectScope).(*models.Project)
 	cluster, _ := ctx.Value(types.ClusterScope).(*models.Cluster)
-	user, _ := ctx.Value(types.UserScope).(*models.User)
 
 	ctx, span := telemetry.NewSpan(r.Context(), "serve-create-porter-app")
 	defer span.End()
@@ -302,7 +301,7 @@ func (c *CreatePorterAppHandler) ServeHTTP(w http.ResponseWriter, r *http.Reques
 			return
 		}
 
-		if features.AreAgentDeployEventsEnabled(user.Email, k8sAgent) {
+		if features.AreAgentDeployEventsEnabled(k8sAgent) {
 			serviceDeploymentStatusMap := getServiceDeploymentMetadataFromValues(values, types.PorterAppEventStatus_Progressing)
 			_, err = createNewPorterAppDeployEvent(ctx, serviceDeploymentStatusMap, types.PorterAppEventStatus_Progressing, porterApp.ID, 1, imageInfo.Tag, c.Repo().PorterAppEvent())
 		} else {
@@ -491,7 +490,7 @@ func (c *CreatePorterAppHandler) ServeHTTP(w http.ResponseWriter, r *http.Reques
 			return
 		}
 
-		if features.AreAgentDeployEventsEnabled(user.Email, k8sAgent) {
+		if features.AreAgentDeployEventsEnabled(k8sAgent) {
 			serviceDeploymentStatusMap := getServiceDeploymentMetadataFromValues(values, types.PorterAppEventStatus_Progressing)
 			_, err = createNewPorterAppDeployEvent(ctx, serviceDeploymentStatusMap, types.PorterAppEventStatus_Progressing, updatedPorterApp.ID, helmRelease.Version+1, imageInfo.Tag, c.Repo().PorterAppEvent())
 		} else {

+ 1 - 2
api/server/handlers/porter_app/rollback.go

@@ -39,7 +39,6 @@ func (c *RollbackPorterAppHandler) ServeHTTP(w http.ResponseWriter, r *http.Requ
 	ctx, span := telemetry.NewSpan(r.Context(), "serve-rollback-porter-app")
 	defer span.End()
 	cluster, _ := ctx.Value(types.ClusterScope).(*models.Cluster)
-	user, _ := ctx.Value(types.UserScope).(*models.User)
 
 	request := &types.RollbackPorterAppRequest{}
 	if ok := c.DecodeAndValidate(w, r, request); !ok {
@@ -154,7 +153,7 @@ func (c *RollbackPorterAppHandler) ServeHTTP(w http.ResponseWriter, r *http.Requ
 		return
 	}
 
-	if features.AreAgentDeployEventsEnabled(user.Email, k8sAgent) {
+	if features.AreAgentDeployEventsEnabled(k8sAgent) {
 		serviceDeploymentStatusMap := getServiceDeploymentMetadataFromValues(values, types.PorterAppEventStatus_Progressing)
 		_, err = createNewPorterAppDeployEvent(ctx, serviceDeploymentStatusMap, types.PorterAppEventStatus_Progressing, porterApp.ID, latestHelmRelease.Version+1, imageInfo.Tag, c.Repo().PorterAppEvent())
 	} else {

+ 7 - 7
api/server/shared/features/features.go

@@ -41,18 +41,18 @@ func isPorterAgentUpdated(agent *kubernetes.Agent, major, minor, patch int) bool
 	parsedPatch, _ := strconv.Atoi(parsedTag[2])
 	if parsedMajor < major {
 		return false
+	} else if parsedMajor > major {
+		return true
 	}
 	if parsedMinor < minor {
 		return false
+	} else if parsedMinor > minor {
+		return true
 	}
-	if parsedPatch < patch {
-		return false
-	}
-	return true
+	return parsedPatch >= patch
 }
 
 // Only create the PROGRESSING event if the cluster's agent is updated, because only the updated agent can update the status
-// TODO: remove dependence on porter email once we are ready to release this feature
-func AreAgentDeployEventsEnabled(email string, agent *kubernetes.Agent) bool {
-	return isPorterAgentUpdated(agent, 3, 1, 6) && strings.HasSuffix(email, "porter.run")
+func AreAgentDeployEventsEnabled(agent *kubernetes.Agent) bool {
+	return isPorterAgentUpdated(agent, 3, 1, 6)
 }

+ 5 - 4
dashboard/src/main/home/app-dashboard/expanded-app/logs/LogSection.tsx

@@ -107,14 +107,15 @@ const LogSection: React.FC<Props> = ({
     const patch = parseInt(versionParts[2]);
     if (major < 3) {
       return false;
+    } else if (major > 3) {
+      return true;
     }
     if (minor < 1) {
       return false;
+    } else if (minor > 1) {
+      return true;
     }
-    if (patch <= 3) {
-      return false;
-    }
-    return true;
+    return patch >= 4;
   }
 
   const [filters, setFilters] = useState<GenericLogFilter[]>(showFilter ? [