From 495e4d8d728311dca16f9d854e33fcdc8ea0ba1d Mon Sep 17 00:00:00 2001 From: Josh Dolitsky Date: Sun, 27 May 2018 09:59:32 -0500 Subject: [PATCH] [stable/chartmuseum] update app version, add vars for openstack and redis (#5784) --- stable/chartmuseum/Chart.yaml | 4 ++-- stable/chartmuseum/README.md | 42 ++++++++++++++++++++++++++++++++++ stable/chartmuseum/values.yaml | 20 +++++++++++++++- 3 files changed, 63 insertions(+), 3 deletions(-) diff --git a/stable/chartmuseum/Chart.yaml b/stable/chartmuseum/Chart.yaml index c053d5d876..80fd7d742d 100644 --- a/stable/chartmuseum/Chart.yaml +++ b/stable/chartmuseum/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 description: Helm Chart Repository with support for Amazon S3 and Google Cloud Storage name: chartmuseum -version: 1.3.1 -appVersion: 0.5.2 +version: 1.4.0 +appVersion: 0.7.0 home: https://github.com/chartmuseum/chartmuseum icon: https://raw.githubusercontent.com/chartmuseum/chartmuseum/master/logo.png keywords: diff --git a/stable/chartmuseum/README.md b/stable/chartmuseum/README.md index 3f09967589..f5e5d91962 100644 --- a/stable/chartmuseum/README.md +++ b/stable/chartmuseum/README.md @@ -79,11 +79,16 @@ their default values. See values.yaml for all available options. | `env.open.GOOGLE_PREFIX` | Prefix to store charts under for GCP | `` | | `env.open.STORAGE_MICROSOFT_CONTAINER` | Container to store charts under for MS | `` | | `env.open.STORAGE_MICROSOFT_PREFIX` | Prefix to store charts under for MS | `` | +| `env.open.STORAGE_OPENSTACK_CONTAINER` | Container to store charts for openstack | `` | +| `env.open.STORAGE_OPENSTACK_PREFIX` | Prefix to store charts for openstack | `` | +| `env.open.STORAGE_OPENSTACK_REGION` | Region of openstack container | `` | +| `env.open.STORAGE_OPENSTACK_CACERT` | Path to a CA cert bundle for openstack | `` | | `env.open.CHART_POST_FORM_FIELD_NAME` | Form field to query for chart file content | `` | | `env.open.PROV_POST_FORM_FIELD_NAME` | Form field to query for chart provenance | `` | | `env.open.DEPTH` | levels of nested repos for multitenancy. | `0` | | `env.open.DEBUG` | Show debug messages | `false` | | `env.open.LOG_JSON` | Output structured logs in JSON | `true` | +| `env.open.DISABLE_STATEFILES` | Disable use of index-cache.yaml | `false` | | `env.open.DISABLE_METRICS` | Disable Prometheus metrics | `true` | | `env.open.DISABLE_API` | Disable all routes prefixed with /api | `true` | | `env.open.ALLOW_OVERWRITE` | Allow chart versions to be re-uploaded | `false` | @@ -91,8 +96,12 @@ their default values. See values.yaml for all available options. | `env.open.AUTH_ANONYMOUS_GET` | Allow anon GET operations when auth is used | `false` | | `env.open.CONTEXT_PATH` | Set the base context path | `` | | `env.open.INDEX_LIMIT` | Parallel scan limit for the repo indexer | `` | +| `env.open.CACHE` | Cache store, can be one of: redis | `` | +| `env.open.CACHE_REDIS_ADDR` | Address of Redis service (host:port) | `` | +| `env.open.CACHE_REDIS_DB` | Redis database to be selected after connect | `0` | | `env.secret.BASIC_AUTH_USER` | Username for basic HTTP authentication | `` | | `env.secret.BASIC_AUTH_PASS` | Password for basic HTTP authentication | `` | +| `env.secret.CACHE_REDIS_PASSWORD` | Redis requirepass server configuration | `` | | `gcp.secret.enabled` | Flag for the GCP service account | `false` | | `gcp.secret.name` | Secret name for the GCP json file | `` | | `gcp.secret.key` | Secret key for te GCP json file | `credentials.json` | @@ -343,6 +352,39 @@ Run command to install helm install --name my-chartmuseum -f custom.yaml stable/chartmuseum ``` +### Using with Openstack Object Storage + +Make sure your environment is properly setup to access `mycontainer`. + +To do so, you must set the following env vars (depending on your openstack version): +- `OS_AUTH_URL` +- either `OS_PROJECT_NAME` or `OS_TENANT_NAME` or `OS_PROJECT_ID` or `OS_TENANT_ID` +- either `OS_DOMAIN_NAME` or `OS_DOMAIN_ID` +- either `OS_USERNAME` or `OS_USERID` +- `OS_PASSWORD` + +Specify `custom.yaml` with such values + +```yaml +env: + open: + STORAGE: openstack + STORAGE_OPENSTACK_CONTAINER: mycontainer + STORAGE_OPENSTACK_PREFIX: + STORAGE_OPENSTACK_REGION: YOURREGION + secret: + OS_AUTH_URL: https://myauth.url.com/v2.0/ + OS_TENANT_ID: yourtenantid + OS_USERNAME: yourusername + OS_PASSWORD: yourpassword +``` + +Run command to install + +```shell +helm install --name my-chartmuseum -f custom.yaml stable/chartmuseum +``` + ### Using with local filesystem storage By default chartmuseum uses local filesystem storage. But on pod recreation it will lose all charts, to prevent that enable persistent storage. diff --git a/stable/chartmuseum/values.yaml b/stable/chartmuseum/values.yaml index 54b3d90d50..af55ed4926 100644 --- a/stable/chartmuseum/values.yaml +++ b/stable/chartmuseum/values.yaml @@ -5,7 +5,7 @@ strategy: maxUnavailable: 0 image: repository: chartmuseum/chartmuseum - tag: v0.5.2 + tag: v0.7.0 pullPolicy: IfNotPresent env: open: @@ -38,6 +38,14 @@ env: STORAGE_MICROSOFT_CONTAINER: # prefix to store charts for microsoft storage backend STORAGE_MICROSOFT_PREFIX: + # container to store charts for openstack storage backend + STORAGE_OPENSTACK_CONTAINER: + # prefix to store charts for openstack storage backend + STORAGE_OPENSTACK_PREFIX: + # region of openstack container + STORAGE_OPENSTACK_REGION: + # path to a CA cert bundle for your openstack endpoint + STORAGE_OPENSTACK_CACERT: # form field which will be queried for the chart file content CHART_POST_FORM_FIELD_NAME: chart # form field which will be queried for the provenance file content @@ -48,6 +56,8 @@ env: DEBUG: false # output structured logs as json LOG_JSON: true + # disable use of index-cache.yaml + DISABLE_STATEFILES: false # disable Prometheus metrics DISABLE_METRICS: true # disable all routes prefixed with /api @@ -62,6 +72,12 @@ env: CONTEXT_PATH: # parallel scan limit for the repo indexer INDEX_LIMIT: 0 + # cache store, can be one of: redis (leave blank for inmemory cache) + CACHE: + # address of Redis service (host:port) + CACHE_REDIS_ADDR: + # Redis database to be selected after connect + CACHE_REDIS_DB: 0 secret: # username for basic http authentication BASIC_AUTH_USER: @@ -69,6 +85,8 @@ env: BASIC_AUTH_PASS: # GCP service account json file GOOGLE_CREDENTIALS_JSON: + # Redis requirepass server configuration + CACHE_REDIS_PASSWORD: deployment: ## Chartmuseum Deployment annotations annotations: {}