fix error in template

equinor · Dec 6, 2024 · c45ba24 · c45ba24
1 parent c75e5e7
commit c45ba24
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 110 deletions.
diff --git a/radixconfig.c2.yaml b/radixconfig.c2.yaml
@@ -35,6 +35,13 @@ spec:
       publicPort: http
       runtime:
         architecture: arm64
+      resources:
+        requests:
+          cpu: "50m"
+          memory: "50Mi"
+        limits:
+          cpu: "100m"
+          memory: "50Mi"
       variables:
         CLUSTER_EGRESS_IPS: undefined # Comma separated list of IPs of all Public IP Prefixes assigned to the ClusterType (production, playground, development)
         CLUSTER_INGRESS_IPS: undefined # Comma separated list of IPs of all Public IP Prefixes assigned to the ClusterType (production, playground, development)
@@ -54,13 +61,6 @@ spec:
             connectionUrl: rediss://radix-c2-qa.redis.cache.windows.net:6380
       environmentConfig:
         - environment: qa
-          resources:
-            requests:
-              cpu: "20m"
-              memory: "50Mi"
-            limits:
-              cpu: "50m"
-              memory: "50Mi"
           horizontalScaling:
             maxReplicas: 1
             minReplicas: 0
@@ -73,18 +73,3 @@ spec:
                   desiredReplicas: 1
         - environment: prod
           replicas: 2
-          resources:
-            requests:
-              cpu: "50m"
-              memory: "50Mi"
-            limits:
-              cpu: "100m"
-              memory: "50Mi"
-        - environment: prod
-          resources:
-            requests:
-              cpu: "50m"
-              memory: "100Mi"
-            limits:
-              cpu: "100m"
-              memory: "100Mi"
diff --git a/radixconfig.dev.yaml b/radixconfig.dev.yaml
@@ -35,6 +35,13 @@ spec:
       publicPort: http
       runtime:
         architecture: arm64
+      resources:
+        requests:
+          cpu: "50m"
+          memory: "50Mi"
+        limits:
+          cpu: "100m"
+          memory: "50Mi"
       variables:
         CLUSTER_EGRESS_IPS: undefined # Comma separated list of IPs of all Public IP Prefixes assigned to the ClusterType (production, playground, development)
         CLUSTER_INGRESS_IPS: undefined # Comma separated list of IPs of all Public IP Prefixes assigned to the ClusterType (production, playground, development)
@@ -54,13 +61,6 @@ spec:
             connectionUrl: rediss://radix-dev-qa.redis.cache.windows.net:6380
       environmentConfig:
         - environment: qa
-          resources:
-            requests:
-              cpu: "20m"
-              memory: "50Mi"
-            limits:
-              cpu: "50m"
-              memory: "50Mi"
           horizontalScaling:
             maxReplicas: 1
             minReplicas: 0
@@ -73,18 +73,3 @@ spec:
                   desiredReplicas: 1
         - environment: prod
           replicas: 2
-          resources:
-            requests:
-              cpu: "50m"
-              memory: "50Mi"
-            limits:
-              cpu: "100m"
-              memory: "50Mi"
-        - environment: prod
-          resources:
-            requests:
-              cpu: "50m"
-              memory: "100Mi"
-            limits:
-              cpu: "100m"
-              memory: "100Mi"
diff --git a/radixconfig.platform.yaml b/radixconfig.platform.yaml
@@ -35,6 +35,13 @@ spec:
       publicPort: http
       runtime:
         architecture: arm64
+      resources:
+        requests:
+          cpu: "50m"
+          memory: "50Mi"
+        limits:
+          cpu: "100m"
+          memory: "50Mi"
       variables:
         CLUSTER_EGRESS_IPS: undefined # Comma separated list of IPs of all Public IP Prefixes assigned to the ClusterType (production, playground, development)
         CLUSTER_INGRESS_IPS: undefined # Comma separated list of IPs of all Public IP Prefixes assigned to the ClusterType (production, playground, development)
