Merge pull request #110 from dasmeta/DMVP-5020-fix-base-cronjob-sa

fix(DMVP-5020): Fixed SA config name in values.yaml
dasmeta · Aug 15, 2024 · d2ccf0f · d2ccf0f
2 parents 4e60ca5 + f60f093
commit d2ccf0f
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 45 deletions.
diff --git a/charts/base-cronjob/Chart.yaml b/charts/base-cronjob/Chart.yaml
@@ -15,12 +15,11 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.15
-
+version: 0.1.16
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
 
-appVersion: "0.1.15"
+appVersion: "0.1.16"
diff --git a/charts/base-cronjob/values.yaml b/charts/base-cronjob/values.yaml
@@ -2,7 +2,7 @@ jobs:
   - name: cronjob1
     schedule: "0 * * * *"
     restartPolicy: OnFailure
-    serviceAccountName:
+    serviceAccount:
       create: true
       name: "sa-1"
     concurrencyPolicy: Forbid
@@ -17,30 +17,30 @@ jobs:
       - name: key4
         value: value4
     volumes: {}
-#      - name: persistent-storage
-#        mountPath: /path
-#        persistentVolumeClaim:
-#          claimName: claim
+    #      - name: persistent-storage
+    #        mountPath: /path
+    #        persistentVolumeClaim:
+    #          claimName: claim
     storage: {}
-#      persistentVolumeClaimName: claim
-#      accessModes:
-#        - ReadWriteMany
-#      className: claim
-#      requestedSize: 5Gi
-#      enableDataSource: false
+    #      persistentVolumeClaimName: claim
+    #      accessModes:
+    #        - ReadWriteMany
+    #      className: claim
+    #      requestedSize: 5Gi
+    #      enableDataSource: false
 
     resources: {}
-#      request:
-#        cpu: 500m
-#        memory: 5Gi
-#      limits:
-#        cpu: 500m
-#        memory: 5Gi
+  #      request:
+  #        cpu: 500m
+  #        memory: 5Gi
+  #      limits:
+  #        cpu: 500m
+  #        memory: 5Gi
 
   - name: cronjob2
     schedule: "* * * * *"
     restartPolicy: OnFailure
-    serviceAccountName:
+    serviceAccount:
       create: false
       name: "sa-2"
     image:
@@ -54,35 +54,33 @@ jobs:
       - name: key4
         value: value4
     volumes: {}
-#      - name: persistent-storage
-#        mountPath: /path
-#        persistentVolumeClaim:
-#          claimName: claim
+    #      - name: persistent-storage
+    #        mountPath: /path
+    #        persistentVolumeClaim:
+    #          claimName: claim
     storage: {}
-#      persistentVolumeClaimName: claim
-#      accessModes:
-#        - ReadWriteMany
-#      className: efs-sc
-#      requestedSize: 5Gi
-#      enableDataSource: false
+    #      persistentVolumeClaimName: claim
+    #      accessModes:
+    #        - ReadWriteMany
+    #      className: efs-sc
+    #      requestedSize: 5Gi
+    #      enableDataSource: false
 
     nodeSelector: {}
-#     nodeSelector:
-#       nodetype: "spot"
-
+    #     nodeSelector:
+    #       nodetype: "spot"
 
     affinity: {}
-#     affinity:
-#       nodeAffinity:
-#         requiredDuringSchedulingIgnoredDuringExecution:
-#            nodeSelectorTerms:
-#           - matchExpressions:
-#             - key: topology.kubernetes.io/zone
-#               operator: In
-#               values:
-#               - antarctica-east1
-#               - antarctica-west1
-
+    #     affinity:
+    #       nodeAffinity:
+    #         requiredDuringSchedulingIgnoredDuringExecution:
+    #            nodeSelectorTerms:
+    #           - matchExpressions:
+    #             - key: topology.kubernetes.io/zone
+    #               operator: In
+    #               values:
+    #               - antarctica-east1
+    #               - antarctica-west1
 
     tolerations: {}
 #     tolerations: