updates to hazelcast 3.12.1 and adds YAML configuration support (#15034)

Signed-off-by: Mesut Celik <mesut@hazelcast.com>
This commit is contained in:
Mesut Celik
2019-06-25 02:14:36 -07:00
committed by Kubernetes Prow Robot
parent ef5b0a0559
commit 033579b0eb
4 changed files with 21 additions and 28 deletions
+2 -2
View File
@@ -1,7 +1,7 @@
apiVersion: v1
name: hazelcast
version: 1.3.3
appVersion: "3.11.2"
version: 1.4.0
appVersion: "3.12.1"
description: Hazelcast IMDG is the most widely used in-memory data grid with hundreds of thousands of installed clusters around the world. It offers caching solutions ensuring that data is in the right place when its needed for optimal performance.
keywords:
- hazelcast
+3 -1
View File
@@ -1,4 +1,4 @@
{{- if .Values.hazelcast.configurationFiles }}
{{- if or .Values.hazelcast.configurationFiles .Values.hazelcast.yaml }}
apiVersion: v1
kind: ConfigMap
metadata:
@@ -13,4 +13,6 @@ data:
{{ $key }}: |-
{{ $val | indent 4}}
{{- end }}
hazelcast.yaml: |-
{{ toYaml .Values.hazelcast.yaml | indent 4 }}
{{- end -}}
+1 -1
View File
@@ -81,7 +81,7 @@ spec:
value: "{{ .Values.metrics.service.port }}"
{{- end }}
- name: JAVA_OPTS
value: "-Dhazelcast.rest.enabled={{ .Values.hazelcast.rest }} -Dhazelcast.config=/data/hazelcast/hazelcast.xml -DserviceName={{ template "hazelcast.fullname" . }} -Dnamespace={{ .Release.Namespace }} {{ if .Values.gracefulShutdown.enabled }}-Dhazelcast.shutdownhook.policy=GRACEFUL -Dhazelcast.shutdownhook.enabled=true -Dhazelcast.graceful.shutdown.max.wait={{ .Values.gracefulShutdown.maxWaitSeconds }} {{ end }} {{ if .Values.metrics.enabled }}-Dhazelcast.jmx=true{{ end }} {{ .Values.hazelcast.javaOpts }}"
value: "-Dhazelcast.rest.enabled={{ .Values.hazelcast.rest }} -Dhazelcast.config=/data/hazelcast/hazelcast.yaml -DserviceName={{ template "hazelcast.fullname" . }} -Dnamespace={{ .Release.Namespace }} {{ if .Values.gracefulShutdown.enabled }}-Dhazelcast.shutdownhook.policy=GRACEFUL -Dhazelcast.shutdownhook.enabled=true -Dhazelcast.graceful.shutdown.max.wait={{ .Values.gracefulShutdown.maxWaitSeconds }} {{ end }} {{ if .Values.metrics.enabled }}-Dhazelcast.jmx=true{{ end }} {{ .Values.hazelcast.javaOpts }}"
serviceAccountName: {{ template "hazelcast.serviceAccountName" . }}
volumes:
- name: hazelcast-storage
+15 -24
View File
@@ -5,7 +5,7 @@ image:
# repository is the Hazelcast image name
repository: "hazelcast/hazelcast"
# tag is the Hazelcast image tag
tag: "3.11.2"
tag: "3.12"
# pullPolicy is the Docker image pull policy
# It's recommended to change this to 'Always' if the image tag is 'latest'
# ref: http://kubernetes.io/docs/user-guide/images/#updating-images
@@ -28,29 +28,20 @@ hazelcast:
rest: true
# javaOpts are additional JAVA_OPTS properties for Hazelcast member
javaOpts:
# configurationFiles are Hazelcast configuration files
configurationFiles:
hazelcast.xml: |-
<?xml version="1.0" encoding="UTF-8"?>
<hazelcast xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.10.xsd"
xmlns="http://www.hazelcast.com/schema/config"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<properties>
<property name="hazelcast.discovery.enabled">true</property>
</properties>
<network>
<join>
<multicast enabled="false"/>
<kubernetes enabled="true">
<service-name>${serviceName}</service-name>
<namespace>${namespace}</namespace>
<resolve-not-ready-addresses>true</resolve-not-ready-addresses>
</kubernetes>
</join>
</network>
</hazelcast>
# yaml is the Hazelcast YAML configuration file
yaml:
hazelcast:
network:
join:
multicast:
enabled: false
kubernetes:
enabled: true
service-name: ${serviceName}
namespace: ${namespace}
resolve-not-ready-addresses: true
# configurationFiles are any additional Hazelcast configuration files
# configurationFiles:
# nodeSelector is an array of Hazelcast Node labels for POD assignments
# ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector