Преглед изворни кода

Merge branch 'master' of github.com:porter-dev/porter into stacks-auto-refresh-built-image-workflow-file

Feroze Mohideen пре 2 година
родитељ
комит
26bc77fe08

+ 1 - 0
dashboard/src/components/GCPProvisionerSettings.tsx

@@ -42,6 +42,7 @@ import PreflightChecks from "./PreflightChecks";
 const locationOptions = [
   { value: "us-east1", label: "us-east1 (South Carolina, USA)" },
   { value: "us-east4", label: "us-east4 (Virginia, USA)" },
+  { value: "us-central1", label: "us-central1 (Iowa, USA)" },
   { value: "asia-south1", label: "asia-south1 (Mumbia, India)" },
 ];
 

+ 0 - 9
dashboard/src/components/ProvisionerSettings.tsx

@@ -10,8 +10,6 @@ import info from "assets/info-outlined.svg";
 
 import SelectRow from "components/form-components/SelectRow";
 import Heading from "components/form-components/Heading";
-import Helper from "components/form-components/Helper";
-import InputRow from "./form-components/InputRow";
 import {
   Contract,
   EnumKubernetesKind,
@@ -34,11 +32,8 @@ import Text from "./porter/Text";
 import Select from "./porter/Select";
 import Input from "./porter/Input";
 import Checkbox from "./porter/Checkbox";
-import { Certificate } from "crypto";
 import Tooltip from "./porter/Tooltip";
 import Icon from "./porter/Icon";
-import { set } from "traverse";
-import { load } from "js-yaml";
 import Loading from "./Loading";
 const regionOptions = [
   { value: "us-east-1", label: "US East (N. Virginia) us-east-1" },
@@ -82,7 +77,6 @@ const machineTypeOptions = [
 
 const clusterVersionOptions = [
   { value: "v1.24.0", label: "1.24.0" },
-  { value: "v1.25.0", label: "1.25.0" },
 ];
 
 type Props = RouteComponentProps & {
@@ -99,9 +93,7 @@ const ProvisionerSettings: React.FC<Props> = (props) => {
     currentCluster,
     setCurrentCluster,
     setShouldRefreshClusters,
-    setHasFinishedOnboarding,
   } = useContext(Context);
-  const [createStatus, setCreateStatus] = useState("");
   const [clusterName, setClusterName] = useState("");
   const [awsRegion, setAwsRegion] = useState("us-east-1");
   const [machineType, setMachineType] = useState("t3.medium");
@@ -436,7 +428,6 @@ const ProvisionerSettings: React.FC<Props> = (props) => {
           setAdditionalNodePolicies(nodeGroup.additionalPolicies);
         }
       });
-      setCreateStatus("");
       setClusterName(eksValues.clusterName);
       setAwsRegion(eksValues.region);
       setClusterVersion(eksValues.clusterVersion);

+ 1 - 4
dashboard/src/main/home/sidebar/ProjectSelectionModal.tsx

@@ -100,12 +100,9 @@ const ProjectSelectionModal: React.FC<Props> = ({
             setCurrentProject(project);
 
             const clusters_list = await updateClusterList(project.id);
-            console.log(clusters_list);
-
             if (clusters_list?.length > 0) {
               setCurrentCluster(clusters_list[0]);
               if (project.simplified_view_enabled) {
-                console.log("HERE BITCH")
                 pushFiltered(props, "/apps", ["project_id"], {});
               }
               else {
@@ -239,4 +236,4 @@ const I = styled.i`
   align-items: center;
   margin-right: 5px;
   justify-content: center;
-`;
+`;