PAUSED: Use git resume to continue working.

carbonin · Feb 19, 2018 · 41a7caf · 41a7caf
1 parent c46258a
commit 41a7caf
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 87 deletions.
diff --git a/templates/miq-template-ext-db.yaml b/templates/miq-template-ext-db.yaml
@@ -133,12 +133,6 @@ objects:
               secretKeyRef:
                 name: "${NAME}-secrets"
                 key: artemis-password
-          resources:
-            requests:
-              memory: "${APPLICATION_MEM_REQ}"
-              cpu: "${APPLICATION_CPU_REQ}"
-            limits:
-              memory: "${APPLICATION_MEM_LIMIT}"
         serviceAccount: miq-orchestrator
         serviceAccountName: miq-orchestrator
         terminationGracePeriodSeconds: 90
@@ -199,12 +193,6 @@ objects:
             value: "${MEMCACHED_MAX_CONNECTIONS}"
           - name: MEMCACHED_SLAB_PAGE_SIZE
             value: "${MEMCACHED_SLAB_PAGE_SIZE}"
-          resources:
-            requests:
-              memory: "${MEMCACHED_MEM_REQ}"
-              cpu: "${MEMCACHED_CPU_REQ}"
-            limits:
-              memory: "${MEMCACHED_MEM_LIMIT}"
 - apiVersion: v1
   kind: Service
   metadata:
@@ -494,12 +482,6 @@ objects:
             mountPath: "${HTTPD_CONFIG_DIR}"
           - name: httpd-auth-config
             mountPath: "${HTTPD_AUTH_CONFIG_DIR}"
-          resources:
-            requests:
-              memory: "${HTTPD_MEM_REQ}"
-              cpu: "${HTTPD_CPU_REQ}"
-            limits:
-              memory: "${HTTPD_MEM_LIMIT}"
           env:
           - name: HTTPD_AUTH_TYPE
             valueFrom:
@@ -673,36 +655,6 @@ parameters:
   displayName: Memcached Slab Page Size
   description: Memcached size of each slab page.
   value: 1m
-- name: APPLICATION_CPU_REQ
-  displayName: Application Min CPU Requested
-  required: true
-  description: Minimum amount of CPU time the Application container will need (expressed in millicores).
-  value: 1000m
-- name: MEMCACHED_CPU_REQ
-  displayName: Memcached Min CPU Requested
-  required: true
-  description: Minimum amount of CPU time the Memcached container will need (expressed in millicores).
-  value: 200m
-- name: APPLICATION_MEM_REQ
-  displayName: Application Min RAM Requested
-  required: true
-  description: Minimum amount of memory the Application container will need.
-  value: 6144Mi
-- name: MEMCACHED_MEM_REQ
-  displayName: Memcached Min RAM Requested
-  required: true
-  description: Minimum amount of memory the Memcached container will need.
-  value: 64Mi
-- name: APPLICATION_MEM_LIMIT
-  displayName: Application Max RAM Limit
-  required: true
-  description: Maximum amount of memory the Application container can consume.
-  value: 16384Mi
-- name: MEMCACHED_MEM_LIMIT
-  displayName: Memcached Max RAM Limit
-  required: true
-  description: Maximum amount of memory the Memcached container can consume.
-  value: 256Mi
 - name: MEMCACHED_IMG_NAME
   displayName: Memcached Image Name
   description: This is the Memcached image name requested to deploy.
@@ -771,18 +723,3 @@ parameters:
   displayName: External Authentication Configuration Directory
   description: Directory used to store the external authentication configuration files.
   value: "/etc/httpd/auth-conf.d"
-- name: HTTPD_CPU_REQ
-  displayName: Apache httpd Min CPU Requested
-  required: true
-  description: Minimum amount of CPU time the httpd container will need (expressed in millicores).
-  value: 500m
-- name: HTTPD_MEM_REQ
-  displayName: Apache httpd Min RAM Requested
-  required: true
-  description: Minimum amount of memory the httpd container will need.
-  value: 512Mi
-- name: HTTPD_MEM_LIMIT
-  displayName: Apache httpd Max RAM Limit
-  required: true
-  description: Maximum amount of memory the httpd container can consume.
-  value: 8192Mi
diff --git a/templates/miq-template.yaml b/templates/miq-template.yaml
@@ -380,12 +380,6 @@ objects:
               secretKeyRef:
                 name: "${NAME}-secrets"
                 key: artemis-password
-          resources:
-            requests:
-              memory: "${APPLICATION_MEM_REQ}"
-              cpu: "${APPLICATION_CPU_REQ}"
-            limits:
-              memory: "${APPLICATION_MEM_LIMIT}"
         serviceAccount: miq-orchestrator
         serviceAccountName: miq-orchestrator
         terminationGracePeriodSeconds: 90
@@ -446,12 +440,6 @@ objects:
             value: "${MEMCACHED_MAX_CONNECTIONS}"
           - name: MEMCACHED_SLAB_PAGE_SIZE
             value: "${MEMCACHED_SLAB_PAGE_SIZE}"
-          resources:
-            requests:
-              memory: "${MEMCACHED_MEM_REQ}"
-              cpu: "${MEMCACHED_CPU_REQ}"
-            limits:
-              memory: "${MEMCACHED_MEM_LIMIT}"
 - apiVersion: v1
   kind: Service
   metadata:
@@ -530,12 +518,6 @@ objects:
             value: "${POSTGRESQL_MAX_CONNECTIONS}"
           - name: POSTGRESQL_SHARED_BUFFERS
             value: "${POSTGRESQL_SHARED_BUFFERS}"
-          resources:
-            requests:
-              memory: "${POSTGRESQL_MEM_REQ}"
-              cpu: "${POSTGRESQL_CPU_REQ}"
-            limits:
-              memory: "${POSTGRESQL_MEM_LIMIT}"
 - apiVersion: v1
   kind: Service
   metadata:
@@ -618,12 +600,6 @@ objects:
             mountPath: "${HTTPD_CONFIG_DIR}"
           - name: httpd-auth-config
             mountPath: "${HTTPD_AUTH_CONFIG_DIR}"
-          resources:
-            requests:
-              memory: "${HTTPD_MEM_REQ}"
-              cpu: "${HTTPD_CPU_REQ}"
-            limits:
-              memory: "${HTTPD_MEM_LIMIT}"
           env:
           - name: HTTPD_AUTH_TYPE
             valueFrom: