diff --git a/apps/tandoor/app.yaml b/apps/tandoor/app.yaml index 07a47a4..af5b4f9 100644 --- a/apps/tandoor/app.yaml +++ b/apps/tandoor/app.yaml @@ -5,11 +5,7 @@ metadata: name: tandoor resources: - app/namespace.yaml - - app/service-account.yaml - app/recipes-sealedsecret.yaml - - app/config.yaml - - app/pvc.yaml - app/postgres.yaml - - app/deploy.yaml - - app/service.yaml + - app/release.yaml - app/route.yaml diff --git a/apps/tandoor/app/config.yaml b/apps/tandoor/app/config.yaml deleted file mode 100644 index 6562376..0000000 --- a/apps/tandoor/app/config.yaml +++ /dev/null @@ -1,30 +0,0 @@ -kind: ConfigMap -apiVersion: v1 -metadata: - labels: - app: recipes - name: recipes-nginx-config - namespace: tandoor -data: - nginx-config: |- - events { - worker_connections 1024; - } - http { - include mime.types; - server { - listen 80; - server_name _; - - client_max_body_size 16M; - - # serve static files - location /static/ { - alias /static/; - } - # serve media files - location /media/ { - alias /media/; - } - } - } \ No newline at end of file diff --git a/apps/tandoor/app/pvc.yaml b/apps/tandoor/app/pvc.yaml deleted file mode 100644 index 9359975..0000000 --- a/apps/tandoor/app/pvc.yaml +++ /dev/null @@ -1,28 +0,0 @@ -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: recipes-media - namespace: tandoor - labels: - app: recipes -spec: - accessModes: - - ReadWriteOnce - storageClassName: longhorn-hdd-crypto-global - resources: - requests: - storage: 5Gi ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: recipes-static - namespace: tandoor - labels: - app: recipes -spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 1Gi \ No newline at end of file diff --git a/apps/tandoor/app/recipes-sealedsecret.yaml b/apps/tandoor/app/recipes-sealedsecret.yaml index dd314cb..8ba46da 100644 --- a/apps/tandoor/app/recipes-sealedsecret.yaml +++ b/apps/tandoor/app/recipes-sealedsecret.yaml @@ -6,9 +6,9 @@ metadata: namespace: tandoor spec: encryptedData: - postgresql-password: AgBcusmDi53vbvZL/v6yTwABvww94o+keuVCKMj6sy6muRzLpLvOu+On3vbNl49hoCXALqsMLQ3NGZ78UpuTWbfUU49nJYrmPyGdBMUW+Nwz1jqkIX/jloUcB/Ltac0YtWu57BOTbhwlGUGSS7LwF8/A2UK3wlQVF/QvUBXU6JRWvWEbzJoQFZQ1xumQR8G1WEqYgMyd99BgJiJYeqoXDFPiYPd+2cUND8B47OgNgXY1MpLo48osbtbdV+lBcCchflX+foGwTHrKTqsrqzhVUQSkEJReAcLg7GzA0f2/vcKxJTZRCv0xgrz8ejo0uz81Xvp0Z0PeLGXmPcT0D3wba1pO+jX32maUtyTBfDwSW8W017fA3q35t0sEPnhJmEFDiIevghjbG0guu9cNubW5pJBs2iHlytzO8e4J1bOfYec23pwbbdJDz1C6Csnh6GfvpYS2E67yKLoEXUDIQPlhRpL2myE1be1DtD3owrh0EsZlAVjWcB9TEnOmVDW2QbJPrCbtattCTCB1RIAEaCB8XT4V1muIX2Y8fwQnGfzWilmbA7TyagwUBbp3WpYAea/Jo+/V9su8QzYgQTyGlbiL0LQpQ96pPZ5ZDYkJRQN0NMfWo0IbdMaUHrD4/5afTEF+hSA6l92qAm2UxcvYonrMvwDfpDUBOgBkrJEwEafiVUNeDkV9d3iukLC1QzT7ubf8WpEXlB12CGYlDy7amrowMhpa - replication-password: AgCXOtyEfTbeUjKWDfLhxLvBzbyFUMDq2Vl64ddwEV+MwVgBTACvXM0JF5GjlX2TsoRB8DvOlMBiuNxCnM+ZO0u0fc8PzjbHq/9onUXNtalzG1srgJctQi4OO/PsnNE7x2Q/CpWAKRXmzRrifHEnyqrqr0heh73C2wCrGRb6tR9Nd6m1H9nf/OaAERx+3Nd3/ChR1y+NPBjMK/VrU5H1+S1lqLw+uokK702cOZlfJxYA8Lzm6g5kigSHrsp+41l5s5xUn0FW+69KCiDPyRJuFTfnNKI+cApw4XBw1YHuL68uvn2dPI0cXGmq2djPziC+vVkABozg2HCSvUYcWlNhPPaK87wAoXUIo1PYz8lwDdsFSZyM0plLzF1ajuZmVsDNPOmBvRbponXT+xDFZV4MJR66q4fVGfiq88eEIO6LJNajdquhPjvN5//K4uWnVtQjfDEmdAJgsvBykikTUeC2BJqjHiwZv6D58eKMBWwdm+71pFOCh4L9Ei3my4M0t2QIADcB3KsPVTPD7XgXBuJvcHwl33g6xKUg7S4HaP6H3ce/gT5cn3Dqezc+U6cjJdjQenpT0CPIhg0ONXVnKY4XpmqJynasXZ2Ur4Jye6XVpnTTk+ZLMy679Bj2GF/YMNMwSaU5LT1TQvELZkdRQEZiiAl2wAES0txG1T6cz/aiW1MOsIIY7en56iIQVkDuR6WqEpmEZi7O+lxAL+4XcXi/HRpU - secret-key: AgBe6S+5Iss4/+RGwYaFYIVsfjCHq8lY5C1NSvbAqladp85C0KabkucEYR5XEv+rbkiSLzQ0fkw9sXPqpySQKIo5K35O5EZYJO8kvLNStD9qmI3pPGgD/dPowMej1n0VyXEkFfacaz6sbu/WZ03+9GjzkQ98mBkUFaCZfYtjjFuBALro6BQReqcaPHI1a2QBKCgpHlH/FTtU4lxixVjDjbH4t5qeO125cx9xt9fkFctELH9I3vCz9xFJgG+pldalSo82Paem3PiGTxYWd0dfE3+2pujRBXOS5xnOBDKYt/bY3783xt02A3rWbDrF+Tuyq97nUDXuGGDd8C2M3250UpUwsQuBz6e9P+RBcznhrrBqFdR5wHigot2Qd0yFOfQOpoXEEXM3FTOBPorwG0IvMemREtyux79tEilr4Uy59zDgcaS0KNJDg+0hBt2IIqxPAYpx2KjSZgBULwWO2JUaaPTxJs43R0UZZ6U8/PFVS1sg1gXgjvi69Kant1oa3c9MIajjfV8lbyeDilivK+/Phx2WJkAZNtbP/twDr0zRw2NIDBu6fzPe4Io6N28I8VRqoTn6jy7l4lNZGE3Zyb3gQfDvfp6JeIkv6vXYylaAdBCnq3eY/JjQosspGRrJ5lTzmoL6Ts3POkZm2w0CNueAwZjQ0sDju9hFEp98MKoB8BCg5trG+1+hu+j5djse6d15+zAQ3aTuSlrS9scV33tiBrnIbVJHB7mbfia48elJ5rvp4g== + postgres-password: AgAlVrfvk/2HGaLZ9H5QeJuxWgJSQbCz9Q0SL5vQUisCkkgWuLeIDkQDQlL5A6vFtxCDsUfRQnJGFrbZpJ17yv2tETrPE5tFgYS5V2d8ISZ0+VWMEp8sqGzvf7+PCzf9ycVNdzAY3N5CJJXq3WdUuqgfyEAYYTtKmhl3CEaruSJLnBIJu3N6M/2ZOhRuY6RIago3feMUnUlBezn95AcYpZk0ijVSPfw9Sbv0B/H1Wsm0Jkb700xPTlN/PON+hip+jmlCTjCJm2pLUd/iFmHhjOkHTWAlxd05oQxZOicuCi8KZoS4pWDejoV/STDDwFOXR2m2WKvVTLZhE+tgj6fCnEJRxQs6IFddl3q8Kod7ASGBpL/wPDcd4+DoVOFrHFv40CVVo0NKhsbhBP1Rg5IPEW1N3j3bxbv36I0W0JobY7Mn4umkQeCJbreVsnTSELkC+7vHoJxDyzWr/w0owmR610iIolRwItsZV1X77Jfo8oKy6lrz8oZJKv8DxeM2gSbdeA04st5GxUi+8IgIgQUVxXzESenFn1+INaQmlzo02EqUgNM/9zAl4mti4x9fZjOlB+w5pNNhL/4UOy5jJi/ZMwAreyAAEnL2/DWDQUoGgU6/HrNlXOFjGXJDOiyY9UfxpD7Nl4yCuHEYZwwbKKoMAnOdNGDizPhWAzPDMzhVxNbt4FpT3sidf8WKAzfWCxU/KE4M1VG0nr8ectknOV9VOw== + replication-password: AgBDaIp6iyz3h2CskEIlUMrz4Vf/I29dNc4rsJXwRQ5n37OVUPoQLbim4DAJdfUpMleEeeIeAZcH2Ade6TNZA9FG/rKz6DVQBQ+xAzuu4Cnke/xsjzx4+H1b2JyaupJpu0ZzCOYvd2Gt3E3Y43Tn6bwSu8zKif6EKkBQrfx+gaBWoyzN/hXYQ3HaCbG5NNoJMHoc1lwNNiij5RJz21BAbhksSIredR9yU6i8DpLtGTrMGJvvxx2O0ORKldnvnJE6QTCFsHr1Cb4IV4u4kvf72RaP5toE11+9FzKqGFzUFPPopOZJKlxlrpk54CKs0+egV9eHEQWsNs85eEMSaSQqPnydxQzBYSpHVkbrX9U8Ql0Zee5UaqgvNDn95XP1vfUm1CmfGi5e9f7dIG0c6EomE+mLBUuad4DLXMin1PLCeXNo9jY5RG71aZqkctx/mHi2b5sWQ4cvpAIvlEEkNo5B3l2JbZHOH34l+8owEMYDwssXHlEdkM4SRGKZSN2BVN00MDvUTDZTbH95ZnX9sYTT2bPvpw09+0QDuCCzbErRnXnj+qogs+v3MO3HuIR/m0F73S8ZB4QPYRlmZNyDYquEszuHuWR15clFmuxBdK8gGYRTeI/Ir1alWsVUPgC3jD631N3sVx+W51VKjXiha7sWhp025aV9w7PbK2fedfbylgbZtPOW2FX9jsYKQ6aRikCbGqG2Ri00feG89B06CZcEyg== + values: AgCe+fO+G3V47BTvZnGQA5dik0XZJggG0rpy4pnMv2/+7a8MqmCLPQuPunus0MUqikoT5JZqJi2lxsuAFt4Qv8fnjNIbc1tQhzZYVIYgAQOY+0N+6k3D3Ma5LkIcMJgN9ufHPwPun/8DcbbemXuqgqdAqsbVMS2cDIXp5EVs0NJ3XEffN9gqVg4iWu/vztl707sGp3DklPApAevgggKllqk31ntFhRRMBkQu0//F/Ee2+H3qCnNYJ/VWCsbTVw2kRtnESu6cDKWoDb5YsG3Gv853OvcdvSk54K0sq9FkmwLdEGTTcrVJD8oJ2VhjoAJAAcIAbS0543JBwTXzlT+wjto821jJrDAz9ZqJ1s+tofiK8Kjwbfn9z9zi7kR3zXcSPQSkuD2jk5Q1555DjaeD/W4uSF5vKCs7wW+KU1Tp7lyLWASBibXGu2WkMbqBE/7krtYypFGoNLFBaKOF6Qz0/exbw0oEZJ104ANHArcBdC8nVZZ3rFUkcreMdu7a9RzY17LB9cvN5GjcSNAszWc8veDBl/6YNtS3hJjwsjSKTUDFbC5yUeyGT3cmWJ5a1jGuusfLQz1d8rGaOTnfDk6j+vD3qI/sa9dXah7efMaryAw0fcIPGSZryj1rBzq2o61YB0MRCiksFN4DgXM8d9BZRq5Awe/+776O6CZsf0eu5TKyEUvpmDXxYW73LwuHBzLObDaMEB+cY0++DbYyw9hzjSozZQKxsQRMzxKtP8UFMyRE2o2bpRHDcv0TqQ== template: metadata: creationTimestamp: null diff --git a/apps/tandoor/app/release.yaml b/apps/tandoor/app/release.yaml new file mode 100644 index 0000000..9d87c16 --- /dev/null +++ b/apps/tandoor/app/release.yaml @@ -0,0 +1,39 @@ +apiVersion: helm.toolkit.fluxcd.io/v2beta1 +kind: HelmRelease +metadata: + name: tandoor + namespace: tandoor +spec: + releaseName: tandoor + chart: + spec: + chart: tandoor + sourceRef: + kind: HelmRepository + name: gabe565 + namespace: repos + interval: 60m + install: + remediation: + retries: 3 + values: + postgresql: + enabled: false + persistence: + media: + enabled: true + storageClass: longhorn-hdd-crypto-global + size: 2Gi + env: + TIMEZONE: Europe/Berlin + ALLOWED_HOSTS: '*' + CSRF_TRUSTED_ORIGINS: https://recipes.trivernis.dev + DB_ENGINE: django.db.backends.postgresql_psycopg2 + POSTGRES_HOST: recipes-db + POSTGRES_PORT: 5432 + POSTGRES_USER: postgres + POSTGRES_DB: postgres + valuesFrom: + - kind: Secret + name: recipes-secret + valuesKey: values \ No newline at end of file diff --git a/apps/tandoor/app/service-account.yaml b/apps/tandoor/app/service-account.yaml deleted file mode 100644 index ae59b30..0000000 --- a/apps/tandoor/app/service-account.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: v1 -kind: ServiceAccount -metadata: - name: recipes - namespace: tandoor \ No newline at end of file diff --git a/apps/tandoor/app/service.yaml b/apps/tandoor/app/service.yaml deleted file mode 100644 index 70660e8..0000000 --- a/apps/tandoor/app/service.yaml +++ /dev/null @@ -1,22 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: recipes-service - namespace: tandoor - labels: - app: recipes - tier: frontend -spec: - selector: - app: recipes - tier: frontend - environment: production - ports: - - port: 80 - targetPort: http - name: http - protocol: TCP - - port: 8080 - targetPort: gunicorn - name: gunicorn - protocol: TCP \ No newline at end of file