1717 IMAGE_REGISTRY_USER : ${{ github.actor }}
1818 IMAGE_REGISTRY_PASSWORD : ${{ github.token }}
1919
20- SPRING_BOOT_IMAGE_NAME : educ-grad-course-api-dc
20+ SPRING_BOOT_IMAGE_NAME : educ-grad-course-api
2121
2222 REPO_NAME : " educ-grad-course-api"
2323 APP_DOMAIN : ${{ vars.APP_DOMAIN }}
@@ -42,15 +42,15 @@ jobs:
4242
4343 steps :
4444 - name : Check out repository
45- uses : actions/checkout@v3
45+ uses : actions/checkout@v4
4646
4747 - name : Determine image tags
4848 if : env.TAG == ''
4949 run : |
5050 echo "TAG=latest ${GITHUB_SHA::12}" | tee -a $GITHUB_ENV
5151
5252name : Login to Docker Hub
53- uses : docker/login-action@v2
53+ uses : docker/login-action@v3
5454 with :
5555 registry : ${{ vars.DOCKER_ARTIFACTORY_REPO }}
5656 username : ${{ vars.DOCKER_ARTIFACTORY_USERNAME }}
@@ -95,16 +95,23 @@ jobs:
9595 oc login --token=${{ env.OPENSHIFT_TOKEN }} --server=${{ env.OPENSHIFT_SERVER }}
9696 oc project ${{ env.OPENSHIFT_NAMESPACE }}
9797 # Cancel any rollouts in progress
98- oc rollout cancel dc /${{ env.SPRING_BOOT_IMAGE_NAME }} 2> /dev/null \
98+ oc rollout cancel deployment /${{ env.SPRING_BOOT_IMAGE_NAME }} 2> /dev/null \
9999 || true && echo "No rollout in progress"
100100 # tag image stream
101101 oc -n ${{ env.OPENSHIFT_NAMESPACE }} tag ${{ steps.push-image.outputs.registry-path }} ${{ env.REPO_NAME }}:${{ env.TAG }}
102102
103103 # Process and apply deployment template
104- oc process -f tools/openshift/api.dc.yaml -p IS_NAMESPACE=${{ env.OPENSHIFT_NAMESPACE }} -p REPO_NAME=${{ env.REPO_NAME }} \
105- -p TAG_NAME=${{ env.TAG }} -p HOST_ROUTE=${{ env.REPO_NAME }}-${{ env.OPENSHIFT_NAMESPACE }}.${{ env.APP_DOMAIN }} \
106- -p MIN_REPLICAS=${{ env.MIN_REPLICAS }} -p MAX_REPLICAS=${{ env.MAX_REPLICAS }} -p MIN_CPU=${{ env.MIN_CPU }} \
107- -p MAX_CPU=${{ env.MAX_CPU }} -p MIN_MEM=${{ env.MIN_MEM }} -p MAX_MEM=${{ env.MAX_MEM }} | oc apply -f -
104+ oc process -f tools/openshift/api.dc.yaml \
105+ -p IS_NAMESPACE=${{ env.OPENSHIFT_NAMESPACE }} \
106+ -p REPO_NAME=${{ env.REPO_NAME }} \
107+ -p TAG_NAME=${{ env.TAG }} \
108+ -p HOST_ROUTE=${{ env.REPO_NAME }}-${{ env.OPENSHIFT_NAMESPACE }}.${{ env.APP_DOMAIN }} \
109+ -p MIN_REPLICAS=${{ env.MIN_REPLICAS }} \
110+ -p MAX_REPLICAS=${{ env.MAX_REPLICAS }} \
111+ -p MIN_CPU=${{ env.MIN_CPU }} \
112+ -p MAX_CPU=${{ env.MAX_CPU }} \
113+ -p MIN_MEM=${{ env.MIN_MEM }} \
114+ -p MAX_MEM=${{ env.MAX_MEM }} | oc apply -f -
108115
109116 # UPDATE Configmaps
110117 curl -s https://raw.githubusercontent.com/bcgov/${{ env.REPO_NAME }}/${{ env.BRANCH }}/tools/config/update-configmap.sh \
@@ -129,14 +136,13 @@ jobs:
129136 ${{ vars.APP_LOG_LEVEL }}
130137
131138 # Start rollout (if necessary) and follow it
132- oc rollout latest dc/${{ env.SPRING_BOOT_IMAGE_NAME }} 2> /dev/null \
133- || true && echo "Rollout in progress"
134- oc logs -f dc/${{ env.SPRING_BOOT_IMAGE_NAME }}
139+ oc rollout restart deployment/${{ env.SPRING_BOOT_IMAGE_NAME }}
140+
135141 # Get status, returns 0 if rollout is successful
136- oc rollout status dc /${{ env.SPRING_BOOT_IMAGE_NAME }}
142+ oc rollout status deployment /${{ env.SPRING_BOOT_IMAGE_NAME }}
137143
138144# now hit it with a zap scan
139145 - name : ZAP Scan
140146
141147 with :
142- target : ' https://${{ env.REPO_NAME }}-${{ env.OPENSHIFT_NAMESPACE }}-dev .apps.silver.devops.gov.bc.ca/api/v1/api-docs'
148+ target : ' https://${{ env.REPO_NAME }}-${{ env.OPENSHIFT_NAMESPACE }}.apps.silver.devops.gov.bc.ca/api/v1/api-docs'
0 commit comments