[stable/kong] add load balancer source range parameters (#9038)

* Add parameters for loadBalancerSourceRanges

Signed-off-by: Christopher Kent <thirstydeveloper@gmail.com>

* Bump version

Signed-off-by: Christopher Kent <thirstydeveloper@gmail.com>

* Update readme

Signed-off-by: Christopher Kent <thirstydeveloper@gmail.com>

* Update README

Signed-off-by: Christopher Kent <thirstydeveloper@gmail.com>

* Add values for ci test of load balancer params

Signed-off-by: Christopher Kent <thirstydeveloper@gmail.com>

* Add symlink to default values for ci testing

Signed-off-by: Christopher Kent <thirstydeveloper@gmail.com>

* Fix README

Signed-off-by: Christopher Kent <thirstydeveloper@gmail.com>

* Fix syntax for multiple cidr blocks

Signed-off-by: Christopher Kent <thirstydeveloper@gmail.com>
This commit is contained in:
Chris Kent
2018-11-06 22:22:34 -08:00
committed by k8s-ci-robot
parent 421b9c7e62
commit bf3ada102c
7 changed files with 67 additions and 4 deletions
+1 -1
View File
@@ -12,5 +12,5 @@ maintainers:
name: kong
sources:
- https://github.com/Kong/kong
version: 0.5.6
version: 0.5.7
appVersion: 0.14.1
+3 -1
View File
@@ -61,6 +61,7 @@ and their default values.
| admin.nodePort | Node port when service type is `NodePort` | |
| admin.type | k8s service type, Options: NodePort, ClusterIP, LoadBalancer | `NodePort` |
| admin.loadBalancerIP | Will reuse an existing ingress static IP for the admin service | `null` |
| admin.loadBalancerSourceRanges | Limit admin access to CIDRs if set and service type is `LoadBalancer` | `[]` |
| admin.ingress.enabled | Enable ingress resource creation (works with proxy.type=ClusterIP) | `false` |
| admin.ingress.tls | Name of secret resource, containing TLS secret | |
| admin.ingress.hosts | List of ingress hosts. | `[]` |
@@ -72,6 +73,7 @@ and their default values.
| proxy.nodePort | Node port when service type is `NodePort` | |
| proxy.type | k8s service type. Options: NodePort, ClusterIP, LoadBalancer | `NodePort` |
| proxy.loadBalancerIP | To reuse an existing ingress static IP for the admin service | |
| proxy.loadBalancerSourceRanges | Limit proxy access to CIDRs if set and service type is `LoadBalancer` | `[]` |
| proxy.ingress.enabled | Enable ingress resource creation (works with proxy.type=ClusterIP) | `false` |
| proxy.ingress.tls | Name of secret resource, containing TLS secret | |
| proxy.ingress.hosts | List of ingress hosts. | `[]` |
@@ -108,7 +110,7 @@ Postgres is enabled by default.
| env.database | Choose either `postgres` or `cassandra` | `postgres` |
| env.pg_user | Postgres username | `kong` |
| env.pg_database | Postgres database name | `kong` |
| env.pg_password | Postgres database password (required if you are using your own database)| `kong` |
| env.pg_password | Postgres database password (required if you are using your own database)| `kong` |
| env.pg_host | Postgres database host (required if you are using your own database) | `` |
| env.pg_port | Postgres database port | `5432` |
| env.cassandra_contact_points | Cassandra contact points (required if you are using your own database) | `` |
+1
View File
@@ -0,0 +1 @@
../values.yaml
+44
View File
@@ -0,0 +1,44 @@
# CI test for LoadBalancer admin/proxy types
admin:
useTLS: true
type: LoadBalancer
loadBalancerSourceRanges:
- 192.168.1.1/32
- 10.10.10.10/32
proxy:
useTLS: true
type: LoadBalancer
loadBalancerSourceRanges:
- 192.168.1.1/32
- 10.10.10.10/32
readinessProbe:
httpGet:
path: "/status"
port: admin
scheme: HTTPS
initialDelaySeconds: 30
timeoutSeconds: 1
periodSeconds: 10
successThreshold: 1
failureThreshold: 5
livenessProbe:
httpGet:
path: "/status"
port: admin
scheme: HTTPS
initialDelaySeconds: 30
timeoutSeconds: 5
periodSeconds: 30
successThreshold: 1
failureThreshold: 5
postgresql:
enabled: true
postgresUser: kong
postgresDatabase: kong
service:
port: 5432
Binary file not shown.
@@ -13,9 +13,17 @@ metadata:
heritage: "{{ .Release.Service }}"
spec:
type: {{ .Values.admin.type }}
{{- if and (eq .Values.admin.type "LoadBalancer") .Values.admin.loadBalancerIP }}
{{- if eq .Values.admin.type "LoadBalancer" }}
{{- if .Values.admin.loadBalancerIP }}
loadBalancerIP: {{ .Values.admin.loadBalancerIP }}
{{- end }}
{{- if .Values.admin.loadBalancerSourceRanges }}
loadBalancerSourceRanges:
{{- range $cidr := .Values.admin.loadBalancerSourceRanges }}
- {{ $cidr }}
{{- end }}
{{- end }}
{{- end }}
ports:
- name: kong-admin
port: {{ .Values.admin.servicePort }}
@@ -13,9 +13,17 @@ metadata:
heritage: "{{ .Release.Service }}"
spec:
type: {{ .Values.proxy.type }}
{{- if and (eq .Values.proxy.type "LoadBalancer") .Values.proxy.loadBalancerIP }}
{{- if eq .Values.proxy.type "LoadBalancer" }}
{{- if .Values.proxy.loadBalancerIP }}
loadBalancerIP: {{ .Values.proxy.loadBalancerIP }}
{{- end }}
{{- if .Values.proxy.loadBalancerSourceRanges }}
loadBalancerSourceRanges:
{{- range $cidr := .Values.admin.loadBalancerSourceRanges }}
- {{ $cidr }}
{{- end }}
{{- end }}
{{- end }}
ports:
- name: kong-proxy
port: {{ .Values.proxy.servicePort }}