Sync chart with bitnami/kubeapps chart (version 7.5.1) (vmware-tanzu#…

…3438) * bump chart version to 7.5.1 * Add dev changes back Signed-off-by: Antonio Gamez Diaz <[email protected]> Co-authored-by: Antonio Gamez Diaz <[email protected]>
w6cloud · Sep 17, 2021 · 2adda15 · 2adda15
1 parent 5aad86e
commit 2adda15
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 14 deletions.
diff --git a/chart/kubeapps/Chart.lock b/chart/kubeapps/Chart.lock
@@ -4,9 +4,9 @@ dependencies:
   version: 1.9.0
 - name: postgresql
   repository: https://charts.bitnami.com/bitnami
-  version: 10.9.5
+  version: 10.10.1
 - name: redis
   repository: https://charts.bitnami.com/bitnami
   version: 15.3.2
-digest: sha256:357eb5265a695705e0602d52b82d1218efe7ace6a54afaf131ae3cbbf96c76cb
-generated: "2021-09-14T21:54:21.67315-07:00"
+digest: sha256:5d13ba8016e00a50bf270d0724e091197f3bea7941c55bdfd5ed834f7c8a4059
+generated: "2021-09-16T15:55:07.549983274+02:00"
diff --git a/chart/kubeapps/Chart.yaml b/chart/kubeapps/Chart.yaml
@@ -33,4 +33,4 @@ maintainers:
 name: kubeapps
 sources:
   - https://github.com/kubeapps/kubeapps
-version: 7.4.1-dev0
+version: 7.5.2-dev0
diff --git a/chart/kubeapps/README.md b/chart/kubeapps/README.md
@@ -89,7 +89,7 @@ Once you have installed Kubeapps follow the [Getting Started Guide](https://gith
 | `ingress.pathType`    | Ingress path type                                                                                     | `ImplementationSpecific` |
 | `ingress.annotations` | Additional custom annotations for the ingress record                                                  | `{}`                     |
 | `ingress.tls`         | Enable TLS configuration for the host defined at `ingress.hostname` parameter                         | `false`                  |
-| `ingress.certManager` | Add the corresponding annotations for cert-manager integration                                        | `false`                  |
+| `ingress.certManager` | Set up the cert-manager integration                                                                   | `{}`                     |
 | `ingress.selfSigned`  | Create a TLS secret for this ingress record using self-signed certificates generated by Helm          | `false`                  |
 | `ingress.extraHosts`  | An array with additional hostname(s) to be covered with the ingress record                            | `[]`                     |
 | `ingress.extraPaths`  | An array with additional arbitrary paths that may need to be added to the ingress under the main host | `[]`                     |

diff --git a/chart/kubeapps/templates/_helpers.tpl b/chart/kubeapps/templates/_helpers.tpl
@@ -211,7 +211,7 @@ kubeapps: ingress.tls
     to be used by the Ingress Controller.
     Please use any of these alternatives:
       - Use the `ingress.extraTls` and `ingress.secrets` parameters to provide your custom TLS certificates.
-      - Relay on cert-manager to create it by setting `ingress.certManager=true`
+      - Relay on cert-manager to create it by configuring `ingress.certManager.clusterIssuer`
       - Relay on Helm to create self-signed certificates by setting `ingress.selfSigned=true`
 {{- end -}}
 {{- end -}}

diff --git a/chart/kubeapps/templates/ingress.yaml b/chart/kubeapps/templates/ingress.yaml
@@ -9,8 +9,14 @@ metadata:
     {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" . ) | nindent 4 }}
     {{- end }}
   annotations:
-    {{- if .Values.ingress.certManager }}
-    kubernetes.io/tls-acme: "true"
+    {{- if .Values.ingress.certManager.clusterIssuer }}
+    cert-manager.io/cluster-issuer: {{ .Values.ingress.certManager.clusterIssuer }}
+    {{- end }}
+    {{- if .Values.ingress.certManager.httpIngressClass }}
+    acme.cert-manager.io/http01-ingress-class: {{ .Values.ingress.certManager.httpIngressClass }}
+    {{- end }}
+    {{- if .Values.ingress.certManager.commonName }}
+    cert-manager.io/common-name: {{ .Values.ingress.certManager.commonName }}
     {{- end }}
     {{- if .Values.ingress.annotations }}
     {{- include "common.tplvalues.render" (dict "value" .Values.ingress.annotations "context" . ) | nindent 4 }}

diff --git a/chart/kubeapps/values.schema.json b/chart/kubeapps/values.schema.json
@@ -68,13 +68,20 @@
           }
         },
         "certManager": {
-          "type": "boolean",
+          "type": "object",
           "form": true,
           "title": "Use cert-manager to auto-generate the TLS certificate",
           "description": "Add the corresponding annotations for cert-manager to auto-generate the TLS certificate",
           "hidden": {
             "value": false,
             "path": "ingress/enabled"
+          },
+          "properties": {
+            "clusterIssuer": {
+              "type": "string",
+              "title": "Cert-manager cluster issuer",
+              "form": true
+            }
           }
         }
       }

diff --git a/chart/kubeapps/values.yaml b/chart/kubeapps/values.yaml
@@ -63,21 +63,26 @@ ingress:
   ##
   pathType: ImplementationSpecific
   ## @param ingress.annotations [object] Additional custom annotations for the ingress record
-  ## NOTE: If `ingress.certManager=true`, annotation `kubernetes.io/tls-acme: "true"` will automatically be added
+  ## NOTE: The `ingress.certManager` values are intended to be used for managing the cert-manager annotations
   ##
   annotations:
     nginx.ingress.kubernetes.io/proxy-read-timeout: "600"
   ## @param ingress.tls Enable TLS configuration for the host defined at `ingress.hostname` parameter
   ## TLS certificates will be retrieved from a TLS secret with name: `{{- printf "%s-tls" .Values.ingress.hostname }}`
   ## You can:
   ##   - Use the `ingress.secrets` parameter to create this TLS secret
-  ##   - Relay on cert-manager to create it by setting `ingress.certManager=true`
+  ##   - Relay on cert-manager to create it by configuring `ingress.certManager.clusterIssuer`
   ##   - Relay on Helm to create self-signed certificates by setting `ingress.selfSigned=true`
   ##
   tls: false
-  ## @param ingress.certManager Add the corresponding annotations for cert-manager integration
-  ##
-  certManager: false
+  ## @param ingress.certManager Set up the cert-manager integration
+  ## For more information, see: https://cert-manager.io/docs/usage/ingress/#optional-configuration
+  ## e.g.:
+  ## certManager:
+  ##   clusterIssuer:
+  ##   httpIngressClass:
+  ##   commonName:
+  certManager: {}
   ## @param ingress.selfSigned Create a TLS secret for this ingress record using self-signed certificates generated by Helm
   ##
   selfSigned: false