From 9208a3ffaeb339bca96d7dc0cbe87cb304b1ae94 Mon Sep 17 00:00:00 2001
From: kqmaverick <121722567+kqmaverick@users.noreply.github.com>
Date: Wed, 6 Dec 2023 18:54:59 -0800
Subject: [PATCH] migrate(cups-server): migrate to new common (#15829)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

**Description**
Migrates cups-server to new common

⚒️ Fixes  #

**⚙️ 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?**

**📃 Notes:**

**✔️ 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
- [X] ⬆️ 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._

---------

Signed-off-by: kqmaverick <121722567+kqmaverick@users.noreply.github.com>
Co-authored-by: Xstar97TheNoob <9399967+xstar97@users.noreply.github.com>
---
 charts/incubator/cups-server/Chart.yaml       |  4 ++--
 .../incubator/cups-server/templates/NOTES.txt |  1 +
 .../cups-server/templates/common.yaml         |  3 ++-
 charts/incubator/cups-server/values.yaml      | 23 ++++++++++++-------
 4 files changed, 20 insertions(+), 11 deletions(-)
 create mode 100644 charts/incubator/cups-server/templates/NOTES.txt

diff --git a/charts/incubator/cups-server/Chart.yaml b/charts/incubator/cups-server/Chart.yaml
index b0ee768658a..f3885cbc71c 100644
--- a/charts/incubator/cups-server/Chart.yaml
+++ b/charts/incubator/cups-server/Chart.yaml
@@ -1,7 +1,7 @@
 kubeVersion: ">=1.24.0"
 apiVersion: v2
 name: cups-server
-version: 3.0.24
+version: 4.0.0
 appVersion: latest
 description: CUPS printing server
 home: https://truecharts.org/charts/incubator/cups-server
@@ -19,7 +19,7 @@ keywords:
   - cups
 dependencies:
   - name: common
-    version: 11.1.2
+    version: 16.0.0
     repository: https://library-charts.truecharts.org
     condition: ""
     alias: ""
diff --git a/charts/incubator/cups-server/templates/NOTES.txt b/charts/incubator/cups-server/templates/NOTES.txt
new file mode 100644
index 00000000000..efcb74cb772
--- /dev/null
+++ b/charts/incubator/cups-server/templates/NOTES.txt
@@ -0,0 +1 @@
+{{- include "tc.v1.common.lib.chart.notes" $ -}}
diff --git a/charts/incubator/cups-server/templates/common.yaml b/charts/incubator/cups-server/templates/common.yaml
index c1a366e1cf0..78d963fb168 100644
--- a/charts/incubator/cups-server/templates/common.yaml
+++ b/charts/incubator/cups-server/templates/common.yaml
@@ -1 +1,2 @@
-{{ include "tc.common.loader.all" . }}
+{{/* Render the templates */}}
+{{ include "tc.v1.common.loader.all" . }}
diff --git a/charts/incubator/cups-server/values.yaml b/charts/incubator/cups-server/values.yaml
index 216218055b9..fb8036d9c18 100644
--- a/charts/incubator/cups-server/values.yaml
+++ b/charts/incubator/cups-server/values.yaml
@@ -3,18 +3,24 @@ image:
   tag: latest@sha256:a5501987937cf8c726e04878ff77d5f15f01070979f40c1a2cec60834bc77c70
   pullPolicy: IfNotPresent
 securityContext:
-  readOnlyRootFilesystem: false
-  runAsNonRoot: false
-podSecurityContext:
-  runAsUser: 0
-  runAsGroup: 0
-secretEnv:
-  ADMIN_PASSWORD: "secretpass"
+  container:
+    readOnlyRootFilesystem: false
+    runAsNonRoot: false
+    runAsUser: 0
+    runAsGroup: 0
+workload:
+  main:
+    podSpec:
+      containers:
+        main:
+          env:
+            ADMIN_PASSWORD: "secretpass"
 service:
   main:
     ports:
       main:
         port: 631
+        protocol: http
         targetPort: 631
 persistence:
   config:
@@ -27,4 +33,5 @@ persistence:
     mountPath: "/var/run/dbus"
     readOnly: false
 portal:
-  enabled: true
+  open:
+    enabled: true