From b976a94e1513ae14dc27db0e265f6e7b0e73ae96 Mon Sep 17 00:00:00 2001 From: Szymon Bogusz Date: Thu, 9 May 2024 13:58:54 +0200 Subject: [PATCH 1/7] Bump appVersion to 1.15.0-RC2 --- src/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Chart.yaml b/src/Chart.yaml index 55253e0..9a8ce95 100644 --- a/src/Chart.yaml +++ b/src/Chart.yaml @@ -15,7 +15,7 @@ type: application # latest-staging version is used when someone run the snapshot build of this chart manually. scala_2.12 is because it can be used with Flink # During release it is replaced by the released image version. In the main we should always keep this version # TODO The best would be to publish X.Y.Z-latest docker image version in core and use it here to make it more explicit -appVersion: 1.15.0-SNAPSHOT +appVersion: 1.15.0-RC2 dependencies: - name: postgresql version: ~12.1.15 From 21c4966a4da6cc44c0c516cd1afc558f341027ad Mon Sep 17 00:00:00 2001 From: Szymon Bogusz Date: Thu, 9 May 2024 14:16:10 +0200 Subject: [PATCH 2/7] Bump dependencies --- src/Chart.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Chart.lock b/src/Chart.lock index 618904a..802b3aa 100644 --- a/src/Chart.lock +++ b/src/Chart.lock @@ -22,6 +22,6 @@ dependencies: version: 4.12.5 - name: telegraf repository: https://helm.influxdata.com/ - version: 1.8.43 -digest: sha256:8b7e16bad782b269dddffad8e520ae7da660ae573ad6fab503749922d37a55ad -generated: "2024-03-21T14:43:47.54987659+01:00" + version: 1.8.45 +digest: sha256:ce0afafcb8139c291c9ea2c42df716350f056919fc83251df66ee4bac8066382 +generated: "2024-05-09T14:07:14.088649586+02:00" From edf2eb682dcaa1da213bb7d65344e02347dc0e49 Mon Sep 17 00:00:00 2001 From: Szymon Bogusz Date: Mon, 20 May 2024 08:34:47 +0200 Subject: [PATCH 3/7] Bump NU to 1.15.0 --- src/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Chart.yaml b/src/Chart.yaml index 9a8ce95..3a31337 100644 --- a/src/Chart.yaml +++ b/src/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: nussknacker # In the main branch it should be always the -SNAPSHOT version. Release versions should be on the tags only -version: 1.15.0-SNAPSHOT +version: 1.15.0 description: Nussknacker - a design, development, and deployment tool for stream processing home: https://nussknacker.io/ icon: https://nussknacker.io/wp-content/uploads/2021/10/Nussknacker-short-black.svg @@ -15,7 +15,7 @@ type: application # latest-staging version is used when someone run the snapshot build of this chart manually. scala_2.12 is because it can be used with Flink # During release it is replaced by the released image version. In the main we should always keep this version # TODO The best would be to publish X.Y.Z-latest docker image version in core and use it here to make it more explicit -appVersion: 1.15.0-RC2 +appVersion: 1.15.0 dependencies: - name: postgresql version: ~12.1.15 From 3c2dd01ad0dcb3e072a095523deaa5c581fcafab Mon Sep 17 00:00:00 2001 From: Szymon Bogusz Date: Mon, 27 May 2024 11:40:47 +0200 Subject: [PATCH 4/7] Change grafana helm to 6.11.0 which uses grafana before license change --- src/Chart.lock | 8 ++++---- src/Chart.yaml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Chart.lock b/src/Chart.lock index 802b3aa..1359c83 100644 --- a/src/Chart.lock +++ b/src/Chart.lock @@ -16,12 +16,12 @@ dependencies: version: 0.2.0 - name: grafana repository: https://grafana.github.io/helm-charts - version: 6.61.2 + version: 6.11.0 - name: influxdb repository: https://helm.influxdata.com/ version: 4.12.5 - name: telegraf repository: https://helm.influxdata.com/ - version: 1.8.45 -digest: sha256:ce0afafcb8139c291c9ea2c42df716350f056919fc83251df66ee4bac8066382 -generated: "2024-05-09T14:07:14.088649586+02:00" + version: 1.8.48 +digest: sha256:79ca60bd2fe8c951a5037708fe69cc9ee39f8b5b4ae5b3eef3364e82bbb98970 +generated: "2024-05-27T10:27:46.47971203+02:00" diff --git a/src/Chart.yaml b/src/Chart.yaml index 3a31337..ece637d 100644 --- a/src/Chart.yaml +++ b/src/Chart.yaml @@ -38,8 +38,8 @@ dependencies: repository: "@riskfocus" condition: flink.enabled - name: grafana - # Grafana has quite good compatibility between minor version so this should be ok - version: ^6.51.1 + # Grafana has changed its license after v7.5 - 6.11.0 is it's helm version + version: 6.11.0 repository: "@grafana" condition: grafana.enabled - name: influxdb From e6aa18c76f14829ad64117556f146ccfb8a76bfd Mon Sep 17 00:00:00 2001 From: Szymon Bogusz Date: Wed, 29 May 2024 10:00:28 +0200 Subject: [PATCH 5/7] Change version for preview --- src/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Chart.yaml b/src/Chart.yaml index ece637d..5520ae1 100644 --- a/src/Chart.yaml +++ b/src/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: nussknacker # In the main branch it should be always the -SNAPSHOT version. Release versions should be on the tags only -version: 1.15.0 +version: 1.15.0-preview description: Nussknacker - a design, development, and deployment tool for stream processing home: https://nussknacker.io/ icon: https://nussknacker.io/wp-content/uploads/2021/10/Nussknacker-short-black.svg @@ -15,7 +15,7 @@ type: application # latest-staging version is used when someone run the snapshot build of this chart manually. scala_2.12 is because it can be used with Flink # During release it is replaced by the released image version. In the main we should always keep this version # TODO The best would be to publish X.Y.Z-latest docker image version in core and use it here to make it more explicit -appVersion: 1.15.0 +appVersion: 1.15.0-preview dependencies: - name: postgresql version: ~12.1.15 From 13a1556794a92f3dafc09eccb5825fb845f4a741 Mon Sep 17 00:00:00 2001 From: Szymon Bogusz Date: Tue, 11 Jun 2024 09:52:13 +0200 Subject: [PATCH 6/7] Return with grafana chart version to newer versions, but select image tag for 7.5.15 --- src/Chart.lock | 6 +++--- src/Chart.yaml | 2 +- src/values.yaml | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Chart.lock b/src/Chart.lock index 1359c83..24f9323 100644 --- a/src/Chart.lock +++ b/src/Chart.lock @@ -16,12 +16,12 @@ dependencies: version: 0.2.0 - name: grafana repository: https://grafana.github.io/helm-charts - version: 6.11.0 + version: 6.61.2 - name: influxdb repository: https://helm.influxdata.com/ version: 4.12.5 - name: telegraf repository: https://helm.influxdata.com/ version: 1.8.48 -digest: sha256:79ca60bd2fe8c951a5037708fe69cc9ee39f8b5b4ae5b3eef3364e82bbb98970 -generated: "2024-05-27T10:27:46.47971203+02:00" +digest: sha256:5f8eebfac4b0b6ba3ba21b5fdb35db6f44cb77de2d8d52a4cdea1c2ca6ef3f1d +generated: "2024-06-11T09:39:59.906511155+02:00" diff --git a/src/Chart.yaml b/src/Chart.yaml index 5520ae1..4a199a4 100644 --- a/src/Chart.yaml +++ b/src/Chart.yaml @@ -39,7 +39,7 @@ dependencies: condition: flink.enabled - name: grafana # Grafana has changed its license after v7.5 - 6.11.0 is it's helm version - version: 6.11.0 + version: ^6.51.1 repository: "@grafana" condition: grafana.enabled - name: influxdb diff --git a/src/values.yaml b/src/values.yaml index fae630e..7d15e23 100644 --- a/src/values.yaml +++ b/src/values.yaml @@ -221,6 +221,8 @@ flink: grafana: enabled: true + image: + tag: 7.5.15 grafana.ini: server: root_url: "%(protocol)s://%(domain)s/grafana" From d1cd8d258261a2ceacc7ce50cc727f84c15309a7 Mon Sep 17 00:00:00 2001 From: Szymon Bogusz Date: Tue, 11 Jun 2024 10:27:45 +0200 Subject: [PATCH 7/7] Add "snapshot" to version so it will get published --- src/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Chart.yaml b/src/Chart.yaml index 4a199a4..594dc03 100644 --- a/src/Chart.yaml +++ b/src/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: nussknacker # In the main branch it should be always the -SNAPSHOT version. Release versions should be on the tags only -version: 1.15.0-preview +version: 1.15.0-preview-SNAPSHOT description: Nussknacker - a design, development, and deployment tool for stream processing home: https://nussknacker.io/ icon: https://nussknacker.io/wp-content/uploads/2021/10/Nussknacker-short-black.svg