Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into release-1.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
bitsf committed Jun 3, 2022
2 parents a78c63d + 58680c2 commit 6bd4e30
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
9 changes: 4 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -428,15 +428,14 @@ install-dependencies: certmanager postgresql redis ingress
.PHONY: redis
redis: helm sample-redis
$(HELM) repo add bitnami https://charts.bitnami.com/bitnami
$(HELM) upgrade --install harbor-redis bitnami/redis --version 12.10.0 \
--set-string existingSecret=harbor-redis \
--set-string existingSecretPasswordKey=redis-password \
--set usePassword=true
$(HELM) upgrade --install harbor-redis bitnami/redis --version 15.7.0 \
--set-string auth.existingSecret=harbor-redis \
--set-string auth.existingSecretPasswordKey=redis-password

.PHONY: postgresql
postgresql: helm sample-database
$(HELM) repo add bitnami https://charts.bitnami.com/bitnami
$(HELM) upgrade --install harbor-database bitnami/postgresql --version 10.3.17 \
$(HELM) upgrade --install harbor-database bitnami/postgresql --version 10.14.3 \
--set-string initdbScriptsConfigMap=harbor-init-db \
--set-string existingSecret=harbor-database-password

Expand Down
4 changes: 2 additions & 2 deletions docs/installation/customize-storage-db-redis.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ For customizing the storage spec, you can directly follow the [CRD spec](../CRD/
Harbor uses PostgreSQL as its database to store the related metadata. You can create a database instance from your cloud provider or pre-install a PostgreSQL on your resources. e.g.:

```shell
helm upgrade --install harbor-database bitnami/postgresql --version 10.3.17 --set-string initdbScriptsConfigMap=harbor-init-db --set-string postgresqlPassword=the-psql-password --set-string image.registry=ghcr.io --set-string image.repository=goharbor/postgresql
helm upgrade --install harbor-database bitnami/postgresql --version 10.14.3 --set-string initdbScriptsConfigMap=harbor-init-db --set-string postgresqlPassword=the-psql-password --set-string image.registry=ghcr.io --set-string image.repository=goharbor/postgresql
```

Here the `initdbScriptsConfigMap` is pointing to a `configMap` used to initialize the databases. e.g.:
Expand Down Expand Up @@ -90,7 +90,7 @@ The thing to note here is the names of the databases `core`, `notaryserver` (onl
Harbor uses Redis as its cache service to cache data. You can create a cache instance from your cloud provider or pre-install a Redis on your resources. e.g.:

```shell
helm upgrade --install harbor-redis bitnami/redis --version 12.10.0 --set-string password=the-redis-password --set usePassword=true --set-string image.registry=ghcr.io --set-string image.repository=goharbor/redis
helm upgrade --install harbor-redis bitnami/redis --version 15.7.0 --set-string password=the-redis-password --set usePassword=true --set-string image.registry=ghcr.io --set-string image.repository=goharbor/redis
```

>NOTES: `make redis` can also help install a Redis instance quickly.
Expand Down

0 comments on commit 6bd4e30

Please sign in to comment.