From 59c36f47b33e1727b21b7a8f70cdbef075e2014d Mon Sep 17 00:00:00 2001 From: Danny Grove Date: Sun, 31 Mar 2024 21:24:45 -0700 Subject: [PATCH] k/invoiceshelf: fix config to get working. migrate ingress to billing.distrust.co --- kustomizations/invoiceshelf/env.enc.yaml | 8 ++--- kustomizations/invoiceshelf/ingress.yaml | 4 +-- .../invoiceshelf/kustomization.yaml | 34 ------------------- kustomizations/invoiceshelf/statefulset.yaml | 32 +++++++++++++---- 4 files changed, 31 insertions(+), 47 deletions(-) diff --git a/kustomizations/invoiceshelf/env.enc.yaml b/kustomizations/invoiceshelf/env.enc.yaml index a71fd57..2340031 100644 --- a/kustomizations/invoiceshelf/env.enc.yaml +++ b/kustomizations/invoiceshelf/env.enc.yaml @@ -3,17 +3,15 @@ kind: Secret metadata: name: env stringData: - DB_PASSWORD: ENC[AES256_GCM,data:nHeFXLOI6bMb1hslXLu9xqbMNppGeGzI,iv:rakHQI3iFNgD9gtUX0HdeFG5afP9ln0a+wenqm692T0=,tag:en9KmjYlZ6xzeC0fs9wKzA==,type:str] - APP_KEY: ENC[AES256_GCM,data:pG99OkN9DpXEJ287ty/7e/86v5kEYeikNN6FnV++uNFE4j48aPiQENd+57RxAXFTUl+6,iv:IFXaK2gnXFm6T3O7ClTRk5HqLGmgFdvh7Dn2Jw+MQU0=,tag:0SPKkf5jfyyuwHNvvDVgCg==,type:str] - MAIL_PASSWORD: ENC[AES256_GCM,data:+pWcN1GYSA3pibo8WgvFsAHjnrvhDNsjuO+QXYR7bdZFBKWJbshf0sS8,iv:Kw6qiUEFnd5FRGBMWutOoxMNFZYMf8NyQkPBR9TvfXg=,tag:4IOU6qOXWQ02S6rc1RHiOQ==,type:str] + env: ENC[AES256_GCM,data:eOLjpVzWl5bamDBmg3an2DrYKJcyMve/RkHha5PvsPFInQLJHlPm0qHP8AucafntFbTg2tV5umcnlJ2+aqNv5h1UF7QGN1oKhe8VTHHxKG4fZWD+m+j+UfpD6eA8dmEf//npgiJsBAx6qRBDWN4SxkryNAP9WsiiN9+VMsJdWe5ItQYQLU+uPNjDHMjYnw1p/JcIxilFFMn6GSV4Kc62ilE6oU5cUKk96xm/JzIX/T4GZ9q3LzCdJtaXsNic/9i6EDDIxNsLYzn0A+T1hp+jZ4k4HICx6ATPA85k1NhH0cH/r4aOv9BYed1375wkWWp4v3qzC8paHATZ5pyPeUrpJqd/uPAE8IYO3sDTimWBKU7X/O0lfTO4tiNVQFDF8cXq8tRJlZWogs67iSSepjb04e7a+OFW9f++E4eeXrbSsVw+YW43Rtbhjw0qlVBM4nBFCchiZk8etTIFkfVvbirvdcLCOCtzjtYO8rVNdj6tzwBFrpFrbvCxgEMLB6P6FwM5epMfiiOLF9DT+ljFeafBEXvy+kU5afYkf1Sh9HNvvs9ifOILyFXjMXb9jAKvNPqd0rZPOQhyvBIwRlhbsWfPO4owa/mFpNmU9mYOwHSFrVZ+V5bDAzXTQ9LKS25/NonBil0c+99peN09U5CwL1gNOtRIaFP3VlRR3/FhUwyKlgeq/Ah0s6jYN7LcNyTj0PKIMjdLotO5XHssQW+Z34s0EDDdkH1t+IODbtE39oVeErfatj+i3kFNSL+E6iVbe3KiWLIWm1xDf0pP5PD/N0OVi6abj/2OD5ClylDzO2q7dRKn3aHlRAZWXeQGMq9hxJm6VCP9HspQs+pGjDiMOs/cYib6LWkoeVN3IDV9rQ9XHeHKAXOQYVQ58auuYAIJ9qbLG0+YQvHoHiFtuK3ucXMbq17oQ/NjZEX/e77ZZCYTfxuxhW9Zwa1abojIwrfKSyhoh91HHvgYmOh8hU+gCthWDNaPJ8XIAaGy+M9V7F2TK4V2vPy6xLp/XmzPUchO78/ZcW71jPDoR7pV5I3vab+c27EWlPw4mv4U+emnVZ1L7VM7+EkpsXuncNaKPCaFz1LDl4sbaAJSS2UK2ZfBBbM/EcGT2Ymm8jOjBwHwDi2VqN/CHMf6qG3P9R3XN/jNU5ShR97D52mSE3zy25wJHcv4Z8iSu98KEC9rNvJviPjncftWkycGjWFXx7mLwsKo6VyfUn/OXuk=,iv:HXTsRJEHxceO1HIA4CaR9CYt3oO18+cdeTAiBk4w0zo=,tag:e44hqgGLC9ugivxaxr+0Gw==,type:str] sops: kms: [] gcp_kms: [] azure_kv: [] hc_vault: [] age: [] - lastmodified: "2024-03-31T09:43:12Z" - mac: ENC[AES256_GCM,data:I9rIuOh2cTJDrlPYs3kf6o6jPPtdElDmjWENc4Yk29ezpWwUj3+BsICpOU0kOrehvuyKtcM6BcxuvJG5Q92gZoVRvlHDoLypMyK3vDBxhGO0CAbcKnKmUSvROr6IWY5jKh9EWczxU3VkDTrm/BmCJAbjC2Ys51ej73InZez4t0g=,iv:gIaUNj8wKew4bH7dBHW+LV5S0a9allRQkWQ/3aWYJ4Q=,tag:mwwI+RDG0i45sPOSh+e1mg==,type:str] + lastmodified: "2024-04-01T03:47:06Z" + mac: ENC[AES256_GCM,data:mrjkTQF+cKuNzbaAaflQCTMT+H7D0dKL6keVLs1ig6ok4Z6JCKxe9+1Fa3q2OIpgq0bhHZqPPe5e2ztQSAzFC9z6c7YCHGh6kPZ8fQ7F0l2dATqNSeaRMsjsMdo7vOOQjNqj0SkeU5c4PSQpQHz9Rg7CtMupQ60iLbsm8GGM1tU=,iv:uhzyxgDSdJ/jw0qZyOddxP3JZ3S4okuWhZdJE22nDEI=,tag:EYe9MYxL8QDPe9Rf53OM+Q==,type:str] pgp: - created_at: "2024-01-11T20:56:10Z" enc: |- diff --git a/kustomizations/invoiceshelf/ingress.yaml b/kustomizations/invoiceshelf/ingress.yaml index a5aa55d..c090527 100644 --- a/kustomizations/invoiceshelf/ingress.yaml +++ b/kustomizations/invoiceshelf/ingress.yaml @@ -7,7 +7,7 @@ metadata: spec: ingressClassName: nginx rules: - - host: invoice.distrust.co + - host: billing.distrust.co http: paths: - path: / @@ -19,5 +19,5 @@ spec: name: http tls: - hosts: - - invoice.distrust.co + - billing.distrust.co secretName: invoiceshelf-tls diff --git a/kustomizations/invoiceshelf/kustomization.yaml b/kustomizations/invoiceshelf/kustomization.yaml index 8322966..19753b1 100644 --- a/kustomizations/invoiceshelf/kustomization.yaml +++ b/kustomizations/invoiceshelf/kustomization.yaml @@ -6,40 +6,6 @@ resources: - statefulset.yaml - service.yaml - ingress.yaml -configMapGenerator: - - name: env - literals: - - DB_CONNECTION=mysql - - DB_HOST=distrust-mysql-do-user-11788707-0.c.db.ondigitalocean.com - - DB_USERNAME=crater - - DB_DATABASE=crater - - DB_PORT=25060 - - APP_ENV=production - - APP_DEBUG=false - - APP_LOG_LEVEL=debug - - APP_URL=https://billing.distrust.co - - ASSET_URL=https://billing.distrust.co - - BROADCAST_DRIVER=log - - CACHE_DRIVER=file - - QUEUE_DRIVER=sync - - SESSION_DRIVER=cookie - - SESSION_LIFETIME=1440 - - REDIS_HOST=127.0.0.1 - - REDIS_PORT=6379 - - MAIL_DRIVER=smtp - - MAIL_HOST=smtp.migadu.com - - MAIL_PORT=465 - - MAIL_USERNAME=billing@distrust.co - - MAIL_FROM_ADDRESS=billing@distrust.co - - MAIL_FROM_NAME="billing@distrust.co" - - MAIL_ENCRYPTION=ssl - - PUSHER_APP_ID= - - PUSHER_KEY= - - PUSHER_SECRET= - - SANCTUM_STATEFUL_DOMAINS=billing.distrust.co - - SESSION_DOMAIN=billing.distrust.co - - TRUSTED_PROXIES="*" - - CRON_JOB_AUTH_TOKEN="" generators: - secret-generator.yaml images: diff --git a/kustomizations/invoiceshelf/statefulset.yaml b/kustomizations/invoiceshelf/statefulset.yaml index 39f6ada..48aed2f 100644 --- a/kustomizations/invoiceshelf/statefulset.yaml +++ b/kustomizations/invoiceshelf/statefulset.yaml @@ -19,19 +19,39 @@ spec: containers: - name: invoiceshelf image: invoiceshelf/invoiceshelf - envFrom: - - secretRef: - name: env - - configMapRef: - name: env ports: - name: http containerPort: 80 securityContext: allowPrivilegeEscalation: false + startupProbe: + initialDelaySeconds: 60 + periodSeconds: 5 + failureThreshold: 10 + httpGet: + path: /api/v1/app/version + port: http + livenessProbe: + periodSeconds: 5 + httpGet: + path: /api/v1/app/version + port: http + readinessProbe: + periodSeconds: 5 + httpGet: + path: /api/v1/app/version + port: http volumeMounts: - name: invoiceshelf-data - mountPath: /var/www/html/InvoiceShelf/storage + mountPath: /data + subPath: data + - name: dot-env + mountPath: /conf/.env + subPath: env + volumes: + - name: dot-env + secret: + secretName: env volumeClaimTemplates: - metadata: name: invoiceshelf-data