diff --git a/index.yaml b/index.yaml index b5a0a0a..84b7d5e 100644 --- a/index.yaml +++ b/index.yaml @@ -9,6 +9,6 @@ entries: name: profisee-platform type: application urls: - - https://profiseedev.github.io/kubernetes/profisee-platform-0.1.32.tgz - version: 0.1.32 + - https://profiseedev.github.io/kubernetes/profisee-platform-0.1.33.tgz + version: 0.1.33 generated: "2023-09-22T17:16:00.0-05:00" diff --git a/profisee-platform-0.1.33.tgz b/profisee-platform-0.1.33.tgz new file mode 100644 index 0000000..fb5b3cf Binary files /dev/null and b/profisee-platform-0.1.33.tgz differ diff --git a/profisee-platform/Chart.yaml b/profisee-platform/Chart.yaml index 42a6625..acc31a1 100644 --- a/profisee-platform/Chart.yaml +++ b/profisee-platform/Chart.yaml @@ -3,4 +3,4 @@ appVersion: 1.16.0 description: A Helm chart for Profisee Platform on Kubernetes name: profisee-platform type: application -version: 0.1.32 +version: 0.1.33 diff --git a/profisee-platform/templates/statefullset-profisee.yaml b/profisee-platform/templates/statefullset-profisee.yaml index c90c9c8..04b6c0d 100644 --- a/profisee-platform/templates/statefullset-profisee.yaml +++ b/profisee-platform/templates/statefullset-profisee.yaml @@ -80,34 +80,61 @@ spec: - name: profisee image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}" imagePullPolicy: Always + {{- if .Values.image.tag | regexMatch "^(2[4-9]|[3-9][0-9])r[0-9]+\..*" }} + livenessProbe: + httpGet: + path: /$env:ProfiseeWebAppName/rest/health + port: 80 + scheme: HTTP + initialDelaySeconds: 20 + timeoutSeconds: 10 + periodSeconds: 20 + SuccessThreshold: 1 + failureThreshold: 4 + {{- else }} livenessProbe: exec: command: - powershell - >- - if(((Get-Service profisee).Status -ne 'Stopped') -and - ($(Get-IISAppPool | Where-Object { $_.State -eq "Stopped" - }).State -ne 'Stopped')){return 0}else{throw 'Profisee is - down'} + if((Get-Service profisee).Status -ne 'Stopped'){return + 0}else{throw 'Profisee service is down'} initialDelaySeconds: 600 timeoutSeconds: 5 periodSeconds: 60 + SuccessThreshold: 1 + failureThreshold: 3 + {{- end }} + {{- if .Values.image.tag | regexMatch "^(2[4-9]|[3-9][0-9])r[0-9]+\..*" }} + startupProbe: + exec: + command: + - powershell + - .\Fileshare\startup-probe.ps1 + initialDelaySeconds: 45 + timeoutSeconds: 600 + periodSeconds: 10 + SuccessThreshold: 1 + failureThreshold: 1 + {{- end }} {{- if not .Values.profiseeRunTime.isPaaS }} - {{- if eq .Values.profiseeRunTime.secondary "false" }} lifecycle: postStart: exec: command: - powershell - >- + curl.exe -fsSL -o .\Fileshare\startup-probe.ps1 + "https://raw.githubusercontent.com/profiseedev/kubernetes/master/Azure-ARM/startup-probe.ps1"; curl.exe -fsSL -o .\Fileshare\forensics_log_pull.ps1 "https://raw.githubusercontent.com/profiseedev/kubernetes/master/Azure-ARM/forensics_log_pull.ps1" + {{- if eq .Values.profiseeRunTime.secondary "false" }} preStop: exec: command: - powershell - .\Fileshare\forensics_log_pull.ps1 - {{- end }} + {{- end }} {{- end }} {{- if .Values.profiseeRunTime.isPaaS }} lifecycle: @@ -116,6 +143,8 @@ spec: command: - powershell - >- + curl.exe -fsSL -o .\Fileshare\startup-probe.ps1 + "https://raw.githubusercontent.com/profiseedev/kubernetes/master/Azure-ARM/startup-probe.ps1"; curl.exe -fsSL -o .\Fileshare\forensics_log_pull.ps1 "https://raw.githubusercontent.com/profiseedev/kubernetes/master/Azure-ARM/forensics_log_pull.ps1" preStop: