fix phpmyadmin chart

Signed-off-by: TasdidurRahman <[email protected]>
kubedb · Sep 4, 2024 · bd80020 · bd80020
1 parent e35e82b
commit bd80020
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 4 deletions.
diff --git a/apis/ui/v1alpha1/types.go b/apis/ui/v1alpha1/types.go
@@ -79,6 +79,7 @@ type ReplicaRange struct {
 type AppRef struct {
 	Service    ObjectRef      `json:"service"`
 	AuthSecret LocalObjectRef `json:"authSecret"`
+	TLS        TLS            `json:"tls"`
 }
 
 type AuthzproxySpec struct {
@@ -96,3 +97,7 @@ type AuthzproxyParams struct {
 	PlatformURL      string `json:"platformURL"`
 	PlatformCABundle string `json:"platformCABundle"`
 }
+
+type TLS struct {
+	Enabled bool `json:"enabled"`
+}
diff --git a/charts/dbgate/README.md b/charts/dbgate/README.md
@@ -88,12 +88,13 @@ The following table lists the configurable parameters of the `dbgate` chart and
 | app.service.name                   |                                                                                                                                                                                                                                   | <code>""</code>                                                                                                                                                                                |
 | app.service.namespace              |                                                                                                                                                                                                                                   | <code>""</code>                                                                                                                                                                                |
 | app.authSecret.name                |                                                                                                                                                                                                                                   | <code>""</code>                                                                                                                                                                                |
+| app.tls.enabled                    |                                                                                                                                                                                                                                   | <code>false</code>                                                                                                                                                                             |
 | bind.name                          |                                                                                                                                                                                                                                   | <code>""</code>                                                                                                                                                                                |
 | bind.namespace                     |                                                                                                                                                                                                                                   | <code>""</code>                                                                                                                                                                                |
 | authzproxy.enabled                 |                                                                                                                                                                                                                                   | <code>false</code>                                                                                                                                                                             |
 | authzproxy.repository              | KubeDB operator container image                                                                                                                                                                                                   | <code>appscode/kube-authz-proxy</code>                                                                                                                                                         |
 | authzproxy.tag                     | KubeDB operator container image tag                                                                                                                                                                                               | <code>"v0.0.1"</code>                                                                                                                                                                          |
-| authzproxy.securityContext         | Security options this container should run with                                                                                                                                                                                   | <code>{"allowPrivilegeEscalation":false,"capabilities":{"drop":["ALL"]},"readOnlyRootFilesystem":true,"runAsNonRoot":true,"runAsUser":65534,"seccompProfile":{"type":"RuntimeDefault"}}</code> |
+| authzproxy.securityContext         | Security options this container should run with                                                                                                                                                                                   | <code>{"allowPrivilegeEscalation":false,"capabilities":{"drop":["ALL"]},"readOnlyRootFilesystem":false,"runAsNonRoot":true,"runAsUser":1000,"seccompProfile":{"type":"RuntimeDefault"}}</code> |
 | authzproxy.resources               | Compute Resources required by this container                                                                                                                                                                                      | <code>{}</code>                                                                                                                                                                                |
 | authzproxy.params.listen           |                                                                                                                                                                                                                                   | <code>8000</code>                                                                                                                                                                              |
 | authzproxy.params.metricsAddr      |                                                                                                                                                                                                                                   | <code>8080</code>                                                                                                                                                                              |

diff --git a/charts/phpmyadmin/README.md b/charts/phpmyadmin/README.md
@@ -65,7 +65,7 @@ The following table lists the configurable parameters of the `phpmyadmin` chart
 | serviceAccount.name                | The name of the service account to use. If not set and create is true, a name is generated using the fullname template | <code>""</code>                                                                                                                                                                                |
 | podAnnotations                     |                                                                                                                        | <code>{}</code>                                                                                                                                                                                |
 | podSecurityContext                 |                                                                                                                        | <code>{}</code>                                                                                                                                                                                |
-| securityContext                    |                                                                                                                        | <code>{"allowPrivilegeEscalation":false,"capabilities":{"drop":["ALL"]},"readOnlyRootFilesystem":true,"runAsNonRoot":true,"runAsUser":65534,"seccompProfile":{"type":"RuntimeDefault"}}</code> |
+| securityContext                    |                                                                                                                        | <code>{"allowPrivilegeEscalation":false,"capabilities":{"drop":["ALL"]},"readOnlyRootFilesystem":false,"runAsNonRoot":true,"runAsUser":1000,"seccompProfile":{"type":"RuntimeDefault"}}</code> |
 | service.type                       |                                                                                                                        | <code>ClusterIP</code>                                                                                                                                                                         |
 | service.port                       |                                                                                                                        | <code>80</code>                                                                                                                                                                                |
 | resources                          |                                                                                                                        | <code>{}</code>                                                                                                                                                                                |
@@ -87,6 +87,7 @@ The following table lists the configurable parameters of the `phpmyadmin` chart
 | app.service.name                   |                                                                                                                        | <code>""</code>                                                                                                                                                                                |
 | app.service.namespace              |                                                                                                                        | <code>""</code>                                                                                                                                                                                |
 | app.authSecret.name                |                                                                                                                        | <code>""</code>                                                                                                                                                                                |
+| app.tls.enabled                    |                                                                                                                        | <code>false</code>                                                                                                                                                                             |
 | bind.name                          |                                                                                                                        | <code>""</code>                                                                                                                                                                                |
 | bind.namespace                     |                                                                                                                        | <code>""</code>                                                                                                                                                                                |
 | authzproxy.enabled                 |                                                                                                                        | <code>false</code>                                                                                                                                                                             |

diff --git a/charts/phpmyadmin/templates/deployment.yaml b/charts/phpmyadmin/templates/deployment.yaml
@@ -84,6 +84,10 @@ spec:
                 secretKeyRef:
                   name: {{ .Values.app.authSecret.name }}
                   key: password
+          {{- if .Values.app.tls.enabled }}
+            - name: PMA_SSL
+              value: "1"
+          {{- end }}
           ports:
             - name: http
               containerPort: 8080

diff --git a/charts/phpmyadmin/values.yaml b/charts/phpmyadmin/values.yaml
@@ -46,9 +46,9 @@ securityContext: # +doc-gen:break
   allowPrivilegeEscalation: false
   capabilities:
     drop: ["ALL"]
-  readOnlyRootFilesystem: true
+  readOnlyRootFilesystem: false
   runAsNonRoot: true
-  runAsUser: 65534
+  runAsUser: 1000
   seccompProfile:
     type: RuntimeDefault
 
@@ -126,6 +126,8 @@ app:
     namespace: ""
   authSecret:
     name: ""
+  tls:
+    enabled: false
 bind:
   name: ""
   namespace: ""