fix(phpmyadmin) code cleanup (#7361)

* fix(phpmyadmin) code cleanup

* fix variable example defaults

charts/incubator/phpmyadmin/Chart.yaml

@@ -1,8 +1,3 @@
-annotations:
-  truecharts.org/SCALE-support: "true"
-  truecharts.org/catagories: |
-    - Tools-Utilities
-    - Other
 apiVersion: v2
 appVersion: "latest"
 dependencies:
@@ -27,4 +22,10 @@ sources:
   - https://github.com/truecharts/charts/tree/master/charts/incubator/phpmyadmin
   - https://hub.docker.com/r/phpmyadmin/phpmyadmin
 type: application
-version: 2.0.10
+version: 2.0.11
+annotations:
+  truecharts.org/catagories: |
+    - Tools-Utilities
+    - Other
+  truecharts.org/SCALE-support: "true"
+  truecharts.org/grade: U

charts/incubator/phpmyadmin/questions.yaml

@@ -9,41 +9,45 @@ questions:
 # Include{replica1}
 # Include{controllerExpertExtraArgs}
   - variable: env
-    group: "App Configuration"
+    group: App Configuration
-    label: "Image Environment"
+    label: Image Environment
     schema:
       additional_attrs: true
       type: dict
       attrs:
         - variable: MYSQL_USER
-          label: "MYSQL_USER"
+          label: MYSQL User
-          description: "Container Variable MYSQLUSER"
           schema:
             type: string
-            default: "root"
+            default: ""
         - variable: MYSQL_PASSWORD
-          label: "MYSQL_PASSWORD"
+          label: MYSQL Password
-          description: "Container Variable MYSQLPASSWORD"
           schema:
             type: string
-            default: "root"
+            default: ""
         - variable: PMA_HOST
-          label: "PMA_HOST"
+          label: PWA Host
-          description: "Container Variable PMAHOST"
+          description: define address/host name of the db
           schema:
             type: string
             default: "192.168.70.99"
         - variable: PMA_PORT
-          label: "PMA_PORT"
+          label: PWA Port
-          description: "Container Variable PMAPORT"
+          description: define port of the MySQL server
           schema:
             type: string
             default: "3306"
+        - variable: PMA_ABSOLUTE_URI
+          label: PWA Absolute URi
+          description: The full URL to phpMyAdmin
+          schema:
+            type: string
+            default: ""
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
-          label: "Main Service"
+          label: Main Service
-          description: "The Primary service on which the healthcheck runs, often the webUI"
+          description: The Primary service on which the healthcheck runs, often the webUI
           schema:
             additional_attrs: true
             type: dict
@@ -51,14 +55,14 @@ questions:
 # Include{serviceSelectorLoadBalancer}
 # Include{serviceSelectorExtras}
                     - variable: main
-                      label: "Main Service Port Configuration"
+                      label: Main Service Port Configuration
                       schema:
                         additional_attrs: true
                         type: dict
                         attrs:
                           - variable: port
-                            label: "Port"
+                            label: Port
-                            description: "This port exposes the container port on the service"
+                            description: This port exposes the container port on the service
                             schema:
                               type: int
                               default: 8080
@@ -70,7 +74,7 @@ questions:
 # Include{persistenceList}
 # Include{ingressRoot}
         - variable: main
-          label: "Main Ingress"
+          label: Main Ingress
           schema:
             additional_attrs: true
             type: dict
@@ -82,41 +86,41 @@ questions:
 # 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{podSecurityContextRoot}
         - variable: runAsUser
-          label: "runAsUser"
+          label: runAsUser
-          description: "The UserID of the user running the application"
+          description: The UserID of the user running the application
           schema:
             type: int
             default: 0
         - variable: runAsGroup
-          label: "runAsGroup"
+          label: runAsGroup
-          description: The groupID this App of the user running the application"
+          description: The groupID this App of the user running the application
           schema:
             type: int
             default: 0
         - variable: fsGroup
-          label: "fsGroup"
+          label: fsGroup
-          description: "The group that should own ALL storage."
+          description: The group that should own ALL storage.
           schema:
             type: int
             default: 568

charts/incubator/phpmyadmin/values.yaml

@@ -1,25 +1,29 @@
+image:
+  pullPolicy: IfNotPresent
+  repository: tccr.io/truecharts/phpmyadmin
+  tag: latest@sha256:34b663ed38d6c87e061f431b02199bc4ace35d95a71aba6ab1125137dc477a78
+
+podSecurityContext:
+  runAsGroup: 0
+  runAsUser: 0
+
+securityContext:
+  readOnlyRootFilesystem: false
+  runAsNonRoot: false
+
 env:
   MYSQL_PASSWORD: root
   MYSQL_USER: root
   PMA_HOST: 192.168.70.99
   PMA_PORT: "3306"
-image:
+  # PMA_ABSOLUTE_URI: ""
-  pullPolicy: IfNotPresent
+
-  repository: tccr.io/truecharts/phpmyadmin
-  tag: latest@sha256:34b663ed38d6c87e061f431b02199bc4ace35d95a71aba6ab1125137dc477a78
-persistence: {}
-podSecurityContext:
-  runAsGroup: 0
-  runAsUser: 0
-securityContext:
-  readOnlyRootFilesystem: false
-  runAsNonRoot: false
 service:
   main:
     ports:
       main:
         port: 8080
-        protocol: TCP
+        protocol: HTTP
         targetPort: 80
 
 portal: