added infra account admin email address

profiseedev · Mar 27, 2024 · 146c800 · 146c800
1 parent 771a01c
commit 146c800
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 3 deletions.
diff --git a/Azure-ARM/Settings.yaml b/Azure-ARM/Settings.yaml
@@ -6,6 +6,7 @@ sqlServer:
 profiseeRunTime:
     useLetsEncrypt: $USELETSENCRYPT
     adminAccount: "$ADMINACCOUNTNAME"
+    InfraAdminAccount: "$INFRAADMINACCOUNT"
     fileRepository:
         accountName: "$FILEREPOACCOUNTNAME"
         userName: "$FILEREPOUSERNAME"

diff --git a/Azure-ARM/azuredeploy.json b/Azure-ARM/azuredeploy.json
@@ -105,6 +105,9 @@
     "AuthenticationType":{
       "type": "string"
     },
+    "InfraAdminAccount":{
+      "type": "string"
+    },
     "SQLServerCreateNew": {
       "type": "String"
     },
@@ -205,6 +208,7 @@
     "KubernetesLinuxNodeCount": "[int(parameters('KubernetesLinuxNodeCount'))]",
     "KubernetesLinuxNodeSize": "[parameters('KubernetesLinuxNodeSize')]",
     "AuthenticationType": "[parameters('AuthenticationType')]",
+    "InfraAdminAccount": "[parameters('InfraAdminAccount')]",
     "KubernetesWindowsNodeCount": "[int(parameters('KubernetesWindowsNodeCount'))]",
     "KubernetesWindowsNodeSize": "[parameters('KubernetesWindowsNodeSize')]",
     "WindowsNodeVersion": "[parameters('WindowsNodeVersion')]",
@@ -819,6 +823,10 @@
                       "name": "AUTHENTICATIONTYPE",
                       "value": "[variables('AuthenticationType')]"
                     },
+                    {
+                      "name": "INFRAADMINACCOUNT",
+                      "value": "[variables('InfraAdminAccount')]"
+                    },
                     {
                       "name": "WINDOWSNODEVERSION",
                       "value": "[variables('WindowsNodeVersion')]"

diff --git a/Azure-ARM/azuredeploy.parameters.json b/Azure-ARM/azuredeploy.parameters.json
@@ -143,6 +143,9 @@
         },    
         "AuthenticationType":{
             "value": ""
-        }
+        },
+        "InfraAdminAccount":{
+            "value": ""
+        }    
     }
 }
diff --git a/Azure-ARM/createUIDefinition.json b/Azure-ARM/createUIDefinition.json
@@ -133,7 +133,7 @@
               ]
             },
             "visible": true
-          },          
+          },
           {
             "name": "ProfiseeAdminUserAccount",
             "type": "Microsoft.Common.TextBox",
@@ -925,6 +925,20 @@
             },
             "visible": "[equals(steps('networking').DNSUpdate,'Yes')]"
           },
+          {
+          "name": "InfraAdminAccount",
+          "type": "Microsoft.Common.TextBox",
+          "label": "Certificate Expirations User",
+          "defaultValue": "",
+          "placeholder": "[email protected]",
+          "toolTip": "Please specify an email address for the user, or group, that should receive email notifications for certificate expiration.",
+          "constraints": {
+            "required": true,
+            "regex": "",
+            "validationMessage": ""
+          },
+          "visible": "[not(equals(steps('networking').HttpsConfigure, 'Yes'))]"
+        },
           {
             "name": "UserDefinedHTTPS",
             "type": "Microsoft.Common.Section",

diff --git a/Azure-ARM/deployprofisee.sh b/Azure-ARM/deployprofisee.sh
@@ -529,6 +529,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

diff --git a/profisee-platform-0.1.31.tgz b/profisee-platform-0.1.31.tgz
diff --git a/profisee-platform/templates/clusterissuer-profisee.yaml b/profisee-platform/templates/clusterissuer-profisee.yaml
@@ -6,7 +6,7 @@ metadata:
 spec:
   acme:
     server: https://acme-v02.api.letsencrypt.org/directory
-    email: {{.Values.profiseeRunTime.adminAccount|quote}}
+    email: {{.Values.profiseeRunTime.InfraAdminAccount|quote}}
     privateKeySecretRef:
       name: letsencrypt
     solvers: