Change tailscale services filter (#4408)

dashboard/src/components/porter-form/field-components/ServiceRow.tsx

@@ -1,7 +1,7 @@
 import React, { Component } from "react";
 import styled from "styled-components";
 import { Context } from "shared/Context";
-import { hardcodedIcons, hardcodedNames } from "shared/hardcodedNameDict";
+import { hardcodedIcons } from "shared/hardcodedNameDict";
 
 type PropsType = {
   service: {
@@ -16,6 +16,13 @@ type PropsType = {
 
 type StateType = any;
 
+const getIcon = (type: string) => {
+  if (hardcodedIcons[type]) {
+    return hardcodedIcons[type];
+  }
+  return hardcodedIcons["web"];
+}
+
 export default class ServiceRow extends Component<PropsType, StateType> {
   render() {
     let { clusterIP, name, namespace, type, app, release } = this.props.service;
@@ -25,13 +32,10 @@ export default class ServiceRow extends Component<PropsType, StateType> {
       <>
         {name &&
           type &&
-          hardcodedNames[type] &&
-          hardcodedIcons[type] &&
           namespace !== "kube-system" && (
             <StyledServiceRow>
               <Flex>
-                <Icon src={hardcodedIcons[type]} />
-                <Type>{hardcodedNames[type]}</Type>
+                <Icon src={getIcon(type)} />
                 <Name>{name}</Name> <Dash>-</Dash> <IP>{clusterIP}</IP>
               </Flex>
               <TagWrapper>

internal/helm/agent.go

@@ -54,15 +54,16 @@ func (a *Agent) ListReleases(
 	ctx, span := telemetry.NewSpan(ctx, "helm-list-releases")
 	defer span.End()
 
+	stringFilter := strings.Join(filter.StatusFilter, ",")
 	telemetry.WithAttributes(span,
 		telemetry.AttributeKV{Key: "namespace", Value: namespace},
+		telemetry.AttributeKV{Key: "filter", Value: stringFilter},
 	)
 
-	lsel := fmt.Sprintf("owner=helm,status in (%s)", strings.Join(filter.StatusFilter, ","))
+	lsel := fmt.Sprintf("owner=helm,status in (%s)", stringFilter)
 
-	// list secrets
 	secretList, err := a.K8sAgent.Clientset.CoreV1().Secrets(namespace).List(
-		context.Background(),
+		ctx,
 		v1.ListOptions{
 			LabelSelector: lsel,
 		},
@@ -365,7 +366,6 @@ func (a *Agent) UpgradeReleaseByValues(
 		doAuth,
 		disablePullSecretsInjection,
 	)
-
 	if err != nil {
 		return nil, telemetry.Error(ctx, span, err, "error getting porter postrenderer")
 	}
@@ -411,14 +411,12 @@ func (a *Agent) UpgradeReleaseByValues(
 					rel.Info.Status = release.StatusFailed
 
 					err = helmSecrets.Update(mostRecentSecret.GetName(), rel)
-
 					if err != nil {
 						return nil, telemetry.Error(ctx, span, err, "error updating helm secrets")
 					}
 
 					// retry upgrade
 					res, err = cmd.Run(conf.Name, ch, conf.Values)
-
 					if err != nil {
 						return nil, telemetry.Error(ctx, span, err, "error running upgrade after updating helm secrets")
 					}
@@ -485,7 +483,6 @@ func (a *Agent) UpgradeReleaseByValues(
 				helmSecrets := driver.NewSecrets(a.K8sAgent.Clientset.CoreV1().Secrets(rel.Namespace))
 
 				err = helmSecrets.Update(mostRecentSecret.GetName(), rel)
-
 				if err != nil {
 					return nil, telemetry.Error(ctx, span, err, "error updating helm secret")
 				}
@@ -592,7 +589,6 @@ func (a *Agent) InstallChart(
 		doAuth,
 		disablePullSecretsInjection,
 	)
-
 	if err != nil {
 		return nil, telemetry.Error(ctx, span, err, "error getting post renderer")
 	}
@@ -658,7 +654,6 @@ func (a *Agent) UpgradeInstallChart(
 		doAuth,
 		disablePullSecretsInjection,
 	)
-
 	if err != nil {
 		return nil, telemetry.Error(ctx, span, err, "error getting post renderer")
 	}