Rev versions for controller 7.1 compatibility

AviatrixSystems · jb-smoker · May 30, 2023 · May 29, 2024 · May 30, 2023 · 1e46ad818601a33e00778a394c4a5cf2c8498712
commit 1e46ad818601a33e00778a394c4a5cf2c8498712
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.15.0
 
-ENV TERRAFORM_VERSION=1.1.7
+ENV TERRAFORM_VERSION=1.4.6
 # Dependencies. #Terraform # Awscli # make directory
 RUN apk update && \
     apk add curl jq python3 py3-pip bash ca-certificates git openssl unzip wget openssh-keygen && \

diff --git a/makefile b/makefile
@@ -1,4 +1,4 @@
-VERSION ?= 1.4.2
+VERSION ?= 1.4.3
 
 build:
 	sed -i'' -e 's+version = ".*"+version = "${VERSION}"+g' sst-frontend/src/components/app-bar/index.tsx

diff --git a/sandbox-starter/mcna-govcloud/versions.tf b/sandbox-starter/mcna-govcloud/versions.tf
@@ -4,16 +4,16 @@ terraform {
       # Make sure to keep the version up to date with the controller version.
       # https://registry.terraform.io/providers/AviatrixSystems/aviatrix/latest/docs/guides/release-compatibility.
       source  = "aviatrixsystems/aviatrix"
-      version = "~> 3.0.0"
+      version = "~> 3.1.0"
     }
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 3.42.0"
+      version = "~> 5.0.0"
     }
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~>2.63.0"
+      version = "~> 3.58.0"
     }
   }
-  required_version = ">= 1.1.7"
+  required_version = ">= 1.4.0"
 }
diff --git a/sandbox-starter/mcna/versions.tf b/sandbox-starter/mcna/versions.tf
@@ -4,16 +4,16 @@ terraform {
       # Make sure to keep the version up to date with the controller version.
       # https://registry.terraform.io/providers/AviatrixSystems/aviatrix/latest/docs/guides/release-compatibility.
       source  = "aviatrixsystems/aviatrix"
-      version = "~> 3.0.0"
+      version = "~> 3.1.0"
     }
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 3.42.0"
+      version = "~> 5.0.0"
     }
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~>2.63.0"
+      version = "~> 3.58.0"
     }
   }
-  required_version = ">= 1.1.7"
+  required_version = ">= 1.4.0"
 }
diff --git a/sandbox-starter/sandbox_starter.sh b/sandbox-starter/sandbox_starter.sh
@@ -185,7 +185,7 @@ controller_init()
     if [ ! -z $KS_GOVCLOUD ]; then
 	cat /root/.eagle
     fi
-    echo -e "\n--> Controller init has completed. Controller is now running. Please note that if you are going to manually upgrade the Controller, only Build release upgrades are supported. For example, manual upgrades from 7.0.x to 7.0.y are supported, but manual upgrades of Minor releases, such as from 6.9.x to 7.0.y are NOT supported."
+    echo -e "\n--> Controller init has completed. Controller is now running. Please note that if you are going to manually upgrade the Controller, only Build release upgrades are supported. For example, manual upgrades from 7.0.x to 7.0.y are supported, but manual upgrades of Minor releases, such as from 7.0.x to 7.1.y are NOT supported."
 }
 
 mcna_aws_transit()

