diff --git a/Azure-ARM/createUIDefinition.json b/Azure-ARM/createUIDefinition.json index 499073f..d5cfc9a 100644 --- a/Azure-ARM/createUIDefinition.json +++ b/Azure-ARM/createUIDefinition.json @@ -142,17 +142,17 @@ "name": "WindowsNodeVersion", "type": "Microsoft.Common.DropDown", "label": "AKS Windows node OS edition", - "defaultValue": "windows 2019", - "toolTip": "windows node version to use", + "defaultValue": "Windows 2019", + "toolTip": "As of Profisee Version 2023r2.0 Profisee can run on Server 2022 nodes.", "constraints": { "required": true, "allowedValues": [ { - "label": "windows 2019", + "label": "Windows 2019", "value": "Windows2019" }, { - "label": "windows 2022", + "label": "Windows 2022", "value": "Windows2022" } ] diff --git a/Azure-ARM/deployprofisee.sh b/Azure-ARM/deployprofisee.sh index a9ef261..c0157bf 100644 --- a/Azure-ARM/deployprofisee.sh +++ b/Azure-ARM/deployprofisee.sh @@ -39,9 +39,6 @@ az feature register --namespace "Microsoft.ContainerService" --name "EnableWorkl az feature show --namespace "Microsoft.ContainerService" --name "EnableWorkloadIdentityPreview" az provider register --namespace Microsoft.ContainerService -#Disable built-in AKS file driver, will install further down. -az aks update -n $CLUSTERNAME -g $RESOURCEGROUPNAME --disable-file-driver --yes - #Install dotnet core. echo $"Installation of dotnet core started."; curl -fsSL -o dotnet-install.sh https://dot.net/v1/dotnet-install.sh @@ -458,12 +455,14 @@ ACRREPOLABEL="${repostring[1],,}" #Installation of Azure File CSI Driver WINDOWS_NODE_VERSION="$(az aks show -n $CLUSTERNAME -g $RESOURCEGROUPNAME --query "agentPoolProfiles[1].osSku" -o tsv)" -if [ "$WINDOWS_NODE_VERSION" = "Windows2022" ]; then - az aks update -n $CLUSTERNAME -g $RESOURCEGROUPNAME --enable-file-driver --yes -else +if [ "$WINDOWS_NODE_VERSION" = "Windows2019" ]; then + #Disable built-in AKS file driver, will install further down. + echo $"Disabling AKS Built-in CSI Driver to install Azure File CSI." + az aks update -n $CLUSTERNAME -g $RESOURCEGROUPNAME --disable-file-driver --yes echo $"Installation of Azure File CSI Driver started."; echo $"Adding Azure File CSI Driver repo." helm repo add azurefile-csi-driver https://raw.githubusercontent.com/kubernetes-sigs/azurefile-csi-driver/master/charts + helm repo update azurefile-csi-driver helm install azurefile-csi-driver azurefile-csi-driver/azurefile-csi-driver --namespace kube-system --set controller.replicas=1 echo $"Azure File CSI Driver installation finished." fi diff --git a/profisee-platform-0.1.29.tgz b/profisee-platform-0.1.29.tgz index ed1d536..e0c88a4 100644 Binary files a/profisee-platform-0.1.29.tgz and b/profisee-platform-0.1.29.tgz differ diff --git a/profisee-platform/templates/clusterissuer-profisee.yaml b/profisee-platform/templates/clusterissuer-profisee.yaml index 42dd0b3..b416f27 100644 --- 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: support@profisee.com + email: {{.Values.profiseeRunTime.adminAccount|quote}} privateKeySecretRef: name: letsencrypt solvers: