From a7675711e02e9b3acb9ec81fddadb7f0b067837f Mon Sep 17 00:00:00 2001
From: sowm9802 <sowmya.kamavaram@rackspace.com>
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 -------------------
 .../barbican/base/hpa-barbican-api.yaml       |  4 +-
 .../magnum/base/hpa-magnum-conductor.yaml     |  2 +-
 .../skyline/base/deployment-apiserver.yaml    |  2 +-
 5 files changed, 8 insertions(+), 49 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-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/magnum/base/hpa-magnum-conductor.yaml b/base-kustomize/magnum/base/hpa-magnum-conductor.yaml
index d0d61f75..857ffd28 100644
--- a/base-kustomize/magnum/base/hpa-magnum-conductor.yaml
+++ b/base-kustomize/magnum/base/hpa-magnum-conductor.yaml
@@ -16,7 +16,7 @@ spec:
     - resource:
         name: memory
         target:
-          averageUtilization: 60
+          averageUtilization: 50
           type: Utilization
       type: Resource
   scaleTargetRef:
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: