From 0b31d4608503b81efccbaa537b4417b2690810a7 Mon Sep 17 00:00:00 2001
From: StevenMcElligott <89483932+StevenMcElligott@users.noreply.github.com>
Date: Tue, 8 Aug 2023 09:46:33 -0400
Subject: [PATCH] migrate(protonmail-brigde): Migrate to New Common (#11253)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

**Description**

Migrate another one!

⚒️ Fixes  #8055

**⚙️ Type of change**

- [X] ⚙️ Feature/App addition
- [ ] 🪛 Bugfix
- [ ] ⚠️ Breaking change (fix or feature that would cause existing
functionality to not work as expected)
- [ ] 🔃 Refactor of current code

**🧪 How Has This Been Tested?**
<!--
Please describe the tests that you ran to verify your changes. Provide
instructions so we can reproduce. Please also list any relevant details
for your test configuration
-->

**📃 Notes:**
<!-- Please enter any other relevant information here -->

**✔️ Checklist:**

- [ ] ⚖️ My code follows the style guidelines of this project
- [ ] 👀 I have performed a self-review of my own code
- [ ] #️⃣ I have commented my code, particularly in hard-to-understand
areas
- [ ] 📄 I have made corresponding changes to the documentation
- [ ] ⚠️ My changes generate no new warnings
- [ ] 🧪 I have added tests to this description that prove my fix is
effective or that my feature works
- [ ] ⬆️ I increased versions for any altered app according to semantic
versioning

**➕ App addition**

If this PR is an app addition please make sure you have done the
following.

- [ ] 🪞 I have opened a PR on
[truecharts/containers](https://github.com/truecharts/containers) adding
the container to TrueCharts mirror repo.
- [ ] 🖼️ I have added an icon in the Chart's root directory called
`icon.png`

---

_Please don't blindly check all the boxes. Read them and only check
those that apply.
Those checkboxes are there for the reviewer to see what is this all
about and
the status of this PR with a quick glance._
---
 charts/incubator/protonmail-bridge/Chart.yaml |  6 ++--
 .../protonmail-bridge/templates/NOTES.txt     |  1 +
 .../protonmail-bridge/templates/common.yaml   |  2 +-
 .../incubator/protonmail-bridge/values.yaml   | 36 ++++++++++++++-----
 4 files changed, 33 insertions(+), 12 deletions(-)
 create mode 100644 charts/incubator/protonmail-bridge/templates/NOTES.txt

diff --git a/charts/incubator/protonmail-bridge/Chart.yaml b/charts/incubator/protonmail-bridge/Chart.yaml
index da5a3689d8a..6f491c3ba8c 100644
--- a/charts/incubator/protonmail-bridge/Chart.yaml
+++ b/charts/incubator/protonmail-bridge/Chart.yaml
@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: "3.1.2"
+appVersion: "3.3.2"
 dependencies:
   - name: common
     repository: https://library-charts.truecharts.org
-    version: 11.1.2
+    version: 14.0.1
 description: Container for protonmail bridge to work on the network.
 home: https://truecharts.org/charts/incubator/protonmail-bridge
 icon: https://truecharts.org/img/hotlink-ok/chart-icons/protonmail-bridge.png
@@ -19,7 +19,7 @@ name: protonmail-bridge
 sources:
   - https://github.com/truecharts/charts/tree/master/charts/incubator/protonmail-bridge
   - https://github.com/shenxn/protonmail-bridge-docker
-version: 10.0.0
+version: 11.0.0
 annotations:
   truecharts.org/catagories: |
     - media
diff --git a/charts/incubator/protonmail-bridge/templates/NOTES.txt b/charts/incubator/protonmail-bridge/templates/NOTES.txt
new file mode 100644
index 00000000000..efcb74cb772
--- /dev/null
+++ b/charts/incubator/protonmail-bridge/templates/NOTES.txt
@@ -0,0 +1 @@
+{{- include "tc.v1.common.lib.chart.notes" $ -}}
diff --git a/charts/incubator/protonmail-bridge/templates/common.yaml b/charts/incubator/protonmail-bridge/templates/common.yaml
index c1a366e1cf0..b51394e00a4 100644
--- a/charts/incubator/protonmail-bridge/templates/common.yaml
+++ b/charts/incubator/protonmail-bridge/templates/common.yaml
@@ -1 +1 @@
-{{ include "tc.common.loader.all" . }}
+{{ include "tc.v1.common.loader.all" . }}
diff --git a/charts/incubator/protonmail-bridge/values.yaml b/charts/incubator/protonmail-bridge/values.yaml
index 79834c245ff..141f4975c6c 100644
--- a/charts/incubator/protonmail-bridge/values.yaml
+++ b/charts/incubator/protonmail-bridge/values.yaml
@@ -1,15 +1,14 @@
 image:
   repository: tccr.io/truecharts/protonmail-bridge
-  tag: 3.1.2@sha256:e5d818f3bffa5b64941df45e9e4c8193cf682d6ccf0e749d26dc6bcdf4abac49
+  tag: v3.3.2@sha256:eadc6c632b0e5ee37d04ae2089a84d60f8b750becd76d63b48962c55afa6e8c3
   pullPolicy: IfNotPresent
 
 securityContext:
-  readOnlyRootFilesystem: false
-  runAsNonRoot: false
-
-podSecurityContext:
-  runAsUser: 0
-  runAsGroup: 0
+  container:
+    readOnlyRootFilesystem: false
+    runAsNonRoot: false
+    runAsUser: 0
+    runAsGroup: 0
 
 service:
   main:
@@ -19,10 +18,13 @@ service:
         enabled: false
   smtp:
     enabled: true
+    primary: true
     ports:
       smtp:
         enabled: true
+        primary: true
         port: 25
+        protocol: tcp
         targetPort: 25
   imap:
     enabled: true
@@ -30,12 +32,30 @@ service:
       imap:
         enabled: true
         port: 143
+        protcol: tcp
         targetPort: 143
 
+workload:
+  main:
+    podSpec:
+      containers:
+        main:
+          probes:
+            liveness:
+              type: tcp
+              port: "{{ .Values.service.smtp.ports.smtp.targetPort }}"
+            readiness:
+              type: tcp
+              port: "{{ .Values.service.smtp.ports.smtp.targetPort }}"
+            startup:
+              type: tcp
+              port: "{{ .Values.service.smtp.ports.smtp.targetPort }}"
+
 persistence:
   config:
     enabled: true
     mountPath: "/root"
 
 portal:
-  enabled: false
+  open:
+    enabled: false