diff options
author | 2018-05-13 17:11:01 +0000 | |
---|---|---|
committer | 2018-05-14 15:40:49 +0300 | |
commit | 20dcf419c5ec6d2193df31903140a5a8dfb2cd3d (patch) | |
tree | 063b2d3ecab56e74e783fc4ccfecd637a267a617 /charts | |
parent | 59722a414a3b004369772228dbd2e88dc3a4706c (diff) |
Fix aai-cassandra service
Make resources and traversal run on non-rancher k8s
Change-Id: I01bd0537bf183ee59f35b272a7a53dffbc5b1d26
Cange-Id: I925964bcc2e0378d947dff33dd2b8870f3acd362
Issue-ID: OOM-1077
Signed-off-by: BorislavG <Borislav.Glozman@amdocs.com>
Diffstat (limited to 'charts')
-rw-r--r-- | charts/aai-cassandra/templates/service.yaml | 48 | ||||
-rw-r--r-- | charts/aai-cassandra/templates/statefulset.yaml | 5 | ||||
-rw-r--r-- | charts/aai-cassandra/values.yaml | 10 | ||||
-rw-r--r-- | charts/aai-resources/resources/config/janusgraph-cached.properties | 2 | ||||
-rw-r--r-- | charts/aai-resources/resources/config/janusgraph-realtime.properties | 3 | ||||
-rw-r--r-- | charts/aai-resources/templates/service.yaml | 10 | ||||
-rw-r--r-- | charts/aai-resources/values.yaml | 3 | ||||
-rw-r--r-- | charts/aai-traversal/resources/config/janusgraph-cached.properties | 2 | ||||
-rw-r--r-- | charts/aai-traversal/resources/config/janusgraph-realtime.properties | 2 | ||||
-rw-r--r-- | charts/aai-traversal/templates/service.yaml | 10 | ||||
-rw-r--r-- | charts/aai-traversal/values.yaml | 3 |
11 files changed, 56 insertions, 42 deletions
diff --git a/charts/aai-cassandra/templates/service.yaml b/charts/aai-cassandra/templates/service.yaml index c49e605..1aded3c 100644 --- a/charts/aai-cassandra/templates/service.yaml +++ b/charts/aai-cassandra/templates/service.yaml @@ -1,27 +1,39 @@ apiVersion: v1 kind: Service metadata: - name: {{ template "common.servicename" . }} + name: {{ include "common.servicename" . }} namespace: {{ include "common.namespace" . }} labels: - app: {{ template "common.fullname" . }} - chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" - release: "{{ .Release.Name }}" - heritage: "{{ .Release.Service }}" + app: {{ include "common.name" . }} + chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} + annotations: + service.alpha.kubernetes.io/tolerate-unready-endpoints: "true" spec: - clusterIP: None type: {{ .Values.service.type }} +# Not working, open k8s bug: https://github.com/kubernetes/kubernetes/issues/58662 + publishNotReadyAddresses: true ports: - - name: cql - port: {{ default 9042 .Values.config.ports.cql }} - targetPort: {{ default 9042 .Values.config.ports.cql }} - - name: thrift - port: {{ default 9160 .Values.config.ports.thrift }} - targetPort: {{ default 9160 .Values.config.ports.thrift }} - {{- if .Values.config.ports.agent }} - - name: agent - port: {{ .Values.config.ports.agent }} - targetPort: {{ .Values.config.ports.agent }} - {{- end }} + {{if eq .Values.service.type "NodePort" -}} + - port: {{ .Values.service.internalPort }} + nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }} + name: {{ .Values.service.portName }} + - port: {{ .Values.service.internalPort2 }} + nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort2 }} + name: {{ .Values.service.portName3 }} + - port: {{ .Values.service.internalPort3 }} + nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort3 }} + name: {{ .Values.service.portName3 }} + {{- else -}} + - port: {{ .Values.service.internalPort }} + name: {{ .Values.service.portName }} + - port: {{ .Values.service.internalPort2 }} + name: {{ .Values.service.portName2 }} + - port: {{ .Values.service.internalPort3 }} + name: {{ .Values.service.portName3 }} + {{- end}} selector: - app: {{ template "common.fullname" . }} + app: {{ include "common.name" . }} + release: {{ .Release.Name }} + clusterIP: None diff --git a/charts/aai-cassandra/templates/statefulset.yaml b/charts/aai-cassandra/templates/statefulset.yaml index 92f05dd..1a00b3c 100644 --- a/charts/aai-cassandra/templates/statefulset.yaml +++ b/charts/aai-cassandra/templates/statefulset.yaml @@ -9,7 +9,7 @@ metadata: release: {{ .Release.Name }} heritage: {{ .Release.Service }} spec: - serviceName: {{ include "common.fullname" . }} + serviceName: {{ include "common.servicename" . }} replicas: {{ .Values.replicaCount }} podManagementPolicy: {{ .Values.podManagementPolicy }} updateStrategy: @@ -29,7 +29,6 @@ spec: - containerPort: {{ .Values.service.internalPort }} - containerPort: {{ .Values.service.internalPort2 }} - containerPort: {{ .Values.service.internalPort3 }} - - containerPort: {{ .Values.service.internalPort4 }} {{- if eq .Values.liveness.enabled true }} livenessProbe: exec: @@ -60,7 +59,7 @@ spec: - name: HEAP_NEWSIZE value: {{ .Values.config.heap.min }} - name: CASSANDRA_SEEDS - value: "{{- range $i, $e := until $seed_size }}{{ template "common.fullname" $global }}-{{ $i }},{{- end }}" + value: "{{- range $i, $e := until $seed_size }}{{ template "common.fullname" $global }}-{{ $i }}.{{ include "common.servicename" $global }},{{- end }}" - name: JVM_OPTS value: {{ .Values.config.jvmOpts | quote }} - name: CASSANDRA_CLUSTER_NAME diff --git a/charts/aai-cassandra/values.yaml b/charts/aai-cassandra/values.yaml index 2706ba8..05f2d08 100644 --- a/charts/aai-cassandra/values.yaml +++ b/charts/aai-cassandra/values.yaml @@ -48,10 +48,12 @@ readiness: service: type: ClusterIP name: aai-cassandra - internalPort: 7000 - internalPort2: 7001 - internalPort3: 7199 - internalPort4: 9042 + internalPort: 9042 + portName: cql + internalPort2: 9160 + portName2: thrift + internalPort3: 61621 + portName3: agent podManagementPolicy: OrderedReady updateStrategy: diff --git a/charts/aai-resources/resources/config/janusgraph-cached.properties b/charts/aai-resources/resources/config/janusgraph-cached.properties index e3128b8..b9216bf 100644 --- a/charts/aai-resources/resources/config/janusgraph-cached.properties +++ b/charts/aai-resources/resources/config/janusgraph-cached.properties @@ -27,7 +27,7 @@ query.smart-limit=false {{- $global := . }} storage.backend=cassandra -storage.hostname={{- range $i, $e := until $seed_size }}{{ $global.Release.Name }}-aai-cassandra-{{ $i }},{{- end }} +storage.hostname={{- range $i, $e := until $seed_size }}{{ $global.Release.Name }}-{{$global.Values.global.cassandra.serviceName}}-{{ $i }}.{{$global.Values.global.cassandra.serviceName}},{{- end }} storage.cassandra.keyspace=aaigraph diff --git a/charts/aai-resources/resources/config/janusgraph-realtime.properties b/charts/aai-resources/resources/config/janusgraph-realtime.properties index 875a8a5..d8f6f71 100644 --- a/charts/aai-resources/resources/config/janusgraph-realtime.properties +++ b/charts/aai-resources/resources/config/janusgraph-realtime.properties @@ -26,8 +26,7 @@ query.smart-limit=false # the following parameters are not reloaded automatically and require a manual bounce storage.backend=cassandra -storage.hostname={{- range $i, $e := until $seed_size }}{{ $global.Release.Name }}-aai-cassandra-{{ $i }},{{- end }} - +storage.hostname={{- range $i, $e := until $seed_size }}{{ $global.Release.Name }}-{{$global.Values.global.cassandra.serviceName}}-{{ $i }}.{{$global.Values.global.cassandra.serviceName}},{{- end }} storage.cassandra.keyspace=aaigraph storage.cassandra.read-consistency-level=LOCAL_QUORUM diff --git a/charts/aai-resources/templates/service.yaml b/charts/aai-resources/templates/service.yaml index 8cea86c..9ba61fa 100644 --- a/charts/aai-resources/templates/service.yaml +++ b/charts/aai-resources/templates/service.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: Service metadata: - name: {{ include "common.name" . }} + name: {{ include "common.servicename" . }} namespace: {{ include "common.namespace" . }} labels: app: {{ include "common.name" . }} @@ -14,15 +14,15 @@ spec: {{if eq .Values.service.type "NodePort" -}} - port: {{ .Values.service.internalPort }} nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }} - name: {{ .Values.service.name }} + name: {{ .Values.service.portName }} - port: {{ .Values.service.internalPort2 }} nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort2 }} - name: {{ .Values.service.name }}2 + name: {{ .Values.service.portName2 }} {{- else -}} - port: {{ .Values.service.internalPort }} - name: {{ .Values.service.name }} + name: {{ .Values.service.portName }} - port: {{ .Values.service.internalPort2 }} - name: {{ .Values.service.name }}2 + name: {{ .Values.service.portName2 }} {{- end}} selector: app: {{ include "common.name" . }} diff --git a/charts/aai-resources/values.yaml b/charts/aai-resources/values.yaml index e7c7503..7b55aa7 100644 --- a/charts/aai-resources/values.yaml +++ b/charts/aai-resources/values.yaml @@ -40,8 +40,9 @@ readiness: service: type: ClusterIP - name: aai-resources + portName: aai-resources-8447 internalPort: 8447 + portName2: aai-resources-5005 internalPort2: 5005 diff --git a/charts/aai-traversal/resources/config/janusgraph-cached.properties b/charts/aai-traversal/resources/config/janusgraph-cached.properties index e3128b8..b9216bf 100644 --- a/charts/aai-traversal/resources/config/janusgraph-cached.properties +++ b/charts/aai-traversal/resources/config/janusgraph-cached.properties @@ -27,7 +27,7 @@ query.smart-limit=false {{- $global := . }} storage.backend=cassandra -storage.hostname={{- range $i, $e := until $seed_size }}{{ $global.Release.Name }}-aai-cassandra-{{ $i }},{{- end }} +storage.hostname={{- range $i, $e := until $seed_size }}{{ $global.Release.Name }}-{{$global.Values.global.cassandra.serviceName}}-{{ $i }}.{{$global.Values.global.cassandra.serviceName}},{{- end }} storage.cassandra.keyspace=aaigraph diff --git a/charts/aai-traversal/resources/config/janusgraph-realtime.properties b/charts/aai-traversal/resources/config/janusgraph-realtime.properties index 875a8a5..a8504dc 100644 --- a/charts/aai-traversal/resources/config/janusgraph-realtime.properties +++ b/charts/aai-traversal/resources/config/janusgraph-realtime.properties @@ -26,7 +26,7 @@ query.smart-limit=false # the following parameters are not reloaded automatically and require a manual bounce storage.backend=cassandra -storage.hostname={{- range $i, $e := until $seed_size }}{{ $global.Release.Name }}-aai-cassandra-{{ $i }},{{- end }} +storage.hostname={{- range $i, $e := until $seed_size }}{{ $global.Release.Name }}-{{$global.Values.global.cassandra.serviceName}}-{{ $i }}.{{$global.Values.global.cassandra.serviceName}},{{- end }} storage.cassandra.keyspace=aaigraph diff --git a/charts/aai-traversal/templates/service.yaml b/charts/aai-traversal/templates/service.yaml index 8cea86c..9ba61fa 100644 --- a/charts/aai-traversal/templates/service.yaml +++ b/charts/aai-traversal/templates/service.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: Service metadata: - name: {{ include "common.name" . }} + name: {{ include "common.servicename" . }} namespace: {{ include "common.namespace" . }} labels: app: {{ include "common.name" . }} @@ -14,15 +14,15 @@ spec: {{if eq .Values.service.type "NodePort" -}} - port: {{ .Values.service.internalPort }} nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }} - name: {{ .Values.service.name }} + name: {{ .Values.service.portName }} - port: {{ .Values.service.internalPort2 }} nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort2 }} - name: {{ .Values.service.name }}2 + name: {{ .Values.service.portName2 }} {{- else -}} - port: {{ .Values.service.internalPort }} - name: {{ .Values.service.name }} + name: {{ .Values.service.portName }} - port: {{ .Values.service.internalPort2 }} - name: {{ .Values.service.name }}2 + name: {{ .Values.service.portName2 }} {{- end}} selector: app: {{ include "common.name" . }} diff --git a/charts/aai-traversal/values.yaml b/charts/aai-traversal/values.yaml index f6800f1..c22ae75 100644 --- a/charts/aai-traversal/values.yaml +++ b/charts/aai-traversal/values.yaml @@ -45,8 +45,9 @@ readiness: service: type: ClusterIP - name: aai-traversal + portName: aai-traversal-8446 internalPort: 8446 + portName2: aai-traversal-5005 internalPort2: 5005 ingress: |