From be645db4c12e0c1feb11b629df3e81af65027a14 Mon Sep 17 00:00:00 2001
From: Bikash <31549600+tulsiojha@users.noreply.github.com>
Date: Tue, 10 Dec 2024 13:59:21 +0530
Subject: [PATCH] Helm related fixes (#338)

* fixed helm manual url input issue

* fixed ts issues

* added managed by helm in secret
---
 gql-queries-generator/doc/queries.graphql     |  22 +--
 .../page-components/secret-resource-v2.tsx    |  35 ++++-
 .../secret.$secret/resources.tsx              |  23 +++-
 .../$environment+/secret.$secret/route.tsx    |   9 +-
 .../services/exposed-service.tsx              | 130 ++++++++++++++++++
 .../services/handle-intercept-service.tsx     |  22 +--
 .../services/services-resource-v2.tsx         |  56 ++++----
 .../workloads+/apps/handle-intercept.tsx      |   1 +
 .../$environment+/workloads+/apps/network.tsx |   5 +-
 .../$helmchart+/settings+/values/route.tsx    |  80 +++++------
 .../helm-utils/use-fetch-helmcharts.tsx       |   2 +-
 .../workloads+/new-helm-chart/route.tsx       |  44 +++---
 .../$account+/new-managed-service/_index.tsx  |  31 ++---
 .../managed-service-layout-v2.tsx             | 100 +++++++-------
 .../console/server/gql/queries/app-queries.ts |  18 +--
 .../cluster-managed-services-queries.ts       |  28 +---
 .../server/gql/queries/secret-queries.ts      |  12 +-
 .../gql/queries/service-binding-queries.ts    |  44 ++++--
 src/generated/gql/sdl.graphql                 |  24 ++--
 src/generated/gql/server.ts                   |  43 +++---
 20 files changed, 459 insertions(+), 270 deletions(-)
 create mode 100644 src/apps/console/routes/_main+/$account+/env+/$environment+/services/exposed-service.tsx

diff --git a/gql-queries-generator/doc/queries.graphql b/gql-queries-generator/doc/queries.graphql
index c51017d02..5d9ac45d0 100644
--- a/gql-queries-generator/doc/queries.graphql
+++ b/gql-queries-generator/doc/queries.graphql
@@ -1033,6 +1033,7 @@ query consoleGetApp($envName: String!, $name: String!) {
         portMappings {
           devicePort
           appPort
+          protocol
         }
       }
       nodeSelector
@@ -1215,6 +1216,7 @@ query consoleListApps($envName: String!, $pq: CursorPaginationIn, $search: Searc
             portMappings {
               appPort
               devicePort
+              protocol
             }
             toDevice
           }
@@ -1668,6 +1670,7 @@ query consoleListSecrets($envName: String!, $search: SearchSecrets, $pq: CursorP
         }
         creationTime
         displayName
+        createdByHelm
         stringData
         environmentName
         isReadyOnly
@@ -1714,6 +1717,7 @@ query consoleGetSecret($envName: String!, $name: String!) {
     environmentName
     immutable
     markedForDeletion
+    createdByHelm
     metadata {
       annotations
       creationTimestamp
@@ -3037,19 +3041,11 @@ query consoleGetClusterMSv($name: String!) {
     recordVersion
     spec {
       msvcSpec {
-        nodeSelector
         serviceTemplate {
           apiVersion
           kind
           spec
         }
-        tolerations {
-          effect
-          key
-          operator
-          tolerationSeconds
-          value
-        }
       }
       targetNamespace
     }
@@ -3116,19 +3112,11 @@ query consoleListClusterMSvs($pagination: CursorPaginationIn, $search: SearchClu
         recordVersion
         spec {
           msvcSpec {
-            nodeSelector
             serviceTemplate {
               apiVersion
               kind
               spec
             }
-            tolerations {
-              effect
-              key
-              operator
-              tolerationSeconds
-              value
-            }
           }
           targetNamespace
         }
@@ -4525,7 +4513,7 @@ query consoleListServiceBinding($envName: String!, $pagination: CursorPagination
         interceptStatus {
           intercepted
           portMappings {
-            containerPort
+            devicePort
             servicePort
           }
           toAddr
diff --git a/src/apps/console/page-components/secret-resource-v2.tsx b/src/apps/console/page-components/secret-resource-v2.tsx
index 2c15311ea..663739421 100644
--- a/src/apps/console/page-components/secret-resource-v2.tsx
+++ b/src/apps/console/page-components/secret-resource-v2.tsx
@@ -27,6 +27,7 @@ import ListV2 from '../components/listV2';
 import ResourceExtraAction from '../components/resource-extra-action';
 import { useConsoleApi } from '../server/gql/api-provider';
 import { ISecrets } from '../server/gql/queries/secret-queries';
+import { Chip } from '@kloudlite/design-system/atoms/chips';
 
 const RESOURCE_NAME = 'secret';
 type BaseType = ExtractNodeType<ISecrets>;
@@ -48,12 +49,21 @@ const parseItem = (item: BaseType) => {
       author: `Updated by ${titleCase(parseUpdateOrCreatedBy(item))}`,
       time: parseUpdateOrCreatedOn(item),
     },
+    createdByHelm: item.createdByHelm,
   };
 };
 
-const ExtraButton = ({ onDelete }: { onDelete: () => void }) => {
+const ExtraButton = ({
+  onDelete,
+  item,
+}: {
+  onDelete: () => void;
+  item: BaseType;
+}) => {
+  console.log(item);
   return (
     <ResourceExtraAction
+      disabled={!!item.createdByHelm}
       options={[
         {
           label: 'Delete',
@@ -111,6 +121,7 @@ const GridView = ({
                           onDelete={() => {
                             onDelete(item);
                           }}
+                          item={item}
                         />
                       )
                     }
@@ -165,11 +176,17 @@ const ListView = ({
             name: 'name',
             className: listClass.title,
           },
+          {
+            render: () => 'Managed by',
+            name: 'managedBy',
+            className: 'flex-1 min-w-[30px] flex items-center justify-center',
+          },
           {
             render: () => 'Entries',
             name: 'entries',
             className: 'flex-1 min-w-[30px] flex items-center justify-center',
           },
+
           {
             render: () => 'Updated',
             name: 'updated',
@@ -182,7 +199,7 @@ const ListView = ({
           },
         ],
         rows: items.map((i) => {
-          const { name, id, entries, updateInfo } = parseItem(i);
+          const { name, id, entries, updateInfo, createdByHelm } = parseItem(i);
           return {
             onClick: () => {
               onClick(i);
@@ -193,6 +210,12 @@ const ListView = ({
               name: {
                 render: () => <ListTitleV2 title={name} />,
               },
+              managedBy: {
+                render: () =>
+                  createdByHelm ? (
+                    <Chip item={'helm-chart'} label="Helm chart" />
+                  ) : null,
+              },
               entries: {
                 render: () => <ListItemV2 data={entries} />,
               },
@@ -209,7 +232,7 @@ const ListView = ({
                 ? {
                     action: {
                       render: () => (
-                        <ExtraButton onDelete={() => onDelete(i)} />
+                        <ExtraButton onDelete={() => onDelete(i)} item={i} />
                       ),
                     },
                   }
@@ -233,7 +256,7 @@ const SecretResourcesV2 = ({
   linkComponent = null,
 }: Omit<IResource, 'onDelete'>) => {
   const [showDeleteDialog, setShowDeleteDialog] = useState<BaseType | null>(
-    null
+    null,
   );
 
   const api = useConsoleApi();
@@ -245,9 +268,9 @@ const SecretResourcesV2 = ({
   useWatchReload(
     items.map((i) => {
       return `account:${account}.environment:${environment}.secret:${parseName(
-        i
+        i,
       )}`;
-    })
+    }),
   );
 
   const props: IResource = {
diff --git a/src/apps/console/routes/_main+/$account+/env+/$environment+/secret.$secret/resources.tsx b/src/apps/console/routes/_main+/$account+/env+/$environment+/secret.$secret/resources.tsx
index 4aaf9cd9c..15cdd29c1 100644
--- a/src/apps/console/routes/_main+/$account+/env+/$environment+/secret.$secret/resources.tsx
+++ b/src/apps/console/routes/_main+/$account+/env+/$environment+/secret.$secret/resources.tsx
@@ -17,6 +17,9 @@ import {
   IShowDialog,
 } from '~/console/components/types.d';
 import Handle from './handle';
+import { ISecret, ISecrets } from '~/console/server/gql/queries/secret-queries';
+import { ExtractNodeType } from '~/console/server/r-utils/common';
+import { NN } from '~/root/lib/types/common';
 
 // const RESOURCE_NAME = 'secret';
 
@@ -26,6 +29,7 @@ interface IResourceBase {
   deleteItem: (item: ICSBase) => void;
   restoreItem: (item: ICSBase) => void;
   searchText: string;
+  orgItem: ISecret;
 }
 
 interface IShowSecretDialog extends Omit<IAlertModal, 'setShow'> {
@@ -51,13 +55,15 @@ type OnAction = ({
 type IExtraButton = {
   onAction: OnAction;
   item: [string, ICSValueExtended];
+  orgItem: ISecret;
 };
 
-const ExtraButton = ({ onAction, item }: IExtraButton) => {
+const ExtraButton = ({ onAction, item, orgItem }: IExtraButton) => {
   const iconSize = 16;
 
   return item[1].newvalue || item[1].delete ? (
     <ResourceExtraAction
+      disabled={!!orgItem.createdByHelm}
       options={[
         {
           label: 'Restore',
@@ -85,6 +91,7 @@ const ExtraButton = ({ onAction, item }: IExtraButton) => {
     />
   ) : (
     <ResourceExtraAction
+      disabled={!!orgItem.createdByHelm}
       options={[
         {
           label: 'Edit',
@@ -184,7 +191,7 @@ const ValueComponent = ({
 //   );
 // };
 
-const ListView = ({ items, onAction, onShow }: IResource) => {
+const ListView = ({ items, onAction, onShow, orgItem }: IResource) => {
   return (
     <ListV2.Root
       data={{
@@ -222,7 +229,13 @@ const ListView = ({ items, onAction, onShow }: IResource) => {
                 ),
               },
               action: {
-                render: () => <ExtraButton onAction={onAction} item={item} />,
+                render: () => (
+                  <ExtraButton
+                    onAction={onAction}
+                    item={item}
+                    orgItem={orgItem}
+                  />
+                ),
               },
             },
           };
@@ -238,6 +251,7 @@ const SecretItemResources = ({
   deleteItem,
   editItem,
   restoreItem,
+  orgItem,
 }: IResourceBase) => {
   const [showSecret, setShowSecret] = useState<IShowSecretDialog>({
     show: false,
@@ -259,7 +273,7 @@ const SecretItemResources = ({
           return true;
         }
         return false;
-      })
+      }),
     );
   }, [searchText, modifiedItems]);
 
@@ -281,6 +295,7 @@ const SecretItemResources = ({
     deleteItem,
     editItem,
     restoreItem,
+    orgItem,
     onShow,
     onAction: ({ action, item }) => {
       const data = {
diff --git a/src/apps/console/routes/_main+/$account+/env+/$environment+/secret.$secret/route.tsx b/src/apps/console/routes/_main+/$account+/env+/$environment+/secret.$secret/route.tsx
index 6f6371ef6..8d6cb02dc 100644
--- a/src/apps/console/routes/_main+/$account+/env+/$environment+/secret.$secret/route.tsx
+++ b/src/apps/console/routes/_main+/$account+/env+/$environment+/secret.$secret/route.tsx
@@ -81,7 +81,7 @@ const ConfigBody = ({ secret }: { secret: ISecret }) => {
               newvalue: null,
             },
           };
-        }, {})
+        }, {}),
       );
     } catch {
       //
@@ -97,7 +97,7 @@ const ConfigBody = ({ secret }: { secret: ISecret }) => {
       (mi) =>
         mi.delete ||
         mi.insert ||
-        (mi.newvalue != null && mi.newvalue !== mi.value)
+        (mi.newvalue != null && mi.newvalue !== mi.value),
     ).length;
   };
 
@@ -123,7 +123,7 @@ const ConfigBody = ({ secret }: { secret: ISecret }) => {
                     data: modifiedItems,
                   })
                 }
-                disabled={success}
+                disabled={success || !!secret.createdByHelm}
               />
               {changesCount() > 0 && !success && (
                 <Button
@@ -151,7 +151,7 @@ const ConfigBody = ({ secret }: { secret: ISecret }) => {
                           [key]: val.newvalue ? val.newvalue : val.value,
                         };
                       },
-                      {}
+                      {},
                     );
                     if (!environment) {
                       throw new Error('Project or Environment is required!.');
@@ -191,6 +191,7 @@ const ConfigBody = ({ secret }: { secret: ISecret }) => {
         tools={<Tools searchText={searchText} setSearchText={setSearchText} />}
       >
         <Resources
+          orgItem={secret}
           searchText={searchText.trim()}
           modifiedItems={modifiedItems}
           editItem={(item, value) => {
diff --git a/src/apps/console/routes/_main+/$account+/env+/$environment+/services/exposed-service.tsx b/src/apps/console/routes/_main+/$account+/env+/$environment+/services/exposed-service.tsx
new file mode 100644
index 000000000..f4e021f7f
--- /dev/null
+++ b/src/apps/console/routes/_main+/$account+/env+/$environment+/services/exposed-service.tsx
@@ -0,0 +1,130 @@
+import { useEffect } from 'react';
+import { IconButton } from '@kloudlite/design-system/atoms/button';
+import { usePagination } from '@kloudlite/design-system/molecule/pagination';
+import { cn } from '@kloudlite/design-system/utils';
+import List from '~/console/components/list';
+import NoResultsFound from '~/console/components/no-results-found';
+import {
+  ChevronLeft,
+  ChevronRight,
+  SmileySad,
+} from '~/console/components/icons';
+import { parseValue } from '~/console/page-components/util';
+import { ISetState } from '~/console/page-components/app-states';
+import { NumberInput } from '@kloudlite/design-system/atoms/input';
+import { Github__Com___Kloudlite___Operator___Apis___Crds___V1__SvcInterceptPortMappingsIn as InterceptServiceIn } from '~/root/src/generated/gql/server';
+
+export type exposedPortsType = InterceptServiceIn;
+
+interface IExposedPortList {
+  exposedPorts: exposedPortsType[];
+  setExposedPorts: ISetState<exposedPortsType[]>;
+}
+const ExposedPortList = ({
+  exposedPorts,
+  setExposedPorts,
+}: IExposedPortList) => {
+  const { page, hasNext, hasPrevious, onNext, onPrev, setItems } =
+    usePagination({
+      items: exposedPorts,
+      itemsPerPage: 5,
+    });
+
+  const updateDevPort = (p: exposedPortsType) => {
+    setExposedPorts((s) =>
+      s.map((d) => (p.servicePort === d.servicePort ? p : d)),
+    );
+  };
+
+  useEffect(() => {
+    setItems(exposedPorts);
+  }, [exposedPorts]);
+  return (
+    <div className="flex flex-col gap-lg bg-surface-basic-default">
+      {exposedPorts.length > 0 && (
+        <List.Root
+          className="min-h-[347px] !shadow-none"
+          header={
+            <div className="flex flex-row items-center justify-between w-full">
+              <div className="text-text-strong bodyMd flex-1">
+                Exposed ports
+              </div>
+              <div className="flex flex-row items-center">
+                <IconButton
+                  icon={<ChevronLeft />}
+                  size="xs"
+                  variant="plain"
+                  onClick={() => onPrev()}
+                  disabled={!hasPrevious}
+                />
+                <IconButton
+                  icon={<ChevronRight />}
+                  size="xs"
+                  variant="plain"
+                  onClick={() => onNext()}
+                  disabled={!hasNext}
+                />
+              </div>
+            </div>
+          }
+        >
+          {page.map((ep, index) => {
+            return (
+              <List.Row
+                className={cn({
+                  '!border-b': index < 4,
+                  '!rounded-b-none': index < 4,
+                })}
+                key={ep.servicePort}
+                columns={[
+                  {
+                    key: `${index}-column-1`,
+                    className: 'flex-1',
+                    render: () => (
+                      <div className="flex flex-row gap-md items-center bodyMd text-text-soft">
+                        <span>Container: </span>
+                        {ep.servicePort}
+                      </div>
+                    ),
+                  },
+                  {
+                    key: `${index}-column-2`,
+                    className: 'flex-1',
+                    render: () => (
+                      <div className="flex flex-row gap-md items-center bodyMd text-text-soft">
+                        <span>Device: </span>
+                        <NumberInput
+                          value={ep.devicePort}
+                          onChange={(value) =>
+                            updateDevPort({
+                              devicePort: parseValue(value.target.value, 0),
+                              servicePort: ep.servicePort,
+                            })
+                          }
+                        />
+                      </div>
+                    ),
+                  },
+                ]}
+              />
+            );
+          })}
+        </List.Root>
+      )}
+      {exposedPorts.length === 0 && (
+        <div className="rounded border-border-default border min-h-[347px] flex flex-row items-center justify-center">
+          <NoResultsFound
+            title={null}
+            subtitle="No ports are exposed currently"
+            compact
+            image={<SmileySad size={32} weight={1} />}
+            shadow={false}
+            border={false}
+          />
+        </div>
+      )}
+    </div>
+  );
+};
+
+export default ExposedPortList;
diff --git a/src/apps/console/routes/_main+/$account+/env+/$environment+/services/handle-intercept-service.tsx b/src/apps/console/routes/_main+/$account+/env+/$environment+/services/handle-intercept-service.tsx
index aae670062..a69de67ac 100644
--- a/src/apps/console/routes/_main+/$account+/env+/$environment+/services/handle-intercept-service.tsx
+++ b/src/apps/console/routes/_main+/$account+/env+/$environment+/services/handle-intercept-service.tsx
@@ -17,9 +17,11 @@ import { useOutletContext } from '@remix-run/react';
 import { ISetState } from '~/console/page-components/app-states';
 import { useReload } from '~/root/lib/client/helpers/reloader';
 import { IEnvironmentContext } from '../_layout';
-import ExposedPortList, { exposedPortsType } from '../workloads+/apps/network';
 import { toast } from '@kloudlite/design-system/molecule/toast';
 import { IServiceBinding } from '~/console/server/gql/queries/service-binding-queries';
+import { NN } from '~/root/lib/types/common';
+import { Github__Com___Kloudlite___Operator___Apis___Crds___V1__SvcInterceptPortMappingsIn as InterceptServiceIn } from '~/root/src/generated/gql/server';
+import ExposedPortList from './exposed-service';
 
 type IDialog = {
   service?: ExtractNodeType<IServiceBinding>;
@@ -27,6 +29,8 @@ type IDialog = {
   setVisible: ISetState<boolean>;
 };
 
+export type exposedPortsType = NN<InterceptServiceIn>;
+
 const Root = (props: IDialog) => {
   const { visible, setVisible, service } = props;
 
@@ -49,13 +53,15 @@ const Root = (props: IDialog) => {
   const [ports, setPorts] = useState<exposedPortsType[]>([]);
 
   useEffect(() => {
-    console.log("here",)
     if (service) {
       setPorts(
         service.spec?.ports?.map((s) => {
           return {
-            appPort: s.port,
-            devicePort: service.interceptStatus?.portMappings?.find((f) => f.containerPort === s.port)?.servicePort || s.port
+            devicePort: s.port,
+            servicePort:
+              service.interceptStatus?.portMappings?.find(
+                (f) => f.devicePort === s.port,
+              )?.servicePort || s.port,
           };
         }) || [],
       );
@@ -75,8 +81,8 @@ const Root = (props: IDialog) => {
   } = useForm({
     initialValues: service
       ? {
-        deviceName: '',
-      }
+          deviceName: '',
+        }
       : {},
     validationSchema: Yup.object({
       deviceName: Yup.string().required(),
@@ -97,7 +103,7 @@ const Root = (props: IDialog) => {
           envName: parseName(environment),
           serviceName,
           interceptTo: `${values.deviceName}.device.local`,
-          portMappings: ports.map((p) => ({ containerPort: p.appPort, servicePort: p.devicePort }))
+          portMappings: ports,
         });
         if (e) {
           throw e[0];
@@ -114,7 +120,7 @@ const Root = (props: IDialog) => {
 
   useEffect(() => {
     if (devices.length) {
-      console.log(devices.length)
+      console.log(devices.length);
       setValues((v) => ({ ...v, deviceName: parseName(devices[0]) }));
     }
   }, [dData]);
diff --git a/src/apps/console/routes/_main+/$account+/env+/$environment+/services/services-resource-v2.tsx b/src/apps/console/routes/_main+/$account+/env+/$environment+/services/services-resource-v2.tsx
index b82eb0c4e..ce1c1a718 100644
--- a/src/apps/console/routes/_main+/$account+/env+/$environment+/services/services-resource-v2.tsx
+++ b/src/apps/console/routes/_main+/$account+/env+/$environment+/services/services-resource-v2.tsx
@@ -13,7 +13,9 @@ import Grid from '~/console/components/grid';
 import { LinkBreak, Repeat } from '~/console/components/icons';
 import ListGridView from '~/console/components/list-grid-view';
 import ListV2 from '~/console/components/listV2';
-import ResourceExtraAction, { IResourceExtraItem } from '~/console/components/resource-extra-action';
+import ResourceExtraAction, {
+  IResourceExtraItem,
+} from '~/console/components/resource-extra-action';
 import {
   ExtractNodeType,
   parseName,
@@ -35,9 +37,9 @@ const RESOURCE_NAME = 'managed resource';
 type BaseType = ExtractNodeType<IServiceBinding>;
 
 const parseItem = (item: BaseType) => {
-  console.log("svcbinding", item)
+  console.log('svcbinding', item);
   return {
-    name: item.spec?.serviceRef?.name || "",
+    name: item.spec?.serviceRef?.name || '',
     serviceHost: item.serviceHost,
     updateInfo: {
       time: parseUpdateOrCreatedOn(item),
@@ -61,8 +63,7 @@ type IExtraButton = {
 const ExtraButton = ({ onAction, item }: IExtraButton) => {
   const iconSize = 16;
 
-  let options: IResourceExtraItem[] = [
-  ]
+  let options: IResourceExtraItem[] = [];
 
   if (item.interceptStatus?.intercepted) {
     options = [
@@ -88,19 +89,16 @@ const ExtraButton = ({ onAction, item }: IExtraButton) => {
     ];
   }
 
-  return (
-    <ResourceExtraAction
-      options={options}
-    />
-  );
+  return <ResourceExtraAction options={options} />;
 };
 
-
 const InterceptPortView = ({
   ports = [],
   devName = '',
 }: {
-  ports: NN<NN<ExtractNodeType<IServiceBinding>['interceptStatus']>['portMappings']>;
+  ports: NN<
+    NN<ExtractNodeType<IServiceBinding>['interceptStatus']>['portMappings']
+  >;
   devName: string;
 }) => {
   return (
@@ -115,9 +113,9 @@ const InterceptPortView = ({
             <div className="flex flex-row gap-md py-md">
               {ports?.map((d) => {
                 return (
-                  <Badge className="shrink-0" key={d.containerPort}>
+                  <Badge className="shrink-0" key={d.servicePort}>
                     <div>
-                      {d.containerPort} → {d.servicePort}
+                      {d.servicePort} → {d.devicePort}
                     </div>
                   </Badge>
                 );
@@ -235,7 +233,7 @@ const ListView = ({ items = [], onAction }: IResource) => {
                 render: () => <ListTitleV2 title={name} />,
               },
               serviceHost: {
-                render: () => <ServiceView service={serviceHost || ""} />
+                render: () => <ServiceView service={serviceHost || ''} />,
               },
               intercept: {
                 render: () =>
@@ -263,10 +261,9 @@ const ListView = ({ items = [], onAction }: IResource) => {
 };
 
 const ServiceBindingsResourcesV2 = ({ items = [] }: { items: BaseType[] }) => {
-
-  const { environment, account } = useOutletContext<IEnvironmentContext>()
-  const api = useConsoleApi()
-  const reload = useReload()
+  const { environment, account } = useOutletContext<IEnvironmentContext>();
+  const api = useConsoleApi();
+  const reload = useReload();
   const [visible, setVisible] = useState(false);
   const [mi, setItem] = useState<ExtractNodeType<IServiceBinding>>();
 
@@ -283,29 +280,29 @@ const ServiceBindingsResourcesV2 = ({ items = [] }: { items: BaseType[] }) => {
           envName: parseName(environment),
           interceptTo: item.interceptStatus?.toAddr,
           serviceName: item.spec?.serviceRef?.name,
-          portMappings: item.interceptStatus.portMappings
-        })
+          portMappings: item.interceptStatus.portMappings,
+        });
         if (errors) {
-          throw errors[0]
+          throw errors[0];
         }
-        toast.success("Service intercept is removed.")
-        reload()
+        toast.success('Service intercept is removed.');
+        reload();
       }
     } catch (e) {
-      handleError(e)
+      handleError(e);
     }
-  }
+  };
 
   const props: IResource = {
     items,
     onAction: ({ action, item }) => {
       switch (action) {
         case 'intercept':
-          setItem(item)
-          setVisible(true)
+          setItem(item);
+          setVisible(true);
           break;
         case 'remove_intercept':
-          removeIntercept(item)
+          removeIntercept(item);
           break;
         default:
           break;
@@ -325,7 +322,6 @@ const ServiceBindingsResourcesV2 = ({ items = [] }: { items: BaseType[] }) => {
           service: mi,
         }}
       />
-
     </>
   );
 };
diff --git a/src/apps/console/routes/_main+/$account+/env+/$environment+/workloads+/apps/handle-intercept.tsx b/src/apps/console/routes/_main+/$account+/env+/$environment+/workloads+/apps/handle-intercept.tsx
index feb101ce3..5700e53cc 100644
--- a/src/apps/console/routes/_main+/$account+/env+/$environment+/workloads+/apps/handle-intercept.tsx
+++ b/src/apps/console/routes/_main+/$account+/env+/$environment+/workloads+/apps/handle-intercept.tsx
@@ -53,6 +53,7 @@ const Root = (props: IDialog) => {
       setPorts(
         app.spec.services?.map((s) => {
           return {
+            protocol: 'TCP',
             appPort: s.port,
             devicePort:
               app.spec.intercept?.portMappings?.find(
diff --git a/src/apps/console/routes/_main+/$account+/env+/$environment+/workloads+/apps/network.tsx b/src/apps/console/routes/_main+/$account+/env+/$environment+/workloads+/apps/network.tsx
index 95858a104..3295e0eec 100644
--- a/src/apps/console/routes/_main+/$account+/env+/$environment+/workloads+/apps/network.tsx
+++ b/src/apps/console/routes/_main+/$account+/env+/$environment+/workloads+/apps/network.tsx
@@ -9,14 +9,14 @@ import {
   ChevronRight,
   SmileySad,
 } from '~/console/components/icons';
-import { IApp } from '~/console/server/gql/queries/app-queries';
 import { NN } from '~/root/lib/types/common';
 import { ExtractArrayType, parseValue } from '~/console/page-components/util';
 import { ISetState } from '~/console/page-components/app-states';
 import { NumberInput } from '@kloudlite/design-system/atoms/input';
+import { AppIn } from '~/root/src/generated/gql/server';
 
 export type exposedPortsType = ExtractArrayType<
-  NN<NN<IApp['spec']['intercept']>['portMappings']>
+  NN<NN<AppIn['spec']['intercept']>['portMappings']>
 >;
 
 interface IExposedPortList {
@@ -100,6 +100,7 @@ const ExposedPortList = ({
                             updateDevPort({
                               devicePort: parseValue(value.target.value, 0),
                               appPort: ep.appPort,
+                              protocol: 'TCP',
                             })
                           }
                         />
diff --git a/src/apps/console/routes/_main+/$account+/env+/$environment+/workloads+/helm-chart+/$helmchart+/settings+/values/route.tsx b/src/apps/console/routes/_main+/$account+/env+/$environment+/workloads+/helm-chart+/$helmchart+/settings+/values/route.tsx
index 7a9b8f319..4143c0893 100644
--- a/src/apps/console/routes/_main+/$account+/env+/$environment+/workloads+/helm-chart+/$helmchart+/settings+/values/route.tsx
+++ b/src/apps/console/routes/_main+/$account+/env+/$environment+/workloads+/helm-chart+/$helmchart+/settings+/values/route.tsx
@@ -1,4 +1,4 @@
-import { Box, BoxPrimitive } from '~/console/components/common-console-components';
+import { BoxPrimitive } from '~/console/components/common-console-components';
 import HelmChartLayout from '../helm-chart-layout';
 import useForm, { dummyEvent } from '~/root/lib/client/hooks/use-form';
 import { useHelmChartState } from '../../useHelmChartContext';
@@ -10,76 +10,66 @@ import yaml from 'js-yaml';
 import { useEffect, useRef } from 'react';
 import { LoadingPlaceHolder } from '~/console/components/loading';
 import Yup from '~/root/lib/server/helpers/yup';
-import { DISCARD_ACTIONS, useUnsavedChanges } from '~/root/lib/client/hooks/use-unsaved-changes';
+import {
+  DISCARD_ACTIONS,
+  useUnsavedChanges,
+} from '~/root/lib/client/hooks/use-unsaved-changes';
 import { parseName } from '~/console/server/r-utils/common';
 
-
 const SettingValues = () => {
   const { performAction } = useUnsavedChanges();
 
   const editorRef = useRef<any>();
 
-  const { helmChart, readOnlyHelmChart, setHelmChart } = useHelmChartState()
-
-  const { values: helmValues, isLoading } =
-    useFetchHelmValue({
-      packageId: helmChart?.metadata?.annotations?.[
-        keyconstants.helmChartRepoPackageId
-      ]
-      ,
-      version: helmChart.spec?.chartVersion,
-    });
+  const { helmChart, readOnlyHelmChart, setHelmChart } = useHelmChartState();
 
+  const { values: helmValues, isLoading } = useFetchHelmValue({
+    packageId:
+      helmChart?.metadata?.annotations?.[keyconstants.helmChartRepoPackageId],
+    version: helmChart.spec?.chartVersion,
+  });
 
   const { values, handleChange, submit, resetValues } = useForm({
     initialValues: {
-      activeTab: 'defaults',
+      activeTab: 'values',
       values:
         Object.keys(helmChart.spec?.values).length > 0
           ? yaml.dump(helmChart.spec?.values)
           : '',
-
     },
     validationSchema: Yup.object({}),
     onSubmit(val) {
       setHelmChart({
         ...helmChart,
         spec: {
-          chartName: helmChart.spec?.chartName || "",
-          chartRepoURL: helmChart.spec?.chartRepoURL || "",
-          chartVersion: helmChart.spec?.chartVersion || "",
-          values: val.values
-            ? yaml.load(val.values, { json: true })
-            : {}
-        }
-      })
-    }
-  })
-
+          chartName: helmChart.spec?.chartName || '',
+          chartRepoURL: helmChart.spec?.chartRepoURL || '',
+          chartVersion: helmChart.spec?.chartVersion || '',
+          values: val.values ? yaml.load(val.values, { json: true }) : {},
+        },
+      });
+    },
+  });
 
   useEffect(() => {
     submit();
   }, [values]);
 
-
   const reset = () => {
     resetValues({
       values:
         Object.keys(readOnlyHelmChart.spec?.values).length > 0
           ? yaml.dump(readOnlyHelmChart.spec?.values)
           : '',
-
     });
-  }
+  };
 
   useEffect(() => {
     if (performAction === DISCARD_ACTIONS.DISCARD_CHANGES) {
-      reset()
+      reset();
     }
   }, [performAction]);
 
-
-
   const valueEditorProps = {
     height: '400px',
     options: {
@@ -108,13 +98,24 @@ const SettingValues = () => {
                 onChange={(e) => {
                   handleChange('activeTab')(dummyEvent(e));
                 }}
-                items={[
-                  { label: 'Defaults', value: 'defaults' },
-                  {
-                    label: 'Values',
-                    value: 'values',
-                  },
-                ]}
+                items={
+                  helmChart?.metadata?.annotations?.[
+                    keyconstants.helmChartRepoPackageId
+                  ]
+                    ? [
+                        { label: 'Defaults', value: 'defaults' },
+                        {
+                          label: 'Values',
+                          value: 'values',
+                        },
+                      ]
+                    : [
+                        {
+                          label: 'Values',
+                          value: 'values',
+                        },
+                      ]
+                }
               />
               <CodeEditorClient
                 {...valueEditorProps}
@@ -152,7 +153,6 @@ const SettingValues = () => {
             </div>
           )}
         </div>
-
       </BoxPrimitive>
     </HelmChartLayout>
   );
diff --git a/src/apps/console/routes/_main+/$account+/env+/$environment+/workloads+/helm-charts/helm-utils/use-fetch-helmcharts.tsx b/src/apps/console/routes/_main+/$account+/env+/$environment+/workloads+/helm-charts/helm-utils/use-fetch-helmcharts.tsx
index 6a15e4375..c64f8ce95 100644
--- a/src/apps/console/routes/_main+/$account+/env+/$environment+/workloads+/helm-charts/helm-utils/use-fetch-helmcharts.tsx
+++ b/src/apps/console/routes/_main+/$account+/env+/$environment+/workloads+/helm-charts/helm-utils/use-fetch-helmcharts.tsx
@@ -18,7 +18,7 @@ type IHelmChart = Array<{
 
 const useFetchHelmCharts = (
   { repoUrl }: { repoUrl?: string },
-  onFetch?: (data: IHelmChart) => void
+  onFetch?: (data: IHelmChart) => void,
 ) => {
   const [loading, setLoading] = useState(false);
   const [error, setError] = useState(false);
diff --git a/src/apps/console/routes/_main+/$account+/env+/$environment+/workloads+/new-helm-chart/route.tsx b/src/apps/console/routes/_main+/$account+/env+/$environment+/workloads+/new-helm-chart/route.tsx
index a244fa890..1a2fe8031 100644
--- a/src/apps/console/routes/_main+/$account+/env+/$environment+/workloads+/new-helm-chart/route.tsx
+++ b/src/apps/console/routes/_main+/$account+/env+/$environment+/workloads+/new-helm-chart/route.tsx
@@ -52,7 +52,7 @@ const repoRenderer = ({
 const filterUniqueVersions = (versions: IHelmDoc['entries']['keys']) => {
   return versions.filter(
     (obj, index, self) =>
-      index === self.findIndex((t) => t.version === obj.version)
+      index === self.findIndex((t) => t.version === obj.version),
   );
 };
 
@@ -70,6 +70,7 @@ const HelmChartLayout = () => {
   >([]);
 
   const [selectedRepo, setSelectedRepo] = useState<string>('');
+  const [packageId, setPackageId] = useState<string>('');
 
   const [repoSearchText, setRepoSearchText] = useState('');
 
@@ -86,7 +87,7 @@ const HelmChartLayout = () => {
   });
 
   const { values: helmValues } = useFetchHelmValue({
-    packageId: selectedRepo,
+    packageId,
     version: chartVersion?.value,
   });
 
@@ -105,7 +106,7 @@ const HelmChartLayout = () => {
       chartVersion: '',
       values: '',
       isNameError: false,
-      activeTab: 'defaults',
+      activeTab: 'values',
     },
     validationSchema: Yup.object({
       displayName: Yup.string().required(),
@@ -115,21 +116,21 @@ const HelmChartLayout = () => {
         'Chart Name is required',
         (v) => {
           return !(currentStep === 2 && !v);
-        }
+        },
       ),
       chartRepoURL: Yup.string().test(
         'required',
         'Chart Repo Url is required',
         (v) => {
           return !(currentStep === 2 && !v);
-        }
+        },
       ),
       chartVersion: Yup.string().test(
         'required',
         'Chart Version is required',
         (v) => {
           return !(currentStep === 2 && !v);
-        }
+        },
       ),
     }),
 
@@ -143,7 +144,7 @@ const HelmChartLayout = () => {
               metadata: {
                 name: val.name,
                 annotations: {
-                  [keyconstants.helmChartRepoPackageId]: selectedRepo,
+                  [keyconstants.helmChartRepoPackageId]: packageId,
                 },
               },
               spec: {
@@ -284,11 +285,11 @@ const HelmChartLayout = () => {
               onChange={(value) => {
                 if (!repoSearchText.startsWith('https://')) {
                   handleChange('chartRepoURL')(dummyEvent(value.repoUrl));
+                  setPackageId(value.value);
                 } else {
                   handleChange('chartRepoURL')(dummyEvent(value.value));
                 }
                 setSelectedRepo(value.value);
-                /* setHelmCharts([]); */
               }}
               onSearch={(text) => {
                 setRepoSearchText(text);
@@ -309,7 +310,9 @@ const HelmChartLayout = () => {
               placeholder="Chart name"
               searchable
               size="lg"
-              disabled={helmCharts.length === 0 || repoLoading || !selectedRepo}
+              disabled={
+                helmCharts.length === 0 || repoLoading || !values.chartRepoURL
+              }
               // @ts-ignore
               value={chartName?.value}
               options={async () => helmCharts}
@@ -369,13 +372,22 @@ const HelmChartLayout = () => {
                     onChange={(e) => {
                       handleChange('activeTab')(dummyEvent(e));
                     }}
-                    items={[
-                      { label: 'Defaults', value: 'defaults' },
-                      {
-                        label: 'Values',
-                        value: 'values',
-                      },
-                    ]}
+                    items={
+                      packageId
+                        ? [
+                            { label: 'Defaults', value: 'defaults' },
+                            {
+                              label: 'Values',
+                              value: 'values',
+                            },
+                          ]
+                        : [
+                            {
+                              label: 'Values',
+                              value: 'values',
+                            },
+                          ]
+                    }
                   />
                   <CodeEditorClient
                     {...valueEditorProps}
diff --git a/src/apps/console/routes/_main+/$account+/new-managed-service/_index.tsx b/src/apps/console/routes/_main+/$account+/new-managed-service/_index.tsx
index 4ef51a7c9..53406dc43 100644
--- a/src/apps/console/routes/_main+/$account+/new-managed-service/_index.tsx
+++ b/src/apps/console/routes/_main+/$account+/new-managed-service/_index.tsx
@@ -79,8 +79,8 @@ const RenderField = ({
             dummyEvent(
               `${parseFloat(target.value) * (field.multiplier || 1)}${
                 field.unit
-              }`
-            )
+              }`,
+            ),
           );
         }}
         suffix={field.displayUnit}
@@ -121,16 +121,16 @@ const RenderField = ({
                     dummyEvent(
                       `${parseFloat(target.value) * (field.multiplier || 1)}${
                         field.unit
-                      }`
-                    )
+                      }`,
+                    ),
                   );
                   if (qos) {
                     onChange(`res.${field.name}.max`)(
                       dummyEvent(
                         `${parseFloat(target.value) * (field.multiplier || 1)}${
                           field.unit
-                        }`
-                      )
+                        }`,
+                      ),
                     );
                   }
                 }}
@@ -150,8 +150,8 @@ const RenderField = ({
                       dummyEvent(
                         `${parseFloat(target.value) * (field.multiplier || 1)}${
                           field.unit
-                        }`
-                      )
+                        }`,
+                      ),
                     );
                   }}
                   suffix={field.displayUnit}
@@ -390,7 +390,7 @@ const ReviewView = ({
 }) => {
   const renderFieldView = () => {
     const fields = Object.entries(values.res).filter(
-      ([k, _v]) => !['resources'].includes(k)
+      ([k, _v]) => !['resources'].includes(k),
     );
     if (fields.length > 0) {
       return (
@@ -608,7 +608,7 @@ const ManagedServiceLayout = () => {
           'Cluster name is required',
           (v) => {
             return !(currentStep === 2 && !v);
-          }
+          },
         ),
         selectedTemplate: Yup.object({}).required('Template is required.'),
         // @ts-ignore
@@ -628,9 +628,9 @@ const ManagedServiceLayout = () => {
                     (acc: any, curr: any) => {
                       return { ...acc, [curr.name]: curr };
                     },
-                    {}
-                  )
-                )
+                    {},
+                  ),
+                ),
               );
             }
 
@@ -663,9 +663,6 @@ const ManagedServiceLayout = () => {
                 clusterName: val.clusterName,
                 spec: {
                   msvcSpec: {
-                    nodeSelector: {
-                      [keyconstants.nodepoolName]: val.nodepoolName,
-                    },
                     serviceTemplate: {
                       apiVersion: selectedTemplate.template.apiVersion,
                       kind: selectedTemplate.template.kind,
@@ -713,7 +710,7 @@ const ManagedServiceLayout = () => {
           ...flatM(
             selectedTemplate?.template?.fields.reduce((acc, curr) => {
               return { ...acc, [curr.name]: curr };
-            }, {})
+            }, {}),
           ),
         },
       }));
diff --git a/src/apps/console/routes/_main+/$account+/new-managed-service/managed-service-layout-v2.tsx b/src/apps/console/routes/_main+/$account+/new-managed-service/managed-service-layout-v2.tsx
index 4a2d16c78..1e5da4cc6 100644
--- a/src/apps/console/routes/_main+/$account+/new-managed-service/managed-service-layout-v2.tsx
+++ b/src/apps/console/routes/_main+/$account+/new-managed-service/managed-service-layout-v2.tsx
@@ -103,7 +103,7 @@ const repoRenderer = ({
 const filterUniqueVersions = (versions: IHelmDoc['entries']['keys']) => {
   return versions.filter(
     (obj, index, self) =>
-      index === self.findIndex((t) => t.version === obj.version)
+      index === self.findIndex((t) => t.version === obj.version),
   );
 };
 
@@ -201,8 +201,8 @@ const RenderHelmFields = ({
                     Search for or enter the repo url
                   </div>
                 }
-              // error={!!errors[fieldKey]}
-              // message={errors[fieldKey]}
+                // error={!!errors[fieldKey]}
+                // message={errors[fieldKey]}
               />
             );
           case 'chart.name':
@@ -351,9 +351,10 @@ const RenderField = ({
         onChange={({ target }) => {
           onChange(`res.${field.input}`)(
             dummyEvent(
-              `${parseFloat(target.value) * (field.multiplier || 1)}${field.unit
-              }`
-            )
+              `${parseFloat(target.value) * (field.multiplier || 1)}${
+                field.unit
+              }`,
+            ),
           );
         }}
         suffix={field.displayUnit}
@@ -396,8 +397,9 @@ const RenderField = ({
   if (field.type === 'int-range') {
     return (
       <div className="flex flex-col gap-md">
-        <div className="bodyMd-medium text-text-default">{`${field.label}${field.required ? ' *' : ''
-          }`}</div>
+        <div className="bodyMd-medium text-text-default">{`${field.label}${
+          field.required ? ' *' : ''
+        }`}</div>
         <div className="flex flex-row gap-xl items-center">
           <div className="flex flex-row gap-xl items-end flex-1 ">
             <div className="flex-1">
@@ -410,16 +412,18 @@ const RenderField = ({
                 onChange={({ target }) => {
                   onChange(`res.${field.input}.min`)(
                     dummyEvent(
-                      `${parseFloat(target.value) * (field.multiplier || 1)}${field.unit
-                      }`
-                    )
+                      `${parseFloat(target.value) * (field.multiplier || 1)}${
+                        field.unit
+                      }`,
+                    ),
                   );
                   if (qos) {
                     onChange(`res.${field.input}.max`)(
                       dummyEvent(
-                        `${parseFloat(target.value) * (field.multiplier || 1)}${field.unit
-                        }`
-                      )
+                        `${parseFloat(target.value) * (field.multiplier || 1)}${
+                          field.unit
+                        }`,
+                      ),
                     );
                   }
                 }}
@@ -437,9 +441,10 @@ const RenderField = ({
                 onChange={({ target }) => {
                   onChange(`res.${field.input}.max`)(
                     dummyEvent(
-                      `${parseFloat(target.value) * (field.multiplier || 1)}${field.unit
-                      }`
-                    )
+                      `${parseFloat(target.value) * (field.multiplier || 1)}${
+                        field.unit
+                      }`,
+                    ),
                   );
                 }}
                 suffix={field.displayUnit}
@@ -454,8 +459,9 @@ const RenderField = ({
   if (field.type === 'Resource') {
     return (
       <div className="flex flex-col gap-md">
-        <div className="bodyMd-medium text-text-default">{`${field.label}${field.required ? ' *' : ''
-          }`}</div>
+        <div className="bodyMd-medium text-text-default">{`${field.label}${
+          field.required ? ' *' : ''
+        }`}</div>
         <div className="flex flex-row gap-xl items-center">
           <div className="flex flex-row gap-xl items-end flex-1 ">
             <div className="flex-1">
@@ -468,16 +474,18 @@ const RenderField = ({
                 onChange={({ target }) => {
                   onChange(`res.${field.input}.min`)(
                     dummyEvent(
-                      `${parseFloat(target.value) * (field.multiplier || 1)}${field.unit
-                      }`
-                    )
+                      `${parseFloat(target.value) * (field.multiplier || 1)}${
+                        field.unit
+                      }`,
+                    ),
                   );
                   if (qos) {
                     onChange(`res.${field.input}.max`)(
                       dummyEvent(
-                        `${parseFloat(target.value) * (field.multiplier || 1)}${field.unit
-                        }`
-                      )
+                        `${parseFloat(target.value) * (field.multiplier || 1)}${
+                          field.unit
+                        }`,
+                      ),
                     );
                   }
                 }}
@@ -495,9 +503,10 @@ const RenderField = ({
                   onChange={({ target }) => {
                     onChange(`res.${field.input}.max`)(
                       dummyEvent(
-                        `${parseFloat(target.value) * (field.multiplier || 1)}${field.unit
-                        }`
-                      )
+                        `${parseFloat(target.value) * (field.multiplier || 1)}${
+                          field.unit
+                        }`,
+                      ),
                     );
                   }}
                   suffix={field.displayUnit}
@@ -513,7 +522,7 @@ const RenderField = ({
                 setQos(_value);
                 if (_value) {
                   onChange(`res.${field.input}.max`)(
-                    dummyEvent(`${value.min}`)
+                    dummyEvent(`${value.min}`),
                   );
                 }
               }}
@@ -707,7 +716,7 @@ const FieldView = ({
         showclear
         error={!!errors.clusterName}
         message={errors.clusterName}
-      // loading={cIsLoading || byokCIsLoading}
+        // loading={cIsLoading || byokCIsLoading}
       />
       {getRenderField()}
 
@@ -734,7 +743,7 @@ const ReviewView = ({
 }) => {
   const renderFieldView = () => {
     const fields = Object.entries(values.res).filter(
-      ([k, _v]) => !['resources'].includes(k)
+      ([k, _v]) => !['resources'].includes(k),
     );
     if (fields.length > 0) {
       return (
@@ -914,15 +923,15 @@ export const ManagedServiceLayoutV2 = () => {
   const getClusters = useCallback(async () => {
     ensureAccountClientSide(params);
     try {
-      const { data: cl, errors } = await api.listAllClusters({})
+      const { data: cl, errors } = await api.listAllClusters({});
       if (errors) {
-        throw errors[0]
+        throw errors[0];
       }
 
       const data = parseNodes(cl).map((c) => {
-        const n = parseName(c)
-        let cs = clustersMap[n]
-        return ({
+        const n = parseName(c);
+        let cs = clustersMap[n];
+        return {
           label: c.displayName,
           value: n,
           ready: cs?.isOnline,
@@ -934,8 +943,8 @@ export const ManagedServiceLayoutV2 = () => {
               disabled={disabled}
             />
           ),
-        })
-      })
+        };
+      });
 
       setClusterList(data);
     } catch (err) {
@@ -972,7 +981,7 @@ export const ManagedServiceLayoutV2 = () => {
           'Cluster name is required',
           (v) => {
             return !(currentStep === 2 && !v);
-          }
+          },
         ),
         selectedPlugin: Yup.object({}).required('Plugin is required.'),
         // @ts-ignore
@@ -992,9 +1001,9 @@ export const ManagedServiceLayoutV2 = () => {
                     (acc: any, curr: any) => {
                       return { ...acc, [curr.name]: curr };
                     },
-                    {}
-                  )
-                )
+                    {},
+                  ),
+                ),
               );
             }
 
@@ -1034,9 +1043,6 @@ export const ManagedServiceLayoutV2 = () => {
                 clusterName: val.clusterName,
                 spec: {
                   msvcSpec: {
-                    nodeSelector: {
-                      [keyconstants.nodepoolName]: val.nodepoolName,
-                    },
                     serviceTemplate: {
                       apiVersion: selectedPlugin.plugin.spec.apiVersion,
                       kind: selectedPlugin.plugin.spec.services[0].kind,
@@ -1085,8 +1091,8 @@ export const ManagedServiceLayoutV2 = () => {
               (acc, curr) => {
                 return { ...acc, [curr.input]: curr };
               },
-              {}
-            )
+              {},
+            ),
           ),
         },
       }));
diff --git a/src/apps/console/server/gql/queries/app-queries.ts b/src/apps/console/server/gql/queries/app-queries.ts
index ea99a6819..ee0ba1fe2 100644
--- a/src/apps/console/server/gql/queries/app-queries.ts
+++ b/src/apps/console/server/gql/queries/app-queries.ts
@@ -33,7 +33,7 @@ export const appQueries = (executor: IExecutor) => ({
     {
       transformer: (data: ConsoleRestartAppQuery) => data.core_restartApp,
       vars: (_: ConsoleRestartAppQueryVariables) => {},
-    }
+    },
   ),
   createApp: executor(
     gql`
@@ -46,7 +46,7 @@ export const appQueries = (executor: IExecutor) => ({
     {
       transformer: (data: ConsoleCreateAppMutation) => data.core_createApp,
       vars(_: ConsoleCreateAppMutationVariables) {},
-    }
+    },
   ),
 
   updateApp: executor(
@@ -62,7 +62,7 @@ export const appQueries = (executor: IExecutor) => ({
         return data.core_updateApp;
       },
       vars(_: ConsoleUpdateAppMutationVariables) {},
-    }
+    },
   ),
   interceptApp: executor(
     gql`
@@ -86,7 +86,7 @@ export const appQueries = (executor: IExecutor) => ({
       transformer: (data: ConsoleInterceptAppMutation) =>
         data.core_interceptApp,
       vars(_: ConsoleInterceptAppMutationVariables) {},
-    }
+    },
   ),
   removeDeviceIntercepts: executor(
     gql`
@@ -101,7 +101,7 @@ export const appQueries = (executor: IExecutor) => ({
       transformer: (data: ConsoleRemoveDeviceInterceptsMutation) =>
         data.core_removeDeviceIntercepts,
       vars(_: ConsoleRemoveDeviceInterceptsMutationVariables) {},
-    }
+    },
   ),
   deleteApp: executor(
     gql`
@@ -112,7 +112,7 @@ export const appQueries = (executor: IExecutor) => ({
     {
       transformer: (data: ConsoleDeleteAppMutation) => data.core_deleteApp,
       vars(_: ConsoleDeleteAppMutationVariables) {},
-    }
+    },
   ),
   getApp: executor(
     gql`
@@ -218,6 +218,7 @@ export const appQueries = (executor: IExecutor) => ({
               portMappings {
                 devicePort
                 appPort
+                protocol
               }
             }
             nodeSelector
@@ -296,7 +297,7 @@ export const appQueries = (executor: IExecutor) => ({
         return data.core_getApp;
       },
       vars(_: ConsoleGetAppQueryVariables) {},
-    }
+    },
   ),
   listApps: executor(
     gql`
@@ -413,6 +414,7 @@ export const appQueries = (executor: IExecutor) => ({
                   portMappings {
                     appPort
                     devicePort
+                    protocol
                   }
                   toDevice
                 }
@@ -589,6 +591,6 @@ export const appQueries = (executor: IExecutor) => ({
     {
       transformer: (data: ConsoleListAppsQuery) => data.core_listApps,
       vars(_: ConsoleListAppsQueryVariables) {},
-    }
+    },
   ),
 });
diff --git a/src/apps/console/server/gql/queries/cluster-managed-services-queries.ts b/src/apps/console/server/gql/queries/cluster-managed-services-queries.ts
index ef127b6f2..def14ce3a 100644
--- a/src/apps/console/server/gql/queries/cluster-managed-services-queries.ts
+++ b/src/apps/console/server/gql/queries/cluster-managed-services-queries.ts
@@ -54,19 +54,11 @@ export const clusterManagedServicesQueries = (executor: IExecutor) => ({
           recordVersion
           spec {
             msvcSpec {
-              nodeSelector
               serviceTemplate {
                 apiVersion
                 kind
                 spec
               }
-              tolerations {
-                effect
-                key
-                operator
-                tolerationSeconds
-                value
-              }
             }
             targetNamespace
           }
@@ -79,7 +71,7 @@ export const clusterManagedServicesQueries = (executor: IExecutor) => ({
         return data.infra_getClusterManagedService;
       },
       vars(_: ConsoleGetClusterMSvQueryVariables) {},
-    }
+    },
   ),
   createClusterMSv: executor(
     gql`
@@ -95,7 +87,7 @@ export const clusterManagedServicesQueries = (executor: IExecutor) => ({
       transformer: (data: ConsoleCreateClusterMSvMutation) =>
         data.infra_createClusterManagedService,
       vars(_: ConsoleCreateClusterMSvMutationVariables) {},
-    }
+    },
   ),
   cloneClusterMSv: executor(
     gql`
@@ -119,7 +111,7 @@ export const clusterManagedServicesQueries = (executor: IExecutor) => ({
       transformer: (data: ConsoleCloneClusterMSvMutation) =>
         data.infra_cloneClusterManagedService,
       vars(_: ConsoleCloneClusterMSvMutationVariables) {},
-    }
+    },
   ),
   updateClusterMSv: executor(
     gql`
@@ -135,7 +127,7 @@ export const clusterManagedServicesQueries = (executor: IExecutor) => ({
       transformer: (data: ConsoleUpdateClusterMSvMutation) =>
         data.infra_updateClusterManagedService,
       vars(_: ConsoleUpdateClusterMSvMutationVariables) {},
-    }
+    },
   ),
   listClusterMSvs: executor(
     gql`
@@ -181,19 +173,11 @@ export const clusterManagedServicesQueries = (executor: IExecutor) => ({
               recordVersion
               spec {
                 msvcSpec {
-                  nodeSelector
                   serviceTemplate {
                     apiVersion
                     kind
                     spec
                   }
-                  tolerations {
-                    effect
-                    key
-                    operator
-                    tolerationSeconds
-                    value
-                  }
                 }
                 targetNamespace
               }
@@ -244,7 +228,7 @@ export const clusterManagedServicesQueries = (executor: IExecutor) => ({
       transformer: (data: ConsoleListClusterMSvsQuery) =>
         data.infra_listClusterManagedServices,
       vars(_: ConsoleListClusterMSvsQueryVariables) {},
-    }
+    },
   ),
   deleteClusterMSv: executor(
     gql`
@@ -256,6 +240,6 @@ export const clusterManagedServicesQueries = (executor: IExecutor) => ({
       transformer: (data: ConsoleDeleteClusterMSvMutation) =>
         data.infra_deleteClusterManagedService,
       vars(_: ConsoleDeleteClusterMSvMutationVariables) {},
-    }
+    },
   ),
 });
diff --git a/src/apps/console/server/gql/queries/secret-queries.ts b/src/apps/console/server/gql/queries/secret-queries.ts
index ce7bb3827..a120cb2e5 100644
--- a/src/apps/console/server/gql/queries/secret-queries.ts
+++ b/src/apps/console/server/gql/queries/secret-queries.ts
@@ -36,6 +36,7 @@ export const secretQueries = (executor: IExecutor) => ({
               }
               creationTime
               displayName
+              createdByHelm
               stringData
               environmentName
               isReadyOnly
@@ -72,7 +73,7 @@ export const secretQueries = (executor: IExecutor) => ({
     {
       transformer: (data: ConsoleListSecretsQuery) => data.core_listSecrets,
       vars(_: ConsoleListSecretsQueryVariables) {},
-    }
+    },
   ),
   createSecret: executor(
     gql`
@@ -86,7 +87,7 @@ export const secretQueries = (executor: IExecutor) => ({
       transformer: (data: ConsoleCreateSecretMutation) =>
         data.core_createSecret,
       vars(_: ConsoleCreateSecretMutationVariables) {},
-    }
+    },
   ),
 
   getSecret: executor(
@@ -98,6 +99,7 @@ export const secretQueries = (executor: IExecutor) => ({
           environmentName
           immutable
           markedForDeletion
+          createdByHelm
           metadata {
             annotations
             creationTimestamp
@@ -115,7 +117,7 @@ export const secretQueries = (executor: IExecutor) => ({
     {
       transformer: (data: ConsoleGetSecretQuery) => data.core_getSecret,
       vars(_: ConsoleGetSecretQueryVariables) {},
-    }
+    },
   ),
   updateSecret: executor(
     gql`
@@ -128,7 +130,7 @@ export const secretQueries = (executor: IExecutor) => ({
     {
       transformer: (data: ConsoleUpdateSecretMutation) => data,
       vars(_: ConsoleUpdateSecretMutationVariables) {},
-    }
+    },
   ),
   deleteSecret: executor(
     gql`
@@ -139,6 +141,6 @@ export const secretQueries = (executor: IExecutor) => ({
     {
       transformer: (data: ConsoleDeleteSecretMutation) => data,
       vars(_: ConsoleDeleteSecretMutationVariables) {},
-    }
+    },
   ),
 });
diff --git a/src/apps/console/server/gql/queries/service-binding-queries.ts b/src/apps/console/server/gql/queries/service-binding-queries.ts
index 18465c50d..83ce134ff 100644
--- a/src/apps/console/server/gql/queries/service-binding-queries.ts
+++ b/src/apps/console/server/gql/queries/service-binding-queries.ts
@@ -5,7 +5,7 @@ import {
   ConsoleListServiceBindingQuery,
   ConsoleListServiceBindingQueryVariables,
   ConsoleInterceptServiceMutation,
-  ConsoleInterceptServiceMutationVariables
+  ConsoleInterceptServiceMutationVariables,
 } from '~/root/src/generated/gql/server';
 
 export type IServiceBinding = NN<
@@ -35,7 +35,7 @@ export const serviceBindingQueries = (executor: IExecutor) => ({
               interceptStatus {
                 intercepted
                 portMappings {
-                  containerPort
+                  devicePort
                   servicePort
                 }
                 toAddr
@@ -99,28 +99,48 @@ export const serviceBindingQueries = (executor: IExecutor) => ({
     {
       transformer: (data: ConsoleListServiceBindingQuery) =>
         data.core_listServiceBindings,
-      vars(_: ConsoleListServiceBindingQueryVariables) { },
+      vars(_: ConsoleListServiceBindingQueryVariables) {},
     },
   ),
   interceptService: executor(
-    gql`mutation Core_createServiceIntercept($envName: String!, $serviceName: String!, $interceptTo: String!, $portMappings: [Github__com___kloudlite___operator___apis___crds___v1__SvcInterceptPortMappingsIn!]) {
-  core_createServiceIntercept(envName: $envName, serviceName: $serviceName, interceptTo: $interceptTo, portMappings: $portMappings)
-}`,
+    gql`
+      mutation Core_createServiceIntercept(
+        $envName: String!
+        $serviceName: String!
+        $interceptTo: String!
+        $portMappings: [Github__com___kloudlite___operator___apis___crds___v1__SvcInterceptPortMappingsIn!]
+      ) {
+        core_createServiceIntercept(
+          envName: $envName
+          serviceName: $serviceName
+          interceptTo: $interceptTo
+          portMappings: $portMappings
+        )
+      }
+    `,
     {
       transformer: (data: ConsoleInterceptServiceMutation) =>
         data.core_createServiceIntercept,
-      vars(_: ConsoleInterceptServiceMutationVariables) { },
+      vars(_: ConsoleInterceptServiceMutationVariables) {},
     },
   ),
 
   removeInterceptService: executor(
-    gql`mutation Core_deleteServiceIntercept($envName: String!, $serviceName: String!) {
-  core_deleteServiceIntercept(envName: $envName, serviceName: $serviceName)
-}`,
+    gql`
+      mutation Core_deleteServiceIntercept(
+        $envName: String!
+        $serviceName: String!
+      ) {
+        core_deleteServiceIntercept(
+          envName: $envName
+          serviceName: $serviceName
+        )
+      }
+    `,
     {
       transformer: (data: ConsoleInterceptServiceMutation) =>
         data.core_createServiceIntercept,
-      vars(_: ConsoleInterceptServiceMutationVariables) { },
+      vars(_: ConsoleInterceptServiceMutationVariables) {},
     },
-  )
+  ),
 });
diff --git a/src/generated/gql/sdl.graphql b/src/generated/gql/sdl.graphql
index a3bcde5b4..1ed0cbed0 100644
--- a/src/generated/gql/sdl.graphql
+++ b/src/generated/gql/sdl.graphql
@@ -365,6 +365,7 @@ type Config {
   apiVersion: String
   binaryData: Map
   createdBy: Github__com___kloudlite___api___common__CreatedOrUpdatedBy!
+  createdByHelm: String
   creationTime: Date!
   data: Map
   displayName: String!
@@ -748,6 +749,7 @@ type Github__com___kloudlite___api___apps___console___internal___entities__Manag
 
 type Github__com___kloudlite___api___apps___console___internal___entities__ManagedServicePluginInputField {
   defaultValue: Any
+  description: String
   displayUnit: String
   input: String!
   label: String!
@@ -761,6 +763,7 @@ type Github__com___kloudlite___api___apps___console___internal___entities__Manag
 
 input Github__com___kloudlite___api___apps___console___internal___entities__ManagedServicePluginInputFieldIn {
   defaultValue: Any
+  description: String
   displayUnit: String
   input: String!
   label: String!
@@ -1430,11 +1433,13 @@ input Github__com___kloudlite___operator___apis___crds___v1__AppContainerIn {
 type Github__com___kloudlite___operator___apis___crds___v1__AppInterceptPortMappings {
   appPort: Int!
   devicePort: Int!
+  protocol: Github__com___kloudlite___operator___apis___crds___v1__ServiceProtocol!
 }
 
 input Github__com___kloudlite___operator___apis___crds___v1__AppInterceptPortMappingsIn {
   appPort: Int!
   devicePort: Int!
+  protocol: Github__com___kloudlite___operator___apis___crds___v1__ServiceProtocol!
 }
 
 type Github__com___kloudlite___operator___apis___crds___v1__AppRouter {
@@ -1764,17 +1769,13 @@ input Github__com___kloudlite___operator___apis___crds___v1__ManagedResourceSpec
 }
 
 type Github__com___kloudlite___operator___apis___crds___v1__ManagedServiceSpec {
-  nodeSelector: Map
   plugin: Github__com___kloudlite___operator___apis___crds___v1__ServiceTemplate
   serviceTemplate: Github__com___kloudlite___operator___apis___crds___v1__ServiceTemplate
-  tolerations: [K8s__io___api___core___v1__Toleration!]
 }
 
 input Github__com___kloudlite___operator___apis___crds___v1__ManagedServiceSpecIn {
-  nodeSelector: Map
   plugin: Github__com___kloudlite___operator___apis___crds___v1__ServiceTemplateIn
   serviceTemplate: Github__com___kloudlite___operator___apis___crds___v1__ServiceTemplateIn
-  tolerations: [K8s__io___api___core___v1__TolerationIn!]
 }
 
 type Github__com___kloudlite___operator___apis___crds___v1__MresResourceTemplate {
@@ -1863,6 +1864,11 @@ input Github__com___kloudlite___operator___apis___crds___v1__RouterSpecIn {
   routes: [Github__com___kloudlite___operator___apis___crds___v1__RouteIn!]
 }
 
+enum Github__com___kloudlite___operator___apis___crds___v1__ServiceProtocol {
+  TCP
+  UDP
+}
+
 type Github__com___kloudlite___operator___apis___crds___v1__ServiceTemplate {
   apiVersion: String!
   export: Github__com___kloudlite___operator___pkg___plugin__Export
@@ -1886,12 +1892,12 @@ input Github__com___kloudlite___operator___apis___crds___v1__ShellProbeIn {
 }
 
 type Github__com___kloudlite___operator___apis___crds___v1__SvcInterceptPortMappings {
-  containerPort: Int!
+  devicePort: Int!
   servicePort: Int!
 }
 
 input Github__com___kloudlite___operator___apis___crds___v1__SvcInterceptPortMappingsIn {
-  containerPort: Int!
+  devicePort: Int!
   servicePort: Int!
 }
 
@@ -2070,12 +2076,12 @@ input Github__com___kloudlite___operator___pkg___operator__StatusIn {
 }
 
 type Github__com___kloudlite___operator___pkg___plugin__Export {
-  kv: Map!
+  template: String!
   viaSecret: String
 }
 
 input Github__com___kloudlite___operator___pkg___plugin__ExportIn {
-  kv: Map!
+  template: String!
   viaSecret: String
 }
 
@@ -4419,6 +4425,7 @@ type Secret {
   accountName: String!
   apiVersion: String
   createdBy: Github__com___kloudlite___api___common__CreatedOrUpdatedBy!
+  createdByHelm: String
   creationTime: Date!
   data: Map
   displayName: String!
@@ -4541,6 +4548,7 @@ type ServiceBinding {
   clusterName: String!
   creationTime: Date!
   environmentName: String!
+  environmentNamespace: String!
   id: ID!
   interceptStatus: Github__com___kloudlite___api___apps___console___internal___entities__InterceptStatus
   kind: String
diff --git a/src/generated/gql/server.ts b/src/generated/gql/server.ts
index 420583b8d..e0d922584 100644
--- a/src/generated/gql/server.ts
+++ b/src/generated/gql/server.ts
@@ -90,6 +90,9 @@ export type Github__Com___Kloudlite___Api___Apps___Container____Registry___Inter
 export type Github__Com___Kloudlite___Operator___Apis___Crds___V1__ConfigOrSecret =
   'config' | 'pvc' | 'secret';
 
+export type Github__Com___Kloudlite___Operator___Apis___Crds___V1__ServiceProtocol =
+  'TCP' | 'UDP';
+
 export type K8s__Io___Api___Core___V1__TaintEffect =
   | 'NoExecute'
   | 'NoSchedule'
@@ -601,6 +604,7 @@ export type Github__Com___Kloudlite___Operator___Apis___Crds___V1__AppInterceptP
   {
     appPort: Scalars['Int']['input'];
     devicePort: Scalars['Int']['input'];
+    protocol: Github__Com___Kloudlite___Operator___Apis___Crds___V1__ServiceProtocol;
   };
 
 export type Github__Com___Kloudlite___Operator___Apis___Crds___V1__AppRouterIn =
@@ -954,7 +958,7 @@ export type SecretVariableIn = {
 
 export type Github__Com___Kloudlite___Operator___Apis___Crds___V1__SvcInterceptPortMappingsIn =
   {
-    containerPort: Scalars['Int']['input'];
+    devicePort: Scalars['Int']['input'];
     servicePort: Scalars['Int']['input'];
   };
 
@@ -1110,10 +1114,8 @@ export type Github__Com___Kloudlite___Operator___Apis___Crds___V1__ClusterManage
 
 export type Github__Com___Kloudlite___Operator___Apis___Crds___V1__ManagedServiceSpecIn =
   {
-    nodeSelector?: InputMaybe<Scalars['Map']['input']>;
     plugin?: InputMaybe<Github__Com___Kloudlite___Operator___Apis___Crds___V1__ServiceTemplateIn>;
     serviceTemplate?: InputMaybe<Github__Com___Kloudlite___Operator___Apis___Crds___V1__ServiceTemplateIn>;
-    tolerations?: InputMaybe<Array<K8s__Io___Api___Core___V1__TolerationIn>>;
   };
 
 export type Github__Com___Kloudlite___Operator___Apis___Crds___V1__ServiceTemplateIn =
@@ -1125,7 +1127,7 @@ export type Github__Com___Kloudlite___Operator___Apis___Crds___V1__ServiceTempla
   };
 
 export type Github__Com___Kloudlite___Operator___Pkg___Plugin__ExportIn = {
-  kv: Scalars['Map']['input'];
+  template: Scalars['String']['input'];
   viaSecret?: InputMaybe<Scalars['String']['input']>;
 };
 
@@ -1316,6 +1318,7 @@ export type Github__Com___Kloudlite___Api___Apps___Console___Internal___Entities
 export type Github__Com___Kloudlite___Api___Apps___Console___Internal___Entities__ManagedServicePluginInputFieldIn =
   {
     defaultValue?: InputMaybe<Scalars['Any']['input']>;
+    description?: InputMaybe<Scalars['String']['input']>;
     displayUnit?: InputMaybe<Scalars['String']['input']>;
     input: Scalars['String']['input'];
     label: Scalars['String']['input'];
@@ -2878,7 +2881,11 @@ export type ConsoleGetAppQuery = {
       intercept?: {
         enabled?: boolean;
         toDevice?: string;
-        portMappings?: Array<{ devicePort: number; appPort: number }>;
+        portMappings?: Array<{
+          devicePort: number;
+          appPort: number;
+          protocol: Github__Com___Kloudlite___Operator___Apis___Crds___V1__ServiceProtocol;
+        }>;
       };
       services?: Array<{ port: number }>;
       tolerations?: Array<{
@@ -3028,7 +3035,11 @@ export type ConsoleListAppsQuery = {
           intercept?: {
             enabled?: boolean;
             toDevice?: string;
-            portMappings?: Array<{ appPort: number; devicePort: number }>;
+            portMappings?: Array<{
+              appPort: number;
+              devicePort: number;
+              protocol: Github__Com___Kloudlite___Operator___Apis___Crds___V1__ServiceProtocol;
+            }>;
           };
           router?: {
             backendProtocol?: string;
@@ -3468,6 +3479,7 @@ export type ConsoleListSecretsQuery = {
       node: {
         creationTime: any;
         displayName: string;
+        createdByHelm?: string;
         stringData?: any;
         environmentName: string;
         isReadyOnly: boolean;
@@ -3518,6 +3530,7 @@ export type ConsoleGetSecretQuery = {
     environmentName: string;
     immutable?: boolean;
     markedForDeletion?: boolean;
+    createdByHelm?: string;
     stringData?: any;
     type?: K8s__Io___Api___Core___V1__SecretType;
     metadata?: {
@@ -4806,15 +4819,7 @@ export type ConsoleGetClusterMSvQuery = {
     spec?: {
       targetNamespace: string;
       msvcSpec: {
-        nodeSelector?: any;
         serviceTemplate?: { apiVersion: string; kind: string; spec?: any };
-        tolerations?: Array<{
-          effect?: K8s__Io___Api___Core___V1__TaintEffect;
-          key?: string;
-          operator?: K8s__Io___Api___Core___V1__TolerationOperator;
-          tolerationSeconds?: number;
-          value?: string;
-        }>;
       };
     };
   };
@@ -4883,15 +4888,7 @@ export type ConsoleListClusterMSvsQuery = {
         spec?: {
           targetNamespace: string;
           msvcSpec: {
-            nodeSelector?: any;
             serviceTemplate?: { apiVersion: string; kind: string; spec?: any };
-            tolerations?: Array<{
-              effect?: K8s__Io___Api___Core___V1__TaintEffect;
-              key?: string;
-              operator?: K8s__Io___Api___Core___V1__TolerationOperator;
-              tolerationSeconds?: number;
-              value?: string;
-            }>;
           };
         };
         status?: {
@@ -6290,7 +6287,7 @@ export type ConsoleListServiceBindingQuery = {
         interceptStatus?: {
           intercepted?: boolean;
           toAddr: string;
-          portMappings?: Array<{ containerPort: number; servicePort: number }>;
+          portMappings?: Array<{ devicePort: number; servicePort: number }>;
         };
         metadata?: { name: string };
         spec?: {