chore(traefik): Add blacklistMode on geoblock and fix label (#6416)

.github/scripts/updateTraefikMiddlewareVersions.sh

@@ -1,10 +1,10 @@
 #! /bin/bash
 
 trainsPath="./charts"
-traefikTrain="stable"
+traefikTrain="enterprise"
 
 get_latest_release() {
-    # Get latest release from GitHub api
+    # Get latest release from GitHub api, NOTE: Remove the header when running locally (or add a valid token)
     curl --silent \
          --header 'authorization: Bearer ${{ secrets.GITHUB_TOKEN }}' \
          --url "https://api.github.com/repos/$1/releases/latest" |

charts/enterprise/traefik/templates/middlewares/geoblock.yaml

@@ -24,6 +24,7 @@ spec:
       forceMonthlyUpdate: {{ $middlewareData.forceMonthlyUpdate }}
       allowUnknownCountries: {{ $middlewareData.allowUnknownCountries }}
       unknownCountryApiResponse: {{ $middlewareData.unknownCountryApiResponse }}
+      blackListMode: {{ $middlewareData.blackListMode }}
       {{- if not $middlewareData.countries }}
         {{- fail "You have to define at least one country..." }}
       {{- end }}

charts/enterprise/traefik/values.yaml

@@ -376,7 +376,7 @@ middlewares:
   addPrefix: []
   # - name: addPrefixName
   #   prefix: "/foo"
-  geoBlockVersion: v0.2.3
+  geoBlockVersion: v0.2.4
   geoBlock: []
   # -- https://github.com/PascalMinder/geoblock
   # - name: geoBlockName
@@ -390,6 +390,7 @@ middlewares:
   #   forceMonthlyUpdate: true
   #   allowUnknownCountries: false
   #   unknownCountryApiResponse: nil
+  #   blackListMode: false
   #   countries:
   #     - RU
 

templates/questions/traefik/geoBlockMiddleware.yaml

@@ -82,15 +82,22 @@
                         type: string
                         required: true
                         default: nil
+                    - variable: blackListMode
+                      label: Blacklist Mode
+                      description: When set to true the filter logic is inverted, i.e. requests originating from countries listed in the countries list are blocked.
+                      schema:
+                        type: boolean
+                        default: false
                     - variable: countries
-                      label: Blocked Countries
+                      description: Country codes (2 characters) from which connections to the service should be allowed or blocked, based on the mode.
+                      label: Countries
                       schema:
                         type: list
                         default: []
                         items:
-                          - variable: blockedCountryEntry
+                          - variable: countryEntry
-                            label: Blocked Country
+                            label: Country
-                            description: Country codes (2 characters) from which connections to the service should be allowed.
+                            description: Country codes (2 characters) from which connections to the service should be allowed or blocked, based on the mode.
                             schema:
                               type: string
                               required: true