From 4104a1d771a1a0b2711f26ab0bfb084eee994681 Mon Sep 17 00:00:00 2001 From: Mubangizi Allan Date: Thu, 11 Jun 2026 14:25:23 +0300 Subject: [PATCH 1/4] change prod deployment server to renu --- .github/workflows/prod.yml | 49 ++++++++++++++++++++++---------------- helm/values.prod.yaml | 2 +- 2 files changed, 30 insertions(+), 21 deletions(-) diff --git a/.github/workflows/prod.yml b/.github/workflows/prod.yml index 14916eb0..68b49c1e 100644 --- a/.github/workflows/prod.yml +++ b/.github/workflows/prod.yml @@ -6,6 +6,10 @@ on: types: - released - prereleased + # to be removed + push: + branches: + - ch-change-dep-server jobs: build: outputs: @@ -14,7 +18,7 @@ jobs: runs-on: ubuntu-latest env: - image: cranecloud/backend + image: cranecloud/cranecloud-backend steps: - name: Checkout uses: actions/checkout@v4 @@ -75,29 +79,35 @@ jobs: env: namespace: cranecloud-prod - image: cranecloud/backend + image: cranecloud/cranecloud-backend steps: - name: Clone - uses: actions/checkout@v2 - - - name: Login (GCP) - uses: google-github-actions/auth@v2 - with: - credentials_json: ${{ secrets.CREDENTIALS_JSON }} - - - name: Install (Gcloud) - uses: google-github-actions/setup-gcloud@v1 - with: - project_id: crane-cloud-274413 - install_components: "gke-gcloud-auth-plugin" + uses: actions/checkout@v4 - - name: Login (Kubernetes Cluster) - uses: google-github-actions/get-gke-credentials@v1 + # --- GCP DEPLOYEMENT --- + # - name: Login (GCP) + # uses: google-github-actions/auth@v2 + # with: + # credentials_json: ${{ secrets.CREDENTIALS_JSON }} + + # - name: Install (Gcloud) + # uses: google-github-actions/setup-gcloud@v2 + # with: + # project_id: crane-cloud-274413 + # install_components: "gke-gcloud-auth-plugin" + + # - name: Login (Kubernetes Cluster) + # uses: google-github-actions/get-gke-credentials@v2 + # with: + # cluster_name: staging-cluster + # location: us-central1-a + # project_id: crane-cloud-274413 + + # --- RENU DEPLOYEMENT --- + - uses: azure/k8s-set-context@v1 with: - cluster_name: staging-cluster - location: us-central1-a - project_id: crane-cloud-274413 + kubeconfig: ${{ secrets.RENU_KUBECONFIG}} - name: Add Repo (cranecloud) run: | @@ -110,7 +120,6 @@ jobs: --version 0.1.7 \ --values helm/values.prod.yaml \ --namespace $namespace \ - --set image.repository="${{ env.image }}" \ --set image.tag="${{ needs.build.outputs.tag }}" \ --set environment.ADMIN_MYSQL_PASSWORD="${{ secrets.PRODUCTION_ADMIN_MYSQL_PASSWORD }}" \ --set environment.ADMIN_PSQL_PASSWORD="${{ secrets.PRODUCTION_ADMIN_PSQL_PASSWORD }}" \ diff --git a/helm/values.prod.yaml b/helm/values.prod.yaml index a7494384..7afbe54e 100644 --- a/helm/values.prod.yaml +++ b/helm/values.prod.yaml @@ -1,7 +1,7 @@ replicaCount: 2 image: - repository: gcr.io/crane-cloud-274413/cranecloud-backend + repository: cranecloud/cranecloud-backend pullPolicy: Always tag: ${{ DOCKER_IMAGE_TAG }} From 9c6842b922a5531dd3cef678d4363ef6fa53f9e8 Mon Sep 17 00:00:00 2001 From: Mubangizi Allan Date: Thu, 11 Jun 2026 14:28:08 +0300 Subject: [PATCH 2/4] update image repo --- .github/workflows/prod.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/prod.yml b/.github/workflows/prod.yml index 68b49c1e..d133a87a 100644 --- a/.github/workflows/prod.yml +++ b/.github/workflows/prod.yml @@ -120,6 +120,7 @@ jobs: --version 0.1.7 \ --values helm/values.prod.yaml \ --namespace $namespace \ + --set image.repository="${{ env.image }}" \ --set image.tag="${{ needs.build.outputs.tag }}" \ --set environment.ADMIN_MYSQL_PASSWORD="${{ secrets.PRODUCTION_ADMIN_MYSQL_PASSWORD }}" \ --set environment.ADMIN_PSQL_PASSWORD="${{ secrets.PRODUCTION_ADMIN_PSQL_PASSWORD }}" \ From 1e017b0b0886b296d9598c46977efca6e210cf61 Mon Sep 17 00:00:00 2001 From: Mubangizi Allan Date: Thu, 11 Jun 2026 18:00:41 +0300 Subject: [PATCH 3/4] add redis deployment --- .github/workflows/prod.yml | 2 +- helm/chart/values.yaml | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/prod.yml b/.github/workflows/prod.yml index d133a87a..f3f93bdd 100644 --- a/.github/workflows/prod.yml +++ b/.github/workflows/prod.yml @@ -85,7 +85,7 @@ jobs: - name: Clone uses: actions/checkout@v4 - # --- GCP DEPLOYEMENT --- + # --- GCP DEPLOYMENT --- # - name: Login (GCP) # uses: google-github-actions/auth@v2 # with: diff --git a/helm/chart/values.yaml b/helm/chart/values.yaml index 07d2689e..935b664a 100644 --- a/helm/chart/values.yaml +++ b/helm/chart/values.yaml @@ -81,4 +81,7 @@ environment: celery: - replicaCount: 1 \ No newline at end of file + replicaCount: 1 + +redis: + create: true \ No newline at end of file From 5b806a2d8af52f3beaa4786de00fd28f5519e093 Mon Sep 17 00:00:00 2001 From: Mubangizi Allan Date: Thu, 11 Jun 2026 18:06:12 +0300 Subject: [PATCH 4/4] cleanup testing data --- .github/workflows/prod.yml | 4 ---- helm/chart/values.yaml | 5 +---- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/prod.yml b/.github/workflows/prod.yml index f3f93bdd..70cb1856 100644 --- a/.github/workflows/prod.yml +++ b/.github/workflows/prod.yml @@ -6,10 +6,6 @@ on: types: - released - prereleased - # to be removed - push: - branches: - - ch-change-dep-server jobs: build: outputs: diff --git a/helm/chart/values.yaml b/helm/chart/values.yaml index 935b664a..07d2689e 100644 --- a/helm/chart/values.yaml +++ b/helm/chart/values.yaml @@ -81,7 +81,4 @@ environment: celery: - replicaCount: 1 - -redis: - create: true \ No newline at end of file + replicaCount: 1 \ No newline at end of file