X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fcommon%2Fcassandra%2Ftemplates%2Fbackup%2Fcronjob.yaml;h=6db1202b4fba8c98ec77c0fed5efd8de1e46c8cd;hb=HEAD;hp=1d1e4594daaa71c7df4eaf3e2f480ebbfcbe601d;hpb=cfb4c8a9e14c0b69213bf0e80a1d5d7a5d697eb9;p=oom.git

diff --git a/kubernetes/common/cassandra/templates/backup/cronjob.yaml b/kubernetes/common/cassandra/templates/backup/cronjob.yaml
index 1d1e4594da..6db1202b4f 100644
--- a/kubernetes/common/cassandra/templates/backup/cronjob.yaml
+++ b/kubernetes/common/cassandra/templates/backup/cronjob.yaml
@@ -14,6 +14,8 @@
 # limitations under the License.
 */}}
 {{- if .Values.backup.enabled }}
+{{- if .Values.global.cassandra.useOperator }}
+{{ else }}
 apiVersion: batch/v1beta1
 kind: CronJob
 metadata:
@@ -37,7 +39,7 @@ spec:
             - command:
               - /app/ready.py
               args:
-              - --container-name
+              - --app-name
               - {{ include "common.name" . }}
               env:
               - name: NAMESPACE
@@ -45,12 +47,26 @@ spec:
                   fieldRef:
                     apiVersion: v1
                     fieldPath: metadata.namespace
-              image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}"
+              image: {{ include "repositoryGenerator.image.readiness" . }}
               imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
               name: {{ include "common.name" . }}-readiness
+              resources:
+                limits:
+                  cpu: "100m"
+                  memory: "500Mi"
+                requests:
+                  cpu: "3m"
+                  memory: "20Mi"
             - name: "cassandra-backup-init"
-              image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}"
+              image: {{ include "repositoryGenerator.image.readiness" . }}
               imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+              resources:
+                limits:
+                  cpu: "100m"
+                  memory: "500Mi"
+                requests:
+                  cpu: "3m"
+                  memory: "20Mi"
               command:
               - /bin/bash
               - -c
@@ -59,7 +75,7 @@ spec:
                   curr_time=$1
                   echo "Clearing snapshots!!!"
                   command="nodetool clearsnapshot -t $curr_time"
-                  /app/exec.py -p "cassandra" -c "$command"
+                  /app/exec.py -p "{{ include "common.name" . }}" -c "$command"
                 }
                 {{ $root := . }}
                 curr_time=`date +%s`
@@ -75,11 +91,11 @@ spec:
 
                 echo "Executing cleanup!!"
                 command="nodetool cleanup"
-                /app/exec.py -p "cassandra" -c "$command"
+                /app/exec.py -p "{{ include "common.name" . }}" -c "$command"
                 echo "Cleaned Node!! Backing up database now!!!"
 
                 command="nodetool snapshot -t $curr_time"
-                /app/exec.py -p "cassandra" -c "$command"
+                /app/exec.py -p "{{ include "common.name" . }}" -c "$command"
                 retCode=$?
                 if [ $retCode -ne 0 ]; then
                   echo "Backup Failed!!!"
@@ -132,9 +148,6 @@ spec:
                     apiVersion: v1
                     fieldPath: metadata.namespace
               volumeMounts:
-              - mountPath: /etc/localtime
-                name: localtime
-                readOnly: true
               {{- range $i := until (int .Values.replicaCount)}}
               - mountPath: /onap-data/cassandra-{{ $i }}
                 name: data-dir-{{ $i }}
@@ -149,7 +162,7 @@ spec:
                 subPath: exec.py
           containers:
             - name: cassandra-backup-validate
-              image: "{{ .Values.image }}"
+              image: {{ include "repositoryGenerator.dockerHubRepository" . }}/{{ .Values.image }}
               imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
               command:
               - /bin/bash
@@ -223,13 +236,7 @@ spec:
               volumeMounts:
               - name: backup-dir
                 mountPath: /backup
-              - name: localtime
-                mountPath: /etc/localtime
-                readOnly: true
           volumes:
-          - name: localtime
-            hostPath:
-              path: /etc/localtime
           - name: scripts
             configMap:
               name: {{ include "common.fullname" . }}-configmap
@@ -243,3 +250,4 @@ spec:
             persistentVolumeClaim:
               claimName: {{ include "common.fullname" . }}-backup-data
 {{- end -}}
+{{- end -}}
\ No newline at end of file