From f23904213ef90d1f5fee86d550cc354d1f396ee0 Mon Sep 17 00:00:00 2001 From: Oscar Pla Date: Wed, 25 Jan 2023 15:02:58 -0500 Subject: [PATCH 1/3] Enable uptime SLA by default --- helper/src/configpresets/entScale.json | 9 ++++++--- helper/src/configpresets/principals.json | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/helper/src/configpresets/entScale.json b/helper/src/configpresets/entScale.json index 407a1b4d0..eb04613d7 100644 --- a/helper/src/configpresets/entScale.json +++ b/helper/src/configpresets/entScale.json @@ -57,7 +57,8 @@ "agentCount": 2, "maxCount": 4, "upgradeChannel": "none", - "DefenderForContainers": true + "DefenderForContainers": true, + "AksPaidSkuForSLA": false }, "addons": { "networkPolicy": "none", @@ -143,7 +144,8 @@ "apisecurity": "private", "autoscale": true, "upgradeChannel": "none", - "DefenderForContainers": true + "DefenderForContainers": true, + "AksPaidSkuForSLA": true }, "addons": { "networkPolicy": "azure", @@ -229,7 +231,8 @@ "apisecurity": "private", "autoscale": true, "upgradeChannel": "none", - "DefenderForContainers": true + "DefenderForContainers": true, + "AksPaidSkuForSLA": true }, "addons": { "networkPolicy": "azure", diff --git a/helper/src/configpresets/principals.json b/helper/src/configpresets/principals.json index bb518a562..e1be433e3 100644 --- a/helper/src/configpresets/principals.json +++ b/helper/src/configpresets/principals.json @@ -164,7 +164,8 @@ "enable_aad": false, "AksDisableLocalAccounts": false, "apisecurity": "none", - "DefenderForContainers": false + "DefenderForContainers": false, + "AksPaidSkuForSLA": false }, "addons": { "networkPolicy": "none", @@ -237,7 +238,8 @@ "enable_aad": true, "AksDisableLocalAccounts": true, "apisecurity": "whitelist", - "DefenderForContainers": true + "DefenderForContainers": true, + "AksPaidSkuForSLA": true }, "addons": { "networkPolicy": "azure", @@ -342,7 +344,8 @@ "enable_aad": true, "AksDisableLocalAccounts": true, "apisecurity": "private", - "DefenderForContainers": true + "DefenderForContainers": true, + "AksPaidSkuForSLA": true }, "addons": { "networkPolicy": "azure", From 6f468bf1191043cb121beb50d45cad0e0b570998 Mon Sep 17 00:00:00 2001 From: Oscar Pla Date: Wed, 25 Jan 2023 18:53:40 -0500 Subject: [PATCH 2/3] Set Uptime SLA default based on Operational Principles --- helper/package-lock.json | 2 +- helper/package.json | 2 +- helper/src/components/clusterTab.js | 4 ++-- helper/src/configpresets/principals.json | 18 +++++++++--------- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/helper/package-lock.json b/helper/package-lock.json index 083f5212e..92160374e 100644 --- a/helper/package-lock.json +++ b/helper/package-lock.json @@ -15,7 +15,7 @@ "playwright-expect": "^0.1.2", "react": "^18.2.0", "react-dom": "^18.2.0", - "react-scripts": "5.0.1", + "react-scripts": "^5.0.1", "web-vitals": "^2.1.4" } }, diff --git a/helper/package.json b/helper/package.json index 71d0ee3f7..7064bb6cc 100644 --- a/helper/package.json +++ b/helper/package.json @@ -11,7 +11,7 @@ "playwright-expect": "^0.1.2", "react": "^18.2.0", "react-dom": "^18.2.0", - "react-scripts": "5.0.1", + "react-scripts": "^5.0.1", "web-vitals": "^2.1.4" }, "scripts": { diff --git a/helper/src/components/clusterTab.js b/helper/src/components/clusterTab.js index ebccf78f3..b5224a75b 100644 --- a/helper/src/components/clusterTab.js +++ b/helper/src/components/clusterTab.js @@ -69,8 +69,8 @@ export default function ({ tabValues, updateFn, featureFlag, invalidArray }) { updateFn("AksPaidSkuForSLA", key)} /> diff --git a/helper/src/configpresets/principals.json b/helper/src/configpresets/principals.json index e1be433e3..9f81af7f3 100644 --- a/helper/src/configpresets/principals.json +++ b/helper/src/configpresets/principals.json @@ -24,7 +24,8 @@ "SystemPoolType": "none", "autoscale": false, "upgradeChannel": "none", - "DefenderForContainers": false + "DefenderForContainers": false, + "AksPaidSkuForSLA": false }, "addons": { "registry": "none", @@ -66,7 +67,8 @@ "cluster": { "SystemPoolType": "CostOptimised", "autoscale": false, - "upgradeChannel": "none" + "upgradeChannel": "none", + "AksPaidSkuForSLA": false }, "addons": { "registry": "none", @@ -111,7 +113,8 @@ "cluster": { "SystemPoolType": "CostOptimised", "autoscale": true, - "upgradeChannel": "stable" + "upgradeChannel": "stable", + "AksPaidSkuForSLA": true }, "addons": { "registry": [ @@ -164,8 +167,7 @@ "enable_aad": false, "AksDisableLocalAccounts": false, "apisecurity": "none", - "DefenderForContainers": false, - "AksPaidSkuForSLA": false + "DefenderForContainers": false }, "addons": { "networkPolicy": "none", @@ -238,8 +240,7 @@ "enable_aad": true, "AksDisableLocalAccounts": true, "apisecurity": "whitelist", - "DefenderForContainers": true, - "AksPaidSkuForSLA": true + "DefenderForContainers": true }, "addons": { "networkPolicy": "azure", @@ -344,8 +345,7 @@ "enable_aad": true, "AksDisableLocalAccounts": true, "apisecurity": "private", - "DefenderForContainers": true, - "AksPaidSkuForSLA": true + "DefenderForContainers": true }, "addons": { "networkPolicy": "azure", From 1c47a89d61d0e98114a3e94fbcfd3241592b7e40 Mon Sep 17 00:00:00 2001 From: Oscar Pla Date: Thu, 26 Jan 2023 11:06:40 -0500 Subject: [PATCH 3/3] Updated API Server Non-AZ to 99.5% from 99.9 --- helper/src/components/clusterTab.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helper/src/components/clusterTab.js b/helper/src/components/clusterTab.js index b5224a75b..812f35b70 100644 --- a/helper/src/components/clusterTab.js +++ b/helper/src/components/clusterTab.js @@ -69,7 +69,7 @@ export default function ({ tabValues, updateFn, featureFlag, invalidArray }) { updateFn("AksPaidSkuForSLA", key)}