@@ -54,13 +61,6 @@ spec:
             connectionUrl: rediss://radix-platform-qa.redis.cache.windows.net:6380
       environmentConfig:
         - environment: qa
-          resources:
-            requests:
-              cpu: "20m"
-              memory: "50Mi"
-            limits:
-              cpu: "50m"
-              memory: "50Mi"
           horizontalScaling:
             maxReplicas: 1
             minReplicas: 0
@@ -73,18 +73,3 @@ spec:
                   desiredReplicas: 1
         - environment: prod
           replicas: 2
-          resources:
-            requests:
-              cpu: "50m"
-              memory: "50Mi"
-            limits:
-              cpu: "100m"
-              memory: "50Mi"
-        - environment: prod
-          resources:
-            requests:
-              cpu: "50m"
-              memory: "100Mi"
-            limits:
-              cpu: "100m"
-              memory: "100Mi"
diff --git a/radixconfig.playground.yaml b/radixconfig.playground.yaml
@@ -35,6 +35,13 @@ spec:
       publicPort: http
       runtime:
         architecture: arm64
+      resources:
+        requests:
+          cpu: "50m"
+          memory: "50Mi"
+        limits:
+          cpu: "100m"
+          memory: "50Mi"
       variables:
         CLUSTER_EGRESS_IPS: undefined # Comma separated list of IPs of all Public IP Prefixes assigned to the ClusterType (production, playground, development)
         CLUSTER_INGRESS_IPS: undefined # Comma separated list of IPs of all Public IP Prefixes assigned to the ClusterType (production, playground, development)
@@ -54,13 +61,6 @@ spec:
             connectionUrl: rediss://radix-playground-qa.redis.cache.windows.net:6380
       environmentConfig:
         - environment: qa
-          resources:
-            requests:
-              cpu: "20m"
-              memory: "50Mi"
-            limits:
-              cpu: "50m"
-              memory: "50Mi"
           horizontalScaling:
             maxReplicas: 1
             minReplicas: 0
@@ -73,18 +73,3 @@ spec:
                   desiredReplicas: 1
         - environment: prod
           replicas: 2
-          resources:
-            requests:
-              cpu: "50m"
-              memory: "50Mi"
-            limits:
-              cpu: "100m"
-              memory: "50Mi"
-        - environment: prod
-          resources:
-            requests:
-              cpu: "50m"
-              memory: "100Mi"
-            limits:
-              cpu: "100m"
-              memory: "100Mi"
diff --git a/radixconfig.tpl.yaml b/radixconfig.tpl.yaml
@@ -35,6 +35,13 @@ spec:
       publicPort: http
       runtime:
         architecture: arm64
+      resources:
+        requests:
+          cpu: "50m"
+          memory: "50Mi"
+        limits:
+          cpu: "100m"
+          memory: "50Mi"
       variables:
         CLUSTER_EGRESS_IPS: undefined # Comma separated list of IPs of all Public IP Prefixes assigned to the ClusterType (production, playground, development)
         CLUSTER_INGRESS_IPS: undefined # Comma separated list of IPs of all Public IP Prefixes assigned to the ClusterType (production, playground, development)
@@ -54,13 +61,6 @@ spec:
             connectionUrl: rediss://${OAUTH2_REDIS_QA_HOSTNAME}:6380
       environmentConfig:
         - environment: qa
-          resources:
-            requests:
-              cpu: "20m"
-              memory: "50Mi"
-            limits:
-              cpu: "50m"
-              memory: "50Mi"
           horizontalScaling:
             maxReplicas: 1
             minReplicas: 0
@@ -73,18 +73,3 @@ spec:
                   desiredReplicas: 1
         - environment: prod
           replicas: 2
-          resources:
-            requests:
-              cpu: "50m"
-              memory: "50Mi"
-            limits:
-              cpu: "100m"
-              memory: "50Mi"
-        - environment: prod
-          resources:
-            requests:
-              cpu: "50m"
-              memory: "100Mi"
-            limits:
-              cpu: "100m"
-              memory: "100Mi"