Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

htpasswdString doc fix - resolves #1210 #1242

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

htpasswdString doc fix - resolves #1210 #1242

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b1fa28b
htpasswdString doc fix - resolves #1210
RichardSufliarsky Jul 28, 2022
6365a42
Merge branch 'goharbor:master' into 1210-htpasswdString-doc-fix
RichardSufliarsky Aug 15, 2022
b75b822
htpasswdString consistency clarification - resolves #1210
RichardSufliarsky Aug 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 10 additions & 3 deletions values.yaml
View file
Open in desktop
Expand Up @@ -576,8 +576,15 @@ registry:
credentials:
username: "harbor_registry_user"
password: "harbor_registry_password"
# Login and password in htpasswd string format. Excludes `registry.credentials.username` and `registry.credentials.password`. May come in handy when integrating with tools like argocd or flux. This allows the same line to be generated each time the template is rendered, instead of the `htpasswd` function from helm, which generates different lines each time because of the salt.
# htpasswdString: $apr1$XLefHzeG$Xl4.s00sMSCCcMyJljSZb0 # example string
# Login and password in htpasswd string format. May come in handy when integrating with tools like argocd or flux.
# This allows the same line to be generated each time the template is rendered, instead of the `htpasswd` function from helm,
# which generates different lines each time because of the salt.
# Do not comment out `registry.credentials.username` and `registry.credentials.password` as these are used
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please add an additional comment:

If using htpasswdString, it should be consistent with using credentials.username and credentials.password.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@zyyw, done.

# for core and jobservice Config Maps and Secrets.
# If using `htpasswdString`, it should be consistent with `registry.credentials.username` and `registry.credentials.password`.
# To generate bcrypt hash: "htpasswd -nbBC10 $username $password".
# More info: https://httpd.apache.org/docs/2.4/misc/password_encryptions.html
# htpasswdString: "harbor_registry_user:$2y$10$XLefHzeG$Xl4.s00sMSCCcMyJljSZb0" # example string
middleware:
enabled: false
type: cloudFront
Expand Down Expand Up @@ -945,4 +952,4 @@ cache:
# default is not enabled.
enabled: false
# default keep cache for one day.
expireHours: 24
expireHours: 24