From 4f5c1b623cb7c83486badd20704bc66fe4dea7fc Mon Sep 17 00:00:00 2001 From: Kevin Franklin Kim Date: Fri, 29 Nov 2024 08:04:09 +0100 Subject: [PATCH 1/2] fix(sesamy-gtm): service monitor condition --- charts/sesamy-gtm/Chart.yaml | 2 +- charts/sesamy-gtm/README.md | 42 +++++------------ .../templates/collect/servicemonitor.yaml | 5 +- charts/sesamy-gtm/values.schema.json | 14 ++++-- charts/sesamy-gtm/values.yaml | 46 +++++++++---------- 5 files changed, 49 insertions(+), 60 deletions(-) diff --git a/charts/sesamy-gtm/Chart.yaml b/charts/sesamy-gtm/Chart.yaml index 33b379d..aaeb28b 100644 --- a/charts/sesamy-gtm/Chart.yaml +++ b/charts/sesamy-gtm/Chart.yaml @@ -15,5 +15,5 @@ annotations: url: https://github.com/foomo/helm-charts - name: GTM Changelog url: https://developers.google.com/tag-platform/tag-manager/server-side/release-notes -version: 0.1.1 +version: 0.1.2 appVersion: 2.4.0 diff --git a/charts/sesamy-gtm/README.md b/charts/sesamy-gtm/README.md index f118cb5..919b781 100644 --- a/charts/sesamy-gtm/README.md +++ b/charts/sesamy-gtm/README.md @@ -51,9 +51,10 @@ Helm chart for the Sesamy GTM tagging & preview service. | collect.readinessProbe | object | `{}` | Readiness probe settings for pods | | collect.replicaCount | int | `1` | Number of replicas | | collect.resources | object | `{}` | Resource request & limits | -| collect.securityContext | object | `{}` | Security context | +| collect.securityContext | object | `{}` | Security Context | | collect.service.annotations | object | `{}` | Annotations for the service | | collect.service.labels | object | `{}` | Labels for service | +| collect.service.ports | object | `{"ga4":8080,"mpv2":8081}` | Ports of the service | | collect.service.type | string | `"ClusterIP"` | Type of the service | | collect.startupProbe | object | `{}` | Startup probe settings for pods | @@ -93,9 +94,10 @@ Helm chart for the Sesamy GTM tagging & preview service. | ingress.className | string | `""` | Ingress class name | | ingress.enabled | bool | `false` | Enable ingress | | ingress.hosts | list | `["example.com"]` | Hosts to listen to | +| ingress.paths | object | `{"preview":[{"path":"/gtm","pathType":"Prefix","port":8080}],"tagging":[{"path":"/gtm.js","pathType":"Exact","port":8080},{"path":"/gtag/js","pathType":"Prefix","port":8080},{"path":"/g/collect","pathType":"Prefix","port":8080}]}` | Path settings | | ingress.tls | list | `[]` | Tls setttings | -### Network policy +### Network Policy | Key | Type | Default | Description | |-----|------|---------|-------------| @@ -122,16 +124,19 @@ Helm chart for the Sesamy GTM tagging & preview service. | preview.extraVolumes | list | `[]` | Volumes to add | | preview.hostAliases | list | `[]` | Host aliases to add | | preview.imagePullSecrets | list | `[]` | Image pull secrets | +| preview.livenessProbe | object | `{"httpGet":{"path":"/healthz","port":"http"}}` | Liveness probe settings for pods | | preview.podAnnotations | object | `{}` | Annotations for pods | | preview.podLabels | object | `{}` | Labels for pods | | preview.podSecurityContext | object | `{}` | The SecurityContext for pods | +| preview.readinessProbe | object | `{"httpGet":{"path":"/healthz","port":"http"}}` | Readiness probe settings for pods | | preview.replicaCount | int | `1` | Number of replicas | | preview.resources | object | `{}` | Resource request & limits | -| preview.securityContext | object | `{}` | Security context | +| preview.securityContext | object | `{}` | Security Context | | preview.service.annotations | object | `{}` | Annotations for the service | | preview.service.labels | object | `{}` | Labels for service | | preview.service.port | int | `8080` | Port of the service | | preview.service.type | string | `"ClusterIP"` | Type of the service | +| preview.startupProbe | object | `{"httpGet":{"path":"/healthz","port":"http"}}` | Startup probe settings for pods | ### HTTPS Proxy @@ -200,12 +205,14 @@ Helm chart for the Sesamy GTM tagging & preview service. | tagging.extraVolumes | list | `[]` | Volumes to add | | tagging.hostAliases | list | `[]` | Host aliases to add | | tagging.imagePullSecrets | list | `[]` | Image pull secrets | +| tagging.livenessProbe | object | `{"httpGet":{"path":"/healthz","port":"http"}}` | Liveness probe settings for pods | | tagging.podAnnotations | object | `{}` | Pod annotations | | tagging.podLabels | object | `{}` | Labels for pods | | tagging.podSecurityContext | object | `{}` | The SecurityContext for pods | +| tagging.readinessProbe | object | `{"httpGet":{"path":"/healthz","port":"http"}}` | Readiness probe settings for pods | | tagging.replicaCount | int | `1` | Number of replicas | | tagging.resources | object | `{}` | Resource request & limits | -| tagging.securityContext | object | `{}` | Security context | +| tagging.securityContext | object | `{}` | Security Context | | tagging.service.annotations | object | `{}` | Annotations for the service | | tagging.service.appProtocol | string | `nil` | Set appProtocol for the service | | tagging.service.clusterIP | string | `nil` | ClusterIP of the gateway service | @@ -213,36 +220,11 @@ Helm chart for the Sesamy GTM tagging & preview service. | tagging.service.nodePort | string | `nil` | Node port if service type is NodePort | | tagging.service.port | int | `8080` | Port of the service | | tagging.service.type | string | `"ClusterIP"` | Type of the service | +| tagging.startupProbe | object | `{"httpGet":{"path":"/healthz","port":"http"}}` | Liveness probe settings for pods | ### Other Values | Key | Type | Default | Description | |-----|------|---------|-------------| -| collect.service.ports.ga4 | int | `8080` | | -| collect.service.ports.mpv2 | int | `8081` | | -| ingress.paths.preview[0].path | string | `"/gtm"` | | -| ingress.paths.preview[0].pathType | string | `"Prefix"` | | -| ingress.paths.preview[0].port | int | `8080` | | -| ingress.paths.tagging[0].path | string | `"/gtm.js"` | | -| ingress.paths.tagging[0].pathType | string | `"Exact"` | | -| ingress.paths.tagging[0].port | int | `8080` | | -| ingress.paths.tagging[1].path | string | `"/gtag/js"` | | -| ingress.paths.tagging[1].pathType | string | `"Prefix"` | | -| ingress.paths.tagging[1].port | int | `8080` | | -| ingress.paths.tagging[2].path | string | `"/g/collect"` | | -| ingress.paths.tagging[2].pathType | string | `"Prefix"` | | -| ingress.paths.tagging[2].port | int | `8080` | | -| preview.livenessProbe.httpGet.path | string | `"/healthz"` | | -| preview.livenessProbe.httpGet.port | string | `"http"` | | -| preview.readinessProbe.httpGet.path | string | `"/healthz"` | | -| preview.readinessProbe.httpGet.port | string | `"http"` | | -| preview.startupProbe.httpGet.path | string | `"/healthz"` | | -| preview.startupProbe.httpGet.port | string | `"http"` | | | serviceMonitor.scrapeTimeout | string | `""` | ServiceMonitor scrape timeout in Go duration format (e.g. 15s) | -| tagging.livenessProbe.httpGet.path | string | `"/healthz"` | | -| tagging.livenessProbe.httpGet.port | string | `"http"` | | -| tagging.readinessProbe.httpGet.path | string | `"/healthz"` | | -| tagging.readinessProbe.httpGet.port | string | `"http"` | | -| tagging.startupProbe.httpGet.path | string | `"/healthz"` | | -| tagging.startupProbe.httpGet.port | string | `"http"` | | diff --git a/charts/sesamy-gtm/templates/collect/servicemonitor.yaml b/charts/sesamy-gtm/templates/collect/servicemonitor.yaml index 68f4994..27822ad 100644 --- a/charts/sesamy-gtm/templates/collect/servicemonitor.yaml +++ b/charts/sesamy-gtm/templates/collect/servicemonitor.yaml @@ -16,12 +16,10 @@ metadata: namespace: {{ include "sesamy.gtm.namespace" . }} spec: selector: - matchLabels: - {{- include "sesamy.gtm.collect.selectorLabels" $ | nindent 6 }} + matchLabels: {{- include "sesamy.gtm.collect.selectorLabels" $ | nindent 6 }} namespaceSelector: matchNames: - {{ include "sesamy.gtm.namespace" . }} - {{- end }} endpoints: - port: prometheus path: /metrics @@ -43,3 +41,4 @@ spec: {{- end }} {{- end }} {{- end }} +{{- end }} diff --git a/charts/sesamy-gtm/values.schema.json b/charts/sesamy-gtm/values.schema.json index 49b4595..47356f3 100644 --- a/charts/sesamy-gtm/values.schema.json +++ b/charts/sesamy-gtm/values.schema.json @@ -275,7 +275,7 @@ }, "securityContext": { "additionalProperties": true, - "description": "podSecurityContext:\n fsGroup: 2000\nSecurity context", + "description": "podSecurityContext:\n fsGroup: 2000\nSecurity Context", "required": [], "title": "securityContext", "type": "object" @@ -300,6 +300,7 @@ }, "ports": { "additionalProperties": true, + "description": "Ports of the service", "properties": { "ga4": { "default": 8080, @@ -480,6 +481,7 @@ }, "paths": { "additionalProperties": true, + "description": "Path settings", "properties": { "preview": { "items": { @@ -868,6 +870,7 @@ }, "livenessProbe": { "additionalProperties": true, + "description": "Liveness probe settings for pods", "properties": { "httpGet": { "additionalProperties": false, @@ -922,6 +925,7 @@ }, "readinessProbe": { "additionalProperties": true, + "description": "Readiness probe settings for pods", "properties": { "httpGet": { "additionalProperties": false, @@ -969,7 +973,7 @@ }, "securityContext": { "additionalProperties": true, - "description": "podSecurityContext:\n fsGroup: 2000\nSecurity context", + "description": "podSecurityContext:\n fsGroup: 2000\nSecurity Context", "required": [], "title": "securityContext", "type": "object" @@ -1016,6 +1020,7 @@ }, "startupProbe": { "additionalProperties": true, + "description": "Startup probe settings for pods", "properties": { "httpGet": { "additionalProperties": false, @@ -1413,6 +1418,7 @@ }, "livenessProbe": { "additionalProperties": true, + "description": "Liveness probe settings for pods", "properties": { "httpGet": { "additionalProperties": false, @@ -1467,6 +1473,7 @@ }, "readinessProbe": { "additionalProperties": true, + "description": "Readiness probe settings for pods", "properties": { "httpGet": { "additionalProperties": false, @@ -1514,7 +1521,7 @@ }, "securityContext": { "additionalProperties": true, - "description": "podSecurityContext\n fsGroup: 2000\nSecurity context", + "description": "podSecurityContext\n fsGroup: 2000\nSecurity Context", "required": [], "title": "securityContext", "type": "object" @@ -1592,6 +1599,7 @@ }, "startupProbe": { "additionalProperties": true, + "description": "Liveness probe settings for pods", "properties": { "httpGet": { "additionalProperties": false, diff --git a/charts/sesamy-gtm/values.yaml b/charts/sesamy-gtm/values.yaml index 3992ff5..65b5d3e 100644 --- a/charts/sesamy-gtm/values.yaml +++ b/charts/sesamy-gtm/values.yaml @@ -252,7 +252,7 @@ tagging: # type: object # additionalProperties: true # @schema - # -- Security context + # -- Security Context # @section -- Tagging securityContext: {} # securityContext @@ -322,7 +322,7 @@ tagging: # type: object # additionalProperties: true # @schema - # @default -- Liveness probe settings for pods + # -- Liveness probe settings for pods # @section -- Tagging startupProbe: httpGet: @@ -332,7 +332,7 @@ tagging: # type: object # additionalProperties: true # @schema - # @default -- Liveness probe settings for pods + # -- Liveness probe settings for pods # @section -- Tagging livenessProbe: httpGet: @@ -342,7 +342,7 @@ tagging: # type: object # additionalProperties: true # @schema - # @default -- Readiness probe settings for pods + # -- Readiness probe settings for pods # @section -- Tagging readinessProbe: httpGet: @@ -461,7 +461,7 @@ preview: # type: object # additionalProperties: true # @schema - # -- Security context + # -- Security Context # @section -- Preview securityContext: {} # securityContext: @@ -513,7 +513,7 @@ preview: # type: object # additionalProperties: true # @schema - # @default -- Startup probe settings for pods + # -- Startup probe settings for pods # @section -- Preview startupProbe: httpGet: @@ -523,7 +523,7 @@ preview: # type: object # additionalProperties: true # @schema - # @default -- Readiness probe settings for pods + # -- Readiness probe settings for pods # @section -- Preview readinessProbe: httpGet: @@ -533,7 +533,7 @@ preview: # type: object # additionalProperties: true # @schema - # @default -- Liveness probe settings for pods + # -- Liveness probe settings for pods # @section -- Preview livenessProbe: httpGet: @@ -689,7 +689,7 @@ collect: # type: object # additionalProperties: true # @schema - # -- Security context + # -- Security Context # @section -- Collect securityContext: {} # securityContext: @@ -708,7 +708,7 @@ collect: # type: object # additionalProperties: true # @schema - # @default -- Ports of the service + # -- Ports of the service # @section -- Collect ports: ga4: 8080 @@ -846,7 +846,7 @@ ingress: # type: object # additionalProperties: true # @schema - # @default -- Path settings + # -- Path settings # @section -- Ingress paths: preview: @@ -1094,7 +1094,7 @@ networkPolicy: # type: boolean # @schema # -- Specifies whether Network Policies should be created - # @section -- Network policy + # @section -- Network Policy enabled: false # @schema # type: object @@ -1106,14 +1106,14 @@ networkPolicy: # additionalProperties: true # @schema # -- Specifies the Pods which are allowed to access the metrics port - # @section -- Network policy + # @section -- Network Policy podSelector: {} # @schema # type: object # additionalProperties: true # @schema # -- Specifies the namespaces which are allowed to access the metrics port - # @section -- Network policy + # @section -- Network Policy namespaceSelector: {} # @schema # type: array @@ -1121,7 +1121,7 @@ networkPolicy: # type: string # @schema # -- Specifies specific network CIDRs which are allowed to access the metrics port - # @section -- Network policy + # @section -- Network Policy cidrs: [] # @schema # type: object @@ -1133,20 +1133,20 @@ networkPolicy: # additionalProperties: true # @schema # -- Specifies the Pods which are allowed to access the http port - # @section -- Network policy + # @section -- Network Policy podSelector: {} # @schema # type: object # additionalProperties: true # @schema # -- Specifies the namespaces which are allowed to access the http port - # @section -- Network policy + # @section -- Network Policy namespaceSelector: {} # @schema # type: object # @schema # External storage settings - # @section -- Network policy + # @section -- Network Policy externalStorage: # @schema # type: array @@ -1154,7 +1154,7 @@ networkPolicy: # type: integer # @schema # -- Specify the port used for external storage, e.g. AWS S3 - # @section -- Network policy + # @section -- Network Policy ports: [] # @schema # type: array @@ -1162,7 +1162,7 @@ networkPolicy: # type: string # @schema # -- Specifies specific network CIDRs you want to limit access to - # @section -- Network policy + # @section -- Network Policy cidrs: [] # @schema # type: object @@ -1173,21 +1173,21 @@ networkPolicy: # type: [integer, null] # @schema # -- Specify the port used for discovery - # @section -- Network policy + # @section -- Network Policy port: null # @schema # type: object # additionalProperties: true # @schema # -- Specifies the Pods labels used for discovery - # @section -- Network policy + # @section -- Network Policy podSelector: {} # @schema # type: object # additionalProperties: true # @schema # -- Specifies the namespace the discovery Pods are running in - # @section -- Network policy + # @section -- Network Policy namespaceSelector: {} # @schema From 644bb2fcb05a9d53815bb94857bbe6d203886912 Mon Sep 17 00:00:00 2001 From: Kevin Franklin Kim Date: Fri, 29 Nov 2024 08:06:33 +0100 Subject: [PATCH 2/2] docs(sesamy-gtm): update chart url --- charts/sesamy-gtm/Chart.yaml | 2 +- charts/sesamy-gtm/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/sesamy-gtm/Chart.yaml b/charts/sesamy-gtm/Chart.yaml index aaeb28b..ed9b7a8 100644 --- a/charts/sesamy-gtm/Chart.yaml +++ b/charts/sesamy-gtm/Chart.yaml @@ -12,7 +12,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/sesamy-gtm - name: GTM Changelog url: https://developers.google.com/tag-platform/tag-manager/server-side/release-notes version: 0.1.2 diff --git a/charts/sesamy-gtm/README.md b/charts/sesamy-gtm/README.md index 919b781..6945e23 100644 --- a/charts/sesamy-gtm/README.md +++ b/charts/sesamy-gtm/README.md @@ -1,6 +1,6 @@ # sesamy-gtm -![Version: 0.1.1](https://img.shields.io/badge/Version-0.1.1-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.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) Helm chart for the Sesamy GTM tagging & preview service.