Merge branch 'main' into feat/online-connectivity-dev

Author: shivani170

.env

@@ -71,3 +71,4 @@ FEATURE_AI_INTEGRATION_ENABLE=false
 LOGIN_PAGE_IMAGE=
 FEATURE_MANAGE_TRAFFIC_ENABLE=false
 FEATURE_REDFISH_NODE_ENABLE=false
+FEATURE_INFRA_PROVISION_INFO_BLOCK_HIDE=false

package.json

@@ -4,7 +4,7 @@
     "private": true,
     "homepage": "/dashboard",
     "dependencies": {
-        "@devtron-labs/devtron-fe-common-lib": "1.15.0-pre-4",
+        "@devtron-labs/devtron-fe-common-lib": "1.15.1-beta-2",
         "@esbuild-plugins/node-globals-polyfill": "0.2.3",
         "@rjsf/core": "^5.13.3",
         "@rjsf/utils": "^5.13.3",

src/Pages/GlobalConfigurations/ClustersAndEnvironments/CreateCluster/CreateCluster.component.tsx

@@ -28,8 +28,9 @@ const CreateClusterForm = importComponentFromFELibrary(
     'CreateClusterForm',
     () => (
         <EnterpriseTrialDialog
-            featureTitle="EKS Cluster"
-            featureDescription="With Devtron, you can effortlessly create an Amazon EKS cluster."
+            featureTitle="Create Kubernetes Cluster"
+            featureDescription="Use Devtron to easily create Kubernetes clusters on popular cloud providers. Simplify cluster
+                provisioning and management with a guided, user-friendly interface."
         />
     ),
     'function',
@@ -74,7 +75,7 @@ const CreateCluster = ({ handleReloadClusterList, handleRedirectOnModalClose }:
                         FooterComponent={FooterComponent}
                     />
                 )
-            case CreateClusterTypeEnum.CREATE_EKS_CLUSTER:
+            case CreateClusterTypeEnum.CREATE_CLUSTER:
                 return (
                     <CreateClusterForm
                         apiCallInProgress={apiCallInProgress}

src/Pages/GlobalConfigurations/ClustersAndEnvironments/CreateCluster/constants.tsx

@@ -12,18 +12,15 @@ export const SIDEBAR_CONFIG: SidebarConfigType = {
             </p>
         ),
     },
-    [CreateClusterTypeEnum.CREATE_EKS_CLUSTER]: {
-        title: 'Create EKS Cluster',
-        iconName: 'ic-cluster',
-        dataTestId: 'create-eks-cluster-tab',
+    [CreateClusterTypeEnum.CREATE_CLUSTER]: {
+        title: 'Create Kubernetes Cluster',
+        iconName: 'ic-new',
+        dataTestId: 'create-cluster-tab',
         body: (
-            <>
-                <p className="m-0">With Devtron, you can effortlessly create an Amazon EKS cluster.</p>
-                <p className="m-0">
-                    Amazon Elastic Kubernetes Service (Amazon EKS) is a fully managed Kubernetes service that enables
-                    you to run Kubernetes seamlessly in both AWS Cloud and on-premises data centers.
-                </p>
-            </>
+            <p className="m-0">
+                Use Devtron to easily create Kubernetes clusters on popular cloud providers. Simplify cluster
+                provisioning and management with a guided, user-friendly interface.
+            </p>
         ),
         isEnterprise: true,
     },

src/Pages/GlobalConfigurations/ClustersAndEnvironments/CreateCluster/types.ts

@@ -2,7 +2,7 @@ import { IconName } from '@devtron-labs/devtron-fe-common-lib'
 
 export enum CreateClusterTypeEnum {
     CONNECT_CLUSTER = 'connect-cluster',
-    CREATE_EKS_CLUSTER = 'create-eks-cluster',
+    CREATE_CLUSTER = 'create-cluster',
     ADD_ISOLATED_CLUSTER = 'add-isolated-cluster',
 }
 

src/config/routes.ts

@@ -17,7 +17,7 @@
 import { AppConfigProps, URLS as COMMON_URLS, EnvResourceType } from '@devtron-labs/devtron-fe-common-lib'
 import { generatePath } from 'react-router-dom'
 
-const CREATE_CLUSTER_PATH = 'create/cluster/:type(connect-cluster|create-eks-cluster|add-isolated-cluster)'
+const CREATE_CLUSTER_PATH = 'create/cluster/:type(connect-cluster|create-cluster|add-isolated-cluster)'
 
 export const URLS = {
     CHARTS: '/chart-store',

src/index.tsx

@@ -172,6 +172,7 @@ if (!window || !window._env_) {
         LOGIN_PAGE_IMAGE: '',
         FEATURE_MANAGE_TRAFFIC_ENABLE: true,
         FEATURE_REDFISH_NODE_ENABLE: false,
+        FEATURE_INFRA_PROVISION_INFO_BLOCK_HIDE: false,
     }
 }
 

yarn.lock

@@ -1125,10 +1125,10 @@
   dependencies:
     "@jridgewell/trace-mapping" "0.3.9"
 
-"@devtron-labs/[email protected].0-pre-4":
-  version "1.15.0-pre-4"
-  resolved "https://registry.yarnpkg.com/@devtron-labs/devtron-fe-common-lib/-/devtron-fe-common-lib-1.15.0-pre-4.tgz#d6a8b8fd33a2882ab4f710fc81dc816425b1ee23"
-  integrity sha512-6Y4f4TYcVKgQ9f0XLhVaCp0JIx6JdDhMb/ce4D0aeeWO42HHny3ImWsdXGnB5z/VJ1Iw38aAYjkiXoTENI0G+w==
+"@devtron-labs/[email protected].1-beta-2":
+  version "1.15.1-beta-2"
+  resolved "https://registry.yarnpkg.com/@devtron-labs/devtron-fe-common-lib/-/devtron-fe-common-lib-1.15.1-beta-2.tgz#a59f39d3e7ca2937a082d863b0dd9ce728646ba6"
+  integrity sha512-egpsymJYKpcFVdbPuDRza5YdyqUuyt/pxmM+fcIulPdahnA6k3f9ng2it1vbZWvCk1HO1/aG3OiM0OHy1EPH5A==
   dependencies:
     "@codemirror/lang-json" "6.0.1"
     "@codemirror/lang-yaml" "6.1.2"