From 26b650faf9e28c3d9c93250dca8d0d3c19c65dfe Mon Sep 17 00:00:00 2001
From: BorislavG <Borislav.Glozman@amdocs.com>
Date: Sun, 13 May 2018 17:11:01 +0000
Subject: 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>
---
 .../charts/aai-cassandra/templates/service.yaml    | 48 ++++++++++++++--------
 .../aai-cassandra/templates/statefulset.yaml       |  5 +--
 2 files changed, 32 insertions(+), 21 deletions(-)

(limited to 'kubernetes/aai/charts/aai-cassandra/templates')

diff --git a/kubernetes/aai/charts/aai-cassandra/templates/service.yaml b/kubernetes/aai/charts/aai-cassandra/templates/service.yaml
index c49e6058e2..1aded3c09c 100644
--- a/kubernetes/aai/charts/aai-cassandra/templates/service.yaml
+++ b/kubernetes/aai/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/kubernetes/aai/charts/aai-cassandra/templates/statefulset.yaml b/kubernetes/aai/charts/aai-cassandra/templates/statefulset.yaml
index 92f05dda7e..1a00b3c1d7 100644
--- a/kubernetes/aai/charts/aai-cassandra/templates/statefulset.yaml
+++ b/kubernetes/aai/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
-- 
cgit 1.2.3-korg