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

enable azure, bump kubernetes version, small fixes (#3650)

Co-authored-by: David Townley <davidtownley@Davids-MacBook-Air.local>
d-g-town пре 2 година
родитељ
комит
5c5472193d

+ 5 - 4
dashboard/src/components/AzureProvisionerSettings.tsx

@@ -55,7 +55,7 @@ const machineTypeOptions = [
   { value: "Standard_A4_v2", label: "Standard_A4_v2" },
 ];
 
-const clusterVersionOptions = [{ value: "v1.26.6", label: "v1.26.6" }, { value: "v1.24.9", label: "v1.24.9" }];
+const clusterVersionOptions = [{ value: "v1.27.3", label: "v1.27" }, { value: "v1.24.9", label: "v1.24" }];
 
 type Props = RouteComponentProps & {
   selectedClusterVersion?: Contract;
@@ -83,7 +83,7 @@ const AzureProvisionerSettings: React.FC<Props> = (props) => {
   const [minInstances, setMinInstances] = useState(1);
   const [maxInstances, setMaxInstances] = useState(10);
   const [cidrRange, setCidrRange] = useState("10.78.0.0/16");
-  const [clusterVersion, setClusterVersion] = useState("v1.26.6");
+  const [clusterVersion, setClusterVersion] = useState("v1.27.3");
   const [isReadOnly, setIsReadOnly] = useState(false);
   const [errorMessage, setErrorMessage] = useState<string>("");
   const [errorDetails, setErrorDetails] = useState<string>("");
@@ -183,7 +183,7 @@ const AzureProvisionerSettings: React.FC<Props> = (props) => {
           case: "aksKind",
           value: new AKS({
             clusterName: clusterName,
-            clusterVersion: clusterVersion || "v1.26.6",
+            clusterVersion: clusterVersion || "v1.27.3",
             cidrRange: cidrRange || "10.78.0.0/16",
             location: azureLocation,
             nodePools: [
@@ -368,6 +368,7 @@ const AzureProvisionerSettings: React.FC<Props> = (props) => {
               setActiveValue={setClusterVersion}
               label="Cluster version"
             />
+            <Spacer y={.75} />
             <SelectRow
               options={machineTypeOptions}
               width="350px"
@@ -516,7 +517,7 @@ const errorMessageToModal = (errorMessage: string) => {
           </Step>
           <Spacer y={1} />
           <Text color="helper">
-            We recommend an initial quota of 30 vCPUs for both Total Regional Cores and Standard Av2 Family.
+            We recommend an initial quota of 20 vCPUs for both Total Regional Cores and Standard Basv2 Family.
           </Text>
           <Spacer y={1} />
           <Step number={5}>

+ 1 - 4
dashboard/src/components/ProvisionerFlow.tsx

@@ -67,14 +67,12 @@ const ProvisionerFlow: React.FC<Props> = ({ }) => {
                   key={i}
                   disabled={
                     isUsageExceeded ||
-                    (provider === "azure" && !currentProject?.azure_enabled) ||
                     (provider === "gcp" && !currentProject?.azure_enabled)
                   }
                   onClick={() => {
                     if (
                       !(
                         isUsageExceeded ||
-                        (provider === "azure" && !currentProject?.azure_enabled) ||
                         (provider === "gcp" && !currentProject?.azure_enabled)
                       )
                     ) {
@@ -87,8 +85,7 @@ const ProvisionerFlow: React.FC<Props> = ({ }) => {
                   <Icon src={providerInfo.icon} />
                   <BlockTitle>{providerInfo.label}</BlockTitle>
                   <BlockDescription>
-                    {(provider === "azure" && !currentProject?.azure_enabled) ||
-                      (provider === "gcp" && !currentProject?.azure_enabled) ? providerInfo.tagline : "Hosted in your own cloud"}
+                    {(provider === "gcp" && !currentProject?.azure_enabled) ? providerInfo.tagline : "Hosted in your own cloud"}
                   </BlockDescription>
                 </Block>
               );