diff --git a/sandbox-starter/sandbox_starter_web.sh b/sandbox-starter/sandbox_starter_web.sh
@@ -34,12 +34,12 @@ controller_file_change(){
   sed -i "s#variable \"controller_version\".*#variable \"controller_version\" { default = \"$controller_version\" }#g"  /root/controller/variables.tf    
   sed -i '/admin_password/d' /root/controller/variables.tf    
   python3 /root/controller/pwd_update.py $controller_password
-  if [ $controller_version = "6.9" ]; then
-  sed -i'' -e 's+version = "~> 3.0.0"+version = "~> 2.24.0"+g' /root/mcna/versions.tf
-  sed -i'' -e 's+version = "~> 3.0.0"+version = "~> 2.24.0"+g' /root/mcna-govcloud/versions.tf
+  if [ $controller_version = "7.0" ]; then
+  sed -i'' -e 's+version = "~> 3.1.0"+version = "~> 3.0.0"+g' /root/mcna/versions.tf
+  sed -i'' -e 's+version = "~> 3.1.0"+version = "~> 3.0.0"+g' /root/mcna-govcloud/versions.tf
   else
-  sed -i'' -e 's+version = "~> 2.24.0"+version = "~> 3.0.0"+g' /root/mcna/versions.tf
-  sed -i'' -e 's+version = "~> 2.24.0"+version = "~> 3.0.0"+g' /root/mcna-govcloud/versions.tf
+  sed -i'' -e 's+version = "~> 3.0.0"+version = "~> 3.1.0"+g' /root/mcna/versions.tf
+  sed -i'' -e 's+version = "~> 3.0.0"+version = "~> 3.1.0"+g' /root/mcna-govcloud/versions.tf
   sed -i '/manage_transit_gateway_attachment/d' /root/mcna/aviatrix_aws.tf
   sed -i '/manage_transit_gateway_attachment/d' /root/mcna/aviatrix_azure.tf
   sed -i '/manage_transit_gateway_attachment/d' /root/mcna-govcloud/aviatrix_aws.tf
@@ -59,12 +59,12 @@ controller_file_change_std(){
   sed -i "s#variable \"controller_version\".*#variable \"controller_version\" { default = \"$controller_version\" }#g"  /root/controller/variables.tf    
   sed -i '/admin_password/d' /root/controller/variables.tf    
   python3 /root/controller/pwd_update.py $controller_password
-  if [ $controller_version = "6.9" ]; then
-  sed -i'' -e 's+version = "~> 3.0.0"+version = "~> 2.24.0"+g' /root/mcna/versions.tf
-  sed -i'' -e 's+version = "~> 3.0.0"+version = "~> 2.24.0"+g' /root/mcna-govcloud/versions.tf
+  if [ $controller_version = "7.0" ]; then
+  sed -i'' -e 's+version = "~> 3.1.0"+version = "~> 3.0.0"+g' /root/mcna/versions.tf
+  sed -i'' -e 's+version = "~> 3.1.0"+version = "~> 3.0.0"+g' /root/mcna-govcloud/versions.tf
   else
-  sed -i'' -e 's+version = "~> 2.24.0"+version = "~> 3.0.0"+g' /root/mcna/versions.tf
-  sed -i'' -e 's+version = "~> 2.24.0"+version = "~> 3.0.0"+g' /root/mcna-govcloud/versions.tf
+  sed -i'' -e 's+version = "~> 3.0.0"+version = "~> 3.1.0"+g' /root/mcna/versions.tf
+  sed -i'' -e 's+version = "~> 3.0.0"+version = "~> 3.1.0"+g' /root/mcna-govcloud/versions.tf
   sed -i '/manage_transit_gateway_attachment/d' /root/mcna/aviatrix_aws.tf
   sed -i '/manage_transit_gateway_attachment/d' /root/mcna/aviatrix_azure.tf
   sed -i '/manage_transit_gateway_attachment/d' /root/mcna-govcloud/aviatrix_aws.tf
@@ -545,7 +545,7 @@ controller_init()
     if [ ! -z $KS_GOVCLOUD ]; then
 	cat /root/.eagle
     fi
-    echo -e "\n--> Controller init has completed. Controller is now running. Please note that if you are going to manually upgrade the Controller, only Build release upgrades are supported. For example, manual upgrades from 7.0.x to 7.0.y are supported, but manual upgrades of Minor releases, such as from 6.9.x to 7.0.y are NOT supported."
+    echo -e "\n--> Controller init has completed. Controller is now running. Please note that if you are going to manually upgrade the Controller, only Build release upgrades are supported. For example, manual upgrades from 7.0.x to 7.0.y are supported, but manual upgrades of Minor releases, such as from 7.0.x to 7.1.y are NOT supported."
 
     writekeys_controller_init  $AVIATRIX_EMAIL $AVIATRIX_PASSWORD $AVIATRIX_USERNAME $SANDBOX_STARTER_CONTROLLER_INIT_DONE
 }

diff --git a/sst-frontend/src/components/app-bar/index.tsx b/sst-frontend/src/components/app-bar/index.tsx
@@ -9,7 +9,7 @@ import { helpIcon, reloadIcon } from "svgs";
 import { AppState } from "store";
 
 export default function AppBar() {
-  const version = "1.4.2";
+  const version = "1.4.3";
   const dispatch = useDispatch();
   const history = useHistory();
   const { is_advance } = useSelector<AppState, AppState["configuration"]>(

diff --git a/sst-frontend/src/components/app-bar/index.tsx-e b/sst-frontend/src/components/app-bar/index.tsx-e
@@ -9,7 +9,7 @@ import { helpIcon, reloadIcon } from "svgs";
 import { AppState } from "store";
 
 export default function AppBar() {
-  const version = "1.4.2";
+  const version = "1.4.3";
   const dispatch = useDispatch();
   const history = useHistory();
   const { is_advance } = useSelector<AppState, AppState["configuration"]>(

diff --git a/sst-frontend/src/pages/configuration/steps/launch-controller/advance-form.tsx b/sst-frontend/src/pages/configuration/steps/launch-controller/advance-form.tsx
@@ -78,7 +78,7 @@ export default function AdvanceForm(props: ComponentProps) {
         email: "",
         password: "",
         confirm_password: "",
-        controller_version: "7.0",
+        controller_version: "7.1",
         controller_license_type: "byol",
         controller_license: "",
         az: "us-east-1a",
@@ -239,19 +239,19 @@ export default function AdvanceForm(props: ComponentProps) {
                 }}
                 disabled={pageDisabled}
               >
-                <MenuItem value="6.9">6.9</MenuItem>
                 <MenuItem value="7.0">7.0</MenuItem>
+                <MenuItem value="7.1">7.1</MenuItem>
               </Select>
             </FormControl>
             {(() => {
-              if (values.controller_version === "6.9") {
+              if (values.controller_version === "7.0") {
                 return (
                   <>
                     <Paragraph
                       customClasses="--light"
                       text={
                         <span>
-                          If using the SST as a prerequisite to ACE Automation (IaC), please select Controller Version 7.0
+                          If using the SST as a prerequisite to ACE Automation (IaC), please select Controller Version 7.1
                         </span>
                       }
                     ></Paragraph>
@@ -297,8 +297,7 @@ export default function AdvanceForm(props: ComponentProps) {
                     >
                       Aviatrix CoPilot
                     </a>{" "}
-                    in the AWS Marketplace. For "Metered 2208", click on "Continue to subscribe", then
-                    "Subscribe", and "Set Up Your Account" to generate your Controller License.
+                    in the AWS Marketplace. For "Metered 2208", click on 'View purchase options', then under 'Purchase', click 'Subscribe'. In the resulting green banner, click 'Set up your account' which will launch a new window to generate your license key. Follow those instructions and your key will be emailed to you.
                     For "BYOL", click on "Continue to subscribe", then "Subscribe".
                     For CoPilot, click "Continue to subscribe", but do NOT click on
                     "Continue to Configuration".

diff --git a/sst-frontend/src/pages/configuration/steps/launch-controller/standard-form.tsx b/sst-frontend/src/pages/configuration/steps/launch-controller/standard-form.tsx
@@ -56,7 +56,7 @@ export default function StandardForm(props: ComponentProps) {
         email: "",
         password: "",
         confirm_password: "",
-        controller_version: "7.0",
+        controller_version: "7.1",
         controller_license_type: "byol",
         controller_license: "",
       }}
@@ -153,19 +153,19 @@ export default function StandardForm(props: ComponentProps) {
               }}
               disabled={pageDisabled}
             >
-              <MenuItem value="6.9">6.9</MenuItem>
               <MenuItem value="7.0">7.0</MenuItem>
+              <MenuItem value="7.1">7.1</MenuItem>
             </Select>
           </FormControl>
           {(() => {
-            if (values.controller_version === "6.9") {
+            if (values.controller_version === "7.0") {
               return (
                 <>
                   <Paragraph
                     customClasses="--light"
                     text={
                       <span>
-                        If using the SST as a prerequisite to ACE Automation (IaC), please select Controller Version 7.0
+                        If using the SST as a prerequisite to ACE Automation (IaC), please select Controller Version 7.1
                       </span>
                     }
                   ></Paragraph>
@@ -211,8 +211,7 @@ export default function StandardForm(props: ComponentProps) {
                   >
                     Aviatrix CoPilot
                   </a>{" "}
-                  in the AWS Marketplace. For "Metered 2208", click on "Continue to subscribe", then
-                  "Subscribe", and "Set Up Your Account" to generate your Controller License.
+                  in the AWS Marketplace. For "Metered 2208", click on 'View purchase options', then under 'Purchase', click 'Subscribe'. In the resulting green banner, click 'Set up your account' which will launch a new window to generate your license key. Follow those instructions and your key will be emailed to you.
                   For "BYOL", click on "Continue to subscribe", then "Subscribe".
                   For CoPilot, click "Continue to subscribe", but do NOT click on
                   "Continue to Configuration".

diff --git a/sst-frontend/src/utils/constants.ts b/sst-frontend/src/utils/constants.ts
@@ -64,7 +64,7 @@ export const FORM_CONFIGS = {
           passwordRegex,
           "Must Contain 8 Characters, One Uppercase, One Lowercase, One Number and one special case (@!%*#?) Character"
         ),
-      controller_version: yup.string().oneOf(["6.9", "7.0"]),
+      controller_version: yup.string().oneOf(["7.0", "7.1"]),
       controller_license_type: yup.string().oneOf(["byol"]),
       confirm_password: yup.string().required("Required"),
       controller_license: yup.string().when("controller_license_type", {
@@ -89,7 +89,7 @@ export const FORM_CONFIGS = {
       confirm_password: yup.string().required("Required"),
       region: yup.string().required("Required"),
       az: yup.string().required("Required"),
-      controller_version: yup.string().oneOf(["6.9", "7.0"]),
+      controller_version: yup.string().oneOf(["7.0", "7.1"]),
       controller_license_type: yup.string().oneOf(["byol"]),
       vpc_cidr: yup
         .string()