From 93333335f3de394b5d0d7b839e60fd6290d77be8 Mon Sep 17 00:00:00 2001 From: nold Date: Sun, 12 Feb 2023 18:52:04 +0100 Subject: [PATCH] change(ntfy): Moved to different chart --- projects/ntfy/project.yml | 4 +- projects/ntfy/values/ntfy.yaml | 145 +++++++++++++++------------------ 2 files changed, 68 insertions(+), 81 deletions(-) diff --git a/projects/ntfy/project.yml b/projects/ntfy/project.yml index 8f131a92..0794aee1 100644 --- a/projects/ntfy/project.yml +++ b/projects/ntfy/project.yml @@ -2,6 +2,6 @@ config: description: Notification Service apps: - name: ntfy - repoURL: https://charts.truecharts.org + repoURL: https://charts.sarabsingh.com chart: ntfy - targetRevision: 4.0.11 + targetRevision: 0.1.0 diff --git a/projects/ntfy/values/ntfy.yaml b/projects/ntfy/values/ntfy.yaml index eb5fa7ec..36013f4f 100644 --- a/projects/ntfy/values/ntfy.yaml +++ b/projects/ntfy/values/ntfy.yaml @@ -1,95 +1,82 @@ +# Default values for ntfy. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. + +replicaCount: 1 + image: - repository: tccr.io/truecharts/ntfy - tag: 1.30.1 + repository: binwiederhier/ntfy + pullPolicy: IfNotPresent + # Overrides the image tag whose default is the chart appVersion. + tag: "" -extraArgs: ["serve"] +imagePullSecrets: [] +nameOverride: "" +fullnameOverride: "" -securityContext: - readOnlyRootFilesystem: false - runAsNonRoot: true +serviceAccount: + # Specifies whether a service account should be created + create: true + # Annotations to add to the service account + annotations: {} + # The name of the service account to use. + # If not set and create is true, a name is generated using the fullname template + name: "" + +podAnnotations: {} podSecurityContext: runAsUser: 1000 runAsGroup: 1000 - fsGroup: 1000 + fsGroup: 2000 -env: - NTFY_LISTEN_HTTP: ":{{ .Values.service.main.ports.main.port }}" - # User Defined - NTFY_BASE_URL: "https://notify.dc" - NTFY_BEHIND_PROXY: false - ENABLE_FIREBASE_FILE: false - ENABLE_CACHE_FILE: false - ENABLE_ATTACHMENT_CACHE_DIR: false - ENABLE_AUTH_FILE: false - # NTFY_CACHE_DURATION: "12h" - # NTFY_KEEPALIVE_INTERVAL: "45s" - # NTFY_MANAGER_INTERVAL: "1m" - # NTFY_GLOBAL_TOPIC_LIMIT: 15000 - # NTFY_VISITOR_SUBSCRIPTION_LIMIT: 30 - # NTFY_VISITOR_ATTACHMENT_TOTAL_SIZE_LIMIT: "100M" - # NTFY_VISITOR_ATTACHMENT_DAILY_BANDWIDTH_LIMIT: "500M" - # NTFY_VISITOR_REQUEST_LIMIT_BURST: 60 - # NTFY_VISITOR_REQUEST_LIMIT_REPLENISH: "5s" - # NTFY_VISITOR_REQUEST_LIMIT_EXEMPT_HOSTS: "" - # NTFY_VISITOR_EMAIL_LIMIT_BURST: 16 - # NTFY_VISITOR_EMAIL_LIMIT_REPLENISH: "1h" - # NTFY_ATTACHMENT_TOTAL_SIZE_LIMIT: "5G" - # NTFY_ATTACHMENT_FILE_SIZE_LIMIT: "15M" - # NTFY_ATTACHMENT_EXPIRY_DURATION: "3h" - # NTFY_AUTH_DEFAULT_ACCESS: "read-write" - # NTFY_SMTP_SENDER_ADDR: "" - # NTFY_SMTP_SENDER_USER: "" - # NTFY_SMTP_SENDER_PASS: "" - # NTFY_SMTP_SENDER_FROM: "" - # NTFY_SMTP_SERVER_LISTEN: "" - # NTFY_SMTP_SERVER_DOMAIN: "" - # NTFY_SMTP_SERVER_ADDR_PREFIX: "" - -envFrom: - - configMapRef: - name: '{{ include "tc.common.names.fullname" . }}-ntfy' +securityContext: + capabilities: + drop: + - ALL + readOnlyRootFilesystem: true + runAsNonRoot: true + runAsUser: 1000 service: - main: - ports: - main: - port: 10222 + type: ClusterIP + port: 80 ingress: - main: - enabled: true - enableFixedMiddlewares: false - annotations: - cert-manager.io/cluster-issuer: vault-issuer - traefik.ingress.kubernetes.io/router.tls: 'true' + enabled: true + className: "" + annotations: + cert-manager.io/cluster-issuer: vault-issuer + traefik.ingress.kubernetes.io/router.tls: 'true' + hosts: + - host: notify.dc + paths: + - path: / + pathType: Prefix + tls: + - secretName: notify-tls hosts: - - host: notify.dc - paths: - - path: / - pathType: Prefix - tls: - - secretName: notify-tls - hosts: - - notify.dc + - notify.dc -persistence: - config: - enabled: true - mountPath: "/etc/ntfy" - cache: - enabled: true - mountPath: "/var/cache/ntfy" +resources: + limits: + cpu: 100m + memory: 128Mi -configmap: - ntfy: - enabled: true - data: - # If a path is set, it enables this options. To disable set to emtpy path - NTFY_ATTACHMENT_CACHE_DIR: '{{ ternary "/var/cache/ntfy/attachments" "" .Values.env.ENABLE_ATTACHMENT_CACHE_DIR }}' - NTFY_CACHE_FILE: '{{ ternary "/var/cache/ntfy/cache.db" "" .Values.env.ENABLE_CACHE_FILE }}' - NTFY_AUTH_FILE: '{{ ternary "/etc/ntfy/user.db" "" .Values.env.ENABLE_AUTH_FILE }}' - NTFY_FIREBASE_KEY_FILE: '{{ ternary "/etc/ntfy/firebase-key.json" "" .Values.env.ENABLE_FIREBASE_FILE }}' - -portal: +autoscaling: enabled: false + minReplicas: 1 + maxReplicas: 100 + targetCPUUtilizationPercentage: 80 + # targetMemoryUtilizationPercentage: 80 + + +config: + enabled: false + data: + base-url: "https://notify.dc" + auth-file: "/var/cache/ntfy/user.db" + auth-default-access: "allow-all" + cache-file: "/var/cache/ntfy/cache.db" + attachment-cache-dir: "/var/cache/ntfy/attachments" + behind-proxy: true