Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-06-29 00:05:09 +02:00
Code Issues Projects Releases Wiki Activity

Helm chart LDAP and authentication variable renaming

Browse Source
This commit is contained in:
lucaim 2018-03-27 15:57:03 +02:00
parent 05b9031327
commit 0664c9a8cd
4 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
contrib/helm/harbor/README.md
View File

@ -111,17 +111,17 @@ The following tables lists the configurable parameters of the Harbor chart and t
| `adminserver.emailIdentity` | | "" | | `adminserver.emailIdentity` | | "" |
| `adminserver.key` | adminsever key | `not-a-secure-key` | | `adminserver.key` | adminsever key | `not-a-secure-key` |
| `adminserver.emailPwd` | password for email | `not-a-secure-password` | | `adminserver.emailPwd` | password for email | `not-a-secure-password` |
| `adminserver.harborAdminPassword` | password for admin user | `Harbor12345` | | `adminserver.adminPassword` | password for admin user | `Harbor12345` |
| `adminserver.harborAuthenticationMode` | authentication mode for Harbor ( `db_auth` for local database, `ldap_auth` for LDAP, etc...) [Docs](https://github.com/vmware/harbor/blob/master/docs/user_guide.md#user-account) | `db_auth` | | `adminserver.authenticationMode` | authentication mode for Harbor ( `db_auth` for local database, `ldap_auth` for LDAP, etc...) [Docs](https://github.com/vmware/harbor/blob/master/docs/user_guide.md#user-account) | `db_auth` |
| `adminserver.selfRegistration` | Allows users to register by themselves, otherwise only administrators can add users | `on` | | `adminserver.selfRegistration` | Allows users to register by themselves, otherwise only administrators can add users | `on` |
| `adminserver.authenticationLdapURL` | LDAP server URL for `ldap_auth` authentication | `ldaps://ldapserver` | | `adminserver.ldap.url` | LDAP server URL for `ldap_auth` authentication | `ldaps://ldapserver` |
| `adminserver.authenticationLdapSearchDN` | LDAP Search DN | `` | | `adminserver.ldap.searchDN` | LDAP Search DN | `` |
| `adminserver.authenticationLdapBaseDN` | LDAP Base DN | `` | | `adminserver.ldap.baseDN` | LDAP Base DN | `` |
| `adminserver.authenticationLdapFilter` | LDAP Filter | `(objectClass=person)` | | `adminserver.ldap.filter` | LDAP Filter | `(objectClass=person)` |
| `adminserver.authenticationLdapUID` | LDAP UID | `uid` | | `adminserver.ldap.uid` | LDAP UID | `uid` |
| `adminserver.authenticationLdapScope` | LDAP Scope | `2` | | `adminserver.ldap.scope` | LDAP Scope | `2` |
| `adminserver.authenticationLdapTimeout` | LDAP Timeout | `5` | | `adminserver.ldap.timeout` | LDAP Timeout | `5` |
| `adminserver.authenticationLdapVerifyCert` | LDAP Verify HTTPS Certificate | `True` | | `adminserver.ldap.verifyCert` | LDAP Verify HTTPS Certificate | `True` |
| `adminserver.resources` | [resources](https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/) to allocate for container | undefined | | `adminserver.resources` | [resources](https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/) to allocate for container | undefined |
| `adminserver.volumes` | used to create PVCs if persistence is enabled (see instructions in values.yaml) | see values.yaml | | `adminserver.volumes` | used to create PVCs if persistence is enabled (see instructions in values.yaml) | see values.yaml |
| **Jobservice** | | **Jobservice** |

18
contrib/helm/harbor/templates/adminserver/adminserver-cm.yaml
View File

@ -29,16 +29,16 @@ data:
WITH_NOTARY: "{{ .Values.notary.enabled }}" WITH_NOTARY: "{{ .Values.notary.enabled }}"
LOG_LEVEL: "info" LOG_LEVEL: "info"
IMAGE_STORE_PATH: "/" # This is a temporary hack. IMAGE_STORE_PATH: "/" # This is a temporary hack.
AUTH_MODE: "{{ .Values.adminserver.harborAuthenticationMode }}" AUTH_MODE: "{{ .Values.adminserver.authenticationMode }}"
SELF_REGISTRATION: "{{ .Values.adminserver.selfRegistration }}" SELF_REGISTRATION: "{{ .Values.adminserver.selfRegistration }}"
LDAP_URL: "{{ .Values.adminserver.authenticationLdapURL }}" LDAP_URL: "{{ .Values.adminserver.ldap.url }}"
LDAP_SEARCH_DN: "{{ .Values.adminserver.authenticationLdapSearchDN }}" LDAP_SEARCH_DN: "{{ .Values.adminserver.ldap.searchDN }}"
LDAP_BASE_DN: "{{ .Values.adminserver.authenticationLdapBaseDN }}" LDAP_BASE_DN: "{{ .Values.adminserver.ldap.baseDN }}"
LDAP_FILTER: "{{ .Values.adminserver.authenticationLdapFilter }}" LDAP_FILTER: "{{ .Values.adminserver.ldap.filter }}"
LDAP_UID: "{{ .Values.adminserver.authenticationLdapUID }}" LDAP_UID: "{{ .Values.adminserver.ldap.uid }}"
LDAP_SCOPE: "{{ .Values.adminserver.authenticationLdapScope }}" LDAP_SCOPE: "{{ .Values.adminserver.ldap.scope }}"
LDAP_TIMEOUT: "{{ .Values.adminserver.authenticationLdapTimeout }}" LDAP_TIMEOUT: "{{ .Values.adminserver.ldap.timeout }}"
LDAP_VERIFY_CERT: "{{ .Values.adminserver.authenticationLdapVerifyCert }}" LDAP_VERIFY_CERT: "{{ .Values.adminserver.ldap.verifyCert }}"
DATABASE_TYPE: "mysql" DATABASE_TYPE: "mysql"
PROJECT_CREATION_RESTRICTION: "everyone" PROJECT_CREATION_RESTRICTION: "everyone"
VERIFY_REMOTE_CERT: "off" VERIFY_REMOTE_CERT: "off"

2
contrib/helm/harbor/templates/adminserver/adminserver-secrets.yaml
View File

@ -9,7 +9,7 @@ type: Opaque
data: data:
secretKey: {{ .Values.secretKey | b64enc | quote }} secretKey: {{ .Values.secretKey | b64enc | quote }}
EMAIL_PWD: {{ .Values.adminserver.emailPwd | b64enc | quote }} EMAIL_PWD: {{ .Values.adminserver.emailPwd | b64enc | quote }}
HARBOR_ADMIN_PASSWORD: {{ .Values.adminserver.harborAdminPassword | b64enc | quote }} HARBOR_ADMIN_PASSWORD: {{ .Values.adminserver.adminPassword | b64enc | quote }}
MYSQL_PWD: {{ .Values.mysql.pass | b64enc | quote }} MYSQL_PWD: {{ .Values.mysql.pass | b64enc | quote }}
JOBSERVICE_SECRET: {{ .Values.jobservice.secret | b64enc | quote }} JOBSERVICE_SECRET: {{ .Values.jobservice.secret | b64enc | quote }}
UI_SECRET: {{ .Values.ui.secret | b64enc | quote }} UI_SECRET: {{ .Values.ui.secret | b64enc | quote }}

21
contrib/helm/harbor/values.yaml
View File

@ -65,17 +65,18 @@ adminserver:
emailIdentity: "" emailIdentity: ""
emailInsecure: "False" emailInsecure: "False"
emailPwd: not-a-secure-password emailPwd: not-a-secure-password
harborAdminPassword: Harbor12345 adminPassword: Harbor12345
harborAuthenticationMode: "db_auth" authenticationMode: "db_auth"
selfRegistration: "on" selfRegistration: "on"
authenticationLdapURL: "ldaps://ldapserver" ldap:
authenticationLdapSearchDN: "" url: "ldaps://ldapserver"
authenticationLdapBaseDN: "" searchDN: ""
authenticationLdapFilter: "(objectClass=person)" baseDN: ""
authenticationLdapUID: "uid" filter: "(objectClass=person)"
authenticationLdapScope: "2" uid: "uid"
authenticationLdapTimeout: "5" scope: "2"
authenticationLdapVerifyCert: "True" timeout: "5"
verifyCert: "True"
## Persist data to a persistent volume ## Persist data to a persistent volume
volumes: volumes:
config: config: