Skip to content

Commit bda4336

Browse files
Alexj9837Alexj9837
committed
Merge main - resolve Cargo.lock conflict, accept StatefulSet→Deployment rename
1 parent d39be44 commit bda4336

2 files changed

Lines changed: 32 additions & 33 deletions

File tree

‎Cargo.lock‎

Lines changed: 31 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

helm/numtracker/templates/statefulset.yaml renamed to helm/numtracker/templates/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
apiVersion: apps/v1
2-
kind: StatefulSet
2+
kind: Deployment
33
metadata:
44
name: {{ include "numtracker.fullname" . }}
55
labels:

0 commit comments

Comments
 (0)