From 90cd311c8fc91cd967900f6c464617cb119ad859 Mon Sep 17 00:00:00 2001 From: sowm9802 Date: Fri, 8 Nov 2024 20:43:23 +0530 Subject: [PATCH 1/3] Add DEF_TAG_NAME to env in release-heat-rxt.yml to fix empty imageTag issue --- .github/workflows/release-heat-rxt.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release-heat-rxt.yml b/.github/workflows/release-heat-rxt.yml index 07b8eadc..34dfd88a 100644 --- a/.github/workflows/release-heat-rxt.yml +++ b/.github/workflows/release-heat-rxt.yml @@ -23,6 +23,7 @@ on: env: REGISTRY: ghcr.io IMAGE_NAME: ${{ github.repository }} + DEF_TAG_NAME: 2024.1-ubuntu_jammy # There is a single job in this workflow. It's configured to run on the latest available version of Ubuntu. jobs: @@ -42,6 +43,10 @@ jobs: registry: ${{ env.REGISTRY }} username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} + # ghcr only allows lowercase repository names + - name: lowercase repo name + run: | + echo "IMAGE_NAME=${GITHUB_REPOSITORY,,}" >>${GITHUB_ENV} # This step uses [docker/metadata-action](https://github.com/docker/metadata-action#about) to extract tags and labels that will be applied to the specified image. The `id` "meta" allows the output of this step to be referenced in a subsequent step. The `images` value provides the base name for the tags and labels. - name: Extract metadata (tags, labels) for Docker id: meta @@ -60,8 +65,8 @@ jobs: file: Containerfiles/HeatRXT-Containerfile push: true tags: | - ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/heat-rxt:${{ github.event.inputs.imageTag }} - ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/heat-rxt:${{ github.event.inputs.imageTag }}-${{ env.MY_DATE }} + ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/heat-rxt:${{ github.event.inputs.imageTag || env.DEF_TAG_NAME }} + ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/heat-rxt:${{ github.event.inputs.imageTag || env.DEF_TAG_NAME }}-${{ env.MY_DATE }} labels: ${{ steps.meta.outputs.labels }} build-args: | - VERSION=${{ github.event.inputs.imageTag }} + VERSION=${{ github.event.inputs.imageTag || env.DEF_TAG_NAME }} From 6c4f6b3bebfe781be91c5ebf95b0a0a68476aad5 Mon Sep 17 00:00:00 2001 From: sowm9802 Date: Tue, 12 Nov 2024 16:04:04 +0530 Subject: [PATCH 2/3] Tune hpa values and rename docker image heat-rxt to heat --- ...{release-heat-rxt.yml => release-heat.yml} | 8 ++-- .github/workflows/smoke-heat-rxt.yml | 41 ------------------- .../magnum/magnum-helm-overrides.yaml | 2 +- .../barbican/base/hpa-barbican-api.yaml | 4 +- .../cinder/base/hpa-cinder-api.yaml | 6 +++ .../cinder/base/hpa-cinder-scheduler.yaml | 6 +++ .../glance/base/hpa-glance-api.yaml | 6 +++ base-kustomize/heat/base/hpa-heat-engine.yaml | 6 +++ .../keystone/base/hpa-keystone-api.yaml | 6 +++ .../magnum/base/hpa-magnum-conductor.yaml | 4 +- .../neutron/base/hpa-neutron-server.yaml | 6 +++ .../nova/base/hpa-nova-conductor.yaml | 6 +++ .../nova/base/hpa-nova-scheduler.yaml | 6 +++ .../skyline/base/deployment-apiserver.yaml | 2 +- 14 files changed, 58 insertions(+), 51 deletions(-) rename .github/workflows/{release-heat-rxt.yml => release-heat.yml} (90%) delete mode 100644 .github/workflows/smoke-heat-rxt.yml diff --git a/.github/workflows/release-heat-rxt.yml b/.github/workflows/release-heat.yml similarity index 90% rename from .github/workflows/release-heat-rxt.yml rename to .github/workflows/release-heat.yml index 34dfd88a..c7ce52ff 100644 --- a/.github/workflows/release-heat-rxt.yml +++ b/.github/workflows/release-heat.yml @@ -1,10 +1,10 @@ # -name: Create and Publish a Heat RXT Image +name: Create and Publish a Heat Image on: push: paths: - - '.github/workflows/release-heat-rxt.yml' + - '.github/workflows/release-heat.yml' - 'Containerfiles/HeatRXT-Containerfile' branches: - development @@ -65,8 +65,8 @@ jobs: file: Containerfiles/HeatRXT-Containerfile push: true tags: | - ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/heat-rxt:${{ github.event.inputs.imageTag || env.DEF_TAG_NAME }} - ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/heat-rxt:${{ github.event.inputs.imageTag || env.DEF_TAG_NAME }}-${{ env.MY_DATE }} + ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/heat:${{ github.event.inputs.imageTag || env.DEF_TAG_NAME }} + ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/heat:${{ github.event.inputs.imageTag || env.DEF_TAG_NAME }}-${{ env.MY_DATE }} labels: ${{ steps.meta.outputs.labels }} build-args: | VERSION=${{ github.event.inputs.imageTag || env.DEF_TAG_NAME }} diff --git a/.github/workflows/smoke-heat-rxt.yml b/.github/workflows/smoke-heat-rxt.yml deleted file mode 100644 index d4ed8e4c..00000000 --- a/.github/workflows/smoke-heat-rxt.yml +++ /dev/null @@ -1,41 +0,0 @@ -# -name: Run build check for the Heat RXT image - -on: - pull_request: - paths: - - Containerfiles/HeatRXT-Containerfile - -# Defines two custom environment variables for the workflow. These are used for the Container registry domain, and a name for the Docker image that this workflow builds. -env: - REGISTRY: ghcr.io - IMAGE_NAME: ${{ github.repository }} - -# There is a single job in this workflow. It's configured to run on the latest available version of Ubuntu. -jobs: - build-and-push-image: - runs-on: ubuntu-latest - # Sets the permissions granted to the `GITHUB_TOKEN` for the actions in this job. - permissions: - contents: read - packages: read - steps: - - name: Checkout repository - uses: actions/checkout@v4 - # Uses the `docker/login-action` action to log in to the Container registry registry using the account and password that will publish the packages. Once published, the packages are scoped to the account defined here. - - name: Log in to the Container registry - uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1 - with: - registry: ${{ env.REGISTRY }} - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - name: Build Docker image - uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4 - with: - context: . - file: Containerfiles/HeatRXT-Containerfile - push: false - tags: | - ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/heat-rxt:2024.1-ubuntu_jammy - build-args: | - VERSION=2024.1-ubuntu_jammy diff --git a/base-helm-configs/magnum/magnum-helm-overrides.yaml b/base-helm-configs/magnum/magnum-helm-overrides.yaml index 2636484c..d585501f 100644 --- a/base-helm-configs/magnum/magnum-helm-overrides.yaml +++ b/base-helm-configs/magnum/magnum-helm-overrides.yaml @@ -569,7 +569,7 @@ pod: cpu: "2000m" conductor: requests: - memory: "128Mi" + memory: "512Mi" cpu: "100m" limits: memory: "1024Mi" diff --git a/base-kustomize/barbican/base/hpa-barbican-api.yaml b/base-kustomize/barbican/base/hpa-barbican-api.yaml index bff6eed5..a44ca0e1 100644 --- a/base-kustomize/barbican/base/hpa-barbican-api.yaml +++ b/base-kustomize/barbican/base/hpa-barbican-api.yaml @@ -4,8 +4,8 @@ metadata: name: barbican-api namespace: openstack spec: - maxReplicas: 3 - minReplicas: 1 + maxReplicas: 9 + minReplicas: 3 metrics: - resource: name: cpu diff --git a/base-kustomize/cinder/base/hpa-cinder-api.yaml b/base-kustomize/cinder/base/hpa-cinder-api.yaml index c33b0545..f588af17 100644 --- a/base-kustomize/cinder/base/hpa-cinder-api.yaml +++ b/base-kustomize/cinder/base/hpa-cinder-api.yaml @@ -13,6 +13,12 @@ spec: averageUtilization: 50 type: Utilization type: Resource + - resource: + name: memory + target: + averageValue: 200Mi + type: Value + type: Resource scaleTargetRef: apiVersion: apps/v1 kind: Deployment diff --git a/base-kustomize/cinder/base/hpa-cinder-scheduler.yaml b/base-kustomize/cinder/base/hpa-cinder-scheduler.yaml index c4b79623..086f561b 100644 --- a/base-kustomize/cinder/base/hpa-cinder-scheduler.yaml +++ b/base-kustomize/cinder/base/hpa-cinder-scheduler.yaml @@ -13,6 +13,12 @@ spec: averageUtilization: 50 type: Utilization type: Resource + - resource: + name: memory + target: + type: AverageValue + averageValue: 200Mi + type: Resource scaleTargetRef: apiVersion: apps/v1 kind: Deployment diff --git a/base-kustomize/glance/base/hpa-glance-api.yaml b/base-kustomize/glance/base/hpa-glance-api.yaml index e2e25254..d014579e 100644 --- a/base-kustomize/glance/base/hpa-glance-api.yaml +++ b/base-kustomize/glance/base/hpa-glance-api.yaml @@ -13,6 +13,12 @@ spec: averageUtilization: 50 type: Utilization type: Resource + - resource: + name: memory + target: + type: AverageValue + averageValue: 200Mi + type: Resource scaleTargetRef: apiVersion: apps/v1 kind: Deployment diff --git a/base-kustomize/heat/base/hpa-heat-engine.yaml b/base-kustomize/heat/base/hpa-heat-engine.yaml index 1276bd70..93a9218c 100644 --- a/base-kustomize/heat/base/hpa-heat-engine.yaml +++ b/base-kustomize/heat/base/hpa-heat-engine.yaml @@ -13,6 +13,12 @@ spec: averageUtilization: 50 type: Utilization type: Resource + - resource: + name: memory + target: + averageValue: 100Mi + type: Value + type: Resource scaleTargetRef: apiVersion: apps/v1 kind: Deployment diff --git a/base-kustomize/keystone/base/hpa-keystone-api.yaml b/base-kustomize/keystone/base/hpa-keystone-api.yaml index c28cf739..66d1df1b 100644 --- a/base-kustomize/keystone/base/hpa-keystone-api.yaml +++ b/base-kustomize/keystone/base/hpa-keystone-api.yaml @@ -13,6 +13,12 @@ spec: averageUtilization: 50 type: Utilization type: Resource + - resource: + name: memory + target: + type: AverageValue + averageValue: 400Mi + type: Resource scaleTargetRef: apiVersion: apps/v1 kind: Deployment diff --git a/base-kustomize/magnum/base/hpa-magnum-conductor.yaml b/base-kustomize/magnum/base/hpa-magnum-conductor.yaml index d0d61f75..818aaddc 100644 --- a/base-kustomize/magnum/base/hpa-magnum-conductor.yaml +++ b/base-kustomize/magnum/base/hpa-magnum-conductor.yaml @@ -16,8 +16,8 @@ spec: - resource: name: memory target: - averageUtilization: 60 - type: Utilization + type: AverageValue + averageValue: 600Mi type: Resource scaleTargetRef: apiVersion: apps/v1 diff --git a/base-kustomize/neutron/base/hpa-neutron-server.yaml b/base-kustomize/neutron/base/hpa-neutron-server.yaml index ef65426a..450074b2 100644 --- a/base-kustomize/neutron/base/hpa-neutron-server.yaml +++ b/base-kustomize/neutron/base/hpa-neutron-server.yaml @@ -13,6 +13,12 @@ spec: averageUtilization: 50 type: Utilization type: Resource + - resource: + name: memory + target: + type: AverageValue + averageValue: 500Mi + type: Resource scaleTargetRef: apiVersion: apps/v1 kind: Deployment diff --git a/base-kustomize/nova/base/hpa-nova-conductor.yaml b/base-kustomize/nova/base/hpa-nova-conductor.yaml index 2814335d..229f8013 100644 --- a/base-kustomize/nova/base/hpa-nova-conductor.yaml +++ b/base-kustomize/nova/base/hpa-nova-conductor.yaml @@ -13,6 +13,12 @@ spec: averageUtilization: 50 type: Utilization type: Resource + - resource: + name: memory + target: + type: AverageValue + averageValue: 500Mi + type: Resource scaleTargetRef: apiVersion: apps/v1 kind: Deployment diff --git a/base-kustomize/nova/base/hpa-nova-scheduler.yaml b/base-kustomize/nova/base/hpa-nova-scheduler.yaml index bb17791c..ce5d25bc 100644 --- a/base-kustomize/nova/base/hpa-nova-scheduler.yaml +++ b/base-kustomize/nova/base/hpa-nova-scheduler.yaml @@ -13,6 +13,12 @@ spec: averageUtilization: 50 type: Utilization type: Resource + - resource: + name: memory + target: + type: AverageValue + averageValue: 500Mi + type: Resource scaleTargetRef: apiVersion: apps/v1 kind: Deployment diff --git a/base-kustomize/skyline/base/deployment-apiserver.yaml b/base-kustomize/skyline/base/deployment-apiserver.yaml index a94e0312..01e091d2 100644 --- a/base-kustomize/skyline/base/deployment-apiserver.yaml +++ b/base-kustomize/skyline/base/deployment-apiserver.yaml @@ -10,7 +10,7 @@ metadata: component: api spec: progressDeadlineSeconds: 600 - replicas: 1 + replicas: 3 revisionHistoryLimit: 3 selector: matchLabels: From dd7993830fa61ec85773e4a18b877214db481271 Mon Sep 17 00:00:00 2001 From: sowm9802 Date: Thu, 14 Nov 2024 23:35:50 +0530 Subject: [PATCH 3/3] Update resource requests in Helm Overrides and fine-tune HPA configurations --- ...{release-heat.yml => release-heat-rxt.yml} | 8 ++-- .github/workflows/smoke-heat-rxt.yml | 41 +++++++++++++++++++ .../ceilometer/ceilometer-helm-overrides.yaml | 2 +- .../glance/glance-helm-overrides.yaml | 2 +- .../heat/heat-helm-overrides.yaml | 2 +- .../keystone/keystone-helm-overrides.yaml | 2 +- .../neutron/neutron-helm-overrides.yaml | 4 +- .../nova/nova-helm-overrides.yaml | 12 +++--- .../octavia/octavia-helm-overrides.yaml | 4 +- .../placement/placement-helm-overrides.yaml | 2 +- .../postgresql/postgresql-helm-overrides.yaml | 4 +- .../barbican/base/hpa-barbican-api.yaml | 6 +++ .../base/hpa-ceilometer-notification.yaml | 6 +++ .../cinder/base/hpa-cinder-api.yaml | 4 +- .../cinder/base/hpa-cinder-scheduler.yaml | 4 +- .../designate/base/hpa-designate-api.yaml | 6 +++ .../gnocchi/base/hpa-gnocchi-api.yaml | 6 +++ base-kustomize/heat/base/hpa-heat-api.yaml | 6 +++ base-kustomize/heat/base/hpa-heat-cfn.yaml | 6 +++ base-kustomize/heat/base/hpa-heat-engine.yaml | 2 +- .../horizon/base/hpa-horizon-api.yaml | 6 +++ .../magnum/base/hpa-magnum-api.yaml | 6 +++ .../magnum/base/hpa-magnum-conductor.yaml | 2 +- .../neutron/base/hpa-neutron-server.yaml | 2 +- .../nova/base/hpa-nova-api-metadata.yaml | 6 +++ .../nova/base/hpa-nova-api-osapi.yaml | 6 +++ .../nova/base/hpa-nova-novncproxy.yaml | 6 +++ .../nova/base/hpa-nova-scheduler.yaml | 2 +- 28 files changed, 136 insertions(+), 29 deletions(-) rename .github/workflows/{release-heat.yml => release-heat-rxt.yml} (90%) create mode 100644 .github/workflows/smoke-heat-rxt.yml diff --git a/.github/workflows/release-heat.yml b/.github/workflows/release-heat-rxt.yml similarity index 90% rename from .github/workflows/release-heat.yml rename to .github/workflows/release-heat-rxt.yml index c7ce52ff..34dfd88a 100644 --- a/.github/workflows/release-heat.yml +++ b/.github/workflows/release-heat-rxt.yml @@ -1,10 +1,10 @@ # -name: Create and Publish a Heat Image +name: Create and Publish a Heat RXT Image on: push: paths: - - '.github/workflows/release-heat.yml' + - '.github/workflows/release-heat-rxt.yml' - 'Containerfiles/HeatRXT-Containerfile' branches: - development @@ -65,8 +65,8 @@ jobs: file: Containerfiles/HeatRXT-Containerfile push: true tags: | - ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/heat:${{ github.event.inputs.imageTag || env.DEF_TAG_NAME }} - ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/heat:${{ github.event.inputs.imageTag || env.DEF_TAG_NAME }}-${{ env.MY_DATE }} + ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/heat-rxt:${{ github.event.inputs.imageTag || env.DEF_TAG_NAME }} + ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/heat-rxt:${{ github.event.inputs.imageTag || env.DEF_TAG_NAME }}-${{ env.MY_DATE }} labels: ${{ steps.meta.outputs.labels }} build-args: | VERSION=${{ github.event.inputs.imageTag || env.DEF_TAG_NAME }} diff --git a/.github/workflows/smoke-heat-rxt.yml b/.github/workflows/smoke-heat-rxt.yml new file mode 100644 index 00000000..d4ed8e4c --- /dev/null +++ b/.github/workflows/smoke-heat-rxt.yml @@ -0,0 +1,41 @@ +# +name: Run build check for the Heat RXT image + +on: + pull_request: + paths: + - Containerfiles/HeatRXT-Containerfile + +# Defines two custom environment variables for the workflow. These are used for the Container registry domain, and a name for the Docker image that this workflow builds. +env: + REGISTRY: ghcr.io + IMAGE_NAME: ${{ github.repository }} + +# There is a single job in this workflow. It's configured to run on the latest available version of Ubuntu. +jobs: + build-and-push-image: + runs-on: ubuntu-latest + # Sets the permissions granted to the `GITHUB_TOKEN` for the actions in this job. + permissions: + contents: read + packages: read + steps: + - name: Checkout repository + uses: actions/checkout@v4 + # Uses the `docker/login-action` action to log in to the Container registry registry using the account and password that will publish the packages. Once published, the packages are scoped to the account defined here. + - name: Log in to the Container registry + uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1 + with: + registry: ${{ env.REGISTRY }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + - name: Build Docker image + uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4 + with: + context: . + file: Containerfiles/HeatRXT-Containerfile + push: false + tags: | + ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/heat-rxt:2024.1-ubuntu_jammy + build-args: | + VERSION=2024.1-ubuntu_jammy diff --git a/base-helm-configs/ceilometer/ceilometer-helm-overrides.yaml b/base-helm-configs/ceilometer/ceilometer-helm-overrides.yaml index 252831c7..37caa96f 100644 --- a/base-helm-configs/ceilometer/ceilometer-helm-overrides.yaml +++ b/base-helm-configs/ceilometer/ceilometer-helm-overrides.yaml @@ -2028,7 +2028,7 @@ pod: cpu: "2000m" notification: requests: - memory: "128Mi" + memory: "256Mi" cpu: "100m" limits: memory: "1024Mi" diff --git a/base-helm-configs/glance/glance-helm-overrides.yaml b/base-helm-configs/glance/glance-helm-overrides.yaml index 23c684b8..8dc96df1 100644 --- a/base-helm-configs/glance/glance-helm-overrides.yaml +++ b/base-helm-configs/glance/glance-helm-overrides.yaml @@ -886,7 +886,7 @@ pod: enabled: false api: requests: - memory: "64Mi" + memory: "128Mi" cpu: "100m" limits: memory: "4096Mi" diff --git a/base-helm-configs/heat/heat-helm-overrides.yaml b/base-helm-configs/heat/heat-helm-overrides.yaml index 9439c180..b6b260fe 100644 --- a/base-helm-configs/heat/heat-helm-overrides.yaml +++ b/base-helm-configs/heat/heat-helm-overrides.yaml @@ -1116,7 +1116,7 @@ pod: memory: "4096Mi" engine: requests: - memory: "64Mi" + memory: "128Mi" cpu: "100m" limits: memory: "4096Mi" diff --git a/base-helm-configs/keystone/keystone-helm-overrides.yaml b/base-helm-configs/keystone/keystone-helm-overrides.yaml index 214ba982..433775fe 100644 --- a/base-helm-configs/keystone/keystone-helm-overrides.yaml +++ b/base-helm-configs/keystone/keystone-helm-overrides.yaml @@ -286,7 +286,7 @@ pod: enabled: false api: requests: - memory: "64Mi" + memory: "256Mi" cpu: "100m" limits: memory: "4096Mi" diff --git a/base-helm-configs/neutron/neutron-helm-overrides.yaml b/base-helm-configs/neutron/neutron-helm-overrides.yaml index f06df466..d1808148 100644 --- a/base-helm-configs/neutron/neutron-helm-overrides.yaml +++ b/base-helm-configs/neutron/neutron-helm-overrides.yaml @@ -769,7 +769,7 @@ pod: memory: "4096Mi" ovn_metadata: requests: - memory: "64Mi" + memory: "512Mi" cpu: "100m" limits: memory: "4096Mi" @@ -805,7 +805,7 @@ pod: memory: "4096Mi" server: requests: - memory: "64Mi" + memory: "1024Mi" cpu: "100m" limits: memory: "4096Mi" diff --git a/base-helm-configs/nova/nova-helm-overrides.yaml b/base-helm-configs/nova/nova-helm-overrides.yaml index 2ff58a1d..db0c5653 100644 --- a/base-helm-configs/nova/nova-helm-overrides.yaml +++ b/base-helm-configs/nova/nova-helm-overrides.yaml @@ -2353,8 +2353,8 @@ pod: enabled: false compute: requests: - memory: "128Mi" - cpu: "100m" + memory: "512Mi" + cpu: "200m" limits: memory: "1024Mi" cpu: "2000m" @@ -2381,15 +2381,15 @@ pod: cpu: "2000m" conductor: requests: - memory: "128Mi" - cpu: "100m" + memory: "256Mi" + cpu: "200m" limits: memory: "1024Mi" cpu: "2000m" scheduler: requests: - memory: "128Mi" - cpu: "100m" + memory: "1024Mi" + cpu: "200m" limits: memory: "1024Mi" cpu: "2000m" diff --git a/base-helm-configs/octavia/octavia-helm-overrides.yaml b/base-helm-configs/octavia/octavia-helm-overrides.yaml index 9a1b98b8..e1051892 100644 --- a/base-helm-configs/octavia/octavia-helm-overrides.yaml +++ b/base-helm-configs/octavia/octavia-helm-overrides.yaml @@ -626,13 +626,13 @@ pod: enabled: false api: requests: - memory: "64Mi" + memory: "128Mi" cpu: "100m" limits: memory: "4096Mi" worker: requests: - memory: "64Mi" + memory: "128Mi" cpu: "100m" limits: memory: "4096Mi" diff --git a/base-helm-configs/placement/placement-helm-overrides.yaml b/base-helm-configs/placement/placement-helm-overrides.yaml index a77a6ad5..02fc5111 100644 --- a/base-helm-configs/placement/placement-helm-overrides.yaml +++ b/base-helm-configs/placement/placement-helm-overrides.yaml @@ -335,7 +335,7 @@ pod: enabled: false api: requests: - memory: "64Mi" + memory: "128Mi" cpu: "100m" limits: memory: "4096Mi" diff --git a/base-helm-configs/postgresql/postgresql-helm-overrides.yaml b/base-helm-configs/postgresql/postgresql-helm-overrides.yaml index ad41ea06..e1873447 100644 --- a/base-helm-configs/postgresql/postgresql-helm-overrides.yaml +++ b/base-helm-configs/postgresql/postgresql-helm-overrides.yaml @@ -87,10 +87,10 @@ pod: enabled: false server: requests: - memory: "2048Mi" + memory: "1024Mi" cpu: "100m" limits: - memory: "1024Mi" + memory: "2048Mi" cpu: "2000m" test: requests: diff --git a/base-kustomize/barbican/base/hpa-barbican-api.yaml b/base-kustomize/barbican/base/hpa-barbican-api.yaml index a44ca0e1..13748301 100644 --- a/base-kustomize/barbican/base/hpa-barbican-api.yaml +++ b/base-kustomize/barbican/base/hpa-barbican-api.yaml @@ -13,6 +13,12 @@ spec: averageUtilization: 50 type: Utilization type: Resource + - resource: + name: memory + target: + type: AverageValue + averageValue: 500Mi + type: Resource scaleTargetRef: apiVersion: apps/v1 kind: Deployment diff --git a/base-kustomize/ceilometer/base/hpa-ceilometer-notification.yaml b/base-kustomize/ceilometer/base/hpa-ceilometer-notification.yaml index 273c6a70..46dc5726 100644 --- a/base-kustomize/ceilometer/base/hpa-ceilometer-notification.yaml +++ b/base-kustomize/ceilometer/base/hpa-ceilometer-notification.yaml @@ -13,6 +13,12 @@ spec: averageUtilization: 50 type: Utilization type: Resource + - resource: + name: memory + target: + type: AverageValue + averageValue: 500Mi + type: Resource scaleTargetRef: apiVersion: apps/v1 kind: Deployment diff --git a/base-kustomize/cinder/base/hpa-cinder-api.yaml b/base-kustomize/cinder/base/hpa-cinder-api.yaml index f588af17..7e2b67e5 100644 --- a/base-kustomize/cinder/base/hpa-cinder-api.yaml +++ b/base-kustomize/cinder/base/hpa-cinder-api.yaml @@ -16,8 +16,8 @@ spec: - resource: name: memory target: - averageValue: 200Mi - type: Value + type: AverageValue + averageValue: 500Mi type: Resource scaleTargetRef: apiVersion: apps/v1 diff --git a/base-kustomize/cinder/base/hpa-cinder-scheduler.yaml b/base-kustomize/cinder/base/hpa-cinder-scheduler.yaml index 086f561b..a57af571 100644 --- a/base-kustomize/cinder/base/hpa-cinder-scheduler.yaml +++ b/base-kustomize/cinder/base/hpa-cinder-scheduler.yaml @@ -17,8 +17,8 @@ spec: name: memory target: type: AverageValue - averageValue: 200Mi - type: Resource + averageValue: 500Mi + type: Resource scaleTargetRef: apiVersion: apps/v1 kind: Deployment diff --git a/base-kustomize/designate/base/hpa-designate-api.yaml b/base-kustomize/designate/base/hpa-designate-api.yaml index 4eca66f1..1ddacfa9 100644 --- a/base-kustomize/designate/base/hpa-designate-api.yaml +++ b/base-kustomize/designate/base/hpa-designate-api.yaml @@ -13,6 +13,12 @@ spec: averageUtilization: 50 type: Utilization type: Resource + - resource: + name: memory + target: + type: AverageValue + averageValue: 500Mi + type: Resource scaleTargetRef: apiVersion: apps/v1 kind: Deployment diff --git a/base-kustomize/gnocchi/base/hpa-gnocchi-api.yaml b/base-kustomize/gnocchi/base/hpa-gnocchi-api.yaml index 72e5f365..83cabe49 100644 --- a/base-kustomize/gnocchi/base/hpa-gnocchi-api.yaml +++ b/base-kustomize/gnocchi/base/hpa-gnocchi-api.yaml @@ -13,6 +13,12 @@ spec: averageUtilization: 50 type: Utilization type: Resource + - resource: + name: memory + target: + type: AverageValue + averageValue: 500Mi + type: Resource scaleTargetRef: apiVersion: apps/v1 kind: Deployment diff --git a/base-kustomize/heat/base/hpa-heat-api.yaml b/base-kustomize/heat/base/hpa-heat-api.yaml index 96d1f25d..c4393308 100644 --- a/base-kustomize/heat/base/hpa-heat-api.yaml +++ b/base-kustomize/heat/base/hpa-heat-api.yaml @@ -13,6 +13,12 @@ spec: averageUtilization: 50 type: Utilization type: Resource + - resource: + name: memory + target: + type: AverageValue + averageValue: 500Mi + type: Resource scaleTargetRef: apiVersion: apps/v1 kind: Deployment diff --git a/base-kustomize/heat/base/hpa-heat-cfn.yaml b/base-kustomize/heat/base/hpa-heat-cfn.yaml index 99a6551e..2902f0b3 100644 --- a/base-kustomize/heat/base/hpa-heat-cfn.yaml +++ b/base-kustomize/heat/base/hpa-heat-cfn.yaml @@ -13,6 +13,12 @@ spec: averageUtilization: 50 type: Utilization type: Resource + - resource: + name: memory + target: + type: AverageValue + averageValue: 500Mi + type: Resource scaleTargetRef: apiVersion: apps/v1 kind: Deployment diff --git a/base-kustomize/heat/base/hpa-heat-engine.yaml b/base-kustomize/heat/base/hpa-heat-engine.yaml index 4a0b510b..8b3d98b7 100644 --- a/base-kustomize/heat/base/hpa-heat-engine.yaml +++ b/base-kustomize/heat/base/hpa-heat-engine.yaml @@ -16,8 +16,8 @@ spec: - resource: name: memory target: + type: AverageValue averageValue: 500Mi - type: Value type: Resource scaleTargetRef: apiVersion: apps/v1 diff --git a/base-kustomize/horizon/base/hpa-horizon-api.yaml b/base-kustomize/horizon/base/hpa-horizon-api.yaml index aac44078..d89443bc 100644 --- a/base-kustomize/horizon/base/hpa-horizon-api.yaml +++ b/base-kustomize/horizon/base/hpa-horizon-api.yaml @@ -13,6 +13,12 @@ spec: averageUtilization: 50 type: Utilization type: Resource + - resource: + name: memory + target: + type: AverageValue + averageValue: 500Mi + type: Resource scaleTargetRef: apiVersion: apps/v1 kind: Deployment diff --git a/base-kustomize/magnum/base/hpa-magnum-api.yaml b/base-kustomize/magnum/base/hpa-magnum-api.yaml index 0285bd4d..53078316 100644 --- a/base-kustomize/magnum/base/hpa-magnum-api.yaml +++ b/base-kustomize/magnum/base/hpa-magnum-api.yaml @@ -13,6 +13,12 @@ spec: averageUtilization: 50 type: Utilization type: Resource + - resource: + name: memory + target: + type: AverageValue + averageValue: 500Mi + type: Resource scaleTargetRef: apiVersion: apps/v1 kind: Deployment diff --git a/base-kustomize/magnum/base/hpa-magnum-conductor.yaml b/base-kustomize/magnum/base/hpa-magnum-conductor.yaml index 818aaddc..677d7d05 100644 --- a/base-kustomize/magnum/base/hpa-magnum-conductor.yaml +++ b/base-kustomize/magnum/base/hpa-magnum-conductor.yaml @@ -17,7 +17,7 @@ spec: name: memory target: type: AverageValue - averageValue: 600Mi + averageValue: 1Gi type: Resource scaleTargetRef: apiVersion: apps/v1 diff --git a/base-kustomize/neutron/base/hpa-neutron-server.yaml b/base-kustomize/neutron/base/hpa-neutron-server.yaml index f91920c7..10308f27 100644 --- a/base-kustomize/neutron/base/hpa-neutron-server.yaml +++ b/base-kustomize/neutron/base/hpa-neutron-server.yaml @@ -17,7 +17,7 @@ spec: name: memory target: type: AverageValue - averageValue: 2048Mi + averageValue: 2Gi type: Resource scaleTargetRef: apiVersion: apps/v1 diff --git a/base-kustomize/nova/base/hpa-nova-api-metadata.yaml b/base-kustomize/nova/base/hpa-nova-api-metadata.yaml index d3295262..83a338f7 100644 --- a/base-kustomize/nova/base/hpa-nova-api-metadata.yaml +++ b/base-kustomize/nova/base/hpa-nova-api-metadata.yaml @@ -13,6 +13,12 @@ spec: averageUtilization: 50 type: Utilization type: Resource + - resource: + name: memory + target: + type: AverageValue + averageValue: 500Mi + type: Resource scaleTargetRef: apiVersion: apps/v1 kind: Deployment diff --git a/base-kustomize/nova/base/hpa-nova-api-osapi.yaml b/base-kustomize/nova/base/hpa-nova-api-osapi.yaml index db8fa57c..5fb353d1 100644 --- a/base-kustomize/nova/base/hpa-nova-api-osapi.yaml +++ b/base-kustomize/nova/base/hpa-nova-api-osapi.yaml @@ -13,6 +13,12 @@ spec: averageUtilization: 50 type: Utilization type: Resource + - resource: + name: memory + target: + type: AverageValue + averageValue: 500Mi + type: Resource scaleTargetRef: apiVersion: apps/v1 kind: Deployment diff --git a/base-kustomize/nova/base/hpa-nova-novncproxy.yaml b/base-kustomize/nova/base/hpa-nova-novncproxy.yaml index 6742a2e5..dd32315d 100644 --- a/base-kustomize/nova/base/hpa-nova-novncproxy.yaml +++ b/base-kustomize/nova/base/hpa-nova-novncproxy.yaml @@ -13,6 +13,12 @@ spec: averageUtilization: 50 type: Utilization type: Resource + - resource: + name: memory + target: + type: AverageValue + averageValue: 500Mi + type: Resource scaleTargetRef: apiVersion: apps/v1 kind: Deployment diff --git a/base-kustomize/nova/base/hpa-nova-scheduler.yaml b/base-kustomize/nova/base/hpa-nova-scheduler.yaml index 0c23d567..65310a35 100644 --- a/base-kustomize/nova/base/hpa-nova-scheduler.yaml +++ b/base-kustomize/nova/base/hpa-nova-scheduler.yaml @@ -17,7 +17,7 @@ spec: name: memory target: type: AverageValue - averageValue: 1024Mi + averageValue: 1Gi type: Resource scaleTargetRef: apiVersion: apps/v1