Merge branch 'master' into ULMS-1896/ban

foxford · Jul 18, 2023 · b76fa29 · b76fa29
2 parents 4955f6b + 51359cf
commit b76fa29
Show file tree

Hide file tree

Showing 45 changed files with 1,444 additions and 1,344 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -2,7 +2,7 @@
 authors = ["Timofey Martynov <[email protected]>"]
 edition = "2021"
 name = "event"
-version = "0.2.75"
+version = "0.2.80"
 
 [dependencies]
 anyhow = "1"

diff --git a/chart/Chart.yaml b/chart/Chart.yaml
@@ -16,4 +16,4 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.2.10
+version: 0.2.12
diff --git a/chart/templates/sts.yaml b/chart/templates/sts.yaml
@@ -24,9 +24,6 @@ spec:
       imagePullSecrets:
         - name: regcred
       initContainers:
-        - image: "{{ .Values.networkTester.image.repository }}:{{ .Values.networkTester.image.tag }}"
-          imagePullPolicy: IfNotPresent
-          name: network-tester
         - name: init-{{ .Chart.Name }}-migration
           image: "{{ .Values.migrations.image.repository }}:{{ .Values.migrations.image.tag | default .Values.app.image.tag }}"
           imagePullPolicy: IfNotPresent

diff --git a/chart/values.yaml b/chart/values.yaml
@@ -6,18 +6,14 @@ replicaCount: 2
 
 minReadySeconds: 5
 preStopSleepSeconds: 5
-networkTester:
-  image:
-    repository: cr.yandex/crp1of6bddata8ain3q5/k8s-network-tester
-    tag: latest
 
 app:
   image:
     repository: cr.yandex/crp1of6bddata8ain3q5/event
 
   resources:
     requests:
-      cpu: 0.1
+      cpu: 0.02
       memory: 100Mi
     limits:
       memory: 200Mi
@@ -27,12 +23,11 @@ migrations:
     repository: cr.yandex/crp1of6bddata8ain3q5/event-migration
 
   resources:
-    limits:
-      cpu: 0.1
-      memory: 100Mi
     requests:
-      cpu: 0.1
+      cpu: 0.02
       memory: 100Mi
+    limits:
+      memory: 200Mi
 
 env:
   RUST_LOG: warn,event=info,svc_utils=info,svc_utils::metrics=warn

diff --git a/migrations/20230704101035_add_kind_to_room.sql b/migrations/20230704101035_add_kind_to_room.sql
@@ -0,0 +1,2 @@
+create type class_type as enum('webinar', 'p2p', 'minigroup');
+alter table room add kind class_type;
diff --git a/migrations/20230705112629_set_room_kind_as_not_null.sql b/migrations/20230705112629_set_room_kind_as_not_null.sql
@@ -0,0 +1,4 @@
+-- Run before migration in all environments
+-- update room set kind = '${KIND}' where kind is null;
+alter table room
+    alter column kind set not null;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		create type class_type as enum('webinar', 'p2p', 'minigroup');
		alter table room add kind class_type;