fix: ingress

AtomiCloud · Oct 21, 2023 · 0543c6b · 0543c6b
1 parent 3b6433b
commit 0543c6b
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/Domain/Model/Template.cs b/Domain/Model/Template.cs
@@ -14,9 +14,6 @@ public record TemplatePrincipal
 {
   public required Guid Id { get; init; }
 
-  // User Controlled, only on create
-  public required TemplateProperty Prop { get; init; }
-
   // Telemetry, non-user controlled
   public required TemplateInfo Info { get; init; }
 
@@ -32,20 +29,23 @@ public record TemplateInfo
 
 public record TemplateMetadata
 {
+  public required string Name { get; init; }
   public required string Project { get; init; }
   public required string Source { get; init; }
   public required string Email { get; init; }
-  public required string Tags { get; init; }
+  public required string[] Tags { get; init; }
   public required string Description { get; init; }
   public required string Readme { get; init; }
 }
 
-public record TemplateProperty
+public record TemplateVersionPrincipal
 {
-  public required string Name { get; init; }
+  public required Guid Id { get; init; }
 
   public required uint Version { get; init; }
 
+  public required DateTime CreatedAt { get; init; }
+
   public required string BlobDockerReference { get; init; }
 
   public required string BlobDockerSha { get; init; }

diff --git a/infra/root_chart/README.md b/infra/root_chart/README.md
@@ -28,11 +28,11 @@ Root Chart to a single Service
 | api.image.repository | string | `"sulfone-zinc-api"` |  |
 | api.image.tag | string | `""` |  |
 | api.imagePullSecrets | list | `[]` |  |
+| api.ingress.className | string | `"nginx"` |  |
 | api.ingress.enabled | bool | `true` |  |
 | api.ingress.hosts[0].host | string | `"api.zinc.sulfone.lapras.lvh.me"` |  |
 | api.ingress.hosts[0].paths[0].path | string | `"/"` |  |
 | api.ingress.hosts[0].paths[0].pathType | string | `"ImplementationSpecific"` |  |
-| api.ingress.ingressClass | string | `"traefik"` |  |
 | api.ingress.tls[0].hosts[0] | string | `"api.zinc.sulfone.lapras.lvh.me"` |  |
 | api.ingress.tls[0].issuerRef | string | `"sample"` |  |
 | api.ingress.tls[0].secretName | string | `"sample"` |  |
@@ -47,7 +47,7 @@ Root Chart to a single Service
 | api.readinessProbe.httpGet.path | string | `"/"` |  |
 | api.readinessProbe.httpGet.port | string | `"http"` |  |
 | api.replicaCount | int | `1` |  |
-| api.resources.limits.cpu | int | `1` |  |
+| api.resources.limits.cpu | string | `"1"` |  |
 | api.resources.limits.memory | string | `"1Gi"` |  |
 | api.resources.requests.cpu | string | `"100m"` |  |
 | api.resources.requests.memory | string | `"128Mi"` |  |

diff --git a/infra/root_chart/values.lapras.yaml b/infra/root_chart/values.lapras.yaml
@@ -19,7 +19,7 @@ api:
 
   ingress:
     enabled: true
-    ingressClass: traefik
+    className: traefik
     hosts:
       - host: api.zinc.sulfone.lapras.lvh.me
         paths:

diff --git a/infra/root_chart/values.pichu.yaml b/infra/root_chart/values.pichu.yaml
@@ -26,7 +26,7 @@ api:
 
   ingress:
     enabled: true
-    ingressClass: nginx
+    className: nginx
     annotations:
       cert-manager.io/cluster-issuer: "entei-zinc-letsencrypt-issuer"
     hosts:

diff --git a/infra/root_chart/values.tauros.yaml b/infra/root_chart/values.tauros.yaml
@@ -19,7 +19,7 @@ api:
 
   ingress:
     enabled: true
-    ingressClass: traefik
+    className: traefik
     hosts:
       - host: api.zinc.sulfone.tauros.lvh.me
         paths:

diff --git a/infra/root_chart/values.yaml b/infra/root_chart/values.yaml
@@ -60,7 +60,7 @@ api:
 
   ingress:
     enabled: true
-    ingressClass: traefik
+    className: nginx
     hosts:
       - host: api.zinc.sulfone.lapras.lvh.me
         paths:
@@ -74,7 +74,7 @@ api:
 
   resources:
     limits:
-      cpu: 1
+      cpu: "1"
       memory: 1Gi
     requests:
       cpu: 100m