diff --git a/stable/oauth2-proxy/Chart.yaml b/stable/oauth2-proxy/Chart.yaml
index c4d940f869..ad008a277d 100644
--- a/stable/oauth2-proxy/Chart.yaml
+++ b/stable/oauth2-proxy/Chart.yaml
@@ -1,5 +1,5 @@
 name: oauth2-proxy
-version: 0.11.0
+version: 0.12.0
 apiVersion: v1
 appVersion: 3.1.0
 home: http://www.videntity.com/
diff --git a/stable/oauth2-proxy/README.md b/stable/oauth2-proxy/README.md
index a4e52867f0..a0bb998b52 100644
--- a/stable/oauth2-proxy/README.md
+++ b/stable/oauth2-proxy/README.md
@@ -73,6 +73,9 @@ Parameter | Description | Default
 `resources` | pod resource requests & limits | `{}`
 `service.port` | port for the service | `80`
 `service.type` | type of service | `ClusterIP`
+`service.clusterIP` | cluster ip address | `nil`
+`service.loadBalancerIP` | ip of load balancer | `nil`
+`service.loadBalancerSourceRanges` | allowed source ranges in load balancer | `nil`
 `tolerations` | List of node taints to tolerate | `[]`
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
diff --git a/stable/oauth2-proxy/templates/service.yaml b/stable/oauth2-proxy/templates/service.yaml
index b89ca6e187..e2d3157779 100644
--- a/stable/oauth2-proxy/templates/service.yaml
+++ b/stable/oauth2-proxy/templates/service.yaml
@@ -12,7 +12,23 @@ metadata:
 {{ toYaml .Values.service.annotations | indent 4 }}
 {{- end }}
 spec:
+{{- if (or (eq .Values.service.type "ClusterIP") (empty .Values.service.type)) }}
+  type: ClusterIP
+  {{- if .Values.service.clusterIP }}
+  clusterIP: {{ .Values.service.clusterIP }}
+  {{end}}
+{{- else if eq .Values.service.type "LoadBalancer" }}
   type: {{ .Values.service.type }}
+  {{- if .Values.service.loadBalancerIP }}
+  loadBalancerIP: {{ .Values.service.loadBalancerIP }}
+  {{- end }}
+  {{- if .Values.service.loadBalancerSourceRanges }}
+  loadBalancerSourceRanges:
+{{ toYaml .Values.service.loadBalancerSourceRanges | indent 4 }}
+  {{- end -}}
+{{- else }}
+  type: {{ .Values.service.type }}
+{{- end }}
   ports:
     - port: {{ .Values.service.port }}
       targetPort: http
diff --git a/stable/oauth2-proxy/values.yaml b/stable/oauth2-proxy/values.yaml
index 35fb4b6de3..a10323c45b 100644
--- a/stable/oauth2-proxy/values.yaml
+++ b/stable/oauth2-proxy/values.yaml
@@ -60,6 +60,11 @@ authenticatedEmailsFile:
 
 service:
   type: ClusterIP
+  # when service.type is ClusterIP ...
+  # clusterIP: 192.0.2.20
+  # when service.type is LoadBalancer ...
+  # loadBalancerIP: 198.51.100.40
+  # loadBalancerSourceRanges: 203.0.113.0/24
   port: 80
   annotations: {}
   # foo.io/bar: "true"