From efd6722a416ebc3f0a98c4e9fff160aa2f6c7293 Mon Sep 17 00:00:00 2001 From: mrachuta <34251394+mrachuta@users.noreply.github.com> Date: Tue, 27 Jun 2023 22:20:09 +0200 Subject: [PATCH 1/2] Add default values for ingresses; update README --- README.md | 4 ++++ values.yaml | 16 ++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/README.md b/README.md index eb6efca..f865065 100755 --- a/README.md +++ b/README.md @@ -186,6 +186,8 @@ phpldapadmin: ingress: enabled: true annotations: {} + # Assuming that ingress-nginx is used + ingressClassName: nginx path: / ## Ingress Host hosts: @@ -212,6 +214,8 @@ ltb-passwd: ingress: enabled: true annotations: {} + # Assuming that ingress-nginx is used + ingressClassName: nginx host: "ssl-ldap2.local" ``` diff --git a/values.yaml b/values.yaml index b65970a..00b42e2 100644 --- a/values.yaml +++ b/values.yaml @@ -452,6 +452,7 @@ test: tag: 0.4.0 ## ltb-passwd +# For more parameters check following file: ./charts/ltb-passwd/values.yaml ltb-passwd: enabled : true image: @@ -459,11 +460,18 @@ ltb-passwd: ingress: enabled: true annotations: {} + # See https://kubernetes.io/docs/concepts/services-networking/ingress/#ingressclass-scope + # ingressClassName: nginx path: / pathType: Prefix ## Ingress Host hosts: - "ssl-ldap2.example" + ## Ingress cert + tls: [] + # - secretName: ssl-ldap2.example + # hosts: + # - ssl-ldap2.example # ldap: # if you want to restrict search base tree for users instead of complete domain # searchBase: "ou=....,dc=mydomain,dc=com" @@ -473,6 +481,7 @@ ltb-passwd: # passKey: LDAP_MY_KEY ## phpldapadmin +## For more parameters check following file: ./charts/phpldapadmin/values.yaml phpldapadmin: enabled: true image: @@ -482,8 +491,15 @@ phpldapadmin: ingress: enabled: true annotations: {} + ## See https://kubernetes.io/docs/concepts/services-networking/ingress/#ingressclass-scope + # ingressClassName: nginx path: / pathType: Prefix ## Ingress Host hosts: - phpldapadmin.example + ## Ingress cert + tls: [] + # - secretName: phpldapadmin.example + # hosts: + # - phpldapadmin.example From bdb37fb486ba7c4f0f50c28fd4b1e974a0874334 Mon Sep 17 00:00:00 2001 From: mrachuta <34251394+mrachuta@users.noreply.github.com> Date: Sat, 1 Jul 2023 14:10:27 +0200 Subject: [PATCH 2/2] Update Readme files and values for sub-charts --- README.md | 6 ++++-- charts/ltb-passwd/README.md | 1 + charts/ltb-passwd/values.yaml | 2 ++ charts/phpldapadmin/README.md | 1 + charts/phpldapadmin/values.yaml | 2 ++ 5 files changed, 10 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f865065..c91867a 100755 --- a/README.md +++ b/README.md @@ -97,7 +97,8 @@ Parameters related to PHPLdapAdmin | `phpldapadmin.ingress` | Ingress of Phpldapadmin | `{}` | | `phpldapadmin.env` | Environment variables for PhpldapAdmin| `{PHPLDAPADMIN_LDAP_CLIENT_TLS_REQCERT: "never"}` | -For more advance configuration see [README.md](./advanced_examples/README.md) +For more advance configuration see [README.md](./advanced_examples/README.md) +For all possible chart parameters see chart's [README.md](./charts/phpldapadmin/README.md) ### Self-service password configuration @@ -108,7 +109,8 @@ Parameters related to Self-service password. |`ltb-passwd.enabled`| Enable the deployment of Ltb-Passwd| `true` | |`ltb-passwd.ingress`| Ingress of the Ltb-Passwd service | `{}` | -For more advance configuration see [README.md](./advanced_examples/README.md) +For more advance configuration see [README.md](./advanced_examples/README.md) +For all possible parameters see chart's [README.md](./charts/ltb-passwd/README.md) ### Kubernetes parameters diff --git a/charts/ltb-passwd/README.md b/charts/ltb-passwd/README.md index 738f315..9aa0f98 100755 --- a/charts/ltb-passwd/README.md +++ b/charts/ltb-passwd/README.md @@ -48,6 +48,7 @@ Configuration is done within `values.yaml`: | `service.type` | Service type | `ClusterIP` | | `ingress.enabled` | Whether to generate ingress resources | `false` | | `ingress.annotations` | Annotations to add to the ingress | `{}` | +| `ingress.ingressClassName` | Ingress class name; required for kubernetes 1.18+ | `nil` | | `ingress.hosts` | Hostnames to redirect to the webapp | `[]` | | `ingress.tls` | TLS Configuration | `[]` | | `resources` | Container resource requests and limits in yaml | `{}` | diff --git a/charts/ltb-passwd/values.yaml b/charts/ltb-passwd/values.yaml index dd5094a..be5e9a7 100755 --- a/charts/ltb-passwd/values.yaml +++ b/charts/ltb-passwd/values.yaml @@ -22,6 +22,8 @@ service: ingress: enabled: false annotations: {} + ## See https://kubernetes.io/docs/concepts/services-networking/ingress/#ingressclass-scope + # ingressClassName: nginx path: / ## Ingress Host # hosts: diff --git a/charts/phpldapadmin/README.md b/charts/phpldapadmin/README.md index a52e1b4..8709510 100755 --- a/charts/phpldapadmin/README.md +++ b/charts/phpldapadmin/README.md @@ -71,6 +71,7 @@ The following table lists the configurable parameters of the phpLDAPadmin chart | **Ingress** | | `ingress.enabled` | Enables Ingress | `false` | | `ingress.annotations` | Ingress annotations | `{}` | +| `ingress.ingressClassName` | Ingress class name; required for kubernetes 1.18+ | `nil` | | `ingress.path` | Path to access frontend | `/` | | `ingress.hosts` | Ingress hosts | `nil` | | `ingress.tls` | Ingress TLS configuration | `[]` | diff --git a/charts/phpldapadmin/values.yaml b/charts/phpldapadmin/values.yaml index 5a49e60..b7193eb 100755 --- a/charts/phpldapadmin/values.yaml +++ b/charts/phpldapadmin/values.yaml @@ -66,6 +66,8 @@ service: ingress: enabled: false annotations: {} + ## See https://kubernetes.io/docs/concepts/services-networking/ingress/#ingressclass-scope + # ingressClassName: nginx path: / ## Ingress Host # hosts: