Merge pull request #19 from baoduy/dev

up
baoduy · Jul 23, 2024 · ae284ba · ae284ba
2 parents 282cb61 + 937ed9d
commit ae284ba
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 17 deletions.
diff --git a/drunk-app/drunk-app-1.0.6.tgz b/drunk-app/drunk-app-1.0.6.tgz
diff --git a/drunk-app/index.yaml b/drunk-app/index.yaml
@@ -3,9 +3,9 @@ entries:
   drunk-app:
   - apiVersion: v2
     appVersion: latest
-    created: "2024-07-23T14:07:28.937949+08:00"
+    created: "2024-07-23T14:26:03.259444+08:00"
     description: The drunkcoding template to deploy an application to Kubernetes
-    digest: 6ba6eee38f4380307bdfb104b5f0bdb9400658cab3453196c7b69ce92869d10c
+    digest: f172f9a90cd871a90616ae5317f4621862da7a16a875c46ce932ae992b762f74
     icon: https://github.com/baoduy/Images/raw/a0b73e4fcb03128ac7ece2a71ee2b40a9c33104d/NugetLogo.PNG
     name: drunk-app
     type: application
@@ -14,7 +14,7 @@ entries:
     version: 1.0.6
   - apiVersion: v2
     appVersion: latest
-    created: "2024-07-23T14:07:28.937637+08:00"
+    created: "2024-07-23T14:26:03.2591+08:00"
     description: The drunkcoding template to deploy an application to Kubernetes
     digest: 3f17d8e5b5d610612837caeacc3e2dfe13ae3641401bd49cc349894f99143999
     icon: https://github.com/baoduy/Images/raw/a0b73e4fcb03128ac7ece2a71ee2b40a9c33104d/NugetLogo.PNG
@@ -25,7 +25,7 @@ entries:
     version: 1.0.5
   - apiVersion: v2
     appVersion: latest
-    created: "2024-07-23T14:07:28.937298+08:00"
+    created: "2024-07-23T14:26:03.258761+08:00"
     description: The drunkcoding template to deploy an application to Kubernetes
     digest: 6bcb63d4ee2a805d024d9e68637729abcfac2a0ad9557b20455e482c573181ba
     icon: https://github.com/baoduy/Images/raw/a0b73e4fcb03128ac7ece2a71ee2b40a9c33104d/NugetLogo.PNG
@@ -36,7 +36,7 @@ entries:
     version: 1.0.4
   - apiVersion: v2
     appVersion: latest
-    created: "2024-07-23T14:07:28.936971+08:00"
+    created: "2024-07-23T14:26:03.257853+08:00"
     description: The drunkcoding template to deploy an application to Kubernetes
     digest: 13947bcdee0b6665dcc3e9f44e0e38789caa96c1111d14236a7b0a8e01312f9d
     icon: https://github.com/baoduy/Images/raw/a0b73e4fcb03128ac7ece2a71ee2b40a9c33104d/NugetLogo.PNG
@@ -47,7 +47,7 @@ entries:
     version: 1.0.3
   - apiVersion: v2
     appVersion: latest
-    created: "2024-07-23T14:07:28.936637+08:00"
+    created: "2024-07-23T14:26:03.257472+08:00"
     description: The drunkcoding template to deploy an application to Kubernetes
     digest: e7721411d9b56a14f5f75d5b8115139d76a82a0aae94b43c7ada62b5d35b5a46
     name: drunk-app
@@ -57,7 +57,7 @@ entries:
     version: 1.0.2
   - apiVersion: v2
     appVersion: latest
-    created: "2024-07-23T14:07:28.936239+08:00"
+    created: "2024-07-23T14:26:03.257017+08:00"
     description: The drunkcoding template to deploy an application to Kubernetes
     digest: 9cd7afa72cc1b584f29f39aa3547be007adfa927be9ccc3ee36bcb38501bbbad
     name: drunk-app
@@ -67,12 +67,12 @@ entries:
     version: 1.0.1
   - apiVersion: v2
     appVersion: latest
-    created: "2024-07-23T14:07:28.935815+08:00"
+    created: "2024-07-23T14:26:03.256542+08:00"
     description: The drunkcoding template to deploy an application to Kubernetes
     digest: 7061ae0d7dfbbfdf79211670cd191a5ea678ce1f05ba2a6b4bd09d577bba2dc5
     name: drunk-app
     type: application
     urls:
     - drunk-app-1.0.0.tgz
     version: 1.0.0
-generated: "2024-07-23T14:07:28.934966+08:00"
+generated: "2024-07-23T14:26:03.255946+08:00"
diff --git a/drunk-app/templates/cronjob.yaml b/drunk-app/templates/cronjob.yaml
@@ -31,9 +31,11 @@ spec:
               {{- toYaml $.Values.securityContext | nindent 14 }}
             image: "{{ $.Values.global.image }}:{{ $.Values.global.tag | default $.Chart.AppVersion }}"
             imagePullPolicy: "{{ $.Values.global.imagePullPolicy | default "Always" }}"
-           {{- with .command }}
-            command:
-              {{- toYaml . | nindent 12 }}
+            {{- if .command }}
+            command: {{- toYaml .command | nindent 12 }}
+            {{- end }}
+            {{- if .args }}
+            args: {{- toYaml .args | nindent 12 }}
             {{- end }}
             envFrom:
             {{- if $.Values.configMap }}

diff --git a/drunk-app/templates/job.yaml b/drunk-app/templates/job.yaml
@@ -28,9 +28,11 @@ spec:
         {{- toYaml $.Values.securityContext | nindent 12 }}
         image: "{{ $.Values.global.image }}:{{ $.Values.global.tag | default $.Chart.AppVersion }}"
         imagePullPolicy: "{{ $.Values.global.imagePullPolicy | default "Always" }}"
-        {{- with .command }}
-        command:
-        {{- toYaml . | nindent 10 }}
+        {{- if .command }}
+        command: {{- toYaml .command | nindent 10 }}
+        {{- end }}
+        {{- if .args }}
+        args: {{- toYaml .args | nindent 10 }}
         {{- end }}
         envFrom:
         {{- if $.Values.configMap }}

diff --git a/drunk-app/values.test.yaml b/drunk-app/values.test.yaml
@@ -53,7 +53,7 @@ deployment:
 cronJobs:
 - name: 'drunk-cjob-1'
   schedule: "* 0 * * *"
-  command:
+  args:
   - hello
 - name: 'drunk-cjob-2'
   schedule: "* 0 * * *"
@@ -64,7 +64,7 @@ cronJobs:
 
 jobs:
 - name: 'drunk-job-1'
-  command:
+  args:
   - hello
 - name: 'drunk-job-2'
   restartPolicy: Always