Bump versions and fix Payphone deployment
This commit is contained in:
@@ -5,3 +5,5 @@
|
|||||||
.env
|
.env
|
||||||
|
|
||||||
00-vault-pwd.txt
|
00-vault-pwd.txt
|
||||||
|
|
||||||
|
reset-ssh.sh
|
||||||
|
|||||||
Generated
+1
-1
@@ -1217,7 +1217,7 @@ checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "payphone"
|
name = "payphone"
|
||||||
version = "4.0.0"
|
version = "4.0.2"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"async-trait",
|
"async-trait",
|
||||||
"axum",
|
"axum",
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "payphone"
|
name = "payphone"
|
||||||
version = "4.0.0"
|
version = "4.0.2"
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
|||||||
@@ -12,5 +12,8 @@ FROM debian:bookworm
|
|||||||
|
|
||||||
COPY --from=builder /app/target/release/payphone /usr/local/bin/payphone
|
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" ]
|
ENTRYPOINT [ "/usr/local/bin/payphone" ]
|
||||||
CMD [ "start" ]
|
CMD [ "start" ]
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ spec:
|
|||||||
loopDevices:
|
loopDevices:
|
||||||
- name: persistent-volumes
|
- name: persistent-volumes
|
||||||
imagePath: /var/lib/persistent-volumes.img
|
imagePath: /var/lib/persistent-volumes.img
|
||||||
size: 50Gi
|
size: 60Gi
|
||||||
filesystems:
|
filesystems:
|
||||||
- device: /dev/loops/persistent-volumes
|
- device: /dev/loops/persistent-volumes
|
||||||
type: xfs
|
type: xfs
|
||||||
|
|||||||
+13
-14
@@ -1,15 +1,14 @@
|
|||||||
$ANSIBLE_VAULT;1.1;AES256
|
$ANSIBLE_VAULT;1.1;AES256
|
||||||
64616462323461653039363034636361393337346266623366663961323739303861323433323631
|
64383938373964633864663939326162613166363733633038656536363736366364373563323434
|
||||||
3332313133646535666330346339653066656362396535340a316565323735386331623038653333
|
3963373162646637646130323638336635653136383331610a346261313864373935616636326630
|
||||||
31366561363433363731323739303362323635383832356132303334363366323034326563393631
|
30353034333466323861633034306530383162383331616234333463366434303238613435373436
|
||||||
3165643138353266380a663563366137643463333934373939643530656163306262613261383237
|
6130643663666336620a316633316266336264356432623432353331613661633965316263666131
|
||||||
63323063613662393832373737663133313238373039343231646561343436343363643031333335
|
35633263346462383366636363326464323164633033623335353631396638363538373531626463
|
||||||
61313631326162656465613666616365393462666661353665376564633732306434366134346466
|
37356662376532323162306463643334333430323632656265613334343562343966356634393334
|
||||||
64356238393939373032653636663861396336373031653232643664613031383838363962333165
|
31393432646363396161653266306433623133396366626362663665336333636564393864363633
|
||||||
62666139613363356331623536626638396663656134366639613731346335616665356662366164
|
63383665383631306463653937623132376332313966303361343364663539346633303164323463
|
||||||
34343439313732616238303335323639623436326432333962313133343836306566313563313966
|
38343139373765323333653839303639383363326337656336333834633735353463633862333835
|
||||||
64383237366562653733643466613532316464353332343736663862633238666338363062623463
|
36343530353639653962313932656433316666373337636266396339646364653838636465646430
|
||||||
66333239343234306261336237363933666232386434643637343234666533343033363530656130
|
64393864653139663233653832646630643036373062306337383235383235343636323238646333
|
||||||
35396530316136616664623739653765633130373865363235313439626231623437363534633061
|
32393036666432303532663264623437313735313864326437303361613362383138356665393739
|
||||||
33313764393766666137343962613132626533616532633864313261316264616139343037623831
|
32326138326434386264343561613664636564336238393937333333343161306231
|
||||||
3536616432363862633638303431373064346335303731313335
|
|
||||||
|
|||||||
@@ -3,10 +3,20 @@
|
|||||||
become: true
|
become: true
|
||||||
gather_facts: false
|
gather_facts: false
|
||||||
tasks:
|
tasks:
|
||||||
- name: Set Up ArgoCD Application for Scylla Cluster
|
- name: Create Scylla Namespace
|
||||||
kubernetes.core.k8s:
|
kubernetes.core.k8s:
|
||||||
state: present
|
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
|
namespace: scylla
|
||||||
kubeconfig: /etc/rancher/k3s/k3s.yaml
|
kubeconfig: /etc/rancher/k3s/k3s.yaml
|
||||||
|
|
||||||
|
|||||||
@@ -52,13 +52,14 @@
|
|||||||
kubeconfig: /etc/rancher/k3s/k3s.yaml
|
kubeconfig: /etc/rancher/k3s/k3s.yaml
|
||||||
|
|
||||||
- name: Set Git credentials
|
- name: Set Git credentials
|
||||||
ansible.builtin.command: |
|
ansible.builtin.shell: >
|
||||||
kubectl create secret docker-registry payphone-git-credentials \
|
kubectl create secret docker-registry payphone-git-credentials \
|
||||||
--docker-server=registry.nyeki.dev \
|
--docker-server=registry.nyeki.dev \
|
||||||
--docker-username={{ gitlab_username }} \
|
--docker-username={{ gitlab_username }} \
|
||||||
--docker-password={{ gitlab_pat }} \
|
--docker-password={{ gitlab_pat }} \
|
||||||
--docker-email={{ gitlab_email }} \
|
--docker-email={{ gitlab_email }} \
|
||||||
-n payphone
|
-n payphone \
|
||||||
|
--dry-run=client -o yaml | kubectl apply -f -
|
||||||
|
|
||||||
- name: Apply Payphone Deployment
|
- name: Apply Payphone Deployment
|
||||||
kubernetes.core.k8s:
|
kubernetes.core.k8s:
|
||||||
@@ -86,7 +87,17 @@
|
|||||||
- name: payphone
|
- name: payphone
|
||||||
image: registry.nyeki.dev/payphone/payphone:{{ hostvars['localhost'].app_version }}
|
image: registry.nyeki.dev/payphone/payphone:{{ hostvars['localhost'].app_version }}
|
||||||
imagePullPolicy: "Always"
|
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:
|
envFrom:
|
||||||
- secretRef:
|
- secretRef:
|
||||||
name: payphone-secrets
|
name: payphone-secrets
|
||||||
@@ -106,3 +117,4 @@
|
|||||||
memory: "100Mi"
|
memory: "100Mi"
|
||||||
imagePullSecrets:
|
imagePullSecrets:
|
||||||
- name: payphone-git-credentials
|
- name: payphone-git-credentials
|
||||||
|
kubeconfig: /etc/rancher/k3s/k3s.yaml
|
||||||
|
|||||||
Reference in New Issue
Block a user