[bitnami/harbor] Store passwords of redis, clair and notary in secrets #1941
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| clair: | ||
|
Contributor
There was a problem hiding this comment. Why are you duplicating the values on this file? They are already into the
Contributor
Author
There was a problem hiding this comment. This file comes from moving this out from clair-cm.yaml
Contributor
There was a problem hiding this comment. Well, in that case, move those values to the
Contributor
Author
There was a problem hiding this comment. This is the config file that clair will use here, it is not related to values.yaml
Contributor
There was a problem hiding this comment. I'm not clear on this because I think this forces the user to clone the bitnami/charts repository in order to work. Would this file become part of the final tarball?
Contributor
Author
There was a problem hiding this comment. Yes, This approach is the same as in here, where we import the |
||
| database: | ||
| type: pgsql | ||
| options: | ||
| source: "{{ template "harbor.database.clair" . }}" | ||
| # Number of elements kept in the cache | ||
| # Values unlikely to change (e.g. namespaces) are cached in order to save prevent needless roundtrips to the database. | ||
| cachesize: 16384 | ||
| api: | ||
| # API server port | ||
| port: 6060 | ||
| healthport: 6061 | ||
| # Deadline before an API request will respond with a 503 | ||
| timeout: 300s | ||
| updater: | ||
| interval: {{ .Values.clair.updatersInterval }}h | ||
| notifier: | ||
| attempts: 3 | ||
| renotifyinterval: 2h | ||
| http: | ||
| endpoint: "http://{{ template "harbor.core" . }}/service/notifications/clair" | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| { | ||
| "server": { | ||
| "http_addr": ":4443" | ||
| }, | ||
| "trust_service": { | ||
| "type": "remote", | ||
| "hostname": "{{ template "harbor.notary-signer" . }}", | ||
| "port": "7899", | ||
| {{- if not .Values.notary.secretName }} | ||
| "tls_ca_file": "./notary-signer-ca.crt", | ||
| {{- else }} | ||
| "tls_ca_file": "/etc/ssl/notary/cert/notary-signer-ca.crt", | ||
| {{- end }} | ||
| "key_algorithm": "ecdsa" | ||
| }, | ||
| "logging": { | ||
| "level": "{{ .Values.logLevel }}" | ||
| }, | ||
| "storage": { | ||
| "backend": "postgres", | ||
| "db_url": "{{ template "harbor.database.notaryServer" . }}" | ||
| }, | ||
| "auth": { | ||
| "type": "token", | ||
| "options": { | ||
| "realm": "{{ template "harbor.externalUrl" . }}/service/token", | ||
| "service": "harbor-notary", | ||
| "issuer": "harbor-token-issuer", | ||
| "rootcertbundle": "/root.crt" | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| { | ||
| "server": { | ||
| "grpc_addr": ":7899", | ||
| {{- if not .Values.notary.secretName }} | ||
| "tls_cert_file": "./notary-signer.crt", | ||
| "tls_key_file": "./notary-signer.key" | ||
| {{- else }} | ||
| "tls_cert_file": "/etc/ssl/notary/cert/notary-signer.crt", | ||
| "tls_key_file": "/etc/ssl/notary/cert/notary-signer.key" | ||
| {{- end }} | ||
| }, | ||
| "logging": { | ||
| "level": "{{ .Values.logLevel }}" | ||
| }, | ||
| "storage": { | ||
| "backend": "postgres", | ||
| "db_url": "{{ template "harbor.database.notarySigner" . }}", | ||
| "default_alias": "defaultalias" | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| {{- if .Values.clair.enabled }} | ||
| apiVersion: v1 | ||
| kind: Secret | ||
| metadata: | ||
| name: {{ template "harbor.clair" . }} | ||
| labels: | ||
| {{ include "harbor.labels" . | indent 4 }} | ||
| type: Opaque | ||
| data: | ||
| config.yaml: {{ tpl (.Files.Get "conf/clair.yaml") . | b64enc }} | ||
|
miguelaeh marked this conversation as resolved.
|
||
| {{- end }} | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| {{- if .Values.notary.enabled }} | ||
|
miguelaeh marked this conversation as resolved.
|
||
| apiVersion: v1 | ||
| kind: Secret | ||
| metadata: | ||
| name: {{ include "harbor.notary-server" . }} | ||
| labels: {{- include "harbor.labels" . | nindent 4 }} | ||
| component: notary | ||
| data: | ||
| {{- if not .Values.notary.secretName }} | ||
| {{ $ca := genCA "harbor-notary-ca" 365 }} | ||
| {{ $cert := genSignedCert (include "harbor.notary-signer" .) nil nil 365 $ca }} | ||
| notary-signer-ca.crt: {{ $ca.Cert | b64enc | quote }} | ||
| notary-signer.crt: {{ $cert.Cert | b64enc | quote }} | ||
| notary-signer.key: {{ $cert.Key | b64enc | quote }} | ||
| {{- end }} | ||
| server-config.postgres.json: {{ tpl (.Files.Get "conf/notary-server.json") . | b64enc }} | ||
| signer-config.postgres.json: {{ tpl (.Files.Get "conf/notary-signer.json") . | b64enc }} | ||
| {{- end }} | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There are variables here that are not used
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
true, I just reviewed them one by one :)