X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fcommon%2Fcassandra%2Ftemplates%2Fstatefulset.yaml;h=ddaff5c7c09a25cfa5fa3558b6f16fc98df29255;hb=refs%2Fheads%2Fmaster;hp=2e73309bb762f8e61dd6d7d795bcf3591cdd097e;hpb=1fcee4e8d3bce9134096dc8c096c20ae54f21f6a;p=oom.git

diff --git a/kubernetes/common/cassandra/templates/statefulset.yaml b/kubernetes/common/cassandra/templates/statefulset.yaml
index 2e73309bb7..ddaff5c7c0 100644
--- a/kubernetes/common/cassandra/templates/statefulset.yaml
+++ b/kubernetes/common/cassandra/templates/statefulset.yaml
@@ -14,7 +14,7 @@
 # limitations under the License.
 */}}
 
-{{- if not .Values.k8ssandraOperator.enabled }}
+{{- if not .Values.global.cassandra.useOperator }}
 apiVersion: apps/v1
 kind: StatefulSet
 metadata: {{- include "common.resourceMetadata" . | nindent 2 }}
@@ -27,19 +27,9 @@ spec:
     type: {{ .Values.updateStrategy.type }}
   template:
     metadata: {{- include "common.templateMetadata" . | nindent 6 }}
-      {{- if or .Values.podAnnotations (and .Values.metrics.serviceMonitor.enabled .Values.metrics.podAnnotations) }}
-      annotations:
-        {{- if .Values.podAnnotations }}
-        {{- include "common.tplValue" (dict "value" .Values.podAnnotations "context" $) | nindent 8 }}
-        {{- end }}
-        {{- if and .Values.metrics.serviceMonitor.enabled .Values.metrics.podAnnotations }}
-        {{- include "common.tplValue" (dict "value" .Values.metrics.podAnnotations "context" $) | nindent 8 }}
-        {{- end }}
-      {{- end }}
     spec:
       hostNetwork: {{ .Values.hostNetwork }}
-      imagePullSecrets:
-      - name: "{{ include "common.namespace" . }}-docker-registry-key"
+      {{- include "common.imagePullSecrets" . | nindent 6 }}
       containers:
       - name: {{ include "common.name" . }}
         image: {{ include "repositoryGenerator.dockerHubRepository" . }}/{{ .Values.image }}
@@ -48,9 +38,6 @@ spec:
         volumeMounts:
           - name: {{ include "common.fullname" . }}-data
             mountPath: /var/lib/cassandra
-          - name: localtime
-            mountPath: /etc/localtime
-            readOnly: true
           - name: cassandra-entrypoint
             mountPath: /docker-entrypoint.sh
             subPath: docker-entrypoint.sh
@@ -179,9 +166,6 @@ spec:
       {{- end }}
       serviceAccountName: {{ include "common.fullname" (dict "suffix" "nothing" "dot" . )}}
       volumes:
-      - name: localtime
-        hostPath:
-          path: /etc/localtime
       {{- range $key, $value := .Values.configOverrides }}
       - name: cassandra-config-{{ $key | replace "." "-" }}
         configMap: