Merge pull request #91 from imgproxy/v0.8.20

v0.8.20

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.8.20 (2022-09-20)
+
+* Add new setting `features.ingress.pathSuffix`
+
 ## 0.8.19 (2022-07-31)
 
 * Fix broken env variables for imgproxy formats

Readme.md

@@ -344,6 +344,7 @@ Deployment specific options.
 |**resources.ingress.enabled**|When true, enables ingress resource for imgproxy|`false`|
 |**resources.ingress.health.whitelist**|Comma separated string of CIDR addresses that are allowed to access `/health` url of imgproxy||
 |**resources.ingress.hosts**|Hostnames for the ingress resource to use|`["example.com"]`|
+|**resources.ingress.pathSuffix**|Suffix to be added to path prefix, for example wildcard '*' for AWS balancer||
 |**resources.ingress.tls**|TLS config array||
 |**resources.ingress.tls[].hosts**|Hostnames this tls secret is used for|`["example.com"]`|
 |**resources.ingress.tls[].secretName**|Name of the k8s Secret resource which stores crt & key for the ingress resource||

imgproxy/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 description: A fast and secure standalone server for resizing and converting remote images. The main principles of imgproxy are simplicity, speed, and security.
 name: imgproxy
 icon: https://cdn.rawgit.com/imgproxy/imgproxy/master/logo.svg
-version: 0.8.19
+version: 0.8.20
 appVersion: 3.7.0
 keywords:
   - imgproxy

imgproxy/README.md

@@ -402,6 +402,7 @@ Deployment specific options.
 |**resources.ingress.enabled**|When true, enables ingress resource for imgproxy|`false`|
 |**resources.ingress.health.whitelist**|Comma separated string of CIDR addresses that are allowed to access `/health` url of imgproxy||
 |**resources.ingress.hosts**|Hostnames for the ingress resource to use|`["example.com"]`|
+|**resources.ingress.pathSuffix**|Suffix to be added to path prefix, for example wildcard '*' for AWS balancer||
 |**resources.ingress.pathType**|Set the pathType for ingress rules explicitly (use `Prefix` for AWS ELB Controllers)|`ImplementationSpecific`|
 |**resources.ingress.tls**|TLS config array||
 |**resources.ingress.tls[].hosts**|Hostnames this tls secret is used for|`["example.com"]`|

imgproxy/templates/_helpers.tpl

@@ -102,3 +102,10 @@ https://docs.aws.amazon.com/eks/latest/userguide/specify-service-account-role.ht
 {{- $custom := $.Values.resources.deployment.resources | default dict -}}
 {{- merge $custom $default | toYaml -}}
 {{- end -}}
+
+{{/* Combine ingress path from server.pathPrefix and ingress.pathSuffix */}}
+{{- define "imgproxy.ingressPath" -}}
+{{- $prefix := ($.Values.features.server.pathPrefix | default "" | trimSuffix "/") -}}
+{{- $suffix := ($.Values.resources.ingress.pathSuffix | default "" | trimPrefix "/") -}}
+{{- printf "%s/%s" $prefix $suffix -}}
+{{- end -}}

imgproxy/templates/ingress.yaml

@@ -40,7 +40,7 @@ spec:
       http:
         paths:
           {{- $name := include "imgproxy.fullname" $ }}
-          {{- $path := default "/" $.Values.features.server.pathPrefix }}
+          {{- $path := include "imgproxy.ingressPath" $ }}
           {{- if eq $apiVersion "networking.k8s.io/v1" }}
           - path: {{ $path | quote }}
             pathType: {{ $pathType | quote }}

imgproxy/values.yaml

@@ -158,6 +158,9 @@ resources:
 
   ingress:
     enabled: false
+    # Add this suffix to ingress host paths. For example, use '*' for AWS load balancer
+    # This is a shortcut for the issue: https://github.com/kubernetes-sigs/aws-load-balancer-controller/issues/667
+    pathSuffix:
     # the custom name for the ingress resource
     className:
     health: