Merge pull request #87 from D10S0VSkY-OSS/hotfix/schedule-rename-branch

fix: schedule change branch and tfvars in deploy
D10S0VSkY-OSS · Jul 21, 2022 · 3a0ea56 · 3a0ea56
2 parents 2ee4915 + 303c08b
commit 3a0ea56
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/.github/workflows/sld-schedule-docker-image.yml b/.github/workflows/sld-schedule-docker-image.yml
@@ -24,11 +24,11 @@ jobs:
 
     - name: Build the Docker image with tags
       working-directory: ./sld-schedule
-      run: docker build . --file Dockerfile --tag ${{ secrets.DOCKER_USERNAME }}/sld-schedule:2.2.0
+      run: docker build . --file Dockerfile --tag ${{ secrets.DOCKER_USERNAME }}/sld-schedule:2.2.1
 
     - name: Docker Push with tags
       #if: github.event.pull_request.merged == true
-      run: docker push ${{ secrets.DOCKER_USERNAME }}/sld-schedule:2.2.0
+      run: docker push ${{ secrets.DOCKER_USERNAME }}/sld-schedule:2.2.1
 
     - name: Build the Docker image
       working-directory: ./sld-schedule

diff --git a/play-with-sld/kubernetes/k8s/kustomization.yaml b/play-with-sld/kubernetes/k8s/kustomization.yaml
@@ -5,7 +5,7 @@ kind: Kustomization
 commonLabels:
   app: stack-lifecycle-deploy
   environment: play
-  version: 2.8.0
+  version: 2.8.1
 
 resources:
  - mysql-service.yml

diff --git a/sld-schedule/helpers/get_deploy_schedule.py b/sld-schedule/helpers/get_deploy_schedule.py
@@ -73,6 +73,9 @@ def get_deploy_by_id(deploy_id):
             "environment": response['json']['environment'],
             "start": response['json']['start_time'],
             "destroy": response['json']['destroy_time'],
+            "stack_branch": response['json']['stack_branch'],
+            "tfvar_file": response['json']['tfvar_file'],
+            "project_path": response['json']['project_path'],
         }
         return(data)
     except Exception as err:
@@ -93,6 +96,9 @@ def update_deploy(deploy_id):
     data = {
         "start_time": content['start_time'],
         "destroy_time": content['destroy_time'],
+        "stack_branch": response['json']['stack_branch'],
+        "tfvar_file": response['json']['tfvar_file'],
+        "project_path": response['json']['project_path'],
         "variables": content['variables']
     }
     response = request_url(
@@ -117,6 +123,9 @@ def destroy_deploy(deploy_id):
     data = {
         "start_time": content['start_time'],
         "destroy_time": content['destroy_time'],
+        "stack_branch": response['json']['stack_branch'],
+        "tfvar_file": response['json']['tfvar_file'],
+        "project_path": response['json']['project_path'],
         "variables": content['variables']
     }
     response = request_url(