From 0969366e27e3c12aa658200842d13edb713591b3 Mon Sep 17 00:00:00 2001 From: polsevev Date: Wed, 29 Nov 2023 21:02:19 +0100 Subject: [PATCH] Added kubernetes config --- .kubernetes/beepsort-cert.yml | 13 +++++++++++++ .kubernetes/beepsort-deploy.yml | 21 +++++++++++++++++++++ .kubernetes/beepsort-ingress.yml | 21 +++++++++++++++++++++ .kubernetes/beepsort-service.yml | 14 ++++++++++++++ Dockerfile | 3 +++ src/GuiHookVec.rs | 21 +++------------------ 6 files changed, 75 insertions(+), 18 deletions(-) create mode 100644 .kubernetes/beepsort-cert.yml create mode 100644 .kubernetes/beepsort-deploy.yml create mode 100644 .kubernetes/beepsort-ingress.yml create mode 100644 .kubernetes/beepsort-service.yml create mode 100644 Dockerfile diff --git a/.kubernetes/beepsort-cert.yml b/.kubernetes/beepsort-cert.yml new file mode 100644 index 0000000..72b790c --- /dev/null +++ b/.kubernetes/beepsort-cert.yml @@ -0,0 +1,13 @@ +apiVersion: cert-manager.io/v1 +kind: Certificate +metadata: + name: beepsort-cert + namespace: beepsort +spec: + secretName: beepsort-cert + issuerRef: + name: acme-issuer + kind: ClusterIssuer + dnsNames: + - "beepsort.polsevev.dev" + diff --git a/.kubernetes/beepsort-deploy.yml b/.kubernetes/beepsort-deploy.yml new file mode 100644 index 0000000..e1f8d9a --- /dev/null +++ b/.kubernetes/beepsort-deploy.yml @@ -0,0 +1,21 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: beepsort + namespace: beepsort +spec: + replicas: 1 + selector: + matchLabels: + app: beepsort + template: + metadata: + labels: + app: beepsort + name: beepsort + spec: + containers: + - name: beepsort + image: registry.lan.polsevev.dev/beepsort:v0.1.1 + ports: + - containerPort: 80 diff --git a/.kubernetes/beepsort-ingress.yml b/.kubernetes/beepsort-ingress.yml new file mode 100644 index 0000000..fbd7c62 --- /dev/null +++ b/.kubernetes/beepsort-ingress.yml @@ -0,0 +1,21 @@ +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: beepsort-ingress + namespace: beepsort +spec: + rules: + - host: "beepsort.polsevev.dev" + http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: beepsort-service + port: + number: 99 + tls: + - hosts: + - beepsort.polsevev.dev + secretName: beepsort-cert diff --git a/.kubernetes/beepsort-service.yml b/.kubernetes/beepsort-service.yml new file mode 100644 index 0000000..0d611bf --- /dev/null +++ b/.kubernetes/beepsort-service.yml @@ -0,0 +1,14 @@ +apiVersion: v1 +kind: Service +metadata: + name: beepsort-service + namespace: beepsort +spec: + selector: + app: beepsort + type: LoadBalancer + ports: + - name: docker-port + protocol: TCP + port: 99 + targetPort: 80 \ No newline at end of file diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..33c43bb --- /dev/null +++ b/Dockerfile @@ -0,0 +1,3 @@ +FROM nginx:alpine3.18 +COPY ./index.html /usr/share/nginx/html/ +COPY ./target/wasm32-unknown-unknown/release/BeepSortMacroQuad.wasm /usr/share/nginx/html/ diff --git a/src/GuiHookVec.rs b/src/GuiHookVec.rs index 10b1845..d25cc0d 100644 --- a/src/GuiHookVec.rs +++ b/src/GuiHookVec.rs @@ -32,7 +32,6 @@ pub struct GuiVec{ skipped:i32, lastTouched:Vec, lastPlayed:f64, - sounds:Vec } #[async_trait] pub trait SortingList{ @@ -77,11 +76,7 @@ impl SortingList for GuiVec{ list.push(Bar::new(i, (colorStep*i as f32)/360.)); } - //Generate sounds - let mut sounds = Vec::with_capacity(1000); - for i in (50..2051).step_by(2){ - sounds.push(soundGenerator::generateTone(i as f32, 0.1).await); - } + GuiVec{ list, @@ -97,7 +92,6 @@ impl SortingList for GuiVec{ skipped:0, lastTouched:Vec::with_capacity(2), lastPlayed:0., - sounds, } } @@ -178,13 +172,7 @@ impl SortingList for GuiVec{ self.list.swap(index1, index2); - if time::get_time() + 0.1 >= self.lastPlayed{ - play_sound(self.sounds[ (self.list[index1].position * 1000 / self.list.len()) ], PlaySoundParams{ - looped:false, - volume:0.5 - }); - self.lastPlayed = time::get_time()+0.1; - } + self.lastTouched.clear(); self.lastTouched.push(index1); @@ -235,10 +223,7 @@ impl SortingList for GuiVec{ self.list[i] = elem; self.draw().await; if time::get_time() + 0.1 >= self.lastPlayed{ - play_sound(self.sounds[ (self.list[i].position * 1000 / self.list.len()) ], PlaySoundParams{ - looped:false, - volume:1. - }); + self.lastPlayed = time::get_time()+0.1; } self.lastTouched.clear();