From ecfd1c4d1c5cecc1432cf030875a5cadbc38ce83 Mon Sep 17 00:00:00 2001 From: Prasant Date: Thu, 17 Jun 2021 15:46:14 +0530 Subject: [PATCH] option to add pathType for Ingress k8s v1.18 --- thanos/templates/bucket-ingress.yaml | 1 + thanos/templates/query-ingress.yml | 2 ++ thanos/templates/rule-ingress.yml | 2 ++ thanos/templates/sidecar-ingress.yaml | 2 ++ thanos/templates/store-ingress.yaml | 2 ++ thanos/values.yaml | 11 +++++++++++ 6 files changed, 20 insertions(+) diff --git a/thanos/templates/bucket-ingress.yaml b/thanos/templates/bucket-ingress.yaml index 949451ec..3d4eccf3 100644 --- a/thanos/templates/bucket-ingress.yaml +++ b/thanos/templates/bucket-ingress.yaml @@ -38,6 +38,7 @@ spec: http: paths: - path: {{ $.Values.bucket.http.ingress.path }} + pathType: {{ $.Values.bucket.http.ingress.pathType }} backend: serviceName: {{ include "thanos.componentname" (list $ "bucket") }} servicePort: {{ $.Values.bucket.http.port }} diff --git a/thanos/templates/query-ingress.yml b/thanos/templates/query-ingress.yml index 5616d1a9..51c4a405 100644 --- a/thanos/templates/query-ingress.yml +++ b/thanos/templates/query-ingress.yml @@ -41,6 +41,7 @@ spec: http: paths: - path: {{ $.Values.query.http.ingress.path }} + pathType: {{ $.Values.query.http.ingress.pathType }} backend: serviceName: {{ include "thanos.componentname" (list $ "query") }}-http servicePort: {{ $.Values.query.http.port }} @@ -90,6 +91,7 @@ spec: http: paths: - path: {{ $.Values.query.grpc.ingress.path }} + pathType: {{ $.Values.query.http.ingress.pathType }} backend: serviceName: {{ include "thanos.componentname" (list $ "query") }}-grpc servicePort: {{ $.Values.query.grpc.port }} diff --git a/thanos/templates/rule-ingress.yml b/thanos/templates/rule-ingress.yml index e9a9f406..9bfe770b 100644 --- a/thanos/templates/rule-ingress.yml +++ b/thanos/templates/rule-ingress.yml @@ -41,6 +41,7 @@ spec: http: paths: - path: {{ $.Values.rule.http.ingress.path }} + pathType: {{ $.Values.rule.http.ingress.pathType }} backend: serviceName: {{ include "thanos.componentname" (list $ "rule") }}-http servicePort: {{ $.Values.rule.http.port }} @@ -90,6 +91,7 @@ spec: http: paths: - path: {{ $.Values.rule.grpc.ingress.path }} + pathType: {{ $.Values.rule.http.ingress.pathType }} backend: serviceName: {{ include "thanos.componentname" (list $ "rule") }}-grpc servicePort: {{ $.Values.rule.grpc.port }} diff --git a/thanos/templates/sidecar-ingress.yaml b/thanos/templates/sidecar-ingress.yaml index 8e65c982..4cc46f9b 100644 --- a/thanos/templates/sidecar-ingress.yaml +++ b/thanos/templates/sidecar-ingress.yaml @@ -41,6 +41,7 @@ spec: http: paths: - path: {{ $.Values.sidecar.http.ingress.path }} + pathType: {{ $.Values.sidecar.http.ingress.pathType }} backend: serviceName: {{ include "thanos.componentname" (list $ "sidecar") }}-http servicePort: {{ $.Values.sidecar.http.port }} @@ -90,6 +91,7 @@ spec: http: paths: - path: {{ $.Values.sidecar.grpc.ingress.path }} + pathType: {{ $.Values.sidecar.http.ingress.pathType }} backend: serviceName: {{ include "thanos.componentname" (list $ "sidecar") }}-grpc servicePort: {{ $.Values.sidecar.grpc.port }} diff --git a/thanos/templates/store-ingress.yaml b/thanos/templates/store-ingress.yaml index 97fbda1c..b117d35a 100644 --- a/thanos/templates/store-ingress.yaml +++ b/thanos/templates/store-ingress.yaml @@ -38,6 +38,7 @@ spec: http: paths: - path: {{ $.Values.store.http.ingress.path }} + pathType: {{ $.Values.store.http.ingress.pathType }} backend: serviceName: {{ include "thanos.componentname" (list $ "store") }}-http servicePort: {{ $.Values.store.http.port }} @@ -86,6 +87,7 @@ spec: http: paths: - path: {{ $.Values.store.grpc.ingress.path }} + pathType: {{ $.Values.store.http.ingress.pathType }} backend: serviceName: {{ include "thanos.componentname" (list $ "store") }}-grpc servicePort: {{ $.Values.store.grpc.port }} diff --git a/thanos/values.yaml b/thanos/values.yaml index 26c5050e..933e8c82 100644 --- a/thanos/values.yaml +++ b/thanos/values.yaml @@ -104,6 +104,7 @@ store: # kubernetes.io/tls-acme: "true" labels: {} path: "/" + pathType: "Prefix" hosts: - "/" tls: [] @@ -138,6 +139,7 @@ store: # kubernetes.io/tls-acme: "true" labels: {} path: "/" + pathType: "Prefix" hosts: - "/" tls: [] @@ -284,6 +286,7 @@ query: # kubernetes.io/tls-acme: "true" labels: {} path: "/" + pathType: "Prefix" hosts: - "/" tls: [] @@ -326,6 +329,7 @@ query: # kubernetes.io/tls-acme: "true" labels: {} path: "/" + pathType: "Prefix" hosts: - "/" tls: [] @@ -452,6 +456,7 @@ queryFrontend: # kubernetes.io/tls-acme: "true" labels: {} path: "/" + pathType: "Prefix" hosts: - "/" tls: [] @@ -487,6 +492,7 @@ queryFrontend: # kubernetes.io/tls-acme: "true" labels: {} path: "/" + pathType: "Prefix" hosts: - "/" tls: [] @@ -757,6 +763,7 @@ bucket: # kubernetes.io/tls-acme: "true" labels: {} path: "/" + pathType: "Prefix" hosts: - "/" tls: [] @@ -952,6 +959,7 @@ rule: # kubernetes.io/tls-acme: "true" labels: {} path: "/" + pathType: "Prefix" hosts: - "/" tls: [] @@ -987,6 +995,7 @@ rule: # kubernetes.io/tls-acme: "true" labels: {} path: "/" + pathType: "Prefix" hosts: - "/" tls: [] @@ -1090,6 +1099,7 @@ sidecar: # kubernetes.io/tls-acme: "true" labels: {} path: "/" + pathType: "Prefix" hosts: - "/" tls: [] @@ -1123,6 +1133,7 @@ sidecar: # kubernetes.io/tls-acme: "true" labels: {} path: "/" + pathType: "Prefix" hosts: - "/" tls: []