From 7fe084d7e90f87968222849ed40d14b49cdc9186 Mon Sep 17 00:00:00 2001 From: Linkurious ci bot Date: Wed, 2 Jul 2025 08:09:27 +0000 Subject: [PATCH 1/3] =?UTF-8?q?Bump=20version:=200.0.11=20=E2=86=92=200.0.?= =?UTF-8?q?12=20[ci:run]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- .version | 2 +- charts/linkurious-entity-resolution/Chart.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 88f4e20..cf90322 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.0.11 +current_version = 0.0.12 commit = False tag = False serialize = diff --git a/.version b/.version index 2cfabea..8cbf02c 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -0.0.11 +0.0.12 diff --git a/charts/linkurious-entity-resolution/Chart.yaml b/charts/linkurious-entity-resolution/Chart.yaml index f7dc94c..7346326 100644 --- a/charts/linkurious-entity-resolution/Chart.yaml +++ b/charts/linkurious-entity-resolution/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.0.11 +version: 0.0.12 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to From 50d5c1592a1373cbca70402e03470755692d2762 Mon Sep 17 00:00:00 2001 From: Edward Nys Date: Wed, 2 Jul 2025 10:44:24 +0200 Subject: [PATCH 2/3] rmove internal values --- .../values.preprod.yaml | 39 ------------------- .../values.preview.yaml | 11 ------ .../values.prod.yaml | 39 ------------------- 3 files changed, 89 deletions(-) delete mode 100644 charts/linkurious-entity-resolution/values.preprod.yaml delete mode 100644 charts/linkurious-entity-resolution/values.preview.yaml delete mode 100644 charts/linkurious-entity-resolution/values.prod.yaml diff --git a/charts/linkurious-entity-resolution/values.preprod.yaml b/charts/linkurious-entity-resolution/values.preprod.yaml deleted file mode 100644 index d6a709c..0000000 --- a/charts/linkurious-entity-resolution/values.preprod.yaml +++ /dev/null @@ -1,39 +0,0 @@ - -hostPostfix: k8s.dev.linkurious.net -ingressRoute: - enabled: true - -envFrom: - - secretRef: - name: linkurious-entity-resolution-api-key - -apiAuth: - enabled: true - existingSecret: "linkurious-entity-resolution-api-key" - -metrics: - enabled: true - serviceMonitor: - enabled: true - labels: - release: kube-prometheus-stack - -mariadb: - ## See https://github.com/bitnami/charts/blob/main/bitnami/mariadb/values.yaml - enabled: true - primary: - persistence: - enabled: true - size: 1Gi - - auth: - database: linkurious - existingSecret: linkurious-entity-resolution-develop-mariadb - - metrics: - enabled: true - serviceMonitor: - enabled: true - labels: - release: kube-prometheus-stack - diff --git a/charts/linkurious-entity-resolution/values.preview.yaml b/charts/linkurious-entity-resolution/values.preview.yaml deleted file mode 100644 index 6a5c20a..0000000 --- a/charts/linkurious-entity-resolution/values.preview.yaml +++ /dev/null @@ -1,11 +0,0 @@ - -mariadb: - ## See https://github.com/bitnami/charts/blob/main/bitnami/mariadb/values.yaml - enabled: true - primary: - persistence: - enabled: false - - auth: - database: linkurious - existingSecret: diff --git a/charts/linkurious-entity-resolution/values.prod.yaml b/charts/linkurious-entity-resolution/values.prod.yaml deleted file mode 100644 index 844376a..0000000 --- a/charts/linkurious-entity-resolution/values.prod.yaml +++ /dev/null @@ -1,39 +0,0 @@ - -hostPostfix: k8s.dev.linkurious.net -ingressRoute: - enabled: true - -envFrom: - - secretRef: - name: linkurious-entity-resolution-api-key - -apiAuth: - enabled: true - existingSecret: "linkurious-entity-resolution-api-key" - -metrics: - enabled: true - serviceMonitor: - enabled: true - labels: - release: kube-prometheus-stack - -mariadb: - ## See https://github.com/bitnami/charts/blob/main/bitnami/mariadb/values.yaml - enabled: true - primary: - persistence: - enabled: true - size: 1Gi - - auth: - database: linkurious - existingSecret: linkurious-entity-resolution-master-mariadb - - metrics: - enabled: true - serviceMonitor: - enabled: true - labels: - release: kube-prometheus-stack - From 01c1fc1dcfc5a77e629e2806fb90ad9eacd4d15c Mon Sep 17 00:00:00 2001 From: Edward Nys Date: Wed, 2 Jul 2025 11:01:47 +0200 Subject: [PATCH 3/3] Fix serviceMonitor selector --- .../templates/servicemonitor.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/charts/linkurious-entity-resolution/templates/servicemonitor.yaml b/charts/linkurious-entity-resolution/templates/servicemonitor.yaml index a5c551a..196724a 100644 --- a/charts/linkurious-entity-resolution/templates/servicemonitor.yaml +++ b/charts/linkurious-entity-resolution/templates/servicemonitor.yaml @@ -58,10 +58,6 @@ spec: {{- end }} selector: matchLabels: - {{- if (and (.Values.metrics.serviceMonitor).enabled) }} - {{- include "linkurious-entity-resolution.metricslabelselector" . | nindent 6 }} - {{- else }} {{- include "linkurious-entity-resolution.selectorLabels" . | nindent 6 }} - {{- end }} {{- end }} {{- end }}