RHINENG-12213 Update CPU and Memory Param names (#254)

Co-authored-by: Sagnik Dutta <[email protected]>
RedHatInsights · Sep 24, 2024 · c504225 · c504225
1 parent 30267fe
commit c504225
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 28 deletions.
diff --git a/clowdapp.yaml b/clowdapp.yaml
@@ -23,11 +23,11 @@ objects:
         args: ["-c", "./rosocp db migrate up && ./rosocp start processor"]
         resources:
           requests:
-            cpu: ${CPU_REQUEST}
-            memory: ${MEMORY_REQUEST}
+            cpu: ${CPU_REQUEST_ROSOCP}
+            memory: ${MEMORY_REQUEST_ROSOCP}
           limits:
-            cpu: ${CPU_LIMIT}
-            memory: ${MEMORY_LIMIT}
+            cpu: ${CPU_LIMIT_ROSOCP}
+            memory: ${MEMORY_LIMIT_ROSOCP}
         livenessProbe:
           failureThreshold: 3
           httpGet:
@@ -73,11 +73,11 @@ objects:
         args: ["-c", "./rosocp db migrate up && ./rosocp start recommendation-poller"]
         resources:
           requests:
-            cpu: ${CPU_REQUEST}
-            memory: ${MEMORY_REQUEST}
+            cpu: ${CPU_REQUEST_ROSOCP}
+            memory: ${MEMORY_REQUEST_ROSOCP}
           limits:
-            cpu: ${CPU_LIMIT}
-            memory: ${MEMORY_LIMIT}
+            cpu: ${CPU_LIMIT_ROSOCP}
+            memory: ${MEMORY_LIMIT_ROSOCP}
         livenessProbe:
           failureThreshold: 3
           httpGet:
@@ -127,11 +127,11 @@ objects:
         args: ["-c", "./rosocp db migrate up && ./rosocp start api"]
         resources:
           requests:
-            cpu: ${CPU_REQUEST}
-            memory: ${MEMORY_REQUEST}
+            cpu: ${CPU_REQUEST_ROSOCP}
+            memory: ${MEMORY_REQUEST_ROSOCP}
           limits:
-            cpu: ${CPU_LIMIT}
-            memory: ${MEMORY_LIMIT}
+            cpu: ${CPU_LIMIT_ROSOCP}
+            memory: ${MEMORY_LIMIT_ROSOCP}
         livenessProbe:
           failureThreshold: 3
           httpGet:
@@ -179,11 +179,11 @@ objects:
         args: ["-c", "./rosocp db migrate up && ./rosocp start housekeeper --sources"]
         resources:
           requests:
-            cpu: ${CPU_REQUEST}
-            memory: ${MEMORY_REQUEST}
+            cpu: ${CPU_REQUEST_ROSOCP}
+            memory: ${MEMORY_REQUEST_ROSOCP}
           limits:
-            cpu: ${CPU_LIMIT}
-            memory: ${MEMORY_LIMIT}
+            cpu: ${CPU_LIMIT_ROSOCP}
+            memory: ${MEMORY_LIMIT_ROSOCP}
         env:
           - name: CLOWDER_ENABLED
             value: ${CLOWDER_ENABLED}
@@ -262,22 +262,22 @@ parameters:
   value: "10000"
 - description: Initial cpu request.
   displayName: CPU Request
-  name: CPU_REQUEST
+  name: CPU_REQUEST_ROSOCP
   required: true
   value: 500m
 - description: Initial amount of memory the container will request.
   displayName: Memory Request
-  name: MEMORY_REQUEST
+  name: MEMORY_REQUEST_ROSOCP
   required: true
   value: 1Gi
 - description: Maximum amount of memory the container can use.
   displayName: Memory Limit
-  name: MEMORY_LIMIT
+  name: MEMORY_LIMIT_ROSOCP
   required: true
   value: 1Gi
 - description: Maximum amount of CPU the build container can use.
   displayName: CPU Limit
-  name: CPU_LIMIT
+  name: CPU_LIMIT_ROSOCP
   required: true
   value: '1'
 - description: Is clowder enabled

diff --git a/kruize-clowdapp.yaml b/kruize-clowdapp.yaml
@@ -23,11 +23,11 @@ objects:
         machinePool: ${MACHINE_POOL_OPTION}
         resources:
           requests:
-            cpu: ${KRUIZE_CPU_REQUEST}
-            memory: ${KRUIZE_MEMORY_REQUEST}
+            cpu: ${CPU_REQUEST_KRUIZE}
+            memory: ${MEMORY_REQUEST_KRUIZE}
           limits:
-            cpu: ${KRUIZE_CPU_LIMIT}
-            memory: ${KRUIZE_MEMORY_LIMIT}
+            cpu: ${CPU_LIMIT_KRUIZE}
+            memory: ${MEMORY_LIMIT_KRUIZE}
         livenessProbe:
           httpGet:
             path: /health
@@ -245,22 +245,22 @@ parameters:
   value: "10000"
 - description: Initial kruize cpu request.
   displayName: KRUIZE CPU Request
-  name: KRUIZE_CPU_REQUEST
+  name: CPU_REQUEST_KRUIZE
   required: true
   value: 500m
 - description: Initial amount of memory kruize container will request.
   displayName: KRUIZE Memory Request
-  name: KRUIZE_MEMORY_REQUEST
+  name: MEMORY_REQUEST_KRUIZE
   required: true
   value: 1Gi
 - description: Maximum amount of CPU kruize container can use.
   displayName: KRUIZE CPU Limit
-  name: KRUIZE_CPU_LIMIT
+  name: CPU_LIMIT_KRUIZE
   required: true
   value: '1'
 - description: Maximum amount of memory kruize container can use.
   displayName: KRUIZE Memory Limit
-  name: KRUIZE_MEMORY_LIMIT
+  name: MEMORY_LIMIT_KRUIZE
   required: true
   value: 1Gi
 - description: Replica count for kruize pod