From bf3ada102c4957dddcd5f3dea0c2f475f411cfb4 Mon Sep 17 00:00:00 2001 From: Chris Kent Date: Wed, 7 Nov 2018 01:22:34 -0500 Subject: [PATCH] [stable/kong] add load balancer source range parameters (#9038) * Add parameters for loadBalancerSourceRanges Signed-off-by: Christopher Kent * Bump version Signed-off-by: Christopher Kent * Update readme Signed-off-by: Christopher Kent * Update README Signed-off-by: Christopher Kent * Add values for ci test of load balancer params Signed-off-by: Christopher Kent * Add symlink to default values for ci testing Signed-off-by: Christopher Kent * Fix README Signed-off-by: Christopher Kent * Fix syntax for multiple cidr blocks Signed-off-by: Christopher Kent --- stable/kong/Chart.yaml | 2 +- stable/kong/README.md | 4 +- stable/kong/ci/default-values.yaml | 1 + stable/kong/ci/loadbalancer-values.yaml | 44 ++++++++++++++++++ stable/kong/kong-0.5.7.tgz | Bin 0 -> 20502 bytes stable/kong/templates/service-kong-admin.yaml | 10 +++- stable/kong/templates/service-kong-proxy.yaml | 10 +++- 7 files changed, 67 insertions(+), 4 deletions(-) create mode 120000 stable/kong/ci/default-values.yaml create mode 100644 stable/kong/ci/loadbalancer-values.yaml create mode 100644 stable/kong/kong-0.5.7.tgz diff --git a/stable/kong/Chart.yaml b/stable/kong/Chart.yaml index 392b3066f7..a41d6e808f 100644 --- a/stable/kong/Chart.yaml +++ b/stable/kong/Chart.yaml @@ -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 diff --git a/stable/kong/README.md b/stable/kong/README.md index 4b980dbb38..91e9ac19cd 100644 --- a/stable/kong/README.md +++ b/stable/kong/README.md @@ -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) | `` | diff --git a/stable/kong/ci/default-values.yaml b/stable/kong/ci/default-values.yaml new file mode 120000 index 0000000000..5d1191e9d1 --- /dev/null +++ b/stable/kong/ci/default-values.yaml @@ -0,0 +1 @@ +../values.yaml \ No newline at end of file diff --git a/stable/kong/ci/loadbalancer-values.yaml b/stable/kong/ci/loadbalancer-values.yaml new file mode 100644 index 0000000000..eb2a7b97c7 --- /dev/null +++ b/stable/kong/ci/loadbalancer-values.yaml @@ -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 diff --git a/stable/kong/kong-0.5.7.tgz b/stable/kong/kong-0.5.7.tgz new file mode 100644 index 0000000000000000000000000000000000000000..cf3a74d53a99f75b9890c4f2ffbb1d9e92902a44 GIT binary patch literal 20502 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 a<#~Bto|or&p8qcZ0RR7R1Oi+D!T|suBYHFd literal 0 HcmV?d00001 diff --git a/stable/kong/templates/service-kong-admin.yaml b/stable/kong/templates/service-kong-admin.yaml index 3b222ad9a1..686efb0593 100644 --- a/stable/kong/templates/service-kong-admin.yaml +++ b/stable/kong/templates/service-kong-admin.yaml @@ -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 }} diff --git a/stable/kong/templates/service-kong-proxy.yaml b/stable/kong/templates/service-kong-proxy.yaml index aed2fc6884..b2b3ebcf71 100644 --- a/stable/kong/templates/service-kong-proxy.yaml +++ b/stable/kong/templates/service-kong-proxy.yaml @@ -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 }}