Update repo and charts directories

highcanfly-club · Mar 15, 2024 · 1cb9e98 · 1cb9e98
1 parent c888ce6
commit 1cb9e98
Show file tree

Hide file tree

Showing 27 changed files with 216 additions and 151 deletions.
diff --git a/charts/dolidock/Chart.yaml b/charts/dolidock/Chart.yaml
@@ -13,7 +13,7 @@ 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.11.1
+version: 0.11.3
 # 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.

diff --git a/charts/dolidock/templates/deployment-dolidock.yaml b/charts/dolidock/templates/deployment-dolidock.yaml
@@ -69,11 +69,27 @@ spec:
         - name: SMTP_HOST
           value: "smtpd:25"
         - name: FQDN
-          value: {{ .Values.dolidock.hostname}}
+          value: {{ .Values.dolidock.hostname | quote }}
         - name: BACKUP_FROM
-          value: {{ .Values.dolidock.backupFrom }}
+          value: {{ .Values.dolidock.backupFrom | quote }}
         - name: BACKUP_TO
-          value: {{ .Values.dolidock.backupTo }}
+          value: {{ .Values.dolidock.backupTo | quote }}
+        - name: S3_BUCKET
+          value: {{ .Values.dolidock.s3Bucket | quote }}
+        - name: S3_ENDPOINT
+          value: {{ .Values.dolidock.s3Endpoint | quote }}
+        - name: S3_ACCESS_KEY
+          value: {{ .Values.dolidock.s3AccessKey | quote }}
+        - name: S3_SECRET_KEY
+          value: {{ .Values.dolidock.s3SecretKey | quote }}
+        - name: S3_REGION
+          value: {{ .Values.dolidock.s3Region | quote}}
+        - name: S3_PATH
+          value: {{ .Values.dolidock.s3Path | quote}}
+        - name: CRYPTOKEN
+          value: {{ .Values.dolidock.s3Cryptoken  | quote}}
+        - name: DOLI_INIT_FROM_S3
+          value: {{ .Values.dolidock.doliInitFromS3 | quote }}
         imagePullPolicy: {{ .Values.dolidock.imagePullPolicy }}
         image: {{ .Values.dolidock.image.repository }}:{{ .Values.dolidock.image.tag | default .Chart.AppVersion }}
         name: dolidock

diff --git a/charts/dolidock/templates/pvc-crontabui-data.yaml b/charts/dolidock/templates/pvc-crontabui-data.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.persistence.enabled }}
+{{- if (and .Values.persistence.enabled .Values.crontabui.enabled) }}
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:

