From d3e192e3c3a9fb9250e415c8a217e241f23875be Mon Sep 17 00:00:00 2001 From: Rafael Bradley Date: Mon, 18 Aug 2025 03:20:57 -0300 Subject: [PATCH] Bump versions and fix Payphone deployment --- .gitignore | 4 +++- Cargo.lock | 2 +- Cargo.toml | 2 +- Dockerfile | 3 +++ k8s/scylla/04-scylla-node-config.yml | 2 +- playbooks/00-vault.yml | 27 +++++++++++++-------------- playbooks/06-scylla-cluster.yml | 14 ++++++++++++-- playbooks/08-payphone.yml | 18 +++++++++++++++--- 8 files changed, 49 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index 01065ff..33fd1ec 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,6 @@ .env -00-vault-pwd.txt \ No newline at end of file +00-vault-pwd.txt + +reset-ssh.sh diff --git a/Cargo.lock b/Cargo.lock index 429dea9..da2c637 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1217,7 +1217,7 @@ checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3" [[package]] name = "payphone" -version = "4.0.0" +version = "4.0.2" dependencies = [ "async-trait", "axum", diff --git a/Cargo.toml b/Cargo.toml index 77e4610..f714f57 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "payphone" -version = "4.0.0" +version = "4.0.2" edition = "2024" [dependencies] diff --git a/Dockerfile b/Dockerfile index aeadb7a..2a2c2ea 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,5 +12,8 @@ FROM debian:bookworm COPY --from=builder /app/target/release/payphone /usr/local/bin/payphone +RUN apt-get update && apt-get install -y ca-certificates +RUN update-ca-certificates + ENTRYPOINT [ "/usr/local/bin/payphone" ] CMD [ "start" ] diff --git a/k8s/scylla/04-scylla-node-config.yml b/k8s/scylla/04-scylla-node-config.yml index 5473c6c..2a0714d 100644 --- a/k8s/scylla/04-scylla-node-config.yml +++ b/k8s/scylla/04-scylla-node-config.yml @@ -7,7 +7,7 @@ spec: loopDevices: - name: persistent-volumes imagePath: /var/lib/persistent-volumes.img - size: 50Gi + size: 60Gi filesystems: - device: /dev/loops/persistent-volumes type: xfs diff --git a/playbooks/00-vault.yml b/playbooks/00-vault.yml index 405a6b8..09c7dbd 100644 --- a/playbooks/00-vault.yml +++ b/playbooks/00-vault.yml @@ -1,15 +1,14 @@ $ANSIBLE_VAULT;1.1;AES256 -64616462323461653039363034636361393337346266623366663961323739303861323433323631 -3332313133646535666330346339653066656362396535340a316565323735386331623038653333 -31366561363433363731323739303362323635383832356132303334363366323034326563393631 -3165643138353266380a663563366137643463333934373939643530656163306262613261383237 -63323063613662393832373737663133313238373039343231646561343436343363643031333335 -61313631326162656465613666616365393462666661353665376564633732306434366134346466 -64356238393939373032653636663861396336373031653232643664613031383838363962333165 -62666139613363356331623536626638396663656134366639613731346335616665356662366164 -34343439313732616238303335323639623436326432333962313133343836306566313563313966 -64383237366562653733643466613532316464353332343736663862633238666338363062623463 -66333239343234306261336237363933666232386434643637343234666533343033363530656130 -35396530316136616664623739653765633130373865363235313439626231623437363534633061 -33313764393766666137343962613132626533616532633864313261316264616139343037623831 -3536616432363862633638303431373064346335303731313335 +64383938373964633864663939326162613166363733633038656536363736366364373563323434 +3963373162646637646130323638336635653136383331610a346261313864373935616636326630 +30353034333466323861633034306530383162383331616234333463366434303238613435373436 +6130643663666336620a316633316266336264356432623432353331613661633965316263666131 +35633263346462383366636363326464323164633033623335353631396638363538373531626463 +37356662376532323162306463643334333430323632656265613334343562343966356634393334 +31393432646363396161653266306433623133396366626362663665336333636564393864363633 +63383665383631306463653937623132376332313966303361343364663539346633303164323463 +38343139373765323333653839303639383363326337656336333834633735353463633862333835 +36343530353639653962313932656433316666373337636266396339646364653838636465646430 +64393864653139663233653832646630643036373062306337383235383235343636323238646333 +32393036666432303532663264623437313735313864326437303361613362383138356665393739 +32326138326434386264343561613664636564336238393937333333343161306231 diff --git a/playbooks/06-scylla-cluster.yml b/playbooks/06-scylla-cluster.yml index 01d5a2d..b98a5ba 100644 --- a/playbooks/06-scylla-cluster.yml +++ b/playbooks/06-scylla-cluster.yml @@ -3,10 +3,20 @@ become: true gather_facts: false tasks: - - name: Set Up ArgoCD Application for Scylla Cluster + - name: Create Scylla Namespace kubernetes.core.k8s: state: present - src: /tmp/k8s/06-scylla-cluster.yml + definition: + apiVersion: v1 + kind: Namespace + metadata: + name: scylla + kubeconfig: /etc/rancher/k3s/k3s.yaml + + - name: Apply Scylla Cluster Config + kubernetes.core.k8s: + state: present + src: /tmp/k8s/scylla/06-scylla-cluster.yml namespace: scylla kubeconfig: /etc/rancher/k3s/k3s.yaml diff --git a/playbooks/08-payphone.yml b/playbooks/08-payphone.yml index c3980e2..2bf009d 100644 --- a/playbooks/08-payphone.yml +++ b/playbooks/08-payphone.yml @@ -52,13 +52,14 @@ kubeconfig: /etc/rancher/k3s/k3s.yaml - name: Set Git credentials - ansible.builtin.command: | + ansible.builtin.shell: > kubectl create secret docker-registry payphone-git-credentials \ --docker-server=registry.nyeki.dev \ --docker-username={{ gitlab_username }} \ --docker-password={{ gitlab_pat }} \ --docker-email={{ gitlab_email }} \ - -n payphone + -n payphone \ + --dry-run=client -o yaml | kubectl apply -f - - name: Apply Payphone Deployment kubernetes.core.k8s: @@ -86,7 +87,17 @@ - name: payphone image: registry.nyeki.dev/payphone/payphone:{{ hostvars['localhost'].app_version }} imagePullPolicy: "Always" - args: ["start", "--shard", "$(SHARD_ID):$(SHARD_COUNT)", "--database-addr", "scylla-client"] + args: [ + "start", + "--shard", + "$(SHARD_ID):$(SHARD_COUNT)", + "--database-addr", + "scylladb-client.scylla.svc.cluster.local", + "--database-username", + "cassandra", + "--database-password", + "cassandra" + ] envFrom: - secretRef: name: payphone-secrets @@ -106,3 +117,4 @@ memory: "100Mi" imagePullSecrets: - name: payphone-git-credentials + kubeconfig: /etc/rancher/k3s/k3s.yaml