From fc451024cd1f39356824c32f7c532919fe55e747 Mon Sep 17 00:00:00 2001
From: StevenMcElligott <89483932+StevenMcElligott@users.noreply.github.com>
Date: Mon, 10 Oct 2022 01:40:36 -0400
Subject: [PATCH] fix(homelablabelmaker): Cleanup to work with SCALE (#4051)

* fix(homelablabelmaker): Cleanup to work with SCALE

* cleanup

Co-authored-by: Stavros kois <s.kois@outlook.com>
---
 charts/incubator/homelablabelmaker/Chart.yaml |  2 +-
 .../homelablabelmaker/questions.yaml          | 67 +++++++++++++++----
 .../incubator/homelablabelmaker/values.yaml   | 27 +++-----
 3 files changed, 67 insertions(+), 29 deletions(-)

diff --git a/charts/incubator/homelablabelmaker/Chart.yaml b/charts/incubator/homelablabelmaker/Chart.yaml
index c70d31040cf..cde2dd3e93a 100644
--- a/charts/incubator/homelablabelmaker/Chart.yaml
+++ b/charts/incubator/homelablabelmaker/Chart.yaml
@@ -28,4 +28,4 @@ sources:
   - https://github.com/DavidSpek/homelablabelmaker
   - https://hub.docker.com/r/davidspek/homelablabelmaker/
 type: application
-version: 0.0.28
+version: 1.0.0
diff --git a/charts/incubator/homelablabelmaker/questions.yaml b/charts/incubator/homelablabelmaker/questions.yaml
index 951965fcb12..ea52e7560d0 100644
--- a/charts/incubator/homelablabelmaker/questions.yaml
+++ b/charts/incubator/homelablabelmaker/questions.yaml
@@ -1,5 +1,7 @@
 # Include{groups}
-portals: {}
+portals:
+  open:
+# Include{portalLink}
 questions:
 # Include{global}
 # Include{controller}
@@ -10,51 +12,92 @@ questions:
 # Include{recreate}
 # Include{controllerExpert}
 # Include{controllerExpertExtraArgs}
-# Include{serviceExpertRoot}
+# Include{serviceRoot}
+        - variable: main
+          label: Main Service
+          description: The Primary service on which the healthcheck runs, often the webUI
+          schema:
+            additional_attrs: true
+            type: dict
+            attrs:
+# Include{serviceSelectorLoadBalancer}
+# Include{serviceSelectorExtras}
+                    - variable: main
+                      label: Main Service Port Configuration
+                      schema:
+                        additional_attrs: true
+                        type: dict
+                        attrs:
+                          - variable: port
+                            label: Port
+                            description: This port exposes the container port on the service
+                            schema:
+                              type: int
+                              default: 10581
+                              required: true
+# Include{advancedPortHTTP}
+                                - variable: targetPort
+                                  label: Target Port
+                                  description: The internal(!) port on the container the Application runs on
+                                  schema:
+                                    type: int
+                                    default: 80
+## Include{serviceExpertRoot}
             default: false
 # Include{serviceExpert}
 # Include{serviceList}
 # Include{persistenceList}
+# Include{ingressRoot}
+        - variable: main
+          label: Main Ingress
+          schema:
+            additional_attrs: true
+            type: dict
+            attrs:
+# Include{ingressDefault}
+# Include{ingressTLS}
+# Include{ingressTraefik}
+# Include{ingressExpert}
 # Include{ingressList}
 # Include{security}
 # Include{securityContextAdvancedRoot}
               - variable: privileged
-                label: "Privileged mode"
+                label: Privileged mode
                 schema:
                   type: boolean
                   default: false
               - variable: readOnlyRootFilesystem
-                label: "ReadOnly Root Filesystem"
+                label: ReadOnly Root Filesystem
                 schema:
                   type: boolean
                   default: false
               - variable: allowPrivilegeEscalation
-                label: "Allow Privilege Escalation"
+                label: Allow Privilege Escalation
                 schema:
                   type: boolean
                   default: false
               - variable: runAsNonRoot
-                label: "runAsNonRoot"
+                label: runAsNonRoot
                 schema:
                   type: boolean
                   default: false
 # Include{securityContextAdvanced}
 # Include{podSecurityContextRoot}
         - variable: runAsUser
-          label: "runAsUser"
-          description: "The UserID of the user running the application"
+          label: runAsUser
+          description: The UserID of the user running the application
           schema:
             type: int
             default: 0
         - variable: runAsGroup
-          label: "runAsGroup"
-          description: The groupID this App of the user running the application"
+          label: runAsGroup
+          description: The groupID this App of the user running the application
           schema:
             type: int
             default: 0
         - variable: fsGroup
-          label: "fsGroup"
-          description: "The group that should own ALL storage."
+          label: fsGroup
+          description: The group that should own ALL storage.
           schema:
             type: int
             default: 568
diff --git a/charts/incubator/homelablabelmaker/values.yaml b/charts/incubator/homelablabelmaker/values.yaml
index 3eae4fd5d2d..0b449fd2012 100644
--- a/charts/incubator/homelablabelmaker/values.yaml
+++ b/charts/incubator/homelablabelmaker/values.yaml
@@ -1,28 +1,23 @@
-env: {}
 image:
-  pullPolicy: IfNotPresent
   repository: tccr.io/truecharts/homelablabelmaker
   tag: latest@sha256:a1e41adaafade429f7603b32f603bc809b0bd3ee4433ac382fd803ef979dce73
-persistence: {}
-podSecurityContext:
-  runAsGroup: 0
-  runAsUser: 0
-probes:
-  liveness:
-    enabled: false
-  readiness:
-    enabled: false
-  startup:
-    enabled: false
+  pullPolicy: IfNotPresent
+
 securityContext:
   readOnlyRootFilesystem: false
   runAsNonRoot: false
+
+podSecurityContext:
+  runAsGroup: 0
+  runAsUser: 0
+
 service:
   main:
-    enabled: false
     ports:
       main:
-        enabled: false
+        port: 10581
+        protocol: HTTP
+        targetPort: 80
 
 portal:
-  enabled: false
+  enabled: true