From 6c4f6b3bebfe781be91c5ebf95b0a0a68476aad5 Mon Sep 17 00:00:00 2001 From: sowm9802 Date: Tue, 12 Nov 2024 16:04:04 +0530 Subject: [PATCH] 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: