From af1418c93e9bf07d16df8e6cc243916562bc70ba Mon Sep 17 00:00:00 2001 From: Sergi Philipsen Date: Thu, 7 Nov 2024 16:10:06 +0100 Subject: [PATCH] Add console to hazelcast network headless service --- charts/frank-console/Chart.yaml | 2 +- charts/frank-console/templates/_labels.tpl | 1 + charts/frank2example/Chart.lock | 6 +++--- charts/frank2example/Chart.yaml | 4 ++-- charts/frankframework/Chart.lock | 6 +++--- charts/frankframework/Chart.yaml | 4 ++-- charts/frankframework/templates/_labels.tpl | 1 + .../templates/configmap.hazelcast-network.yaml | 1 + charts/frankframework/templates/service.hazelcast.yaml | 3 ++- 9 files changed, 16 insertions(+), 12 deletions(-) diff --git a/charts/frank-console/Chart.yaml b/charts/frank-console/Chart.yaml index 67409aa..18182d1 100644 --- a/charts/frank-console/Chart.yaml +++ b/charts/frank-console/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: frank-console description: The Frank!Framework console is a web application that allows you to manage multiple instances of Frank!Framework from a single console. -version: 0.5.0 +version: 0.5.1 appVersion: "8.3.0-SNAPSHOT" type: application home: https://frankframework.org diff --git a/charts/frank-console/templates/_labels.tpl b/charts/frank-console/templates/_labels.tpl index f2775cb..e71717e 100644 --- a/charts/frank-console/templates/_labels.tpl +++ b/charts/frank-console/templates/_labels.tpl @@ -16,4 +16,5 @@ Selector labels {{- define "frank-console.selectorLabels" -}} app.kubernetes.io/name: {{ include "frank-console.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} +frankframework/hazelcast: {{ .Release.Name }} {{- end -}} diff --git a/charts/frank2example/Chart.lock b/charts/frank2example/Chart.lock index 068302f..ff372af 100644 --- a/charts/frank2example/Chart.lock +++ b/charts/frank2example/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: frankframework repository: file://../frankframework - version: 0.5.1 -digest: sha256:4ebe357f868b8a9893d46ebb67fbebc2f86388d18b51a9484fb0c765cc974eca -generated: "2024-10-22T13:36:32.3436931+02:00" + version: 0.5.2 +digest: sha256:823c1ffcab9ef32877d9fa3bcd16e121d6b7e647219356177addc98f27418d85 +generated: "2024-11-07T15:49:41.1849908+01:00" diff --git a/charts/frank2example/Chart.yaml b/charts/frank2example/Chart.yaml index 73f314b..42e0b70 100644 --- a/charts/frank2example/Chart.yaml +++ b/charts/frank2example/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: frank2example description: A Helm chart for running Frank2Example on Kubernetes -version: 0.5.1 +version: 0.5.2 type: application home: https://frankframework.org icon: https://raw.githubusercontent.com/frankframework/charts/master/charts/frank2example/icon.svg @@ -11,5 +11,5 @@ keywords: dependencies: - name: frankframework - version: 0.5.1 + version: 0.5.2 repository: file://../frankframework \ No newline at end of file diff --git a/charts/frankframework/Chart.lock b/charts/frankframework/Chart.lock index 266e5f8..038e90b 100644 --- a/charts/frankframework/Chart.lock +++ b/charts/frankframework/Chart.lock @@ -1,9 +1,9 @@ dependencies: - name: frank-console repository: file://../frank-console - version: 0.5.0 + version: 0.5.1 - name: postgresql repository: https://charts.bitnami.com/bitnami version: 16.0.0 -digest: sha256:0f2675239e7268361427aed374d46796b0ea3caa40f35ad2f70acfff26845b94 -generated: "2024-10-09T13:28:43.5106639+02:00" +digest: sha256:7ea45ea8b7ce5aa511f68eafae944246de2296b4a0f986ba9039a935ba7f528d +generated: "2024-11-07T16:02:11.3758001+01:00" diff --git a/charts/frankframework/Chart.yaml b/charts/frankframework/Chart.yaml index bde16c4..b3e0652 100644 --- a/charts/frankframework/Chart.yaml +++ b/charts/frankframework/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: frankframework description: A Helm chart for running the Frank!Framework on Kubernetes -version: 0.5.1 +version: 0.5.2 appVersion: "8.3.0-SNAPSHOT" type: application home: https://frankframework.org @@ -15,7 +15,7 @@ keywords: dependencies: - name: frank-console - version: 0.5.0 + version: 0.5.1 alias: console condition: console.enabled repository: file://../frank-console diff --git a/charts/frankframework/templates/_labels.tpl b/charts/frankframework/templates/_labels.tpl index f5065df..dcfe305 100644 --- a/charts/frankframework/templates/_labels.tpl +++ b/charts/frankframework/templates/_labels.tpl @@ -16,4 +16,5 @@ Selector labels {{- define "frankframework.selectorLabels" -}} app.kubernetes.io/name: {{ include "frankframework.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} +frankframework/hazelcast: {{ .Release.Name }} {{- end -}} diff --git a/charts/frankframework/templates/configmap.hazelcast-network.yaml b/charts/frankframework/templates/configmap.hazelcast-network.yaml index 195ff4c..0a24f00 100644 --- a/charts/frankframework/templates/configmap.hazelcast-network.yaml +++ b/charts/frankframework/templates/configmap.hazelcast-network.yaml @@ -23,5 +23,6 @@ data: + {{- end -}} \ No newline at end of file diff --git a/charts/frankframework/templates/service.hazelcast.yaml b/charts/frankframework/templates/service.hazelcast.yaml index 55620a4..2374bb1 100644 --- a/charts/frankframework/templates/service.hazelcast.yaml +++ b/charts/frankframework/templates/service.hazelcast.yaml @@ -10,7 +10,8 @@ spec: type: ClusterIP clusterIP: None selector: - {{- include "frankframework.selectorLabels" . | nindent 4 }} + app.kubernetes.io/instance: {{ .Release.Name }} + frankframework/hazelcast: {{ .Release.Name }} ports: - name: hazelcast port: 5701