feat: K8s client update

package.json

@@ -63,7 +63,7 @@
         "build": "NODE_OPTIONS=--max_old_space_size=4096 vite build",
         "serve": "vite preview",
         "build-light": "NODE_OPTIONS=--max_old_space_size=4096 GENERATE_SOURCEMAP=false vite build",
-        "build-k8s-app": "NODE_OPTIONS=--max_old_space_size=4096 GENERATE_SOURCEMAP=false VITE_K8S_CLIENT=true vite build",
+        "build-k8s-app": "NODE_OPTIONS=--max_old_space_size=4096 GENERATE_SOURCEMAP=false vite build --mode K8S_CLIENT",
         "test": "vitest test",
         "test-coverage:watch": "npm run test -- --coverage",
         "test-coverage": "npm run test -- --coverage --watchAll=false",

src/components/ClusterNodes/ClusterOverview.tsx

@@ -460,7 +460,7 @@ function ClusterOverview({ isSuperAdmin, selectedCluster }: ClusterOverviewProps
                     <GenericDescription
                         isClusterTerminal
                         clusterId={clusterId}
-                        isSuperAdmin={isSuperAdmin}
+                        isSuperAdmin={window._env_.K8S_CLIENT || isSuperAdmin}
                         descriptionId={descriptionData.descriptionId}
                         initialDescriptionText={descriptionData.descriptionText}
                         initialDescriptionUpdatedBy={descriptionData.descriptionUpdatedBy}

src/components/ClusterNodes/ClusterSelectionList.tsx

@@ -90,18 +90,22 @@ const ClusterSelectionList: React.FC<ClusterSelectionType> = ({
                     {/* NOTE: visible-hover plays with display prop; therefore need to set display: flex on a new div */}
                     <div className="cursor dc__visible-hover--child ml-8">
                         <div className="flexbox dc__align-items-center dc__gap-4">
-                            {!!clusterData.nodeCount && !clusterListLoader && isSuperAdmin && (
-                                <Tooltip alwaysShowTippyOnHover content="View terminal">
-                                    <div className="flex">
-                                        <TerminalIcon
-                                            data-testid={`cluster-terminal-${clusterData.name}`}
-                                            className="icon-dim-24 p-4 dc__no-shrink dc__hover-n100 br-4 dc__hover-color-n800 fill"
-                                            onClick={getOpenTerminalHandler(clusterData)}
-                                        />
-                                    </div>
-                                </Tooltip>
+                            {!!clusterData.nodeCount &&
+                                !clusterListLoader &&
+                                (isSuperAdmin || window._env_.K8S_CLIENT) && (
+                                    <Tooltip alwaysShowTippyOnHover content="View terminal">
+                                        <div className="flex">
+                                            <TerminalIcon
+                                                data-testid={`cluster-terminal-${clusterData.name}`}
+                                                className="icon-dim-24 p-4 dc__no-shrink dc__hover-n100 br-4 dc__hover-color-n800 fill"
+                                                onClick={getOpenTerminalHandler(clusterData)}
+                                            />
+                                        </div>
+                                    </Tooltip>
+                                )}
+                            {!window._env_.K8S_CLIENT && KubeConfigButton && (
+                                <KubeConfigButton clusterName={clusterData.name} />
                             )}
-                            {KubeConfigButton && <KubeConfigButton clusterName={clusterData.name} />}
                         </div>
                     </div>
                 </div>

src/components/ResourceBrowser/ResourceList/ResourceList.tsx

@@ -100,7 +100,7 @@ const ResourceList = () => {
         [clusterId, clusterOptions],
     )
 
-    const isSuperAdmin = !!userRole?.result.superAdmin
+    const isSuperAdmin = (selectedCluster.label && window._env_.K8S_CLIENT) || !!userRole?.result.superAdmin
 
     const isOverviewNodeType = nodeType === SIDEBAR_KEYS.overviewGVK.Kind.toLowerCase()
     const isTerminalNodeType = nodeType === AppDetailsTabs.terminal

src/components/cluster/ClusterForm.tsx

@@ -70,7 +70,6 @@ import { ReactComponent as InfoIcon } from '../../assets/icons/info-filled.svg'
 import ClusterInfoStepsModal from './ClusterInfoStepsModal'
 import { UPLOAD_STATE } from '@Pages/GlobalConfigurations/DeploymentCharts/types'
 import UserNameDropDownList from './UseNameListDropdown'
-import { clusterId } from '../ClusterNodes/__mocks__/clusterAbout.mock'
 import { getModuleInfo } from '../v2/devtronStackManager/DevtronStackManager.service'
 import { RemoteConnectionType } from '../dockerRegistry/dockerType'
 
@@ -140,7 +139,7 @@ export default function ClusterForm({
     const authenTicationType = prometheusAuth?.userName ? AuthenticationType.BASIC : AuthenticationType.ANONYMOUS
 
     const isDefaultCluster = (): boolean => {
-        return id == 1
+        return id == DEFAULT_CLUSTER_ID
     }
     const [deleting, setDeleting] = useState(false)
     const [confirmation, toggleConfirmation] = useState(false)
@@ -164,7 +163,7 @@ export default function ClusterForm({
 
     const [, grafanaModuleStatus] = useAsync(
         () => getModuleInfo(ModuleNameMap.GRAFANA),
-        [clusterId],
+        [DEFAULT_CLUSTER_ID],
         !window._env_.K8S_CLIENT,
     )
 
@@ -442,7 +441,7 @@ export default function ClusterForm({
     }
 
     const handleOnBlur = (e): void => {
-        if (id && id !== 1 && !e.target.value) {
+        if (id && id !== DEFAULT_CLUSTER_ID && !e.target.value) {
             e.target.value = DEFAULT_SECRET_PLACEHOLDER
         }
     }
@@ -735,9 +734,7 @@ export default function ClusterForm({
                                 name="token"
                                 value={
                                     id
-                                        ? id !== 1
-                                            ? DEFAULT_SECRET_PLACEHOLDER
-                                            : config?.bearer_token
+                                        ? config?.bearer_token
                                               ? config.bearer_token
                                               : ''
                                         : state.token.value
@@ -808,7 +805,7 @@ export default function ClusterForm({
                                         className="dc__resizable-textarea__with-max-height w-100"
                                         name="certificateAuthorityData"
                                         value={
-                                            id && id !== 1 && isTlsConnection
+                                            id && id !== DEFAULT_CLUSTER_ID && isTlsConnection
                                                 ? DEFAULT_SECRET_PLACEHOLDER
                                                 : state.certificateAuthorityData.value
                                         }
@@ -833,7 +830,7 @@ export default function ClusterForm({
                                         className="dc__resizable-textarea__with-max-height w-100"
                                         name="tlsClientKey"
                                         value={
-                                            id && id !== 1 && isTlsConnection
+                                            id && id !== DEFAULT_CLUSTER_ID && isTlsConnection
                                                 ? DEFAULT_SECRET_PLACEHOLDER
                                                 : state.tlsClientKey.value
                                         }
@@ -858,7 +855,7 @@ export default function ClusterForm({
                                         className="dc__resizable-textarea__with-max-height w-100"
                                         name="tlsClientCert"
                                         value={
-                                            id && id !== 1 && isTlsConnection
+                                            id && id !== DEFAULT_CLUSTER_ID && isTlsConnection
                                                 ? DEFAULT_SECRET_PLACEHOLDER
                                                 : state.tlsClientCert.value
                                         }

src/components/cluster/cluster.type.ts

@@ -20,7 +20,7 @@ import { OptionType } from '../app/types'
 
 export const POLLING_INTERVAL = 30000
 
-export const DEFAULT_CLUSTER_ID = 1
+export const DEFAULT_CLUSTER_ID = window._env_.K8S_CLIENT ? -1 : 1
 
 export const AuthenticationType = {
     BASIC: 'BASIC',

src/index.tsx

@@ -38,7 +38,7 @@ declare global {
 
 if (!window.__BASE_URL__ || !window.__ORCHESTRATOR_ROOT__) {
     window.__BASE_URL__ = import.meta.env.BASE_URL || '/dashboard'
-    window.__ORCHESTRATOR_ROOT__ = import.meta.env.VITE_ORCHESTRATOR_ROOT || 'orchestrator'
+    window.__ORCHESTRATOR_ROOT__ = import.meta.env.VITE_ORCHESTRATOR_ROOT || '/orchestrator'
     window.__GRAFANA_ORG_ID__ = import.meta.env.VITE_GRAFANA_ORG_ID || 2
 }
 

vite.config.mts

@@ -92,7 +92,7 @@ const jsToBottomNoModule = () => {
 
 // https://vitejs.dev/config/
 export default defineConfig(({ mode }) => {
-    process.env = { ...process.env, ...loadEnv(mode, process.cwd(), '') }
+    process.env = { ...process.env, ...loadEnv(mode, process.cwd(), ''), VITE_K8S_CLIENT: `${mode === 'K8S_CLIENT'}` }
     const baseConfig = {
         base: '/dashboard',
         preview: {