Added support for clusterIP and headless services. (helm#8312)

Signed-off-by: Arvind Gupta <guptaarvindk@gmail.com>
davidkarlsen · Oct 9, 2018 · d2983fb · d2983fb
1 parent 80a49ba
commit d2983fb
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 11 deletions.
diff --git a/stable/chartmuseum/Chart.yaml b/stable/chartmuseum/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: Helm Chart Repository with support for Amazon S3 and Google Cloud Storage
 name: chartmuseum
-version: 1.6.1
+version: 1.6.2
 appVersion: 0.7.1
 home: https://github.com/chartmuseum/chartmuseum
 icon: https://raw.githubusercontent.com/chartmuseum/chartmuseum/master/logo.png

diff --git a/stable/chartmuseum/README.md b/stable/chartmuseum/README.md
@@ -25,7 +25,7 @@ Please also see https://github.com/kubernetes-helm/chartmuseum
 - [Uninstall](#uninstall)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
- 
+
 
 ## Prerequisites
 
@@ -46,7 +46,7 @@ kubectl create -f /path/to/storage_class.yaml
 ```
 
 The following table lists common configurable parameters of the chart and
-their default values. See values.yaml for all available options. 
+their default values. See values.yaml for all available options.
 
 |       Parameter                        |           Description                       |                         Default                     |
 |----------------------------------------|---------------------------------------------|-----------------------------------------------------|
@@ -108,6 +108,8 @@ their default values. See values.yaml for all available options.
 | `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`                                  |
+| `service.type`                         | Kubernetes Service type                     | `ClusterIP`                                          |
+| `service.clusterIP`                    | Static clusterIP or None for headless services| `nil`                                              |
 
 Specify each parameter using the `--set key=value[,key=value]` argument to
 `helm install`.
@@ -165,7 +167,7 @@ env:
     STORAGE_AMAZON_REGION: us-east-1
   secret:
     AWS_ACCESS_KEY_ID: "********" ## aws access key id value
-    AWS_SECRET_ACCESS_KEY: "********" ## aws access key secret value 
+    AWS_SECRET_ACCESS_KEY: "********" ## aws access key secret value
 ```
 
 Run command to install
@@ -318,7 +320,7 @@ env:
     STORAGE_MICROSOFT_PREFIX:    
   secret:
     AZURE_STORAGE_ACCOUNT: "********" ## azure storage account
-    AZURE_STORAGE_ACCESS_KEY: "********" ## azure storage account access key 
+    AZURE_STORAGE_ACCESS_KEY: "********" ## azure storage account access key
 ```
 
 Run command to install
@@ -346,7 +348,7 @@ env:
     STORAGE_ALIBABA_ENDPOINT: oss-cn-beijing.aliyuncs.com
   secret:
     ALIBABA_CLOUD_ACCESS_KEY_ID: "********" ## alibaba OSS access key id
-    ALIBABA_CLOUD_ACCESS_KEY_SECRET: "********" ## alibaba OSS access key secret 
+    ALIBABA_CLOUD_ACCESS_KEY_SECRET: "********" ## alibaba OSS access key secret
 ```
 
 Run command to install
@@ -389,8 +391,8 @@ 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. 
+By default chartmuseum uses local filesystem storage.
+But on pod recreation it will lose all charts, to prevent that enable persistent storage.
 
 ```yaml
 env:
@@ -438,12 +440,12 @@ parameters:
   adminSecretNamespace: default
   pool: chartstore
   userId: user
-  userSecretName: thesecret 
+  userSecretName: thesecret
 ```
 
-## Uninstall 
+## Uninstall
 
-By default, a deliberate uninstall will result in the persistent volume 
+By default, a deliberate uninstall will result in the persistent volume
 claim being deleted.   
 
 ```shell

diff --git a/stable/chartmuseum/templates/service.yaml b/stable/chartmuseum/templates/service.yaml
@@ -12,6 +12,11 @@ metadata:
 {{- end }}
 spec:
   type: {{ .Values.service.type }}
+  {{- if eq .Values.service.type "ClusterIP" }}
+  {{- if .Values.service.clusterIP }}
+  clusterIP: {{ .Values.service.clusterIP }}
+  {{- end }}
+  {{- end }}
   ports:
   - port: {{ .Values.service.externalPort }}
 {{- if (and (eq .Values.service.type "NodePort") (not (empty .Values.service.nodePort))) }}

diff --git a/stable/chartmuseum/values.yaml b/stable/chartmuseum/values.yaml
@@ -98,6 +98,7 @@ replica:
   #   iam.amazonaws.com/role: role-arn
 service:
   type: ClusterIP
+  # clusterIP: None
   externalPort: 8080
   nodePort:
   annotations: {}