removed 2022r1 and 2022r2 references and updated script to pass infra…

…adminaccount variable only if we use lets encrypt
profiseedev · Aug 6, 2024 · 072eb8e · 072eb8e
1 parent d187c28
commit 072eb8e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 17 deletions.
diff --git a/Azure-ARM/createUIDefinition.json b/Azure-ARM/createUIDefinition.json
@@ -97,19 +97,11 @@
             "name": "ProfiseeVersion",
             "type": "Microsoft.Common.DropDown",
             "label": "Profisee version",
-            "defaultValue": "2023R2.0-win22",
+            "defaultValue": "2024R1.0-win22",
             "toolTip": "Which release of the Profisee Platform to deploy.",
             "constraints": {
               "required": true,
               "allowedValues": [
-                {
-                  "label": "2022R1.0",
-                  "value": "profiseeplatform:2022r1.0"
-                },
-                {
-                  "label": "2022R2.0",
-                  "value": "profiseeplatform:2022r2.0"
-                },
                 {
                   "label": "2023R1.0",
                   "value": "profiseeplatform:2023r1.0"
@@ -123,12 +115,12 @@
                   "value": "profiseeplatform:2023r2.0-win22"
                 },
                 {
-                  "label": "2024r1.preview-win19",
-                  "value": "profiseeplatformdev:2024r1.preview-win19"
+                  "label": "2024r1.0-win19",
+                  "value": "profiseeplatform:2024r1.0-win19"
                 },
                 {
-                  "label": "2024r1.preview-win22",
-                  "value": "profiseeplatformdev:2024r1.preview-win22"
+                  "label": "2024r1.0-win22",
+                  "value": "profiseeplatform:2024r1.0-win22"
                 },
                 {
                   "label": "2024r2.preview-matching-win19",
@@ -283,7 +275,7 @@
               ],
               "required": true
             },
-            "visible": "[or(equals(steps('profisee').ProfiseeVersion, 'profiseeplatform:2022r1.0'), equals(steps('profisee').ProfiseeVersion, 'profiseeplatform:2022r2.0'), equals(steps('profisee').ProfiseeVersion, 'profiseeplatform:2023r1.0'), equals(steps('profisee').ProfiseeVersion, 'profiseeplatform:2023r2.0-win19'), equals(steps('profisee').ProfiseeVersion, 'profiseeplatform:2023r2.0-win22'), equals(steps('profisee').ProfiseeVersion, 'profiseeplatformdev:2024r1.preview-win19'), equals(steps('profisee').ProfiseeVersion, 'profiseeplatformdev:2024r1.preview-win22'),equals(steps('profisee').ProfiseeVersion, 'profiseeplatformdev:2024r2.preview-matching-win19'),equals(steps('profisee').ProfiseeVersion, 'profiseeplatformdev:2024r2.preview-matching-win22'))]"
+            "visible": true
           },
           {
             "name": "PurviewAccountName",
@@ -319,7 +311,7 @@
               "regex": "",
               "validationMessage": ""
             },
-            "visible": "[and(equals(steps('profisee').UsePurview,'Yes'), or(equals(steps('profisee').ProfiseeVersion, 'profiseeplatform:2022r2.0'), equals(steps('profisee').ProfiseeVersion, 'profiseeplatform:2023r1.0'), equals(steps('profisee').ProfiseeVersion, 'profiseeplatform:2023r2.0-win19'), equals(steps('profisee').ProfiseeVersion, 'profiseeplatform:2023r2.0-win22'), equals(steps('profisee').ProfiseeVersion, 'profiseeplatformdev:2024r1.preview-win19'), equals(steps('profisee').ProfiseeVersion, 'profiseeplatformdev:2024r1.preview-win22'),equals(steps('profisee').ProfiseeVersion, 'profiseeplatformdev:2024r2.preview-matching-win19'),equals(steps('profisee').ProfiseeVersion, 'profiseeplatformdev:2024r2.preview-matching-win22')))]"
+            "visible": "[equals(steps('profisee').UsePurview,'Yes')]"
           },
           {
             "name": "PurviewClientID",
@@ -435,7 +427,7 @@
               "required": true
             },
             "visible": true
-          },          
+          },
           {
             "name": "KubernetesLinuxNodeSizeSection",
             "type": "Microsoft.Common.Section",

diff --git a/Azure-ARM/deployprofisee.sh b/Azure-ARM/deployprofisee.sh
@@ -557,7 +557,7 @@ sed -i -e 's~$OIDCURL~'"$OIDCURL"'~g' Settings.yaml
 sed -i -e 's/$CLIENTID/'"$CLIENTID"'/g' Settings.yaml
 sed -i -e 's/$OIDCCLIENTSECRET/'"$CLIENTSECRET"'/g' Settings.yaml
 sed -i -e 's/$ADMINACCOUNTNAME/'"$ADMINACCOUNTNAME"'/g' Settings.yaml
-sed -i -e 's/$INFRAADMINACCOUNT/'"$INFRAADMINACCOUNT"'/g' Settings.yaml
+
 sed -i -e 's~$EXTERNALDNSURL~'"$EXTERNALDNSURL"'~g' Settings.yaml
 sed -i -e 's/$EXTERNALDNSNAME/'"$EXTERNALDNSNAME"'/g' Settings.yaml
 sed -i -e 's~$LICENSEDATA~'"$LICENSEDATA"'~g' Settings.yaml
@@ -601,6 +601,7 @@ if [ "$USELETSENCRYPT" = "Yes" ]; then
 	helm repo add jetstack https://charts.jetstack.io
 	# Update your local Helm chart repository cache
 	helm repo update
+
 	#If cert-manager is present, uninstall it.
         certmgrpresent=$(helm list -n profisee -f cert-manager -o table --short)
         if [ "$certmgrpresent" = "cert-manager" ]; then
@@ -614,6 +615,7 @@ if [ "$USELETSENCRYPT" = "Yes" ]; then
 	echo $"Let's Encrypt is waiting for certificate manager to be ready, sleeping for 30 seconds.";
 	sleep 30;
 	sed -i -e 's/$USELETSENCRYPT/'true'/g' Settings.yaml
+	sed -i -e 's/$INFRAADMINACCOUNT/'"$INFRAADMINACCOUNT"'/g' Settings.yaml
 	echo "Let's Encrypt installation finshed";
 	#################################Lets Encrypt End #######################################
 else