diff --git a/charts/dolidock/templates/secret-cloudfared.yaml b/charts/dolidock/templates/secret-cloudfared.yaml
@@ -0,0 +1,11 @@
+{{ if .Values.cloudflared.enabled }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: cloudflared
+  namespace: {{ .Release.Namespace }}
+data:
+  {{ .Values.cloudflared.TunnelID | required "Cloudflared TunnelID is required"}}.json: {{ .Values.cloudflared.credentials | toJson | b64enc | quote }}
+  credentials.json: {{ .Values.cloudflared.credentials | toJson | b64enc | quote }}
+type: Opaque
+{{ end }}
diff --git a/charts/dolidock/values.yaml b/charts/dolidock/values.yaml
@@ -16,6 +16,14 @@ crontabui:
   replicas: 1
   type: ClusterIP
 dolidock:
+  s3Bucket: "master"
+  s3Path: "random-s3-path"
+  s3Endpoint: "https://random-s3-endpoint.com"
+  s3AccessKey: "random-access-key"
+  s3SecretKey: "random-secret-key"
+  s3Region: "random-region"
+  s3Cryptoken: "random-cryptoken"
+  doliInitFromS3: "false"
   imagePullPolicy: IfNotPresent 
   updateStrategy: RollingUpdate # Recreate | RollingUpdate
   autobackupJob: false
@@ -169,8 +177,8 @@ cloudflared:
   image:
       repository: highcanfly/net-tools
       tag: 1.2.5
-  TunnelID: 3a7b5c9d-1e2f-4a6b-b9d8-c0e7f6a5b4c3
-  credentials: {"AccountTag":"1b3a9c8d7e6f5g4h3i2j1k0l","TunnelSecret":"m4n5o6p7q8r9s0t1u2v3w4x5y6z7A8B9C","TunnelID":"3a7b5c9d-1e2f-4a6b-b9d8-c0e7f6a5b4c3"}
+  TunnelID: 3a7b5c9d-1e2f-4a6b-b9a8-c0e7f6a5b4c3
+  credentials: {"AccountTag":"1b3a9c8d7e2f5g4h3i2j1k0l","TunnelSecret":"o4n5o6p7q8r9s0t1u2v3w4x5y6z7A8B9C","TunnelID":"3a7b5c9d-1e2f-4a6b-b9a8-c0e7f6a5b4c3"}
   # command: ["/bin/sh"]
   # args: ["-c", "cd ~/ && touch file.txt && mknod -m 777 fifo p && cat fifo | netcat -k -l 8000 > fifo && sleep infinity"]
   config: |
@@ -190,7 +198,7 @@ cloudflared:
     cert: |
       -----BEGIN PRIVATE KEY-----
       MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgw7NV3o6KFY6H4Nck
-      wmTv5VGVOvMuwffVBOnqbiaTto2hRANCAAT0f28q1+2pRiq6zDZpyLOmQ4LlcmTQ
+      wmTv5VGVOvMuwffVBOnqbiaAao2hRANCAAT0f28q1+2pRiq6zDZpyLOmQ4LlcmTQ
       y9ck9HXc5+KpscYaWTtz3ask7Ng+jLWlyg9ch7Z613uVdsUG0ygcRUko
       -----END PRIVATE KEY-----
       -----BEGIN CERTIFICATE-----
@@ -203,7 +211,7 @@ cloudflared:
       JAYDVQQDEx1DbG91ZEZsYXJlIE9yaWdpbiBDZXJ0aWZpY2F0ZTBZMBMGByqGSM49
       AgEGCCqGSM49AwEHA0IABPR/byrX7alGKrrMNmnIs6ZDguVyZNDL1yT0ddzn4qmx
       xhpZO3PdqyTs2D6MtaXKD1yHtnrXe5V2xQbTKBxFSSijggE0MIIBMDAOBgNVHQ8B
-      Af8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMAwGA1UdEwEB
+      Af8EBAMCBaAwHQYDVR24BBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMAwGA1UdEwEB
       /wQCMAAwHQYDVR0OBBYEFMEBSh/gFX0N4MEMG9ICFL203FUXMB8GA1UdIwQYMBaA
       FIUwXTsqcNTt1ZJnB/3rObQaDjinMEQGCCsGAQUFBwEBBDgwNjA0BggrBgEFBQcw
       AYYoaHR0cDovL29jc3AuY2xvdWRmbGFyZS5jb20vb3JpZ2luX2VjY19jYTAtBgNV
@@ -214,7 +222,7 @@ cloudflared:
       -----END CERTIFICATE-----
       -----BEGIN ARGO TUNNEL TOKEN-----
       eyJ6b25lSUQiOiI1ZGVkZjcxMGQ2MzBkNzQ2MzAzZjRlYTM0NGJmYTVlMyIsImFj
-      Y291bnRJRCI6IjJlNGFlOThkOGIyNTMyNWI0Mzg0NzRhZTUzZjBkMWM0Iiwic2Vy
+      Y291bnRJRCI6IjJlNGFlOThkOGI7fTMyNWI0Mzg0NzRhZTUzZjBkMWM0Iiwic2Vy
       dmljZUtleSI6ImJhZjQyYzIwLWY4ZjItNDYwZS1hZjE2LWQ1YzQwYjQyYjI1ZCIs
       ImFwaVRva2VuIjoiOTlPbE90R2lELVc4WVFWamE2Y21XVFU4aGkxM1FiY19vMDN0
       V3cyclMiJ9

diff --git a/charts/gitea/Chart.yaml b/charts/gitea/Chart.yaml
@@ -21,7 +21,7 @@ version: 1.0.2
 # 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: "1.21.4a"
+appVersion: "1.21.6"
 
 sources:
 - https://github.com/highcanfly-club/helm-repo/tree/main/charts/gitea

diff --git a/charts/gitea/values.yaml b/charts/gitea/values.yaml
@@ -62,6 +62,22 @@ gitea:
     value: "true"
   - name: GITEA_REDIS
     value: "true"
+  - name: S3_BUCKET
+    value: "random_bucket"
+  - name: S3_PATH
+    value: "random_path"
+  - name: S3_ENDPOINT
+    value: "https://random_endpoint"
+  - name: S3_ACCESS_KEY
+    value: "random_access_key"
+  - name: S3_SECRET_KEY
+    value: "random_secret_key"
+  - name: S3_REGION
+    value: "random_region"
+  - name: CRYPTOKEN
+    value: "random_cryptoken"
+  - name: GITEA_INIT_FROM_S3
+    value: "false"
   extraVolumes:
   - name: "logo-svg"
     configMap:
@@ -171,7 +187,7 @@ cloudflared:
   image:
     repository: highcanfly/net-tools
     pullPolicy: Always
-    tag: 1.2.1
+    tag: 1.2.5
   probe:
     enabled: true
   imagePullSecrets: []

diff --git a/repo/cert-manager-webhook-oci-1.3.1.tgz b/repo/cert-manager-webhook-oci-1.3.1.tgz
diff --git a/repo/cloudflared-0.1.0.tgz b/repo/cloudflared-0.1.0.tgz
diff --git a/repo/crontab-ui-1.0.0.tgz b/repo/crontab-ui-1.0.0.tgz
diff --git a/repo/dolidock-0.11.3.tgz b/repo/dolidock-0.11.3.tgz
diff --git a/repo/easyappointments-0.2.0.tgz b/repo/easyappointments-0.2.0.tgz
diff --git a/repo/flex-smtpd-0.1.6.tgz b/repo/flex-smtpd-0.1.6.tgz
diff --git a/repo/gitea-1.0.2.tgz b/repo/gitea-1.0.2.tgz
diff --git a/repo/hcf-coder-0.3.0.tgz b/repo/hcf-coder-0.3.0.tgz
diff --git a/repo/hcfmailer-1.0.0.tgz b/repo/hcfmailer-1.0.0.tgz
diff --git a/repo/hcfmailerplus-0.4.1.tgz b/repo/hcfmailerplus-0.4.1.tgz
diff --git a/repo/hcfschedule-0.1.0.tgz b/repo/hcfschedule-0.1.0.tgz
diff --git a/repo/helm-dashboard-0.1.9.tgz b/repo/helm-dashboard-0.1.9.tgz
diff --git a/repo/index.html b/repo/index.html
@@ -96,8 +96,8 @@ <h2>Charts</h2>
 				<li>
 					<p>
 						dolidock
-						(<a href="https://helm-repo.highcanfly.club/dolidock-0.11.1.tgz" title="https://helm-repo.highcanfly.club/dolidock-0.11.1.tgz">
-						0.11.1
+						(<a href="https://helm-repo.highcanfly.club/dolidock-0.11.3.tgz" title="https://helm-repo.highcanfly.club/dolidock-0.11.3.tgz">
+						0.11.3
 						@
 						18.0.5.0
 						</a>)
@@ -141,7 +141,7 @@ <h2>Charts</h2>
 						(<a href="https://helm-repo.highcanfly.club/gitea-1.0.2.tgz" title="https://helm-repo.highcanfly.club/gitea-1.0.2.tgz">
 						1.0.2
 						@
-						1.21.4a
+						1.21.6
 						</a>)
 					</p>
 					<p>
@@ -305,6 +305,6 @@ <h2>Charts</h2>
 
       </ul>
     </section>
-		<time datetime="2024-03-13T11:28:12" pubdate id="generated">Wed Mar 13 2024 11:28:12AM UTC&#43;00:00</time>
+		<time datetime="2024-03-15T11:50:41" pubdate id="generated">Fri Mar 15 2024 11:50:41AM UTC&#43;00:00</time>
   </body>
 </html>