diff --git a/stable/chartmuseum/Chart.yaml b/stable/chartmuseum/Chart.yaml index 9eaa33198f..5a470a69df 100644 --- a/stable/chartmuseum/Chart.yaml +++ b/stable/chartmuseum/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 description: Host your own Helm Chart Repository name: chartmuseum -version: 2.0.1 -appVersion: 0.8.1 +version: 2.1.0 +appVersion: 0.8.2 home: https://github.com/helm/chartmuseum icon: https://raw.githubusercontent.com/helm/chartmuseum/master/logo2.png keywords: diff --git a/stable/chartmuseum/README.md b/stable/chartmuseum/README.md index 4ec232ebb0..60f4ed3e7b 100644 --- a/stable/chartmuseum/README.md +++ b/stable/chartmuseum/README.md @@ -10,27 +10,29 @@ Please also see https://github.com/kubernetes-helm/chartmuseum -- [Prerequisites](#prerequisites) -- [Configuration](#configuration) -- [Installation](#installation) - - [Using with Amazon S3](#using-with-amazon-s3) - - [permissions grant with access keys](#permissions-grant-with-access-keys) - - [permissions grant with IAM instance profile](#permissions-grant-with-iam-instance-profile) - - [permissions grant with IAM assumed role](#permissions-grant-with-iam-assumed-role) - - [Using with Google Cloud Storage](#using-with-google-cloud-storage) - - [Using with Google Cloud Storage and a Google Service Account](#using-with-google-cloud-storage-and-a-google-service-account) - - [Using with Microsoft Azure Blob Storage](#using-with-microsoft-azure-blob-storage) - - [Using with Alibaba Cloud OSS Storage](#using-with-alibaba-cloud-oss-storage) - - [Using with Openstack Object Storage](#using-with-openstack-object-storage) - - [Using with Oracle Object Storage](#using-with-oracle-object-storage) - - [Using an existing secret](#using-an-existing-secret) - - [Using with local filesystem storage](#using-with-local-filesystem-storage) - - [Example storage class](#example-storage-class) - - [Ingress](#ingress) - - [Hosts](#hosts) - - [Annotations](#annotations) - - [Example Ingress configuration](#example-ingress-configuration) -- [Uninstall](#uninstall) +- [ChartMuseum Helm Chart](#chartmuseum-helm-chart) + - [Table of Content](#table-of-content) + - [Prerequisites](#prerequisites) + - [Configuration](#configuration) + - [Installation](#installation) + - [Using with Amazon S3](#using-with-amazon-s3) + - [permissions grant with access keys](#permissions-grant-with-access-keys) + - [permissions grant with IAM instance profile](#permissions-grant-with-iam-instance-profile) + - [permissions grant with IAM assumed role](#permissions-grant-with-iam-assumed-role) + - [Using with Google Cloud Storage](#using-with-google-cloud-storage) + - [Using with Google Cloud Storage and a Google Service Account](#using-with-google-cloud-storage-and-a-google-service-account) + - [Using with Microsoft Azure Blob Storage](#using-with-microsoft-azure-blob-storage) + - [Using with Alibaba Cloud OSS Storage](#using-with-alibaba-cloud-oss-storage) + - [Using with Openstack Object Storage](#using-with-openstack-object-storage) + - [Using with Oracle Object Storage](#using-with-oracle-object-storage) + - [Using an existing secret](#using-an-existing-secret) + - [Using with local filesystem storage](#using-with-local-filesystem-storage) + - [Example storage class](#example-storage-class) + - [Ingress](#ingress) + - [Hosts](#hosts) + - [Annotations](#annotations) + - [Example Ingress configuration](#example-ingress-configuration) + - [Uninstall](#uninstall) @@ -155,6 +157,8 @@ their default values. See values.yaml for all available options. | `ingress.hosts[0].path` | Path within the url structure | `` | | `ingress.hosts[0].tls ` | Enable TLS on the ingress host | `false` | | `ingress.hosts[0].tlsSecret` | TLS secret to use (must be manually created)| `` | +| `ingress.hosts[0].serviceName` | The name of the service to route traffic to. | `{{ .Values.service.externalPort }}` | +| `ingress.hosts[0].servicePort` | The port of the service to route traffic to. | `{{ .chartmuseum. }}` | Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. @@ -571,6 +575,8 @@ To enable ingress integration, please set `ingress.enabled` to `true` Most likely you will only want to have one hostname that maps to this Chartmuseum installation, however, it is possible to have more than one host. To facilitate this, the `ingress.hosts` object is an array. TLS secrets referenced in the ingress host configuration must be manually created in the namespace. +In most cases, you should not specify values for `ingress.hosts[0].serviceName` and `ingress.hosts[0].servicePort`. However, some ingress controllers support advanced scenarios requiring you to specify these values. For example, [setting up an SSL redirect using the AWS ALB Ingress Controller](https://kubernetes-sigs.github.io/aws-alb-ingress-controller/guide/tasks/ssl_redirect/). + #### Annotations For annotations, please see [this document for nginx](https://github.com/kubernetes/ingress-nginx/blob/master/docs/user-guide/nginx-configuration/annotations.md) and [this document for Traefik](https://docs.traefik.io/configuration/backends/kubernetes/#general-annotations). Not all annotations are supported by all ingress controllers, but this document does a good job of indicating which annotation is supported by many popular ingress controllers. Annotations can be set using `ingress.annotations`. diff --git a/stable/chartmuseum/templates/ingress.yaml b/stable/chartmuseum/templates/ingress.yaml index 9d14993bf9..3c2aa1751e 100644 --- a/stable/chartmuseum/templates/ingress.yaml +++ b/stable/chartmuseum/templates/ingress.yaml @@ -21,8 +21,8 @@ spec: paths: - path: {{ default "/" .path | quote }} backend: - serviceName: {{ $serviceName }} - servicePort: {{ $servicePort }} + serviceName: {{ default $serviceName .serviceName }} + servicePort: {{ default $servicePort .servicePort }} {{- end }} tls: {{- range .Values.ingress.hosts }} diff --git a/stable/chartmuseum/values.yaml b/stable/chartmuseum/values.yaml index 1a31197740..2b1dcd8d80 100644 --- a/stable/chartmuseum/values.yaml +++ b/stable/chartmuseum/values.yaml @@ -5,7 +5,7 @@ strategy: maxUnavailable: 0 image: repository: chartmuseum/chartmuseum - tag: v0.8.1 + tag: v0.8.2 pullPolicy: IfNotPresent env: open: