[stable/kong] 0.35.1 mutliple small fixes (helm#19914)

* [stable/kong] add rainest as a maintainer Signed-off-by: Harry Bagdi <harrybagdi@gmail.com> * [stable/kong] update CRDs to Ingress Controller 0.7 Signed-off-by: Harry Bagdi <harrybagdi@gmail.com> * [stable/kong] standardize and optimize readiness and liveness probes - Initial delay has been lowered to 5 seconds for increased responsiveness - Frequency is now 10 seconds, again for reponsiveness - timeout has been standardized to 1s Signed-off-by: Harry Bagdi <harrybagdi@gmail.com> * [stable/kong] 0.35.1 changelog Signed-off-by: Harry Bagdi <harrybagdi@gmail.com> * [stable/kong] remove the extra space in NOTES.txt Signed-off-by: Harry Bagdi <harrybagdi@gmail.com> * [stable/kong] fix values.yalm ingress tls section Signed-off-by: Harry Bagdi <harrybagdi@gmail.com> Signed-off-by: Artur <artur@upbound.io>
arturrez · Jan 7, 2020 · 4b73adf · 4b73adf
1 parent 0bdea18
commit 4b73adf
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 21 deletions.
diff --git a/stable/kong/Chart.yaml b/stable/kong/Chart.yaml
@@ -10,6 +10,5 @@ maintainers:
   email: harry@konghq.com
 name: kong
 sources:
-- /~https://github.com/Kong/kong
-version: 0.35.0
+version: 0.35.1
 appVersion: 1.4
diff --git a/stable/kong/OWNERS b/stable/kong/OWNERS
@@ -1,6 +1,8 @@
 approvers:
 - hbagdi
 - shashiranjan84
+- rainest
 reviewers:
 - hbagdi
 - shashiranjan84
+- rainest
diff --git a/stable/kong/README.md b/stable/kong/README.md
@@ -461,6 +461,16 @@ value is your SMTP password.
 
 ## Changelog
 
+### 0.35.1
+
+> PR /~https://github.com/helm/charts/pull/19914
+
+#### Improvements
+
+- Update CRDs to Ingress Controller 0.7
+- Optimize readiness and liveness probes for more responsive health checks
+- Fixed incorrect space in NOTES.txt
+
 ### 0.35.0
 
 > PR [#19856](/~https://github.com/helm/charts/pull/19856)
@@ -477,7 +487,7 @@ value is your SMTP password.
 
 This release contains no user-visible changes
 
-### Under the hood
+#### Under the hood
 
  - Various tests have been consolidated to speed up CI.
 

diff --git a/stable/kong/templates/NOTES.txt b/stable/kong/templates/NOTES.txt
@@ -7,7 +7,7 @@ To connect to Kong, please execute the following command
 {{- else if contains "NodePort" .Values.proxy.type -}}
   HOST=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath='{.items[0].status.addresses[0].address}')
   PORT=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "kong.fullname" . }}-proxy -o jsonpath='{.spec.ports[0].nodePort}')
-{{- end  -}}
+{{- end -}}
 export PROXY_IP=${HOST}:${PORT}
 curl $PROXY_IP
 

diff --git a/stable/kong/templates/custom-resource-definitions.yaml b/stable/kong/templates/custom-resource-definitions.yaml
@@ -30,6 +30,10 @@ spec:
           type: string
         custom_id:
           type: string
+        credentials:
+          type: array
+          items:
+            type: string
 ---
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
@@ -172,6 +176,8 @@ spec:
                 enum:
                 - http
                 - https
+                - grpc
+                - grpcs
             https_redirect_status_code:
               type: integer
         proxy:
@@ -182,6 +188,8 @@ spec:
               enum:
               - http
               - https
+              - grpc
+              - grpcs
             path:
               type: string
               pattern: ^/.*$
@@ -206,6 +214,8 @@ spec:
               - "round-robin"
               - "consistent-hashing"
               - "least-connections"
+            host_header:
+              type: string
             hash_on:
               type: string
             hash_on_cookie:

diff --git a/stable/kong/values.yaml b/stable/kong/values.yaml
@@ -115,11 +115,12 @@ proxy:
     # TLS section. Unlike other ingresses, this follows the format at
     # https://kubernetes.io/docs/concepts/services-networking/ingress/#tls
     # tls:
-    #   hosts:
-    #     - example.com
-    #     secretName: example-com-tls-secret
-    #     - example.net
-    #     secretName: example-net-tls-secret
+    # - hosts:
+    #   - 1.example.com
+    #   secretName: example1-com-tls-secret
+    # - hosts:
+    #   - 2.example.net
+    #   secretName: example2-net-tls-secret
     # Map of ingress annotations.
     annotations: {}
     # Ingress path.
@@ -208,25 +209,25 @@ ingressController:
 
   # general properties
   livenessProbe:
-    failureThreshold: 3
     httpGet:
       path: "/healthz"
       port: 10254
       scheme: HTTP
-    initialDelaySeconds: 10
+    initialDelaySeconds: 5
+    timeoutSeconds: 1
     periodSeconds: 10
     successThreshold: 1
-    timeoutSeconds: 5
-  readinessProbe:
     failureThreshold: 3
+  readinessProbe:
     httpGet:
       path: "/healthz"
       port: 10254
       scheme: HTTP
-    initialDelaySeconds: 10
+    initialDelaySeconds: 5
+    timeoutSeconds: 1
     periodSeconds: 10
     successThreshold: 1
-    timeoutSeconds: 5
+    failureThreshold: 3
   resources: {}
 
 # -----------------------------------------------------------------------------
@@ -286,23 +287,23 @@ readinessProbe:
     path: "/status"
     port: metrics
     scheme: HTTP
-  initialDelaySeconds: 10
+  initialDelaySeconds: 5
   timeoutSeconds: 1
   periodSeconds: 10
   successThreshold: 1
-  failureThreshold: 5
+  failureThreshold: 3
 
 # livenessProbe for Kong pods
 livenessProbe:
   httpGet:
     path: "/status"
     port: metrics
     scheme: HTTP
-  initialDelaySeconds: 10
-  timeoutSeconds: 5
-  periodSeconds: 30
+  initialDelaySeconds: 5
+  timeoutSeconds: 1
+  periodSeconds: 10
   successThreshold: 1
-  failureThreshold: 5
+  failureThreshold: 3
 
 # Affinity for pod assignment
 # Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity