Fix EE manifests and Helm deployment template (#76)

* Fix EE manifests and Helm deployment template * bump chart version * fix invalid condition for the exposed ports * add condition to only publish 9443 if ce Co-authored-by: Sam Dulam <[email protected]>
portainer · Oct 11, 2021 · f6ca6c0 · f6ca6c0
1 parent 78294f8
commit f6ca6c0
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 2 deletions.
diff --git a/.ci/scripts/generate-portainer-manifests-from-chart.sh b/.ci/scripts/generate-portainer-manifests-from-chart.sh
diff --git a/.ci/scripts/local-ct-lint.sh b/.ci/scripts/local-ct-lint.sh
diff --git a/.ci/scripts/local-kube-score.sh b/.ci/scripts/local-kube-score.sh
diff --git a/charts/portainer/Chart.yaml b/charts/portainer/Chart.yaml
@@ -16,7 +16,7 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 1.0.17
+version: 1.0.18
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.

diff --git a/charts/portainer/templates/deployment.yaml b/charts/portainer/templates/deployment.yaml
@@ -62,12 +62,26 @@ spec:
             - name: http
               containerPort: 9000
               protocol: TCP
+            {{- if not .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/charts/portainer/templates/service.yaml b/charts/portainer/templates/service.yaml
@@ -22,13 +22,15 @@ spec:
       {{- if (and (eq .Values.service.type "NodePort") (not (empty .Values.service.httpNodePort))) }}
       nodePort: {{ .Values.service.httpNodePort}}
       {{- end }}
+    {{- if not .Values.enterpriseEdition.enabled }}  
     - port: {{ .Values.service.httpsPort }}
       targetPort: 9443
       protocol: TCP
       name: https
       {{- if (and (eq .Values.service.type "NodePort") (not (empty .Values.service.httpsNodePort))) }}
       nodePort: {{ .Values.service.httpsNodePort}}
       {{- end }}
+    {{- end }}
     {{- if (eq .Values.service.type "NodePort") }}      
     - port: {{ .Values.service.edgeNodePort }}
       targetPort: {{ .Values.service.edgeNodePort }}

diff --git a/deploy/manifests/agent/ee/portainer-edge-agent-setup.sh b/deploy/manifests/agent/ee/portainer-edge-agent-setup.sh
diff --git a/deploy/manifests/agent/ee/portainer-ee210-edge-agent-setup.sh b/deploy/manifests/agent/ee/portainer-ee210-edge-agent-setup.sh
diff --git a/deploy/manifests/agent/portainer-ce29-edge-agent-setup.sh b/deploy/manifests/agent/portainer-ce29-edge-agent-setup.sh
diff --git a/deploy/manifests/agent/portainer-edge-agent-setup.sh b/deploy/manifests/agent/portainer-edge-agent-setup.sh