Merge pull request #53 from foomo/gateway

feat(squadron-keel-server) feat: add gateway
foomo · Dec 23, 2024 · d6ba375 · d6ba375
2 parents 4359545 + a0a3f52
commit d6ba375
Show file tree

Hide file tree

Showing 13 changed files with 131 additions and 24 deletions.
diff --git a/charts/beam/Chart.yaml b/charts/beam/Chart.yaml
@@ -13,16 +13,16 @@ sources:
 annotations:
   "artifacthub.io/links": |
     - name: Chart Source
-      url: https://github.com/foomo/helm-charts
+      url: https://github.com/foomo/helm-chartstree/main/charts/beam
     - name: Pinniped Chart Source
       url: https://github.com/bitnami/charts/tree/main/bitnami/pinniped/
 dependencies:
   # https://artifacthub.io/packages/helm/bitnami/pinniped
   - name: pinniped
     alias: pinniped
-    version: 2.3.5
+    version: 2.4.1
     repository: "oci://registry-1.docker.io/bitnamicharts"
     condition: pinniped.enabled
-version: 0.4.3
-appVersion: 0.4.3
+version: 0.5.0
+appVersion: 0.5.0
 
diff --git a/charts/beam/README.md b/charts/beam/README.md
@@ -1,6 +1,6 @@
 # beam
 
