Update repo and charts directories

highcanfly-club · Mar 11, 2024 · c503310 · c503310
1 parent 86b0b3a
commit c503310
Show file tree

Hide file tree

Showing 25 changed files with 320 additions and 137 deletions.
diff --git a/charts/odoo/Chart.yaml b/charts/odoo/Chart.yaml
@@ -25,7 +25,7 @@ appVersion: "16.0.0.22"
 
 dependencies:
 - name: odoo
-  version: 24.0.5
+  version: 25.0.0
   repository: oci://registry-1.docker.io/bitnamicharts
 - name: flex-smtpd
   version: 0.1.6

diff --git a/charts/odoo/templates/configmap-cloudflared.yaml b/charts/odoo/templates/configmap-cloudflared.yaml
@@ -0,0 +1,9 @@
+{{ if .Values.cloudflared.enabled }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: cloudflared
+data:
+  config.yaml: {{ .Values.cloudflared.config | toYaml | indent 2}}
+  cert.pem: {{ .Values.cloudflared.cert | toYaml | indent 2 }}
+{{ end }}
diff --git a/charts/odoo/templates/deployment-cloudflared.yaml b/charts/odoo/templates/deployment-cloudflared.yaml
@@ -0,0 +1,91 @@
+{{ if .Values.cloudflared.enabled }}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: cloudflared
+spec:
+  {{- if not .Values.cloudflared.autoscaling.enabled }}
+  replicas: {{ .Values.cloudflared.replicaCount }}
+  {{- end }}
+  selector:
+    matchLabels:
+      app: cloudflared
+  template:
+    metadata:
+      {{- with .Values.cloudflared.podAnnotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      labels:
+        app: cloudflared
+    spec:
+      {{- with .Values.cloudflared.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      securityContext:
+        {{- toYaml .Values.cloudflared.podSecurityContext | nindent 8 }}
+      containers:
+        - name: {{ .Chart.Name }}
+          securityContext:
+            {{- toYaml .Values.cloudflared.securityContext | nindent 12 }}
+          image: "{{ .Values.cloudflared.image.repository }}:{{ .Values.cloudflared.image.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.cloudflared.image.pullPolicy }}
+          {{- if .Values.cloudflared.command }}
+          command: {{- include "common.tplvalues.render" (dict "value" .Values.cloudflared.command "context" $) | nindent 12 }}
+          {{- else}}
+          command: 
+            - cloudflared
+          {{- end }}
+          {{- if .Values.cloudflared.args }}
+          args: {{- include "common.tplvalues.render" (dict "value" .Values.cloudflared.args "context" $) | nindent 12 }}
+          {{- else}}
+            - tunnel
+            - --config
+            - /etc/cloudflared/config/config.yaml
+            - --origincert=/etc/cloudflared/config/cert.pem
+            - run
+          {{- end }}
+          resources:
+            {{- toYaml .Values.cloudflared.resources | nindent 12 }}
+          {{- if .Values.cloudflared.probe.enabled }}
+          livenessProbe:
+            httpGet:
+              path: /ready
+              port: 2000
+            failureThreshold: 1
+            initialDelaySeconds: 30
+            periodSeconds: 10
+          {{- end }}
+          volumeMounts:
+            - name: creds
+              mountPath: /etc/cloudflared/creds
+              readOnly: true
+            - name: config
+              mountPath: /etc/cloudflared/config
+              readOnly: true
+      volumes:
+        - name: creds
+          secret:
+            secretName: cloudflared
+        - name: config
+          configMap:
+            name: cloudflared
+            items:
+            - key: config.yaml
+              path: config.yaml
+            - key: cert.pem
+              path: cert.pem
+      {{- with .Values.cloudflared.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.cloudflared.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.cloudflared.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+{{ end }}
diff --git a/charts/odoo/templates/secret-cloudfared.yaml b/charts/odoo/templates/secret-cloudfared.yaml
@@ -0,0 +1,13 @@
+{{ if .Values.cloudflared.enabled }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: cloudflared
+  namespace: {{ .Release.Namespace }}
+  labels:
+  {{- include "gitea.labels" . | nindent 4 }}
+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/odoo/values.yaml b/charts/odoo/values.yaml
@@ -90,6 +90,18 @@ odoo:
       value: odoo.example.org
     - name: BACKUP_KEEP_DAYS
       value: "60"
+    # - name: S3_BUCKET
+    #   value: "example-bucket"
+    # - name: S3_ENDPOINT
+    #   value: "https://example-endpoint.com"
+    # - name: S3_ACCESS_KEY
+    #   value: "example-access-key"
+    # - name: S3_SECRET_KEY
+    #   value: "example-secret-key"
+    # - name: S3_REGION
+    #   value: "example-region"
+    # - name: CRYPTOKEN
+    #   value: "example-cryptoken-if-backup-is-encrypted"
   customPostInitScripts:
       start-autobackup-cron: |
           #!/bin/bash
@@ -107,4 +119,62 @@ odoo:
     backup:
       cronjob:
         enabled: true
-        schedule: '@weekly'
+        schedule: '@weekly'
+
+cloudflared:
+  probe:
+    enabled: true
+  enabled: false
+  image:
+      repository: highcanfly/net-tools
+      tag: 1.2.4
+  TunnelID: 3a7b5c9d-1e2f-4a6b-b9d8-c0e7f6a5b4c3
+  credentials: {"AccountTag":"1b3a9c8d7e6f5g4h3i2j1k0l","TunnelSecret":"m4n5o6p7q8r9s0t1u2v3w4x5y6z7A8B9C","TunnelID":"3a7b5c9d-1e2f-4a6b-b9d8-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: |
+    # Name of the tunnel you want to run
+    tunnel: lasersmart-gitea
+    credentials-file: /etc/cloudflared/creds/credentials.json
+    metrics: 0.0.0.0:2000
+    # grace-period: 180s
+    no-autoupdate: true
+    ingress:
+      - hostname: odoo.sample.com
+        service: http://odoo:80
+      - hostname: pgadmin.sample.com
+        service: http://pgadmin:80
+      # This rule matches any traffic which didn't match a previous rule, and responds with HTTP 404.
+      - service: http_status:404
+    cert: |
+      -----BEGIN PRIVATE KEY-----
+      MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgw7NV3o6KFY6H4Nck
+      wmTv5VGVOvMuwffVBOnqbiaTto2hRANCAAT0f28q1+2pRiq6zDZpyLOmQ4LlcmTQ
+      y9ck9HXc5+KpscYaWTtz3ask7Ng+jLWlyg9ch7Z613uVdsUG0ygcRUko
+      -----END PRIVATE KEY-----
+      -----BEGIN CERTIFICATE-----
+      MIICjDCCAXWgAwIBAgIUIvX6J9Q0v2Q1Y7Zz4v4Qz8Y3yjUwCgYIKoZIzj0EAwIw
+      gY8xCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T
+      YW4gRnJhbmNpc2NvMRkwFwYDVQQKExBDbG91ZEZsYXJlLCBJbmMuMTgwNgYDVQQL
+      Ey9DbG91ZEZsYXJlIE9yaWdpbiBTU0wgRUNDIENlcnRpZmljYXRlIEF1dGhvcml0
+      eTAeFw0yMzExMTcxNjQ1MDBaFw0zODExMTMxNjQ1MDBaMGIxGTAXBgNVBAoTEENs
+      b3VkRmxhcmUsIEluYy4xHTAbBgNVBAsTFENsb3VkRmxhcmUgT3JpZ2luIENBMSYw
+      JAYDVQQDEx1DbG91ZEZsYXJlIE9yaWdpbiBDZXJ0aWZpY2F0ZTBZMBMGByqGSM49
+      AgEGCCqGSM49AwEHA0IABPR/byrX7alGKrrMNmnIs6ZDguVyZNDL1yT0ddzn4qmx
+      xhpZO3PdqyTs2D6MtaXKD1yHtnrXe5V2xQbTKBxFSSijggE0MIIBMDAOBgNVHQ8B
+      Af8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMAwGA1UdEwEB
+      /wQCMAAwHQYDVR0OBBYEFMEBSh/gFX0N4MEMG9ICFL203FUXMB8GA1UdIwQYMBaA
+      FIUwXTsqcNTt1ZJnB/3rObQaDjinMEQGCCsGAQUFBwEBBDgwNjA0BggrBgEFBQcw
+      AYYoaHR0cDovL29jc3AuY2xvdWRmbGFyZS5jb20vb3JpZ2luX2VjY19jYTAtBgNV
+      HREEJjAkghEqLmxhc2Vyc21hcnQud29ya4IPbGFzZXJzbWFydC53b3JrMDwGA1Ud
+      HwQ1MDMwMaAvoC2GK2h0dHA6Ly9jcmwuY2xvdWRmbGFyZS5jb20vb3JpZ2luX2Vj
+      Y19jYS5jcmwwCgYIKoZIzj0EAwIDSAAwRQIhANIFwqsvS/GGKug8zraQ3wDmbOHT
+      tL+LXqeRlfe2g6qOAiBqjkcTYI/Ip1wcV0H4D4N3O1DBuKz81X85xCNIPvqbbw==
+      -----END CERTIFICATE-----
+      -----BEGIN ARGO TUNNEL TOKEN-----
+      eyJ6b25lSUQiOiI1ZGVkZjcxMGQ2MzBkNzQ2MzAzZjRlYTM0NGJmYTVlMyIsImFj
+      Y291bnRJRCI6IjJlNGFlOThkOGIyNTMyNWI0Mzg0NzRhZTUzZjBkMWM0Iiwic2Vy
+      dmljZUtleSI6ImJhZjQyYzIwLWY4ZjItNDYwZS1hZjE2LWQ1YzQwYjQyYjI1ZCIs
+      ImFwaVRva2VuIjoiOTlPbE90R2lELVc4WVFWamE2Y21XVFU4aGkxM1FiY19vMDN0
+      V3cyclMiJ9
+      -----END ARGO TUNNEL TOKEN-----
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.10.4.tgz b/repo/dolidock-0.10.4.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
@@ -305,6 +305,6 @@ <h2>Charts</h2>
 
       </ul>
     </section>
-		<time datetime="2024-03-10T20:28:19" pubdate id="generated">Sun Mar 10 2024 08:28:19PM UTC&#43;00:00</time>
+		<time datetime="2024-03-11T19:54:49" pubdate id="generated">Mon Mar 11 2024 07:54:49PM UTC&#43;00:00</time>
   </body>
 </html>