Jelajahi Sumber

confirm provisioning w/ link to pricing info for AWS, GCP, DO

jusrhee 5 tahun lalu
induk
melakukan
cc4282e280

+ 0 - 2
dashboard/src/components/values-form/Helper.tsx

@@ -11,6 +11,4 @@ const StyledHelper = styled.div`
   font-size: 13px;
   margin-bottom: 15px;
   margin-top: 20px;
-  display: flex;
-  align-items: center;
 `;

+ 1 - 0
dashboard/src/main/home/launch/expanded-template/LaunchTemplate.tsx

@@ -844,6 +844,7 @@ const Warning = styled.span<{ highlight: boolean; makeFlush?: boolean }>`
 const Required = styled.div`
   margin-left: 8px;
   color: #fc4976;
+  dislay: inline-block;
 `;
 
 const Link = styled.a`

+ 1 - 0
dashboard/src/main/home/new-project/NewProject.tsx

@@ -182,6 +182,7 @@ const Placeholder = styled.div`
 const Required = styled.div`
   margin-left: 8px;
   color: #fc4976;
+  display: inline-block;
 `;
 
 const Highlight = styled.div`

+ 3 - 4
dashboard/src/main/home/provisioner/AWSFormSection.tsx

@@ -304,7 +304,7 @@ class AWSFormSection extends Component<PropsType, StateType> {
           />
           <Br />
           <Heading>AWS Resources</Heading>
-          <Helper>Porter will provision the following AWS resources</Helper>
+          <Helper>Porter will provision the following AWS resources in your own cloud.</Helper>
           <CheckboxList
             options={provisionOptions}
             selected={selectedInfras}
@@ -313,8 +313,8 @@ class AWSFormSection extends Component<PropsType, StateType> {
             }}
           />
           <Helper>
-            Important: AWS will bill you for any provisioned resources. Learn more about EKS pricing
-            <Highlight href="https://aws.amazon.com/eks/pricing/" target="_blank">here</Highlight>
+            By default, Porter creates a cluster with three t2.medium instances (2vCPUs and 4GB RAM each). AWS will bill you for any provisioned resources. Learn more about EKS pricing
+            <Highlight href="https://aws.amazon.com/eks/pricing/" target="_blank">here</Highlight>.
           </Helper>
           <CheckboxRow
             required={true}
@@ -346,7 +346,6 @@ const Highlight = styled.a`
   cursor: pointer;
   text-decoration: none;
   margin-left: 5px;
-  margin-right: 10px;
 `;
 
 const Padding = styled.div`

+ 7 - 4
dashboard/src/main/home/provisioner/DOFormSection.tsx

@@ -81,6 +81,10 @@ export default class DOFormSection extends Component<PropsType, StateType> {
   };
 
   checkFormDisabled = () => {
+    if (!this.state.provisionConfirmed) {
+      return true;
+    }
+    
     let { selectedInfras } = this.state;
     let { projectName } = this.props;
     if (projectName || projectName === "") {
@@ -188,7 +192,7 @@ export default class DOFormSection extends Component<PropsType, StateType> {
           <Br />
           <Heading>DigitalOcean Resources</Heading>
           <Helper>
-            Porter will provision the following DigitalOcean resources
+            Porter will provision the following DigitalOcean resources in your own cloud.
           </Helper>
           <CheckboxList
             options={provisionOptions}
@@ -198,8 +202,8 @@ export default class DOFormSection extends Component<PropsType, StateType> {
             }}
           />
           <Helper>
-            Important: AWS will bill you for any provisioned resources. Learn more about EKS pricing
-            <Highlight href="https://aws.amazon.com/eks/pricing/" target="_blank">here</Highlight>
+            By default, Porter creates a cluster with three Standard (2vCPUs / 2GB RAM) droplets. DigitalOcean will bill you for any provisioned resources. Learn more about DOKS pricing
+            <Highlight href="https://www.digitalocean.com/products/kubernetes/" target="_blank">here</Highlight>.
           </Helper>
           <CheckboxRow
             required={true}
@@ -229,7 +233,6 @@ const Highlight = styled.a`
   cursor: pointer;
   text-decoration: none;
   margin-left: 5px;
-  margin-right: 10px;
 `;
 
 const Padding = styled.div`

+ 3 - 4
dashboard/src/main/home/provisioner/GCPFormSection.tsx

@@ -293,7 +293,7 @@ class GCPFormSection extends Component<PropsType, StateType> {
           />
           <Br />
           <Heading>GCP Resources</Heading>
-          <Helper>Porter will provision the following GCP resources</Helper>
+          <Helper>Porter will provision the following GCP resources in your own cloud.</Helper>
           <CheckboxList
             options={provisionOptions}
             selected={selectedInfras}
@@ -302,8 +302,8 @@ class GCPFormSection extends Component<PropsType, StateType> {
             }}
           />
           <Helper>
-            Important: AWS will bill you for any provisioned resources. Learn more about EKS pricing
-            <Highlight href="https://aws.amazon.com/eks/pricing/" target="_blank">here</Highlight>
+            By default, Porter creates a cluster with three e2-medium instances (2vCPUs and 4GB RAM each). Google Cloud will bill you for any provisioned resources. Learn more about GKE pricing
+            <Highlight href="https://cloud.google.com/kubernetes-engine/pricing" target="_blank">here</Highlight>.
           </Helper>
           <CheckboxRow
             required={true}
@@ -335,7 +335,6 @@ const Highlight = styled.a`
   cursor: pointer;
   text-decoration: none;
   margin-left: 5px;
-  margin-right: 10px;
 `;
 
 const Padding = styled.div`

+ 2 - 0
dashboard/src/main/home/provisioner/ProvisionerSettings.tsx

@@ -203,6 +203,7 @@ const PositionWrapper = styled.div<{ selectedProvider: string | null }>``;
 const Highlight = styled.div`
   margin-left: 5px;
   color: #8590ff;
+  display: inline-block;
   cursor: pointer;
 `;
 
@@ -219,6 +220,7 @@ const BlockList = styled.div`
 const Required = styled.div`
   margin-left: 8px;
   color: #fc4976;
+  display: inline-block;
 `;
 
 const Icon = styled.img<{ bw?: boolean }>`