From 89dece526aaf4c2ee65aee331e1995be0d2eeb24 Mon Sep 17 00:00:00 2001 From: Stefan McShane Date: Thu, 12 Oct 2023 15:42:56 -0400 Subject: [PATCH] Default cluster version 1.27 (#3806) --- dashboard/package-lock.json | 14 +++++++------- dashboard/package.json | 2 +- dashboard/src/components/ProvisionerSettings.tsx | 5 +++-- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dashboard/package-lock.json b/dashboard/package-lock.json index 6b67dded46..df1fb18d03 100644 --- a/dashboard/package-lock.json +++ b/dashboard/package-lock.json @@ -13,7 +13,7 @@ "@loadable/component": "^5.15.2", "@material-ui/core": "^4.11.3", "@material-ui/lab": "^4.0.0-alpha.61", - "@porter-dev/api-contracts": "^0.2.15", + "@porter-dev/api-contracts": "^0.2.17", "@react-spring/web": "^9.6.1", "@sentry/react": "^6.13.2", "@sentry/tracing": "^6.13.2", @@ -2455,9 +2455,9 @@ } }, "node_modules/@porter-dev/api-contracts": { - "version": "0.2.15", - "resolved": "https://registry.npmjs.org/@porter-dev/api-contracts/-/api-contracts-0.2.15.tgz", - "integrity": "sha512-2TmCMyjPbdHZcTV6ThueV0ITM4d/nipjNUJk0vbNtUeeJ8WwKebxBwbFaTfhTVJ4GLmnsa08ZAbJ372Nizc0Qw==", + "version": "0.2.17", + "resolved": "https://registry.npmjs.org/@porter-dev/api-contracts/-/api-contracts-0.2.17.tgz", + "integrity": "sha512-E5VEAS7ovim2G7EfmGb6co/aFQvZiHPQzw8EKEdWuzcLrn4DErSNsGJJzVyqm/86FuZkHrYtec89hyPj8u2rbw==", "dependencies": { "@bufbuild/protobuf": "^1.1.0" } @@ -16956,9 +16956,9 @@ "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==" }, "@porter-dev/api-contracts": { - "version": "0.2.15", - "resolved": "https://registry.npmjs.org/@porter-dev/api-contracts/-/api-contracts-0.2.15.tgz", - "integrity": "sha512-2TmCMyjPbdHZcTV6ThueV0ITM4d/nipjNUJk0vbNtUeeJ8WwKebxBwbFaTfhTVJ4GLmnsa08ZAbJ372Nizc0Qw==", + "version": "0.2.17", + "resolved": "https://registry.npmjs.org/@porter-dev/api-contracts/-/api-contracts-0.2.17.tgz", + "integrity": "sha512-E5VEAS7ovim2G7EfmGb6co/aFQvZiHPQzw8EKEdWuzcLrn4DErSNsGJJzVyqm/86FuZkHrYtec89hyPj8u2rbw==", "requires": { "@bufbuild/protobuf": "^1.1.0" } diff --git a/dashboard/package.json b/dashboard/package.json index 1b9aca65ae..66bd029c43 100644 --- a/dashboard/package.json +++ b/dashboard/package.json @@ -8,7 +8,7 @@ "@loadable/component": "^5.15.2", "@material-ui/core": "^4.11.3", "@material-ui/lab": "^4.0.0-alpha.61", - "@porter-dev/api-contracts": "^0.2.15", + "@porter-dev/api-contracts": "^0.2.17", "@react-spring/web": "^9.6.1", "@sentry/react": "^6.13.2", "@sentry/tracing": "^6.13.2", diff --git a/dashboard/src/components/ProvisionerSettings.tsx b/dashboard/src/components/ProvisionerSettings.tsx index 73d6ae7141..ce7d8b2209 100644 --- a/dashboard/src/components/ProvisionerSettings.tsx +++ b/dashboard/src/components/ProvisionerSettings.tsx @@ -93,6 +93,7 @@ const machineTypeOptions = [ const defaultCidrVpc = "10.78.0.0/16" const defaultCidrServices = "172.20.0.0/16" +const defaultClusterVersion = "v1.27.0" type Props = RouteComponentProps & { selectedClusterVersion?: Contract; @@ -137,7 +138,7 @@ const ProvisionerSettings: React.FC = (props) => { >([]); const [cidrRangeVPC, setCidrRangeVPC] = useState(defaultCidrVpc); const [cidrRangeServices, setCidrRangeServices] = useState(defaultCidrServices); - const [clusterVersion, setClusterVersion] = useState("v1.24.0"); + const [clusterVersion, setClusterVersion] = useState(defaultClusterVersion); const [isReadOnly, setIsReadOnly] = useState(false); const [errorMessage, setErrorMessage] = useState(undefined); const [isClicked, setIsClicked] = useState(false); @@ -297,7 +298,7 @@ const ProvisionerSettings: React.FC = (props) => { case: "eksKind", value: new EKS({ clusterName, - clusterVersion: clusterVersion || "v1.24.0", + clusterVersion: clusterVersion || defaultClusterVersion, cidrRange: cidrRangeVPC || defaultCidrVpc, // deprecated in favour of network.cidrRangeVPC: can be removed after december 2023 region: awsRegion, loadBalancer: loadBalancerObj,