fix/cronjob-request-host (#17)

* fix #16 Signed-off-by: elonzh <[email protected]> * bump version Signed-off-by: elonzh <[email protected]>
nextcloud · Sep 15, 2020 · a20fd94 · a20fd94
1 parent e093fdb
commit a20fd94
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 12 deletions.
diff --git a/charts/nextcloud/Chart.yaml b/charts/nextcloud/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: nextcloud
-version: 2.1.0
+version: 2.1.1
 appVersion: 17.0.0
 description: A file sharing server that puts the control and security of your own data back into your hands.
 keywords:

diff --git a/charts/nextcloud/README.md b/charts/nextcloud/README.md
@@ -117,7 +117,6 @@ The following table lists the configurable parameters of the nextcloud chart and
 | `cronjob.enabled`                                            | Whether to enable/disable cronjob                       | `false`                                     |
 | `cronjob.schedule`                                           | Schedule for the CronJob                                | `*/15 * * * *`                              |
 | `cronjob.annotations`                                        | Annotations to add to the cronjob                       | {}                                          |
-| `cronjob.curlInsecure`                                       | Set insecure (-k) option to curl                        | false                                       |
 | `cronjob.failedJobsHistoryLimit`                             | Specify the number of failed Jobs to keep               | `5`                                         |
 | `cronjob.successfulJobsHistoryLimit`                         | Specify the number of completed Jobs to keep            | `2`                                         |
 | `cronjob.resources`                                          | Cronjob Resources                                       | `nil`                                       |

diff --git a/charts/nextcloud/templates/cronjob.yaml b/charts/nextcloud/templates/cronjob.yaml
@@ -44,16 +44,9 @@ spec:
               imagePullPolicy: {{ default .Values.image.pullPolicy .Values.cronjob.image.pullPolicy }}
               command: [ "curl" ]
               args:
-              {{- if .Values.cronjob.curlInsecure }}
-                - "-k"
-              {{- end }}
                 - "--fail"
                 - "-L"
-              {{- if .Values.ingress.tls }}
-                - "https://{{ .Values.nextcloud.host }}/cron.php"
-              {{- else }}
-                - "http://{{ .Values.nextcloud.host }}/cron.php"
-              {{- end }}
+                - "http://{{ template "nextcloud.fullname" . }}:{{ .Values.service.port }}/cron.php"
               resources:
 {{ toYaml (default .Values.resources .Values.cronjob.resources) | indent 16 }}
     {{- with (default .Values.nodeSelector .Values.cronjob.nodeSelector) }}

diff --git a/charts/nextcloud/values.yaml b/charts/nextcloud/values.yaml
@@ -261,8 +261,6 @@ cronjob:
   #  cause issues with how nextcloud background jobs are executed
   schedule: "*/15 * * * *"
   annotations: {}
-  # Set curl's insecure option if you use e.g. self-signed certificates
-  curlInsecure: false
   failedJobsHistoryLimit: 5
   successfulJobsHistoryLimit: 2
   # If not set, nextcloud deployment one will be set