-![Version: 0.4.3](https://img.shields.io/badge/Version-0.4.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.4.3](https://img.shields.io/badge/AppVersion-0.4.3-informational?style=flat-square)
+![Version: 0.5.0](https://img.shields.io/badge/Version-0.5.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.0](https://img.shields.io/badge/AppVersion-0.5.0-informational?style=flat-square)
 
 Secure infrastructure access
 
@@ -107,7 +107,7 @@ HTTPS_PROXY=socks5://127.0.0.1:1234 kubectl get namespaces --kubeconfig "beam-ku
 
 | Repository | Name | Version |
 |------------|------|---------|
-| oci://registry-1.docker.io/bitnamicharts | pinniped(pinniped) | 2.3.5 |
+| oci://registry-1.docker.io/bitnamicharts | pinniped(pinniped) | 2.4.1 |
 
 ## Values
 
@@ -136,7 +136,7 @@ HTTPS_PROXY=socks5://127.0.0.1:1234 kubectl get namespaces --kubeconfig "beam-ku
 | cloudflared.image.pullPolicy | string | `"IfNotPresent"` | Image tag |
 | cloudflared.image.pullSecrets | list | `[]` | Image pull secrets |
 | cloudflared.image.repository | string | `"cloudflare/cloudflared"` | Image repository |
-| cloudflared.image.tag | string | `"2024.11.1"` | Image tag |
+| cloudflared.image.tag | string | `"2024.12.2"` | Image tag |
 | cloudflared.ingress | list | `[]` | Define ingress rules for the tunnel ([read more](https://developers.cloudflare.com/cloudflare-one/connections/connect-apps/configuration/configuration-file/ingress)) |
 | cloudflared.livenessProbe | object | `{"failureThreshold":1,"httpGet":{"path":"/ready","port":2000},"initialDelaySeconds":10,"periodSeconds":10}` | Liveness probe settings for pods. |
 | cloudflared.podAnnotations | object | `{}` | Annotations for pods |
@@ -181,11 +181,11 @@ HTTPS_PROXY=socks5://127.0.0.1:1234 kubectl get namespaces --kubeconfig "beam-ku
 | cloudflaredSplitter.extraVolumeMounts | list | `[]` | Volume mounts to add |
 | cloudflaredSplitter.image.pullPolicy | string | `"IfNotPresent"` | Image tag |
 | cloudflaredSplitter.image.repository | string | `"nginx"` | Image repository |
-| cloudflaredSplitter.image.tag | string | `"1.27.2"` | Image tag |
+| cloudflaredSplitter.image.tag | string | `"1.27.3"` | Image tag |
 | cloudflaredSplitter.livenessProbe | object | `{}` | Liveness probe settings for pods |
 | cloudflaredSplitter.readinessProbe | object | `{}` | Readiness probe settings for pods |
 | cloudflaredSplitter.resources | object | `{}` | Resource request & limits. |
-| cloudflaredSplitter.securityContext | object | `{}` | Security context |
+| cloudflaredSplitter.securityContext | object | `{}` | Security Context |
 | cloudflaredSplitter.startProbe | object | `{}` | Startup probe settings for pods |
 
 ### Overrides

diff --git a/charts/beam/values.schema.json b/charts/beam/values.schema.json
@@ -204,7 +204,7 @@
               "type": "string"
             },
             "tag": {
-              "default": "2024.11.1",
+              "default": "2024.12.2",
               "description": "Image tag",
               "required": [],
               "title": "tag",
@@ -691,7 +691,7 @@
               "type": "string"
             },
             "tag": {
-              "default": "1.27.2",
+              "default": "1.27.3",
               "description": "Image tag",
               "required": [],
               "title": "tag",
@@ -728,7 +728,7 @@
         },
         "securityContext": {
           "additionalProperties": true,
-          "description": "Security context",
+          "description": "Security Context",
           "required": [],
           "title": "securityContext",
           "type": "object"

diff --git a/charts/beam/values.yaml b/charts/beam/values.yaml
@@ -124,7 +124,7 @@ cloudflared:
     # @schema
     # -- Image tag
     # @section -- Cloudflared settings
-    tag: '2024.11.1' # https://github.com/cloudflare/cloudflared/releases
+    tag: '2024.12.2' # https://github.com/cloudflare/cloudflared/releases
   # @schema
   # type: object
   # @schema
@@ -481,12 +481,12 @@ cloudflaredSplitter:
     # @schema
     # -- Image tag
     # @section -- Cloudflared Splitter settings
-    tag: '1.27.2' # https://github.com/nginx/nginx/releases
+    tag: '1.27.3' # https://github.com/nginx/nginx/releases
   # @schema
   # type: object
   # additionalProperties: true
   # @schema
-  # -- Security context
+  # -- Security Context
   # @section -- Cloudflared Splitter settings
   securityContext: {}
   # securityContext:

diff --git a/charts/sesamy-gtm/Chart.yaml b/charts/sesamy-gtm/Chart.yaml
@@ -15,5 +15,5 @@ annotations:
       url: https://github.com/foomo/helm-charts/tree/main/charts/sesamy-gtm
     - name: GTM Changelog
       url: https://developers.google.com/tag-platform/tag-manager/server-side/release-notes
-version: 0.1.2
+version: 0.1.3
 appVersion: 2.4.0
diff --git a/charts/sesamy-gtm/README.md b/charts/sesamy-gtm/README.md
@@ -1,6 +1,6 @@
 # sesamy-gtm
 
-![Version: 0.1.2](https://img.shields.io/badge/Version-0.1.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.4.0](https://img.shields.io/badge/AppVersion-2.4.0-informational?style=flat-square)
+![Version: 0.1.3](https://img.shields.io/badge/Version-0.1.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.4.0](https://img.shields.io/badge/AppVersion-2.4.0-informational?style=flat-square)
 
 Helm chart for the Sesamy GTM tagging & preview service.
 
@@ -145,7 +145,7 @@ Helm chart for the Sesamy GTM tagging & preview service.
 | proxy.config | string | `"server {\n  listen              443 ssl;\n\n  ssl_certificate     /etc/nginx/ssl/tls.crt;\n  ssl_certificate_key /etc/nginx/ssl/tls.key;\n  ssl_session_cache   shared:SSL:10m;\n  ssl_session_timeout 1h;\n  ssl_buffer_size     8k;\n\n  location / {\n      proxy_pass         http://0.0.0.0:{{ .Values.tagging.service.port }};\n      proxy_set_header   Host $host;\n      proxy_set_header   X-Real-IP $remote_addr;\n      proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;\n      proxy_set_header   X-Forwarded-Host $server_name;\n      proxy_set_header   Upgrade $http_upgrade;\n      proxy_set_header   Connection 'upgrade';\n      proxy_cache_bypass $http_upgrade;\n  }\n}\n"` | Nginx SSL Reverse Proxy config |
 | proxy.image.pullPolicy | string | `"IfNotPresent"` | The image pull policy |
 | proxy.image.repository | string | `"nginx"` | The image repository |
-| proxy.image.tag | string | `"1.27-alpine"` | The image [tag](https://hub.docker.com/_/nginx) |
+| proxy.image.tag | string | `"1.27.3-alpine"` | The image [tag](https://hub.docker.com/_/nginx) |
 | proxy.resources | object | `{}` | Resource request & limits |
 | proxy.tls.crt | string | `""` | Base64 encoded TLS cert |
 | proxy.tls.key | string | `""` | Base64 encoded TLS key |

diff --git a/charts/sesamy-gtm/values.schema.json b/charts/sesamy-gtm/values.schema.json
@@ -1090,7 +1090,7 @@
               "type": "string"
             },
             "tag": {
-              "default": "1.27-alpine",
+              "default": "1.27.3-alpine",
               "description": "The image [tag](https://hub.docker.com/_/nginx)",
               "required": [],
               "title": "tag",

diff --git a/charts/sesamy-gtm/values.yaml b/charts/sesamy-gtm/values.yaml
@@ -166,7 +166,7 @@ proxy:
     # @schema
     # -- The image [tag](https://hub.docker.com/_/nginx)
     # @section -- HTTPS Proxy
-    tag: '1.27-alpine'
+    tag: '1.27.3-alpine'
   # @schema
   # type: object
   # @schema

diff --git a/charts/squadron-keel-server/Chart.yaml b/charts/squadron-keel-server/Chart.yaml
@@ -13,7 +13,7 @@ sources:
 annotations:
   "artifacthub.io/links": |
     - name: Chart Source
-      url: https://github.com/foomo/helm-charts
+      url: https://github.com/foomo/helm-charts/tree/main/charts/squadron-keel-server
 
-version: 0.1.16
-appVersion: 0.1.16
+version: 0.2.0
+appVersion: 0.2.0
diff --git a/charts/squadron-keel-server/README.md b/charts/squadron-keel-server/README.md
@@ -1,6 +1,6 @@
 # squadron-keel-server
 
-![Version: 0.1.16](https://img.shields.io/badge/Version-0.1.16-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.16](https://img.shields.io/badge/AppVersion-0.1.16-informational?style=flat-square)
+![Version: 0.2.0](https://img.shields.io/badge/Version-0.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.2.0](https://img.shields.io/badge/AppVersion-0.2.0-informational?style=flat-square)
 
 Squadron Keel Server Chart
 
@@ -47,6 +47,15 @@ Squadron Keel Server Chart
 | nameOverride | string | `""` | Overrides the chart's name |
 | namespaceOverride | string | `""` | The name of the Namespace to deploy |
 
+### Gateway
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| gateway.addToRobots | string | `""` | Robots.txt |
+| gateway.enabled | bool | `false` | Indicates wether the gateway is enabled or not |
+| gateway.expose | list | `[]` | Expose settings |
+| gateway.sitemap | string | `""` | Sitemap |
+
 ### Global
 
 | Key | Type | Default | Description |

diff --git a/charts/squadron-keel-server/templates/gateway.yaml b/charts/squadron-keel-server/templates/gateway.yaml
@@ -0,0 +1,19 @@
+{{- if and (.Capabilities.APIVersions.Has "foomo.org/v1") .Values.gateway.enabled }}
+apiVersion: foomo.org/v1
+kind: Gateway
+metadata:
+  name: {{ include "keel.server.fullname" . }}
+  labels: {{- include "keel.server.labels" . | nindent 4 }}
+  namespace: {{ include "keel.server.namespace" . }}
+spec:
+  service: http://{{ include "keel.server.fullname" . }}.{{ include "keel.server.namespace" . }}
+  {{- with .Values.gateway.addToRobots }}
+  addToRobots: {{ . }}
+  {{- end }}
+  {{- with .Values.gateway.sitemap }}
+  sitemap: {{ . }}
+  {{- end }}
+  {{- with .Values.gateway.expose }}
+  expose: {{- toYaml . | nindent 4 }}
+  {{ end }}
+{{- end }}
diff --git a/charts/squadron-keel-server/values.schema.json b/charts/squadron-keel-server/values.schema.json
@@ -100,6 +100,46 @@
       "title": "fullnameOverride",
       "type": "string"
     },
+    "gateway": {
+      "additionalProperties": false,
+      "description": "Foomo gateway settings",
+      "properties": {
+        "addToRobots": {
+          "default": "",
+          "description": "Robots.txt",
+          "required": [],
+          "title": "addToRobots",
+          "type": "string"
+        },
+        "enabled": {
+          "default": false,
+          "description": "Indicates wether the gateway is enabled or not",
+          "required": [],
+          "title": "enabled",
+          "type": "boolean"
+        },
+        "expose": {
+          "description": "Expose settings",
+          "items": {
+            "required": [],
+            "type": "object"
+          },
+          "required": [],
+          "title": "expose",
+          "type": "array"
+        },
+        "sitemap": {
+          "default": "",
+          "description": "Sitemap",
+          "required": [],
+          "title": "sitemap",
+          "type": "string"
+        }
+      },
+      "required": [],
+      "title": "gateway",
+      "type": "object"
+    },
     "global": {
       "additionalProperties": true,
       "properties": {

diff --git a/charts/squadron-keel-server/values.yaml b/charts/squadron-keel-server/values.yaml
@@ -890,6 +890,45 @@ scheduling:
   # @section -- Scheduling
   priorityClass: null
 
+# @schema
+# type: object
+# @schema
+# Foomo gateway settings
+gateway:
+  # @schema
+  # type: boolean
+  # @schema
+  # -- Indicates wether the gateway is enabled or not
+  # @section -- Gateway
+  enabled: false
+  # @schema
+  # type: string
+  # @schema
+  # -- Sitemap
+  # @section -- Gateway
+  sitemap: ''
+  # @schema
+  # type: string
+  # @schema
+  # -- Robots.txt
+  # @section -- Gateway
+  addToRobots: ''
+  # @schema
+  # type: array
+  # items:
+  #   type: object
+  #   additionProperties: true
+  # @schema
+  # -- Expose settings
+  # @section -- Gateway
+  expose: []
+  # expose:
+  #   - stripBasePath: true
+  #     cmsMimetypes:
+  #       - application/x-page
+  #       - application/x-folder
+  #       - application/x-shortcut
+
 # @schema
 # type: object
 # @schema