From ea4f8ad6bd970ca86d1b297daadc2c7ac0a640c0 Mon Sep 17 00:00:00 2001
From: deviantony <anthony.lapenna@portainer.io>
Date: Mon, 11 Oct 2021 12:30:06 -0700
Subject: [PATCH] Fix EE manifests and Helm deployment template

---
 charts/portainer/templates/deployment.yaml      | 17 ++++++++++++++++-
 deploy/manifests/portainer/portainer-ee.yaml    | 11 ++++-------
 deploy/manifests/portainer/portainer-lb-ee.yaml | 11 ++++-------
 3 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/charts/portainer/templates/deployment.yaml b/charts/portainer/templates/deployment.yaml
index 0d6d150..4896672 100644
--- a/charts/portainer/templates/deployment.yaml
+++ b/charts/portainer/templates/deployment.yaml
@@ -62,12 +62,26 @@ spec:
             - name: http
               containerPort: 9000
               protocol: TCP
+            {{- if .Values.enterpriseEdition.enabled }}
             - name: https
               containerPort: 9443
-              protocol: TCP              
+              protocol: TCP
+            {{- end }}                
             - name: tcp-edge
               containerPort: 8000
               protocol: TCP              
+          {{- if .Values.enterpriseEdition.enabled }}
+          livenessProbe:
+            httpGet:
+              path: /
+              port: 9000
+              scheme: HTTP
+          readinessProbe:
+            httpGet:
+              path: /
+              port: 9000
+              scheme: HTTP
+          {{- else }}
           livenessProbe:
             httpGet:
               path: /
@@ -78,5 +92,6 @@ spec:
               path: /
               port: 9443
               scheme: HTTPS
+          {{- end }}          
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
diff --git a/deploy/manifests/portainer/portainer-ee.yaml b/deploy/manifests/portainer/portainer-ee.yaml
index 8adffec..9f922de 100644
--- a/deploy/manifests/portainer/portainer-ee.yaml
+++ b/deploy/manifests/portainer/portainer-ee.yaml
@@ -132,22 +132,19 @@ spec:
             - name: http
               containerPort: 9000
               protocol: TCP
-            - name: https
-              containerPort: 9443
-              protocol: TCP              
             - name: tcp-edge
               containerPort: 8000
               protocol: TCP              
           livenessProbe:
             httpGet:
               path: /
-              port: 9443
-              scheme: HTTPS
+              port: 9000
+              scheme: HTTP
           readinessProbe:
             httpGet:
               path: /
-              port: 9443
-              scheme: HTTPS
+              port: 9000
+              scheme: HTTP
           resources:
             {}
 
diff --git a/deploy/manifests/portainer/portainer-lb-ee.yaml b/deploy/manifests/portainer/portainer-lb-ee.yaml
index 4b56b93..a7b3883 100644
--- a/deploy/manifests/portainer/portainer-lb-ee.yaml
+++ b/deploy/manifests/portainer/portainer-lb-ee.yaml
@@ -128,22 +128,19 @@ spec:
             - name: http
               containerPort: 9000
               protocol: TCP
-            - name: https
-              containerPort: 9443
-              protocol: TCP              
             - name: tcp-edge
               containerPort: 8000
               protocol: TCP              
           livenessProbe:
             httpGet:
               path: /
-              port: 9443
-              scheme: HTTPS
+              port: 9000
+              scheme: HTTP
           readinessProbe:
             httpGet:
               path: /
-              port: 9443
-              scheme: HTTPS
+              port: 9000
+              scheme: HTTP
           resources:
             {}