From 6d30279e40e1bd4f1036e968b66349de664e4a80 Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Thu, 28 Jul 2022 19:12:10 +0530 Subject: [PATCH 01/68] Create openshift.yml --- .github/workflows/openshift.yml | 70 +++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 .github/workflows/openshift.yml diff --git a/.github/workflows/openshift.yml b/.github/workflows/openshift.yml new file mode 100644 index 00000000..f43b1541 --- /dev/null +++ b/.github/workflows/openshift.yml @@ -0,0 +1,70 @@ +name: OpenShift + +env: + IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }} + REGISTRY_USER: ${{ github.actor }} + REGISTRY_PASSWORD: ${{ github.token }} + APP_NAME: nationalparks + IMAGE_TAGS: latest ${{ github.sha }} + + OPENSHIFT_SERVER: ${{ secrets.OPENSHIFT_SERVER }} + OPENSHIFT_TOKEN: ${{ secrets.OPENSHIFT_TOKEN }} + OPENSHIFT_NAMESPACE: "%PROJECT%" + + APP_PORT: "8080" + +on: + # https://docs.github.com/en/free-pro-team@latest/actions/reference/events-that-trigger-workflows + push: + branches: [ master ] + +jobs: + build-and-push: + name: Build and push to github container registry + runs-on: ubuntu-18.04 + environment: development + + outputs: + ROUTE: ${{ steps.deploy-and-expose.outputs.route }} + SELECTOR: ${{ steps.deploy-and-expose.outputs.selector }} + + steps: + - name: Checkout + id: checkout + uses: actions/checkout@v2 + + # https://github.com/redhat-actions/s2i-build#readme + - name: S2I Build + id: build_image + uses: redhat-actions/s2i-build@v2 + with: + path_context: '.' + builder_image: 'registry.access.redhat.com/ubi8/openjdk-11' + image: ${{ env.APP_NAME }} + tags: ${{ env.IMAGE_TAGS }} + + # https://github.com/redhat-actions/push-to-registry#readme + - name: Push to Registry + id: push-to-registry + uses: redhat-actions/push-to-registry@v2 + with: + image: ${{ steps.build_image.outputs.image }} + tags: ${{ steps.build_image.outputs.tags }} + registry: ${{ env.IMAGE_REGISTRY }} + username: ${{ env.REGISTRY_USER }} + password: ${{ env.REGISTRY_PASSWORD }} + + # The path the image was pushed to is now stored in ${{ steps.push-to-registry.outputs.registry-path }} + + # https://github.com/redhat-actions/oc-login#readme + - name: Log in to OpenShift + uses: redhat-actions/oc-login@v1 + with: + openshift_server_url: ${{ env.OPENSHIFT_SERVER }} + openshift_token: ${{ env.OPENSHIFT_TOKEN }} + insecure_skip_tls_verify: true + namespace: ${{ env.OPENSHIFT_NAMESPACE }} + + # Run a script to create a new app or update the current one with the previously pushed container image + - run: | + "${GITHUB_WORKSPACE}/.github/script.sh" ${{ env.APP_NAME }} ${{ env.IMAGE_REGISTRY }}/${{ steps.build_image.outputs.image }}:${{ github.sha }} ${{ env.OPENSHIFT_NAMESPACE }} From 56aa8f72cebb9df0748db37071dd03c4468af082 Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Thu, 28 Jul 2022 19:20:13 +0530 Subject: [PATCH 02/68] Update openshift.yml --- .github/workflows/openshift.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/openshift.yml b/.github/workflows/openshift.yml index f43b1541..5fc8fcba 100644 --- a/.github/workflows/openshift.yml +++ b/.github/workflows/openshift.yml @@ -9,7 +9,7 @@ env: OPENSHIFT_SERVER: ${{ secrets.OPENSHIFT_SERVER }} OPENSHIFT_TOKEN: ${{ secrets.OPENSHIFT_TOKEN }} - OPENSHIFT_NAMESPACE: "%PROJECT%" + OPENSHIFT_NAMESPACE: "manoj-singh8-dev" APP_PORT: "8080" From 9ee3c2b3a36e42945d495cac28ed1800ead4577e Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Tue, 2 Aug 2022 18:43:10 +0530 Subject: [PATCH 03/68] Update script.sh --- .github/script.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/script.sh b/.github/script.sh index 90816b27..ac71f3ae 100755 --- a/.github/script.sh +++ b/.github/script.sh @@ -1,8 +1,8 @@ #!/bin/bash -app_name=$1 -image=$2 -namespace=$3 +app_name=nationalparks +image=nationalparks +namespace=manoj-singh8-dev deploy=`oc get deployment $app_name -n $namespace` if [[ "$?" -eq 0 ]]; then From 8ab6668750669b7c538d585a5802164d52fab1c7 Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Tue, 2 Aug 2022 21:05:29 +0530 Subject: [PATCH 04/68] Update openshift.yml --- .github/workflows/openshift.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/openshift.yml b/.github/workflows/openshift.yml index 5fc8fcba..980db7fd 100644 --- a/.github/workflows/openshift.yml +++ b/.github/workflows/openshift.yml @@ -68,3 +68,9 @@ jobs: # Run a script to create a new app or update the current one with the previously pushed container image - run: | "${GITHUB_WORKSPACE}/.github/script.sh" ${{ env.APP_NAME }} ${{ env.IMAGE_REGISTRY }}/${{ steps.build_image.outputs.image }}:${{ github.sha }} ${{ env.OPENSHIFT_NAMESPACE }} +- name: Scan image + uses: PaloAltoNetworks/prisma-cloud-scan@v1 + with:pcc_console_url: ${{ env.PCC_CONSOLE_URL }} +pcc_user: ${{ env.PCC_USER }} +pcc_pass: ${{ env.PCC_PASS }} +image_name: ${{ env.IMAGE_NAME }} From ca4a8d6d342b34f6c973355a36791d3d7a99cc72 Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Tue, 2 Aug 2022 21:08:47 +0530 Subject: [PATCH 05/68] Update openshift.yml --- .github/workflows/openshift.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/openshift.yml b/.github/workflows/openshift.yml index 980db7fd..5fc8fcba 100644 --- a/.github/workflows/openshift.yml +++ b/.github/workflows/openshift.yml @@ -68,9 +68,3 @@ jobs: # Run a script to create a new app or update the current one with the previously pushed container image - run: | "${GITHUB_WORKSPACE}/.github/script.sh" ${{ env.APP_NAME }} ${{ env.IMAGE_REGISTRY }}/${{ steps.build_image.outputs.image }}:${{ github.sha }} ${{ env.OPENSHIFT_NAMESPACE }} -- name: Scan image - uses: PaloAltoNetworks/prisma-cloud-scan@v1 - with:pcc_console_url: ${{ env.PCC_CONSOLE_URL }} -pcc_user: ${{ env.PCC_USER }} -pcc_pass: ${{ env.PCC_PASS }} -image_name: ${{ env.IMAGE_NAME }} From a1b8da8960890eed2124b0dad299efdbc9ad084f Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Tue, 2 Aug 2022 21:43:42 +0530 Subject: [PATCH 06/68] Update openshift.yml --- .github/workflows/openshift.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/openshift.yml b/.github/workflows/openshift.yml index 5fc8fcba..574b7e9f 100644 --- a/.github/workflows/openshift.yml +++ b/.github/workflows/openshift.yml @@ -68,3 +68,10 @@ jobs: # Run a script to create a new app or update the current one with the previously pushed container image - run: | "${GITHUB_WORKSPACE}/.github/script.sh" ${{ env.APP_NAME }} ${{ env.IMAGE_REGISTRY }}/${{ steps.build_image.outputs.image }}:${{ github.sha }} ${{ env.OPENSHIFT_NAMESPACE }} + # Run Prisma Scan IBM Account + - name: Scan image + uses: PaloAltoNetworks/prisma-cloud-scan@v1 + with:pcc_console_url:${{ env.PCC_CONSOLE_URL }} + pcc_user:${{ env.PCC_USER }} + pcc_pass:${{ env.PCC_PASS }} + image_name:${{ env.IMAGE_NAME }} From 8fd6219a2c91bc0198be113e2a5836ccd2f0ed8a Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Tue, 2 Aug 2022 21:52:35 +0530 Subject: [PATCH 07/68] Update openshift.yml --- .github/workflows/openshift.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/openshift.yml b/.github/workflows/openshift.yml index 574b7e9f..c259031b 100644 --- a/.github/workflows/openshift.yml +++ b/.github/workflows/openshift.yml @@ -71,7 +71,8 @@ jobs: # Run Prisma Scan IBM Account - name: Scan image uses: PaloAltoNetworks/prisma-cloud-scan@v1 - with:pcc_console_url:${{ env.PCC_CONSOLE_URL }} - pcc_user:${{ env.PCC_USER }} - pcc_pass:${{ env.PCC_PASS }} - image_name:${{ env.IMAGE_NAME }} + with: + pcc_console_url: ${{ env.PCC_CONSOLE_URL }} + pcc_user: ${{ env.PCC_USER }} + pcc_pass: ${{ env.PCC_PASS }} + image_name: ${{ env.IMAGE_NAME }} From 15f5e95a52432d3e99ce99ef1b16b8aecb0b3378 Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Tue, 2 Aug 2022 22:01:15 +0530 Subject: [PATCH 08/68] Update openshift.yml --- .github/workflows/openshift.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/openshift.yml b/.github/workflows/openshift.yml index c259031b..3fc882ad 100644 --- a/.github/workflows/openshift.yml +++ b/.github/workflows/openshift.yml @@ -10,6 +10,9 @@ env: OPENSHIFT_SERVER: ${{ secrets.OPENSHIFT_SERVER }} OPENSHIFT_TOKEN: ${{ secrets.OPENSHIFT_TOKEN }} OPENSHIFT_NAMESPACE: "manoj-singh8-dev" + pcc_console_url: ${{ secrets.PCC_CONSOLE_URL }} + pcc_user: ${{ secrets.PCC_USER }} + pcc_pass: ${{ secrets.PCC_PASS }} APP_PORT: "8080" From a5b5c8925f803c0b0e565fcadf40ebc5f0e64f7d Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Tue, 2 Aug 2022 22:07:05 +0530 Subject: [PATCH 09/68] Update openshift.yml --- .github/workflows/openshift.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/openshift.yml b/.github/workflows/openshift.yml index 3fc882ad..8327d3f3 100644 --- a/.github/workflows/openshift.yml +++ b/.github/workflows/openshift.yml @@ -10,6 +10,7 @@ env: OPENSHIFT_SERVER: ${{ secrets.OPENSHIFT_SERVER }} OPENSHIFT_TOKEN: ${{ secrets.OPENSHIFT_TOKEN }} OPENSHIFT_NAMESPACE: "manoj-singh8-dev" + pcc_console_url: ${{ secrets.PCC_CONSOLE_URL }} pcc_user: ${{ secrets.PCC_USER }} pcc_pass: ${{ secrets.PCC_PASS }} From 13b798c234250e72590f2db8f0c043db44d1a8d4 Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Wed, 3 Aug 2022 17:29:29 +0530 Subject: [PATCH 10/68] Update openshift.yml --- .github/workflows/openshift.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/openshift.yml b/.github/workflows/openshift.yml index 8327d3f3..bed00736 100644 --- a/.github/workflows/openshift.yml +++ b/.github/workflows/openshift.yml @@ -76,7 +76,7 @@ jobs: - name: Scan image uses: PaloAltoNetworks/prisma-cloud-scan@v1 with: - pcc_console_url: ${{ env.PCC_CONSOLE_URL }} - pcc_user: ${{ env.PCC_USER }} - pcc_pass: ${{ env.PCC_PASS }} + pcc_console_url: ${{ secrets.PCC_CONSOLE_URL }} + pcc_user: ${{ secrets.PCC_USER }} + pcc_pass: ${{ secrets.PCC_PASS }} image_name: ${{ env.IMAGE_NAME }} From a39a50a8fcf9b5c49fdc540433aebef85d297ed8 Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Wed, 3 Aug 2022 17:34:42 +0530 Subject: [PATCH 11/68] Update openshift.yml --- .github/workflows/openshift.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/openshift.yml b/.github/workflows/openshift.yml index bed00736..68591109 100644 --- a/.github/workflows/openshift.yml +++ b/.github/workflows/openshift.yml @@ -79,4 +79,4 @@ jobs: pcc_console_url: ${{ secrets.PCC_CONSOLE_URL }} pcc_user: ${{ secrets.PCC_USER }} pcc_pass: ${{ secrets.PCC_PASS }} - image_name: ${{ env.IMAGE_NAME }} + image_name: ${{ env.APP_NAME }} From 29173e55031c09f4dd697b29dd4740afbeaa7d68 Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Thu, 4 Aug 2022 21:18:31 +0530 Subject: [PATCH 12/68] Update README.adoc --- README.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.adoc b/README.adoc index 24c14b92..ff6d2f3b 100644 --- a/README.adoc +++ b/README.adoc @@ -30,7 +30,7 @@ There's some options that can be parameterized: * MAVEN_MIRROR_URL: Url of a maven mirror * APPLICATION_HOSTNAME: Hostname/route to access your application -Example: +Example: Hello World ---- oc new-app nationalparks -p APPLICATION_HOSTNAME=nationalparks-roadshow.127.0.0.1.xip.io -p MAVEN_MIRROR_URL=http://nexus.ci:8081/content/groups/public From 5ef82c4d9d97ddb717548542f8e6a2f1d32d4473 Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Mon, 22 Aug 2022 18:31:35 +0530 Subject: [PATCH 13/68] Update README.adoc --- README.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.adoc b/README.adoc index ff6d2f3b..7fbac900 100644 --- a/README.adoc +++ b/README.adoc @@ -30,7 +30,7 @@ There's some options that can be parameterized: * MAVEN_MIRROR_URL: Url of a maven mirror * APPLICATION_HOSTNAME: Hostname/route to access your application -Example: Hello World +Example: Hello World Hello World ---- oc new-app nationalparks -p APPLICATION_HOSTNAME=nationalparks-roadshow.127.0.0.1.xip.io -p MAVEN_MIRROR_URL=http://nexus.ci:8081/content/groups/public From 9cdb616cd8c05019b2cc50377bf15caf42b4ad82 Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Mon, 22 Aug 2022 18:40:01 +0530 Subject: [PATCH 14/68] Update openshift.yml --- .github/workflows/openshift.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/openshift.yml b/.github/workflows/openshift.yml index 68591109..9f989288 100644 --- a/.github/workflows/openshift.yml +++ b/.github/workflows/openshift.yml @@ -25,7 +25,7 @@ on: jobs: build-and-push: name: Build and push to github container registry - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 environment: development outputs: From 3f137217794e384ca7f9353d633c54bd340db829 Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Thu, 8 Sep 2022 16:50:19 +0530 Subject: [PATCH 15/68] Update README.adoc --- README.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.adoc b/README.adoc index 7fbac900..3ea0e238 100644 --- a/README.adoc +++ b/README.adoc @@ -1,7 +1,7 @@ = NationalParks backend application This application is a backend that provides geolocation information about NationalParks. The information is stored in a mongodb - +Hello DevD == Installation As the application needs to interact with openshift's API, you'll need to provide some permissions to the default ServiceAccount for that. From 5c75fa5a9675293c6ca0e0bce4d0714141b48112 Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Fri, 30 Sep 2022 15:35:37 +0530 Subject: [PATCH 16/68] Update PIPELINE.md --- PIPELINE.md | 1 + 1 file changed, 1 insertion(+) diff --git a/PIPELINE.md b/PIPELINE.md index 49e16f21..f9873568 100644 --- a/PIPELINE.md +++ b/PIPELINE.md @@ -147,3 +147,4 @@ in the same project as Jenkins. This will contain the `master` branch of each pr to each repository will result in a new pipeline getting instantiated and a new project getting created for that pipeline. The GitHub PR will then include a status of the build, a link to the application preview, and a link to the approval page. +heelo From 00159de6880edbec1450c95789a5b73a7768944e Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Fri, 30 Sep 2022 15:41:21 +0530 Subject: [PATCH 17/68] Update PIPELINE.md --- PIPELINE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PIPELINE.md b/PIPELINE.md index f9873568..c35484b2 100644 --- a/PIPELINE.md +++ b/PIPELINE.md @@ -147,4 +147,4 @@ in the same project as Jenkins. This will contain the `master` branch of each pr to each repository will result in a new pipeline getting instantiated and a new project getting created for that pipeline. The GitHub PR will then include a status of the build, a link to the application preview, and a link to the approval page. -heelo + From c8a1398c3e09201ebce8f9424f29cf9dad9d33a9 Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Mon, 14 Nov 2022 15:18:05 +0530 Subject: [PATCH 18/68] Update README.adoc --- README.adoc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.adoc b/README.adoc index 3ea0e238..7274a322 100644 --- a/README.adoc +++ b/README.adoc @@ -41,3 +41,5 @@ oc new-app nationalparks -p APPLICATION_HOSTNAME=nationalparks-roadshow.127.0.0. National Parks data comes from link:https://protectedplanet.net[ProtectedPlanet], listing worldwide National Parks categories, filtered as units shown link:https://en.wikipedia.org/wiki/List_of_the_United_States_National_Park_System_official_units[here] We used this link:https://www.protectedplanet.net/en/search-areas?filters%5Bis_type%5D%5B%5D=terrestrial&filters%5Bdesignation%5D%5B%5D=Nacional+Park&filters%5Bdesignation%5D%5B%5D=National+Forest+Park&filters%5Bdesignation%5D%5B%5D=National+Historic+Park&filters%5Bdesignation%5D%5B%5D=National+Battlefield&filters%5Bdesignation%5D%5B%5D=National+Historic+Site&filters%5Bdesignation%5D%5B%5D=National+Historical+Park&filters%5Bdesignation%5D%5B%5D=National+Lakeshore&filters%5Bdesignation%5D%5B%5D=National+Military+Park&filters%5Bdesignation%5D%5B%5D=National+Monument&filters%5Bdesignation%5D%5B%5D=National+Park&filters%5Bdesignation%5D%5B%5D=National+Park+%28Category+Ii%29&filters%5Bdesignation%5D%5B%5D=National+Park+%28Commonwealth%29&filters%5Bdesignation%5D%5B%5D=National+Park+%28Fbih+Law%29&filters%5Bdesignation%5D%5B%5D=National+Park+%28PN%29&filters%5Bdesignation%5D%5B%5D=National+Park+%28Rs+Law%29&filters%5Bdesignation%5D%5B%5D=National+Park+%28Scientific%29&filters%5Bdesignation%5D%5B%5D=National+Park+%28Svalbard%29&filters%5Bdesignation%5D%5B%5D=National+Park+%28project%29&filters%5Bdesignation%5D%5B%5D=National+Park+-+Buffer+Zone&filters%5Bdesignation%5D%5B%5D=National+Park+-+Buffer+Zone%2FArea+Of+Adhesion&filters%5Bdesignation%5D%5B%5D=National+Park+-+Core+Area&filters%5Bdesignation%5D%5B%5D=National+Park+-+Integrale+Reserve&filters%5Bdesignation%5D%5B%5D=National+Park+-+Peripheral+Zone&filters%5Bdesignation%5D%5B%5D=National+Park+Aboriginal&filters%5Bdesignation%5D%5B%5D=National+Park+and+ASEAN+Heritage+Park&filters%5Bdesignation%5D%5B%5D=National+Park+and+Ecological+Reserve&filters%5Bdesignation%5D%5B%5D=National+Park+and+Indigenous+Territory&filters%5Bdesignation%5D%5B%5D=National+Reserve&filters%5Bdesignation%5D%5B%5D=National+River&filters%5Bdesignation%5D%5B%5D=National+Seashore[query] listing 2830 National Parks at the moment. + +test From ce4c38d718447ae8bb71943d28cd1df6ded4077c Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Tue, 29 Nov 2022 21:25:54 +0530 Subject: [PATCH 19/68] Update README.adoc --- README.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.adoc b/README.adoc index 7274a322..66ef5e7b 100644 --- a/README.adoc +++ b/README.adoc @@ -30,7 +30,7 @@ There's some options that can be parameterized: * MAVEN_MIRROR_URL: Url of a maven mirror * APPLICATION_HOSTNAME: Hostname/route to access your application -Example: Hello World Hello World +Example: Hello World Hello World hello word ---- oc new-app nationalparks -p APPLICATION_HOSTNAME=nationalparks-roadshow.127.0.0.1.xip.io -p MAVEN_MIRROR_URL=http://nexus.ci:8081/content/groups/public From ec2d1332d43ddbee2a43681654e53b3d70ee1239 Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Tue, 21 Mar 2023 17:19:18 +0530 Subject: [PATCH 20/68] Update README.adoc --- README.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.adoc b/README.adoc index 66ef5e7b..dec38599 100644 --- a/README.adoc +++ b/README.adoc @@ -42,4 +42,4 @@ National Parks data comes from link:https://protectedplanet.net[ProtectedPlanet] We used this link:https://www.protectedplanet.net/en/search-areas?filters%5Bis_type%5D%5B%5D=terrestrial&filters%5Bdesignation%5D%5B%5D=Nacional+Park&filters%5Bdesignation%5D%5B%5D=National+Forest+Park&filters%5Bdesignation%5D%5B%5D=National+Historic+Park&filters%5Bdesignation%5D%5B%5D=National+Battlefield&filters%5Bdesignation%5D%5B%5D=National+Historic+Site&filters%5Bdesignation%5D%5B%5D=National+Historical+Park&filters%5Bdesignation%5D%5B%5D=National+Lakeshore&filters%5Bdesignation%5D%5B%5D=National+Military+Park&filters%5Bdesignation%5D%5B%5D=National+Monument&filters%5Bdesignation%5D%5B%5D=National+Park&filters%5Bdesignation%5D%5B%5D=National+Park+%28Category+Ii%29&filters%5Bdesignation%5D%5B%5D=National+Park+%28Commonwealth%29&filters%5Bdesignation%5D%5B%5D=National+Park+%28Fbih+Law%29&filters%5Bdesignation%5D%5B%5D=National+Park+%28PN%29&filters%5Bdesignation%5D%5B%5D=National+Park+%28Rs+Law%29&filters%5Bdesignation%5D%5B%5D=National+Park+%28Scientific%29&filters%5Bdesignation%5D%5B%5D=National+Park+%28Svalbard%29&filters%5Bdesignation%5D%5B%5D=National+Park+%28project%29&filters%5Bdesignation%5D%5B%5D=National+Park+-+Buffer+Zone&filters%5Bdesignation%5D%5B%5D=National+Park+-+Buffer+Zone%2FArea+Of+Adhesion&filters%5Bdesignation%5D%5B%5D=National+Park+-+Core+Area&filters%5Bdesignation%5D%5B%5D=National+Park+-+Integrale+Reserve&filters%5Bdesignation%5D%5B%5D=National+Park+-+Peripheral+Zone&filters%5Bdesignation%5D%5B%5D=National+Park+Aboriginal&filters%5Bdesignation%5D%5B%5D=National+Park+and+ASEAN+Heritage+Park&filters%5Bdesignation%5D%5B%5D=National+Park+and+Ecological+Reserve&filters%5Bdesignation%5D%5B%5D=National+Park+and+Indigenous+Territory&filters%5Bdesignation%5D%5B%5D=National+Reserve&filters%5Bdesignation%5D%5B%5D=National+River&filters%5Bdesignation%5D%5B%5D=National+Seashore[query] listing 2830 National Parks at the moment. -test +test testing From 431a97cc592d8d680b3579604b257867235b5c6e Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Tue, 21 Mar 2023 17:35:13 +0530 Subject: [PATCH 21/68] Update README.adoc --- README.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.adoc b/README.adoc index dec38599..730565c0 100644 --- a/README.adoc +++ b/README.adoc @@ -42,4 +42,4 @@ National Parks data comes from link:https://protectedplanet.net[ProtectedPlanet] We used this link:https://www.protectedplanet.net/en/search-areas?filters%5Bis_type%5D%5B%5D=terrestrial&filters%5Bdesignation%5D%5B%5D=Nacional+Park&filters%5Bdesignation%5D%5B%5D=National+Forest+Park&filters%5Bdesignation%5D%5B%5D=National+Historic+Park&filters%5Bdesignation%5D%5B%5D=National+Battlefield&filters%5Bdesignation%5D%5B%5D=National+Historic+Site&filters%5Bdesignation%5D%5B%5D=National+Historical+Park&filters%5Bdesignation%5D%5B%5D=National+Lakeshore&filters%5Bdesignation%5D%5B%5D=National+Military+Park&filters%5Bdesignation%5D%5B%5D=National+Monument&filters%5Bdesignation%5D%5B%5D=National+Park&filters%5Bdesignation%5D%5B%5D=National+Park+%28Category+Ii%29&filters%5Bdesignation%5D%5B%5D=National+Park+%28Commonwealth%29&filters%5Bdesignation%5D%5B%5D=National+Park+%28Fbih+Law%29&filters%5Bdesignation%5D%5B%5D=National+Park+%28PN%29&filters%5Bdesignation%5D%5B%5D=National+Park+%28Rs+Law%29&filters%5Bdesignation%5D%5B%5D=National+Park+%28Scientific%29&filters%5Bdesignation%5D%5B%5D=National+Park+%28Svalbard%29&filters%5Bdesignation%5D%5B%5D=National+Park+%28project%29&filters%5Bdesignation%5D%5B%5D=National+Park+-+Buffer+Zone&filters%5Bdesignation%5D%5B%5D=National+Park+-+Buffer+Zone%2FArea+Of+Adhesion&filters%5Bdesignation%5D%5B%5D=National+Park+-+Core+Area&filters%5Bdesignation%5D%5B%5D=National+Park+-+Integrale+Reserve&filters%5Bdesignation%5D%5B%5D=National+Park+-+Peripheral+Zone&filters%5Bdesignation%5D%5B%5D=National+Park+Aboriginal&filters%5Bdesignation%5D%5B%5D=National+Park+and+ASEAN+Heritage+Park&filters%5Bdesignation%5D%5B%5D=National+Park+and+Ecological+Reserve&filters%5Bdesignation%5D%5B%5D=National+Park+and+Indigenous+Territory&filters%5Bdesignation%5D%5B%5D=National+Reserve&filters%5Bdesignation%5D%5B%5D=National+River&filters%5Bdesignation%5D%5B%5D=National+Seashore[query] listing 2830 National Parks at the moment. -test testing +test testing sam From fd93d6d72c899d1b76e2bdfd24eeb75e123ad43c Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Wed, 24 May 2023 16:22:33 +0530 Subject: [PATCH 22/68] Update README.adoc --- README.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.adoc b/README.adoc index 730565c0..f0d43345 100644 --- a/README.adoc +++ b/README.adoc @@ -42,4 +42,4 @@ National Parks data comes from link:https://protectedplanet.net[ProtectedPlanet] We used this link:https://www.protectedplanet.net/en/search-areas?filters%5Bis_type%5D%5B%5D=terrestrial&filters%5Bdesignation%5D%5B%5D=Nacional+Park&filters%5Bdesignation%5D%5B%5D=National+Forest+Park&filters%5Bdesignation%5D%5B%5D=National+Historic+Park&filters%5Bdesignation%5D%5B%5D=National+Battlefield&filters%5Bdesignation%5D%5B%5D=National+Historic+Site&filters%5Bdesignation%5D%5B%5D=National+Historical+Park&filters%5Bdesignation%5D%5B%5D=National+Lakeshore&filters%5Bdesignation%5D%5B%5D=National+Military+Park&filters%5Bdesignation%5D%5B%5D=National+Monument&filters%5Bdesignation%5D%5B%5D=National+Park&filters%5Bdesignation%5D%5B%5D=National+Park+%28Category+Ii%29&filters%5Bdesignation%5D%5B%5D=National+Park+%28Commonwealth%29&filters%5Bdesignation%5D%5B%5D=National+Park+%28Fbih+Law%29&filters%5Bdesignation%5D%5B%5D=National+Park+%28PN%29&filters%5Bdesignation%5D%5B%5D=National+Park+%28Rs+Law%29&filters%5Bdesignation%5D%5B%5D=National+Park+%28Scientific%29&filters%5Bdesignation%5D%5B%5D=National+Park+%28Svalbard%29&filters%5Bdesignation%5D%5B%5D=National+Park+%28project%29&filters%5Bdesignation%5D%5B%5D=National+Park+-+Buffer+Zone&filters%5Bdesignation%5D%5B%5D=National+Park+-+Buffer+Zone%2FArea+Of+Adhesion&filters%5Bdesignation%5D%5B%5D=National+Park+-+Core+Area&filters%5Bdesignation%5D%5B%5D=National+Park+-+Integrale+Reserve&filters%5Bdesignation%5D%5B%5D=National+Park+-+Peripheral+Zone&filters%5Bdesignation%5D%5B%5D=National+Park+Aboriginal&filters%5Bdesignation%5D%5B%5D=National+Park+and+ASEAN+Heritage+Park&filters%5Bdesignation%5D%5B%5D=National+Park+and+Ecological+Reserve&filters%5Bdesignation%5D%5B%5D=National+Park+and+Indigenous+Territory&filters%5Bdesignation%5D%5B%5D=National+Reserve&filters%5Bdesignation%5D%5B%5D=National+River&filters%5Bdesignation%5D%5B%5D=National+Seashore[query] listing 2830 National Parks at the moment. -test testing sam +test testing SITA RAM HANUMAN From 3bf96523aec69af17f3be290a24e942148dcc905 Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Wed, 7 Jun 2023 10:33:56 +0530 Subject: [PATCH 23/68] Update README.adoc --- README.adoc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.adoc b/README.adoc index f0d43345..d3f4f75e 100644 --- a/README.adoc +++ b/README.adoc @@ -43,3 +43,5 @@ National Parks data comes from link:https://protectedplanet.net[ProtectedPlanet] We used this link:https://www.protectedplanet.net/en/search-areas?filters%5Bis_type%5D%5B%5D=terrestrial&filters%5Bdesignation%5D%5B%5D=Nacional+Park&filters%5Bdesignation%5D%5B%5D=National+Forest+Park&filters%5Bdesignation%5D%5B%5D=National+Historic+Park&filters%5Bdesignation%5D%5B%5D=National+Battlefield&filters%5Bdesignation%5D%5B%5D=National+Historic+Site&filters%5Bdesignation%5D%5B%5D=National+Historical+Park&filters%5Bdesignation%5D%5B%5D=National+Lakeshore&filters%5Bdesignation%5D%5B%5D=National+Military+Park&filters%5Bdesignation%5D%5B%5D=National+Monument&filters%5Bdesignation%5D%5B%5D=National+Park&filters%5Bdesignation%5D%5B%5D=National+Park+%28Category+Ii%29&filters%5Bdesignation%5D%5B%5D=National+Park+%28Commonwealth%29&filters%5Bdesignation%5D%5B%5D=National+Park+%28Fbih+Law%29&filters%5Bdesignation%5D%5B%5D=National+Park+%28PN%29&filters%5Bdesignation%5D%5B%5D=National+Park+%28Rs+Law%29&filters%5Bdesignation%5D%5B%5D=National+Park+%28Scientific%29&filters%5Bdesignation%5D%5B%5D=National+Park+%28Svalbard%29&filters%5Bdesignation%5D%5B%5D=National+Park+%28project%29&filters%5Bdesignation%5D%5B%5D=National+Park+-+Buffer+Zone&filters%5Bdesignation%5D%5B%5D=National+Park+-+Buffer+Zone%2FArea+Of+Adhesion&filters%5Bdesignation%5D%5B%5D=National+Park+-+Core+Area&filters%5Bdesignation%5D%5B%5D=National+Park+-+Integrale+Reserve&filters%5Bdesignation%5D%5B%5D=National+Park+-+Peripheral+Zone&filters%5Bdesignation%5D%5B%5D=National+Park+Aboriginal&filters%5Bdesignation%5D%5B%5D=National+Park+and+ASEAN+Heritage+Park&filters%5Bdesignation%5D%5B%5D=National+Park+and+Ecological+Reserve&filters%5Bdesignation%5D%5B%5D=National+Park+and+Indigenous+Territory&filters%5Bdesignation%5D%5B%5D=National+Reserve&filters%5Bdesignation%5D%5B%5D=National+River&filters%5Bdesignation%5D%5B%5D=National+Seashore[query] listing 2830 National Parks at the moment. test testing SITA RAM HANUMAN + +Hello From 84f4e91eebe3c1c2c7bed5e3b6b58e726fe06e68 Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Mon, 10 Jul 2023 15:57:59 +0530 Subject: [PATCH 24/68] Update README.adoc --- README.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.adoc b/README.adoc index d3f4f75e..ef2a9ab6 100644 --- a/README.adoc +++ b/README.adoc @@ -44,4 +44,4 @@ We used this link:https://www.protectedplanet.net/en/search-areas?filters%5Bis_t test testing SITA RAM HANUMAN -Hello +Hello Sita Ram From 5780650b452c7e7e723d623d109f32ac6eb71829 Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Thu, 3 Aug 2023 16:33:32 +0530 Subject: [PATCH 25/68] Update README.adoc --- README.adoc | 1 + 1 file changed, 1 insertion(+) diff --git a/README.adoc b/README.adoc index ef2a9ab6..c9f60af7 100644 --- a/README.adoc +++ b/README.adoc @@ -45,3 +45,4 @@ We used this link:https://www.protectedplanet.net/en/search-areas?filters%5Bis_t test testing SITA RAM HANUMAN Hello Sita Ram +Hello Test From 8740308528c79309135cfa8dc37364a502c6a65a Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Thu, 31 Aug 2023 16:37:21 +0530 Subject: [PATCH 26/68] Update README.adoc --- README.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.adoc b/README.adoc index c9f60af7..1a62973c 100644 --- a/README.adoc +++ b/README.adoc @@ -44,5 +44,5 @@ We used this link:https://www.protectedplanet.net/en/search-areas?filters%5Bis_t test testing SITA RAM HANUMAN -Hello Sita Ram +Hello Sita Ram Sita Ram Hello Test From 2c1de500ec487a4416eb7209f2b7769e3caaa797 Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Sat, 30 Sep 2023 21:55:45 +0530 Subject: [PATCH 27/68] Update README.adoc --- README.adoc | 1 + 1 file changed, 1 insertion(+) diff --git a/README.adoc b/README.adoc index 1a62973c..fd30ff3a 100644 --- a/README.adoc +++ b/README.adoc @@ -46,3 +46,4 @@ test testing SITA RAM HANUMAN Hello Sita Ram Sita Ram Hello Test +Hello World From 19e7da7146604c082b131a689b0bf1f321e0dcc0 Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Sat, 30 Sep 2023 22:04:17 +0530 Subject: [PATCH 28/68] Update script.sh --- .github/script.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/script.sh b/.github/script.sh index ac71f3ae..d6d7fe8a 100755 --- a/.github/script.sh +++ b/.github/script.sh @@ -2,7 +2,7 @@ app_name=nationalparks image=nationalparks -namespace=manoj-singh8-dev +namespace=manojsingh17-dev deploy=`oc get deployment $app_name -n $namespace` if [[ "$?" -eq 0 ]]; then From 23ece46e66361943180fc9d4460318a634412a45 Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Sat, 30 Sep 2023 22:28:53 +0530 Subject: [PATCH 29/68] Update script.sh --- .github/script.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/script.sh b/.github/script.sh index d6d7fe8a..ac71f3ae 100755 --- a/.github/script.sh +++ b/.github/script.sh @@ -2,7 +2,7 @@ app_name=nationalparks image=nationalparks -namespace=manojsingh17-dev +namespace=manoj-singh8-dev deploy=`oc get deployment $app_name -n $namespace` if [[ "$?" -eq 0 ]]; then From 2ddde6a654e7fab17c101f1135b65bfcb788e1cc Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Fri, 6 Oct 2023 15:45:36 +0530 Subject: [PATCH 30/68] Update README.adoc --- README.adoc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.adoc b/README.adoc index fd30ff3a..2d929ab9 100644 --- a/README.adoc +++ b/README.adoc @@ -1,4 +1,6 @@ = NationalParks backend application + +aaaaaaaaa This application is a backend that provides geolocation information about NationalParks. The information is stored in a mongodb Hello DevD From 5cc9fc66775417f704a2f6e7ca9be5e70164c2c8 Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Fri, 6 Oct 2023 15:48:57 +0530 Subject: [PATCH 31/68] Update script.sh --- .github/script.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/script.sh b/.github/script.sh index ac71f3ae..d6d7fe8a 100755 --- a/.github/script.sh +++ b/.github/script.sh @@ -2,7 +2,7 @@ app_name=nationalparks image=nationalparks -namespace=manoj-singh8-dev +namespace=manojsingh17-dev deploy=`oc get deployment $app_name -n $namespace` if [[ "$?" -eq 0 ]]; then From b2f4ccc3843fe884ad057f9455c06c3e93756640 Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Wed, 17 Jan 2024 18:14:09 +0530 Subject: [PATCH 32/68] Update README.adoc --- README.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.adoc b/README.adoc index 2d929ab9..75f518e1 100644 --- a/README.adoc +++ b/README.adoc @@ -1,6 +1,6 @@ = NationalParks backend application -aaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaa This application is a backend that provides geolocation information about NationalParks. The information is stored in a mongodb Hello DevD From 911b88c36e4082362ee81b8efc5c05ea2a4fc2fa Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Wed, 17 Jan 2024 20:43:23 +0530 Subject: [PATCH 33/68] Update script.sh --- .github/script.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/script.sh b/.github/script.sh index d6d7fe8a..ac71f3ae 100755 --- a/.github/script.sh +++ b/.github/script.sh @@ -2,7 +2,7 @@ app_name=nationalparks image=nationalparks -namespace=manojsingh17-dev +namespace=manoj-singh8-dev deploy=`oc get deployment $app_name -n $namespace` if [[ "$?" -eq 0 ]]; then From d708f297e8a50296444bebdf286cf747b6dcd6a7 Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Tue, 19 Mar 2024 22:52:05 +0530 Subject: [PATCH 34/68] Update README.adoc --- README.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.adoc b/README.adoc index 75f518e1..698ec3bd 100644 --- a/README.adoc +++ b/README.adoc @@ -1,6 +1,6 @@ = NationalParks backend application -aaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa This application is a backend that provides geolocation information about NationalParks. The information is stored in a mongodb Hello DevD From 6e6953b03312a834249712a265bcddc896b9483d Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Thu, 17 Oct 2024 21:24:16 +0530 Subject: [PATCH 35/68] Update README.adoc --- README.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.adoc b/README.adoc index 698ec3bd..a2448f1e 100644 --- a/README.adoc +++ b/README.adoc @@ -1,6 +1,6 @@ = NationalParks backend application -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabbbbbbbbb This application is a backend that provides geolocation information about NationalParks. The information is stored in a mongodb Hello DevD From 13b3fa7a15536ea54297e51e444cfa13b48650d7 Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Thu, 17 Oct 2024 21:32:11 +0530 Subject: [PATCH 36/68] Update README.adoc --- README.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.adoc b/README.adoc index a2448f1e..8e4f4346 100644 --- a/README.adoc +++ b/README.adoc @@ -1,6 +1,6 @@ = NationalParks backend application -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabbbbbbbbb +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabbbbbbbbbcccccccccccc This application is a backend that provides geolocation information about NationalParks. The information is stored in a mongodb Hello DevD From 4820ce352970303f9070863d128e9b3406e86a4d Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Thu, 24 Oct 2024 02:09:20 +0530 Subject: [PATCH 37/68] Update README.adoc --- README.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.adoc b/README.adoc index 8e4f4346..a3788b62 100644 --- a/README.adoc +++ b/README.adoc @@ -1,6 +1,6 @@ = NationalParks backend application -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabbbbbbbbbcccccccccccc +aaaaaaaaaaaa This application is a backend that provides geolocation information about NationalParks. The information is stored in a mongodb Hello DevD From 40d2b9b4866f2abf1b899b26c713507bea9209bf Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Mon, 28 Oct 2024 15:41:17 +0530 Subject: [PATCH 38/68] Create docker-image.yml --- .github/workflows/docker-image.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .github/workflows/docker-image.yml diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml new file mode 100644 index 00000000..793d8e0e --- /dev/null +++ b/.github/workflows/docker-image.yml @@ -0,0 +1,18 @@ +name: Docker Image CI + +on: + push: + branches: [ "master" ] + pull_request: + branches: [ "master" ] + +jobs: + + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + - name: Build the Docker image + run: docker build . --file Dockerfile --tag my-image-name:$(date +%s) From 9df7aef115f0e7d66fa064e5b22ef13ebe8d38c3 Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Mon, 28 Oct 2024 15:48:58 +0530 Subject: [PATCH 39/68] Update docker-image.yml --- .github/workflows/docker-image.yml | 35 +++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 793d8e0e..5164612f 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -1,18 +1,33 @@ -name: Docker Image CI +name: Build and Deploy to OpenShift on: push: - branches: [ "master" ] - pull_request: - branches: [ "master" ] + branches: + - main jobs: - - build: - + build-and-deploy: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - - name: Build the Docker image - run: docker build . --file Dockerfile --tag my-image-name:$(date +%s) + - name: Checkout code + uses: actions/checkout@v2 + + - name: Set up JDK + uses: actions/setup-java@v2 + with: + java-version: '11' + + - name: Build with Maven + run: mvn clean package + + - name: Check for target directory and files + run: | + ls -l target + ls -l target/nationalparks.jar + + - name: Build Docker Image with Tags + env: + GITHUB_SHA: ${{ github.sha }} + run: | + docker build -t nationalparks:latest -t nationalparks:${GITHUB_SHA} . From 56658936048799b3e80bf4b18d00a2581bdcd98f Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Mon, 28 Oct 2024 15:50:26 +0530 Subject: [PATCH 40/68] Delete .github/workflows directory --- .github/workflows/docker-image.yml | 33 ------------ .github/workflows/openshift.yml | 82 ------------------------------ 2 files changed, 115 deletions(-) delete mode 100644 .github/workflows/docker-image.yml delete mode 100644 .github/workflows/openshift.yml diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml deleted file mode 100644 index 5164612f..00000000 --- a/.github/workflows/docker-image.yml +++ /dev/null @@ -1,33 +0,0 @@ -name: Build and Deploy to OpenShift - -on: - push: - branches: - - main - -jobs: - build-and-deploy: - runs-on: ubuntu-latest - - steps: - - name: Checkout code - uses: actions/checkout@v2 - - - name: Set up JDK - uses: actions/setup-java@v2 - with: - java-version: '11' - - - name: Build with Maven - run: mvn clean package - - - name: Check for target directory and files - run: | - ls -l target - ls -l target/nationalparks.jar - - - name: Build Docker Image with Tags - env: - GITHUB_SHA: ${{ github.sha }} - run: | - docker build -t nationalparks:latest -t nationalparks:${GITHUB_SHA} . diff --git a/.github/workflows/openshift.yml b/.github/workflows/openshift.yml deleted file mode 100644 index 9f989288..00000000 --- a/.github/workflows/openshift.yml +++ /dev/null @@ -1,82 +0,0 @@ -name: OpenShift - -env: - IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }} - REGISTRY_USER: ${{ github.actor }} - REGISTRY_PASSWORD: ${{ github.token }} - APP_NAME: nationalparks - IMAGE_TAGS: latest ${{ github.sha }} - - OPENSHIFT_SERVER: ${{ secrets.OPENSHIFT_SERVER }} - OPENSHIFT_TOKEN: ${{ secrets.OPENSHIFT_TOKEN }} - OPENSHIFT_NAMESPACE: "manoj-singh8-dev" - - pcc_console_url: ${{ secrets.PCC_CONSOLE_URL }} - pcc_user: ${{ secrets.PCC_USER }} - pcc_pass: ${{ secrets.PCC_PASS }} - - APP_PORT: "8080" - -on: - # https://docs.github.com/en/free-pro-team@latest/actions/reference/events-that-trigger-workflows - push: - branches: [ master ] - -jobs: - build-and-push: - name: Build and push to github container registry - runs-on: ubuntu-22.04 - environment: development - - outputs: - ROUTE: ${{ steps.deploy-and-expose.outputs.route }} - SELECTOR: ${{ steps.deploy-and-expose.outputs.selector }} - - steps: - - name: Checkout - id: checkout - uses: actions/checkout@v2 - - # https://github.com/redhat-actions/s2i-build#readme - - name: S2I Build - id: build_image - uses: redhat-actions/s2i-build@v2 - with: - path_context: '.' - builder_image: 'registry.access.redhat.com/ubi8/openjdk-11' - image: ${{ env.APP_NAME }} - tags: ${{ env.IMAGE_TAGS }} - - # https://github.com/redhat-actions/push-to-registry#readme - - name: Push to Registry - id: push-to-registry - uses: redhat-actions/push-to-registry@v2 - with: - image: ${{ steps.build_image.outputs.image }} - tags: ${{ steps.build_image.outputs.tags }} - registry: ${{ env.IMAGE_REGISTRY }} - username: ${{ env.REGISTRY_USER }} - password: ${{ env.REGISTRY_PASSWORD }} - - # The path the image was pushed to is now stored in ${{ steps.push-to-registry.outputs.registry-path }} - - # https://github.com/redhat-actions/oc-login#readme - - name: Log in to OpenShift - uses: redhat-actions/oc-login@v1 - with: - openshift_server_url: ${{ env.OPENSHIFT_SERVER }} - openshift_token: ${{ env.OPENSHIFT_TOKEN }} - insecure_skip_tls_verify: true - namespace: ${{ env.OPENSHIFT_NAMESPACE }} - - # Run a script to create a new app or update the current one with the previously pushed container image - - run: | - "${GITHUB_WORKSPACE}/.github/script.sh" ${{ env.APP_NAME }} ${{ env.IMAGE_REGISTRY }}/${{ steps.build_image.outputs.image }}:${{ github.sha }} ${{ env.OPENSHIFT_NAMESPACE }} - # Run Prisma Scan IBM Account - - name: Scan image - uses: PaloAltoNetworks/prisma-cloud-scan@v1 - with: - pcc_console_url: ${{ secrets.PCC_CONSOLE_URL }} - pcc_user: ${{ secrets.PCC_USER }} - pcc_pass: ${{ secrets.PCC_PASS }} - image_name: ${{ env.APP_NAME }} From 8e0a7ba0f4099cf51d101c235a2db22fe2c587ec Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Mon, 28 Oct 2024 15:51:26 +0530 Subject: [PATCH 41/68] Create docker-image.yml --- .github/workflows/docker-image.yml | 33 ++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 .github/workflows/docker-image.yml diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml new file mode 100644 index 00000000..5164612f --- /dev/null +++ b/.github/workflows/docker-image.yml @@ -0,0 +1,33 @@ +name: Build and Deploy to OpenShift + +on: + push: + branches: + - main + +jobs: + build-and-deploy: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Set up JDK + uses: actions/setup-java@v2 + with: + java-version: '11' + + - name: Build with Maven + run: mvn clean package + + - name: Check for target directory and files + run: | + ls -l target + ls -l target/nationalparks.jar + + - name: Build Docker Image with Tags + env: + GITHUB_SHA: ${{ github.sha }} + run: | + docker build -t nationalparks:latest -t nationalparks:${GITHUB_SHA} . From faf6d41893edc77602d238ce2e754b0637a58cf7 Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Mon, 28 Oct 2024 15:53:19 +0530 Subject: [PATCH 42/68] Update README.adoc --- README.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.adoc b/README.adoc index a3788b62..32eb4ec9 100644 --- a/README.adoc +++ b/README.adoc @@ -1,6 +1,6 @@ = NationalParks backend application -aaaaaaaaaaaa + This application is a backend that provides geolocation information about NationalParks. The information is stored in a mongodb Hello DevD From 20dc7e034d6b37729dd07351536241e5b224a4b9 Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Mon, 28 Oct 2024 15:58:15 +0530 Subject: [PATCH 43/68] Delete .github/workflows directory --- .github/workflows/docker-image.yml | 33 ------------------------------ 1 file changed, 33 deletions(-) delete mode 100644 .github/workflows/docker-image.yml diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml deleted file mode 100644 index 5164612f..00000000 --- a/.github/workflows/docker-image.yml +++ /dev/null @@ -1,33 +0,0 @@ -name: Build and Deploy to OpenShift - -on: - push: - branches: - - main - -jobs: - build-and-deploy: - runs-on: ubuntu-latest - - steps: - - name: Checkout code - uses: actions/checkout@v2 - - - name: Set up JDK - uses: actions/setup-java@v2 - with: - java-version: '11' - - - name: Build with Maven - run: mvn clean package - - - name: Check for target directory and files - run: | - ls -l target - ls -l target/nationalparks.jar - - - name: Build Docker Image with Tags - env: - GITHUB_SHA: ${{ github.sha }} - run: | - docker build -t nationalparks:latest -t nationalparks:${GITHUB_SHA} . From d4a91495c3edaf16f75f1f7131d91444c87d7427 Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Mon, 28 Oct 2024 15:59:11 +0530 Subject: [PATCH 44/68] Add files via upload --- .github/openshift.yml | 82 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100644 .github/openshift.yml diff --git a/.github/openshift.yml b/.github/openshift.yml new file mode 100644 index 00000000..9f989288 --- /dev/null +++ b/.github/openshift.yml @@ -0,0 +1,82 @@ +name: OpenShift + +env: + IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }} + REGISTRY_USER: ${{ github.actor }} + REGISTRY_PASSWORD: ${{ github.token }} + APP_NAME: nationalparks + IMAGE_TAGS: latest ${{ github.sha }} + + OPENSHIFT_SERVER: ${{ secrets.OPENSHIFT_SERVER }} + OPENSHIFT_TOKEN: ${{ secrets.OPENSHIFT_TOKEN }} + OPENSHIFT_NAMESPACE: "manoj-singh8-dev" + + pcc_console_url: ${{ secrets.PCC_CONSOLE_URL }} + pcc_user: ${{ secrets.PCC_USER }} + pcc_pass: ${{ secrets.PCC_PASS }} + + APP_PORT: "8080" + +on: + # https://docs.github.com/en/free-pro-team@latest/actions/reference/events-that-trigger-workflows + push: + branches: [ master ] + +jobs: + build-and-push: + name: Build and push to github container registry + runs-on: ubuntu-22.04 + environment: development + + outputs: + ROUTE: ${{ steps.deploy-and-expose.outputs.route }} + SELECTOR: ${{ steps.deploy-and-expose.outputs.selector }} + + steps: + - name: Checkout + id: checkout + uses: actions/checkout@v2 + + # https://github.com/redhat-actions/s2i-build#readme + - name: S2I Build + id: build_image + uses: redhat-actions/s2i-build@v2 + with: + path_context: '.' + builder_image: 'registry.access.redhat.com/ubi8/openjdk-11' + image: ${{ env.APP_NAME }} + tags: ${{ env.IMAGE_TAGS }} + + # https://github.com/redhat-actions/push-to-registry#readme + - name: Push to Registry + id: push-to-registry + uses: redhat-actions/push-to-registry@v2 + with: + image: ${{ steps.build_image.outputs.image }} + tags: ${{ steps.build_image.outputs.tags }} + registry: ${{ env.IMAGE_REGISTRY }} + username: ${{ env.REGISTRY_USER }} + password: ${{ env.REGISTRY_PASSWORD }} + + # The path the image was pushed to is now stored in ${{ steps.push-to-registry.outputs.registry-path }} + + # https://github.com/redhat-actions/oc-login#readme + - name: Log in to OpenShift + uses: redhat-actions/oc-login@v1 + with: + openshift_server_url: ${{ env.OPENSHIFT_SERVER }} + openshift_token: ${{ env.OPENSHIFT_TOKEN }} + insecure_skip_tls_verify: true + namespace: ${{ env.OPENSHIFT_NAMESPACE }} + + # Run a script to create a new app or update the current one with the previously pushed container image + - run: | + "${GITHUB_WORKSPACE}/.github/script.sh" ${{ env.APP_NAME }} ${{ env.IMAGE_REGISTRY }}/${{ steps.build_image.outputs.image }}:${{ github.sha }} ${{ env.OPENSHIFT_NAMESPACE }} + # Run Prisma Scan IBM Account + - name: Scan image + uses: PaloAltoNetworks/prisma-cloud-scan@v1 + with: + pcc_console_url: ${{ secrets.PCC_CONSOLE_URL }} + pcc_user: ${{ secrets.PCC_USER }} + pcc_pass: ${{ secrets.PCC_PASS }} + image_name: ${{ env.APP_NAME }} From acc7859db3d103cd5b72ab148fe7793dee8b2e9b Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Mon, 28 Oct 2024 16:08:07 +0530 Subject: [PATCH 45/68] Create OpenShift.yml --- .github/workflows/OpenShift.yml | 82 +++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100644 .github/workflows/OpenShift.yml diff --git a/.github/workflows/OpenShift.yml b/.github/workflows/OpenShift.yml new file mode 100644 index 00000000..9f989288 --- /dev/null +++ b/.github/workflows/OpenShift.yml @@ -0,0 +1,82 @@ +name: OpenShift + +env: + IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }} + REGISTRY_USER: ${{ github.actor }} + REGISTRY_PASSWORD: ${{ github.token }} + APP_NAME: nationalparks + IMAGE_TAGS: latest ${{ github.sha }} + + OPENSHIFT_SERVER: ${{ secrets.OPENSHIFT_SERVER }} + OPENSHIFT_TOKEN: ${{ secrets.OPENSHIFT_TOKEN }} + OPENSHIFT_NAMESPACE: "manoj-singh8-dev" + + pcc_console_url: ${{ secrets.PCC_CONSOLE_URL }} + pcc_user: ${{ secrets.PCC_USER }} + pcc_pass: ${{ secrets.PCC_PASS }} + + APP_PORT: "8080" + +on: + # https://docs.github.com/en/free-pro-team@latest/actions/reference/events-that-trigger-workflows + push: + branches: [ master ] + +jobs: + build-and-push: + name: Build and push to github container registry + runs-on: ubuntu-22.04 + environment: development + + outputs: + ROUTE: ${{ steps.deploy-and-expose.outputs.route }} + SELECTOR: ${{ steps.deploy-and-expose.outputs.selector }} + + steps: + - name: Checkout + id: checkout + uses: actions/checkout@v2 + + # https://github.com/redhat-actions/s2i-build#readme + - name: S2I Build + id: build_image + uses: redhat-actions/s2i-build@v2 + with: + path_context: '.' + builder_image: 'registry.access.redhat.com/ubi8/openjdk-11' + image: ${{ env.APP_NAME }} + tags: ${{ env.IMAGE_TAGS }} + + # https://github.com/redhat-actions/push-to-registry#readme + - name: Push to Registry + id: push-to-registry + uses: redhat-actions/push-to-registry@v2 + with: + image: ${{ steps.build_image.outputs.image }} + tags: ${{ steps.build_image.outputs.tags }} + registry: ${{ env.IMAGE_REGISTRY }} + username: ${{ env.REGISTRY_USER }} + password: ${{ env.REGISTRY_PASSWORD }} + + # The path the image was pushed to is now stored in ${{ steps.push-to-registry.outputs.registry-path }} + + # https://github.com/redhat-actions/oc-login#readme + - name: Log in to OpenShift + uses: redhat-actions/oc-login@v1 + with: + openshift_server_url: ${{ env.OPENSHIFT_SERVER }} + openshift_token: ${{ env.OPENSHIFT_TOKEN }} + insecure_skip_tls_verify: true + namespace: ${{ env.OPENSHIFT_NAMESPACE }} + + # Run a script to create a new app or update the current one with the previously pushed container image + - run: | + "${GITHUB_WORKSPACE}/.github/script.sh" ${{ env.APP_NAME }} ${{ env.IMAGE_REGISTRY }}/${{ steps.build_image.outputs.image }}:${{ github.sha }} ${{ env.OPENSHIFT_NAMESPACE }} + # Run Prisma Scan IBM Account + - name: Scan image + uses: PaloAltoNetworks/prisma-cloud-scan@v1 + with: + pcc_console_url: ${{ secrets.PCC_CONSOLE_URL }} + pcc_user: ${{ secrets.PCC_USER }} + pcc_pass: ${{ secrets.PCC_PASS }} + image_name: ${{ env.APP_NAME }} From 34a7451ccd663f0922b9546c98fa9576b14d0c6e Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Fri, 1 Nov 2024 16:14:50 +0530 Subject: [PATCH 46/68] Update OpenShift.yml --- .github/workflows/OpenShift.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/OpenShift.yml b/.github/workflows/OpenShift.yml index 9f989288..6a81db4c 100644 --- a/.github/workflows/OpenShift.yml +++ b/.github/workflows/OpenShift.yml @@ -38,14 +38,14 @@ jobs: uses: actions/checkout@v2 # https://github.com/redhat-actions/s2i-build#readme - - name: S2I Build - id: build_image - uses: redhat-actions/s2i-build@v2 - with: - path_context: '.' - builder_image: 'registry.access.redhat.com/ubi8/openjdk-11' - image: ${{ env.APP_NAME }} - tags: ${{ env.IMAGE_TAGS }} + - - name: S2I Build + id: build_image + uses: redhat-actions/s2i-build@v2 + with: + path_context: '.' + builder_image: 'registry.access.redhat.com/ubi8/openjdk-11' + image: ${{ env.APP_NAME }} + tags: ${{ env.IMAGE_TAGS }} # https://github.com/redhat-actions/push-to-registry#readme - name: Push to Registry From 5e9a42bc73b960cc0cc1f102099c97f3e6d54d9b Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Fri, 1 Nov 2024 16:29:09 +0530 Subject: [PATCH 47/68] Update OpenShift.yml --- .github/workflows/OpenShift.yml | 91 +++++++++++++++++---------------- 1 file changed, 47 insertions(+), 44 deletions(-) diff --git a/.github/workflows/OpenShift.yml b/.github/workflows/OpenShift.yml index 6a81db4c..f2120931 100644 --- a/.github/workflows/OpenShift.yml +++ b/.github/workflows/OpenShift.yml @@ -1,67 +1,58 @@ -name: OpenShift +name: OpenShift Deployment and Prisma Scan env: IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }} REGISTRY_USER: ${{ github.actor }} REGISTRY_PASSWORD: ${{ github.token }} APP_NAME: nationalparks - IMAGE_TAGS: latest ${{ github.sha }} - + IMAGE_TAGS: latest,${{ github.sha }} OPENSHIFT_SERVER: ${{ secrets.OPENSHIFT_SERVER }} OPENSHIFT_TOKEN: ${{ secrets.OPENSHIFT_TOKEN }} OPENSHIFT_NAMESPACE: "manoj-singh8-dev" - - pcc_console_url: ${{ secrets.PCC_CONSOLE_URL }} - pcc_user: ${{ secrets.PCC_USER }} - pcc_pass: ${{ secrets.PCC_PASS }} - + PCC_CONSOLE_URL: ${{ secrets.PCC_CONSOLE_URL }} + PCC_USER: ${{ secrets.PCC_USER }} + PCC_PASS: ${{ secrets.PCC_PASS }} APP_PORT: "8080" on: - # https://docs.github.com/en/free-pro-team@latest/actions/reference/events-that-trigger-workflows push: branches: [ master ] jobs: - build-and-push: - name: Build and push to github container registry + build-and-deploy: + name: Build, Push, Deploy to OpenShift, and Scan runs-on: ubuntu-22.04 environment: development - outputs: - ROUTE: ${{ steps.deploy-and-expose.outputs.route }} - SELECTOR: ${{ steps.deploy-and-expose.outputs.selector }} - steps: - - name: Checkout - id: checkout + - name: Checkout Code uses: actions/checkout@v2 - # https://github.com/redhat-actions/s2i-build#readme - - - name: S2I Build - id: build_image - uses: redhat-actions/s2i-build@v2 - with: - path_context: '.' - builder_image: 'registry.access.redhat.com/ubi8/openjdk-11' - image: ${{ env.APP_NAME }} - tags: ${{ env.IMAGE_TAGS }} + - name: Set up QEMU + uses: docker/setup-qemu-action@v2 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 - # https://github.com/redhat-actions/push-to-registry#readme - - name: Push to Registry - id: push-to-registry - uses: redhat-actions/push-to-registry@v2 + - name: Log in to GitHub Container Registry + uses: docker/login-action@v2 with: - image: ${{ steps.build_image.outputs.image }} - tags: ${{ steps.build_image.outputs.tags }} registry: ${{ env.IMAGE_REGISTRY }} username: ${{ env.REGISTRY_USER }} password: ${{ env.REGISTRY_PASSWORD }} - # The path the image was pushed to is now stored in ${{ steps.push-to-registry.outputs.registry-path }} + - name: Build and Push Docker Image + id: build-and-push + uses: docker/build-push-action@v4 + with: + context: . + file: ./Dockerfile + tags: | + ${{ env.IMAGE_REGISTRY }}/${{ env.APP_NAME }}:latest + ${{ env.IMAGE_REGISTRY }}/${{ env.APP_NAME }}:${{ github.sha }} + push: true - # https://github.com/redhat-actions/oc-login#readme - - name: Log in to OpenShift + - name: Log in to OpenShift uses: redhat-actions/oc-login@v1 with: openshift_server_url: ${{ env.OPENSHIFT_SERVER }} @@ -69,14 +60,26 @@ jobs: insecure_skip_tls_verify: true namespace: ${{ env.OPENSHIFT_NAMESPACE }} - # Run a script to create a new app or update the current one with the previously pushed container image - - run: | - "${GITHUB_WORKSPACE}/.github/script.sh" ${{ env.APP_NAME }} ${{ env.IMAGE_REGISTRY }}/${{ steps.build_image.outputs.image }}:${{ github.sha }} ${{ env.OPENSHIFT_NAMESPACE }} - # Run Prisma Scan IBM Account - - name: Scan image + - name: Deploy to OpenShift + run: | + oc new-app --docker-image=${{ env.IMAGE_REGISTRY }}/${{ env.APP_NAME }}:latest \ + --name=${{ env.APP_NAME }} -n ${{ env.OPENSHIFT_NAMESPACE }} || true + oc rollout latest dc/${{ env.APP_NAME }} -n ${{ env.OPENSHIFT_NAMESPACE }} + oc expose svc/${{ env.APP_NAME }} --port=${{ env.APP_PORT }} -n ${{ env.OPENSHIFT_NAMESPACE }} + + - name: Get OpenShift Route URL + id: get-route + run: | + export ROUTE_URL=$(oc get route ${{ env.APP_NAME }} -n ${{ env.OPENSHIFT_NAMESPACE }} -o jsonpath='{.spec.host}') + echo "ROUTE_URL=${ROUTE_URL}" >> $GITHUB_ENV + + - name: Print Route URL + run: echo "Application Route URL:https://${{ env.ROUTE_URL }}" + + - name: Prisma Cloud Scan uses: PaloAltoNetworks/prisma-cloud-scan@v1 with: - pcc_console_url: ${{ secrets.PCC_CONSOLE_URL }} - pcc_user: ${{ secrets.PCC_USER }} - pcc_pass: ${{ secrets.PCC_PASS }} - image_name: ${{ env.APP_NAME }} + pcc_console_url: ${{ secrets.PCC_CONSOLE_URL }} + pcc_user: ${{ secrets.PCC_USER }} + pcc_pass: ${{ secrets.PCC_PASS }} + image_name: ${{ env.IMAGE_REGISTRY }}/${{ env.APP_NAME }}:latest From e5516d3332272b503928053fa382292ab9f4e91b Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Fri, 1 Nov 2024 16:34:53 +0530 Subject: [PATCH 48/68] Update OpenShift.yml --- .github/workflows/OpenShift.yml | 59 +++++---------------------------- 1 file changed, 8 insertions(+), 51 deletions(-) diff --git a/.github/workflows/OpenShift.yml b/.github/workflows/OpenShift.yml index f2120931..c9eab463 100644 --- a/.github/workflows/OpenShift.yml +++ b/.github/workflows/OpenShift.yml @@ -1,19 +1,5 @@ name: OpenShift Deployment and Prisma Scan -env: - IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }} - REGISTRY_USER: ${{ github.actor }} - REGISTRY_PASSWORD: ${{ github.token }} - APP_NAME: nationalparks - IMAGE_TAGS: latest,${{ github.sha }} - OPENSHIFT_SERVER: ${{ secrets.OPENSHIFT_SERVER }} - OPENSHIFT_TOKEN: ${{ secrets.OPENSHIFT_TOKEN }} - OPENSHIFT_NAMESPACE: "manoj-singh8-dev" - PCC_CONSOLE_URL: ${{ secrets.PCC_CONSOLE_URL }} - PCC_USER: ${{ secrets.PCC_USER }} - PCC_PASS: ${{ secrets.PCC_PASS }} - APP_PORT: "8080" - on: push: branches: [ master ] @@ -28,6 +14,9 @@ jobs: - name: Checkout Code uses: actions/checkout@v2 + - name: Build with Maven + run: mvn clean package # Or use ./gradlew build for Gradle + - name: Set up QEMU uses: docker/setup-qemu-action@v2 @@ -37,9 +26,9 @@ jobs: - name: Log in to GitHub Container Registry uses: docker/login-action@v2 with: - registry: ${{ env.IMAGE_REGISTRY }} - username: ${{ env.REGISTRY_USER }} - password: ${{ env.REGISTRY_PASSWORD }} + registry: ghcr.io/${{ github.repository_owner }} + username: ${{ github.actor }} + password: ${{ github.token }} - name: Build and Push Docker Image id: build-and-push @@ -48,38 +37,6 @@ jobs: context: . file: ./Dockerfile tags: | - ${{ env.IMAGE_REGISTRY }}/${{ env.APP_NAME }}:latest - ${{ env.IMAGE_REGISTRY }}/${{ env.APP_NAME }}:${{ github.sha }} + ghcr.io/${{ github.repository_owner }}/nationalparks:latest + ghcr.io/${{ github.repository_owner }}/nationalparks:${{ github.sha }} push: true - - - name: Log in to OpenShift - uses: redhat-actions/oc-login@v1 - with: - openshift_server_url: ${{ env.OPENSHIFT_SERVER }} - openshift_token: ${{ env.OPENSHIFT_TOKEN }} - insecure_skip_tls_verify: true - namespace: ${{ env.OPENSHIFT_NAMESPACE }} - - - name: Deploy to OpenShift - run: | - oc new-app --docker-image=${{ env.IMAGE_REGISTRY }}/${{ env.APP_NAME }}:latest \ - --name=${{ env.APP_NAME }} -n ${{ env.OPENSHIFT_NAMESPACE }} || true - oc rollout latest dc/${{ env.APP_NAME }} -n ${{ env.OPENSHIFT_NAMESPACE }} - oc expose svc/${{ env.APP_NAME }} --port=${{ env.APP_PORT }} -n ${{ env.OPENSHIFT_NAMESPACE }} - - - name: Get OpenShift Route URL - id: get-route - run: | - export ROUTE_URL=$(oc get route ${{ env.APP_NAME }} -n ${{ env.OPENSHIFT_NAMESPACE }} -o jsonpath='{.spec.host}') - echo "ROUTE_URL=${ROUTE_URL}" >> $GITHUB_ENV - - - name: Print Route URL - run: echo "Application Route URL:https://${{ env.ROUTE_URL }}" - - - name: Prisma Cloud Scan - uses: PaloAltoNetworks/prisma-cloud-scan@v1 - with: - pcc_console_url: ${{ secrets.PCC_CONSOLE_URL }} - pcc_user: ${{ secrets.PCC_USER }} - pcc_pass: ${{ secrets.PCC_PASS }} - image_name: ${{ env.IMAGE_REGISTRY }}/${{ env.APP_NAME }}:latest From 8f095517c1accb40d2f3d2ebffebdcdd1d5d80ea Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Fri, 1 Nov 2024 16:41:06 +0530 Subject: [PATCH 49/68] Update OpenShift.yml --- .github/workflows/OpenShift.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/OpenShift.yml b/.github/workflows/OpenShift.yml index c9eab463..50de64fa 100644 --- a/.github/workflows/OpenShift.yml +++ b/.github/workflows/OpenShift.yml @@ -40,3 +40,10 @@ jobs: ghcr.io/${{ github.repository_owner }}/nationalparks:latest ghcr.io/${{ github.repository_owner }}/nationalparks:${{ github.sha }} push: true + - name: Prisma Cloud Scan + uses: PaloAltoNetworks/prisma-cloud-scan@v1 + with: + pcc_console_url: ${{ secrets.PCC_CONSOLE_URL }} + pcc_user: ${{ secrets.PCC_USER }} + pcc_pass: ${{ secrets.PCC_PASS }} + image_name: ${{ env.IMAGE_REGISTRY }}/${{ env.APP_NAME }}:latest From 36a473b5ce6354aaf3b09b46c9bc01a2c244f6aa Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Fri, 1 Nov 2024 16:47:58 +0530 Subject: [PATCH 50/68] Update OC Depoly and PRISMA Scan.yml --- .github/workflows/OpenShift.yml | 97 ++++++++++++++++++++++----------- 1 file changed, 66 insertions(+), 31 deletions(-) diff --git a/.github/workflows/OpenShift.yml b/.github/workflows/OpenShift.yml index 50de64fa..1a388fb6 100644 --- a/.github/workflows/OpenShift.yml +++ b/.github/workflows/OpenShift.yml @@ -1,49 +1,84 @@ -name: OpenShift Deployment and Prisma Scan +name: OpenShift + +env: + IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }} + REGISTRY_USER: ${{ github.actor }} + REGISTRY_PASSWORD: ${{ github.token }} + APP_NAME: nationalparks + IMAGE_TAGS: latest,${{ github.sha }} + + OPENSHIFT_SERVER: ${{ secrets.OPENSHIFT_SERVER }} + OPENSHIFT_TOKEN: ${{ secrets.OPENSHIFT_TOKEN }} + OPENSHIFT_NAMESPACE: "manoj-singh8-dev" + + pcc_console_url: ${{ secrets.PCC_CONSOLE_URL }} + pcc_user: ${{ secrets.PCC_USER }} + pcc_pass: ${{ secrets.PCC_PASS }} + + APP_PORT: "8080" on: push: branches: [ master ] jobs: - build-and-deploy: - name: Build, Push, Deploy to OpenShift, and Scan + build-and-push: + name: Build and push to GitHub container registry runs-on: ubuntu-22.04 environment: development + outputs: + ROUTE: ${{ steps.deploy-and-expose.outputs.route }} + SELECTOR: ${{ steps.deploy-and-expose.outputs.selector }} + steps: - - name: Checkout Code + - name: Checkout + id: checkout uses: actions/checkout@v2 - - name: Build with Maven - run: mvn clean package # Or use ./gradlew build for Gradle - - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + # Build the image using Source-to-Image (S2I) + - name: S2I Build + id: build_image + uses: redhat-actions/s2i-build@v2 + with: + path_context: '.' + builder_image: 'registry.access.redhat.com/ubi8/openjdk-11' + image: ${{ env.APP_NAME }} + tags: ${{ env.IMAGE_TAGS }} - - name: Log in to GitHub Container Registry - uses: docker/login-action@v2 + # Push the image to GitHub Container Registry + - name: Push to Registry + id: push-to-registry + uses: redhat-actions/push-to-registry@v2 with: - registry: ghcr.io/${{ github.repository_owner }} - username: ${{ github.actor }} - password: ${{ github.token }} + image: ${{ steps.build_image.outputs.image }} + tags: ${{ steps.build_image.outputs.tags }} + registry: ${{ env.IMAGE_REGISTRY }} + username: ${{ env.REGISTRY_USER }} + password: ${{ env.REGISTRY_PASSWORD }} - - name: Build and Push Docker Image - id: build-and-push - uses: docker/build-push-action@v4 + # Log in to OpenShift + - name: Log in to OpenShift + uses: redhat-actions/oc-login@v1 with: - context: . - file: ./Dockerfile - tags: | - ghcr.io/${{ github.repository_owner }}/nationalparks:latest - ghcr.io/${{ github.repository_owner }}/nationalparks:${{ github.sha }} - push: true - - name: Prisma Cloud Scan + openshift_server_url: ${{ env.OPENSHIFT_SERVER }} + openshift_token: ${{ env.OPENSHIFT_TOKEN }} + insecure_skip_tls_verify: true + namespace: ${{ env.OPENSHIFT_NAMESPACE }} + + # Deploy or update the application in OpenShift + - name: Deploy to OpenShift + run: | + bash "${GITHUB_WORKSPACE}/.github/script.sh" \ + ${{ env.APP_NAME }} \ + ${{ env.IMAGE_REGISTRY }}/${{ steps.build_image.outputs.image }}:${{ github.sha }} \ + ${{ env.OPENSHIFT_NAMESPACE }} + + # Run Prisma Cloud Scan + - name: Scan image uses: PaloAltoNetworks/prisma-cloud-scan@v1 with: - pcc_console_url: ${{ secrets.PCC_CONSOLE_URL }} - pcc_user: ${{ secrets.PCC_USER }} - pcc_pass: ${{ secrets.PCC_PASS }} - image_name: ${{ env.IMAGE_REGISTRY }}/${{ env.APP_NAME }}:latest + pcc_console_url: ${{ env.pcc_console_url }} + pcc_user: ${{ env.pcc_user }} + pcc_pass: ${{ env.pcc_pass }} + image_name: ${{ env.IMAGE_REGISTRY }}/${{ env.APP_NAME }}:${{ github.sha }} From 61325e8e82075de425c66bde71362f2271abbcb1 Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Fri, 1 Nov 2024 16:50:25 +0530 Subject: [PATCH 51/68] Update OpenShift.yml --- .github/workflows/OpenShift.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/OpenShift.yml b/.github/workflows/OpenShift.yml index 1a388fb6..b2f32095 100644 --- a/.github/workflows/OpenShift.yml +++ b/.github/workflows/OpenShift.yml @@ -5,7 +5,7 @@ env: REGISTRY_USER: ${{ github.actor }} REGISTRY_PASSWORD: ${{ github.token }} APP_NAME: nationalparks - IMAGE_TAGS: latest,${{ github.sha }} + IMAGE_TAGS: latest,${{ github.sha }} # No change needed here, but ensure commas are properly used in the push step OPENSHIFT_SERVER: ${{ secrets.OPENSHIFT_SERVER }} OPENSHIFT_TOKEN: ${{ secrets.OPENSHIFT_TOKEN }} @@ -52,7 +52,7 @@ jobs: uses: redhat-actions/push-to-registry@v2 with: image: ${{ steps.build_image.outputs.image }} - tags: ${{ steps.build_image.outputs.tags }} + tags: ${{ steps.build_image.outputs.tags }} # Ensure that this is a valid reference registry: ${{ env.IMAGE_REGISTRY }} username: ${{ env.REGISTRY_USER }} password: ${{ env.REGISTRY_PASSWORD }} From 9aca03d7b88f6b49dd1bc61c3d7db2e80f1069e5 Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Fri, 1 Nov 2024 17:00:10 +0530 Subject: [PATCH 52/68] Update OpenShift.yml --- .github/workflows/OpenShift.yml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/.github/workflows/OpenShift.yml b/.github/workflows/OpenShift.yml index b2f32095..182b7f80 100644 --- a/.github/workflows/OpenShift.yml +++ b/.github/workflows/OpenShift.yml @@ -47,17 +47,14 @@ jobs: tags: ${{ env.IMAGE_TAGS }} # Push the image to GitHub Container Registry - - name: Push to Registry - id: push-to-registry - uses: redhat-actions/push-to-registry@v2 - with: - image: ${{ steps.build_image.outputs.image }} - tags: ${{ steps.build_image.outputs.tags }} # Ensure that this is a valid reference - registry: ${{ env.IMAGE_REGISTRY }} - username: ${{ env.REGISTRY_USER }} - password: ${{ env.REGISTRY_PASSWORD }} + - name: Push to registry + uses: redhat-actions/push-to-registry@v2 + with: + image: "ghcr.io/devopscicd17/nationalparks" + tag: "latest-$(git rev-parse --short HEAD)" # Log in to OpenShift + - name: Log in to OpenShift uses: redhat-actions/oc-login@v1 with: From 4cb8334c49b78ed29f0eaa2c9fc5d2a788512ef3 Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Fri, 1 Nov 2024 17:03:46 +0530 Subject: [PATCH 53/68] Update OpenShift.yml --- .github/workflows/OpenShift.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/OpenShift.yml b/.github/workflows/OpenShift.yml index 182b7f80..b2f32095 100644 --- a/.github/workflows/OpenShift.yml +++ b/.github/workflows/OpenShift.yml @@ -47,14 +47,17 @@ jobs: tags: ${{ env.IMAGE_TAGS }} # Push the image to GitHub Container Registry - - name: Push to registry - uses: redhat-actions/push-to-registry@v2 - with: - image: "ghcr.io/devopscicd17/nationalparks" - tag: "latest-$(git rev-parse --short HEAD)" + - name: Push to Registry + id: push-to-registry + uses: redhat-actions/push-to-registry@v2 + with: + image: ${{ steps.build_image.outputs.image }} + tags: ${{ steps.build_image.outputs.tags }} # Ensure that this is a valid reference + registry: ${{ env.IMAGE_REGISTRY }} + username: ${{ env.REGISTRY_USER }} + password: ${{ env.REGISTRY_PASSWORD }} # Log in to OpenShift - - name: Log in to OpenShift uses: redhat-actions/oc-login@v1 with: From b63e11e4ff033942b80ef96672ab5f4015df31ed Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Fri, 1 Nov 2024 17:13:13 +0530 Subject: [PATCH 54/68] Update OpenShift.yml --- .github/workflows/OpenShift.yml | 78 +++++++++++---------------------- 1 file changed, 26 insertions(+), 52 deletions(-) diff --git a/.github/workflows/OpenShift.yml b/.github/workflows/OpenShift.yml index b2f32095..9237bb74 100644 --- a/.github/workflows/OpenShift.yml +++ b/.github/workflows/OpenShift.yml @@ -1,72 +1,46 @@ -name: OpenShift - -env: - IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }} - REGISTRY_USER: ${{ github.actor }} - REGISTRY_PASSWORD: ${{ github.token }} - APP_NAME: nationalparks - IMAGE_TAGS: latest,${{ github.sha }} # No change needed here, but ensure commas are properly used in the push step - - OPENSHIFT_SERVER: ${{ secrets.OPENSHIFT_SERVER }} - OPENSHIFT_TOKEN: ${{ secrets.OPENSHIFT_TOKEN }} - OPENSHIFT_NAMESPACE: "manoj-singh8-dev" - - pcc_console_url: ${{ secrets.PCC_CONSOLE_URL }} - pcc_user: ${{ secrets.PCC_USER }} - pcc_pass: ${{ secrets.PCC_PASS }} - - APP_PORT: "8080" +name: OpenShift Deployment and Prisma Scan on: push: branches: [ master ] jobs: - build-and-push: - name: Build and push to GitHub container registry + build-and-deploy: + name: Build, Push, Deploy to OpenShift, and Scan runs-on: ubuntu-22.04 environment: development - outputs: - ROUTE: ${{ steps.deploy-and-expose.outputs.route }} - SELECTOR: ${{ steps.deploy-and-expose.outputs.selector }} - steps: - - name: Checkout - id: checkout + - name: Checkout Code uses: actions/checkout@v2 - # Build the image using Source-to-Image (S2I) - - name: S2I Build - id: build_image - uses: redhat-actions/s2i-build@v2 - with: - path_context: '.' - builder_image: 'registry.access.redhat.com/ubi8/openjdk-11' - image: ${{ env.APP_NAME }} - tags: ${{ env.IMAGE_TAGS }} + - name: Build with Maven + run: mvn clean package # Or use ./gradlew build for Gradle + + - name: Set up QEMU + uses: docker/setup-qemu-action@v2 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 - # Push the image to GitHub Container Registry - - name: Push to Registry - id: push-to-registry - uses: redhat-actions/push-to-registry@v2 + - name: Log in to GitHub Container Registry + uses: docker/login-action@v2 with: - image: ${{ steps.build_image.outputs.image }} - tags: ${{ steps.build_image.outputs.tags }} # Ensure that this is a valid reference - registry: ${{ env.IMAGE_REGISTRY }} - username: ${{ env.REGISTRY_USER }} - password: ${{ env.REGISTRY_PASSWORD }} + registry: ghcr.io/${{ github.repository_owner }} + username: ${{ github.actor }} + password: ${{ github.token }} - # Log in to OpenShift - - name: Log in to OpenShift - uses: redhat-actions/oc-login@v1 + - name: Build and Push Docker Image + id: build-and-push + uses: docker/build-push-action@v4 with: - openshift_server_url: ${{ env.OPENSHIFT_SERVER }} - openshift_token: ${{ env.OPENSHIFT_TOKEN }} - insecure_skip_tls_verify: true - namespace: ${{ env.OPENSHIFT_NAMESPACE }} + context: . + file: ./Dockerfile + tags: | + ghcr.io/${{ github.repository_owner }}/nationalparks:latest + ghcr.io/${{ github.repository_owner }}/nationalparks:${{ github.sha }} + push: true - # Deploy or update the application in OpenShift - name: Deploy to OpenShift run: | bash "${GITHUB_WORKSPACE}/.github/script.sh" \ From 97d50290b2b6cd4a29bf5c00fac8eefbbc8312b5 Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Fri, 1 Nov 2024 22:37:12 +0530 Subject: [PATCH 55/68] Update OpenShift.yml --- .github/workflows/OpenShift.yml | 56 +++++++++++++++++++++++++++++---- 1 file changed, 50 insertions(+), 6 deletions(-) diff --git a/.github/workflows/OpenShift.yml b/.github/workflows/OpenShift.yml index 9237bb74..7af96008 100644 --- a/.github/workflows/OpenShift.yml +++ b/.github/workflows/OpenShift.yml @@ -41,12 +41,56 @@ jobs: ghcr.io/${{ github.repository_owner }}/nationalparks:${{ github.sha }} push: true - - name: Deploy to OpenShift - run: | - bash "${GITHUB_WORKSPACE}/.github/script.sh" \ - ${{ env.APP_NAME }} \ - ${{ env.IMAGE_REGISTRY }}/${{ steps.build_image.outputs.image }}:${{ github.sha }} \ - ${{ env.OPENSHIFT_NAMESPACE }} + name: Deploy to OpenShift + +on: + push: + branches: + - main + +jobs: + deploy: + runs-on: ubuntu-latest + + env: + APP_NAME: nationalparks-new + IMAGE_REGISTRY: my-registry-url + OPENSHIFT_NAMESPACE: manoj-singh8-dev + OPENSHIFT_SERVER: https://api.sandbox-m3.1530.p1.openshiftapps.com:6443 + + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Set up OpenShift CLI + run: | + curl -LO https://mirror.openshift.com/pub/openshift-v4/clients/ocp/stable/openshift-client-linux.tar.gz + tar -xzf openshift-client-linux.tar.gz -C /usr/local/bin/ + oc version + + - name: Login to OpenShift + env: + OPENSHIFT_TOKEN: ${{ secrets.OPENSHIFT_TOKEN }} + run: | + if [ -z "$OPENSHIFT_TOKEN" ]; then + echo "OpenShift token is not set." + exit 1 + fi + oc login "${{ env.OPENSHIFT_SERVER }}" --token="$OPENSHIFT_TOKEN" --insecure-skip-tls-verify + + - name: Build and push image to OpenShift registry + run: | + IMAGE="${{ env.IMAGE_REGISTRY }}/${{ env.OPENSHIFT_NAMESPACE }}/${{ env.APP_NAME }}:${{ github.sha }}" + docker build -t "$IMAGE" . + docker push "$IMAGE" + + - name: Deploy to OpenShift + run: | + bash "${GITHUB_WORKSPACE}/.github/script.sh" \ + "${{ env.APP_NAME }}" \ + "${{ env.IMAGE_REGISTRY }}/${{ env.OPENSHIFT_NAMESPACE }}/${{ env.APP_NAME }}:${{ github.sha }}" \ + "${{ env.OPENSHIFT_NAMESPACE }}" + # Run Prisma Cloud Scan - name: Scan image From 4e7abea120ad614ad3be5277f4faf538305d374f Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Tue, 12 Nov 2024 23:45:38 +0530 Subject: [PATCH 56/68] Update README.adoc --- README.adoc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.adoc b/README.adoc index 32eb4ec9..13ab9f62 100644 --- a/README.adoc +++ b/README.adoc @@ -44,8 +44,8 @@ National Parks data comes from link:https://protectedplanet.net[ProtectedPlanet] We used this link:https://www.protectedplanet.net/en/search-areas?filters%5Bis_type%5D%5B%5D=terrestrial&filters%5Bdesignation%5D%5B%5D=Nacional+Park&filters%5Bdesignation%5D%5B%5D=National+Forest+Park&filters%5Bdesignation%5D%5B%5D=National+Historic+Park&filters%5Bdesignation%5D%5B%5D=National+Battlefield&filters%5Bdesignation%5D%5B%5D=National+Historic+Site&filters%5Bdesignation%5D%5B%5D=National+Historical+Park&filters%5Bdesignation%5D%5B%5D=National+Lakeshore&filters%5Bdesignation%5D%5B%5D=National+Military+Park&filters%5Bdesignation%5D%5B%5D=National+Monument&filters%5Bdesignation%5D%5B%5D=National+Park&filters%5Bdesignation%5D%5B%5D=National+Park+%28Category+Ii%29&filters%5Bdesignation%5D%5B%5D=National+Park+%28Commonwealth%29&filters%5Bdesignation%5D%5B%5D=National+Park+%28Fbih+Law%29&filters%5Bdesignation%5D%5B%5D=National+Park+%28PN%29&filters%5Bdesignation%5D%5B%5D=National+Park+%28Rs+Law%29&filters%5Bdesignation%5D%5B%5D=National+Park+%28Scientific%29&filters%5Bdesignation%5D%5B%5D=National+Park+%28Svalbard%29&filters%5Bdesignation%5D%5B%5D=National+Park+%28project%29&filters%5Bdesignation%5D%5B%5D=National+Park+-+Buffer+Zone&filters%5Bdesignation%5D%5B%5D=National+Park+-+Buffer+Zone%2FArea+Of+Adhesion&filters%5Bdesignation%5D%5B%5D=National+Park+-+Core+Area&filters%5Bdesignation%5D%5B%5D=National+Park+-+Integrale+Reserve&filters%5Bdesignation%5D%5B%5D=National+Park+-+Peripheral+Zone&filters%5Bdesignation%5D%5B%5D=National+Park+Aboriginal&filters%5Bdesignation%5D%5B%5D=National+Park+and+ASEAN+Heritage+Park&filters%5Bdesignation%5D%5B%5D=National+Park+and+Ecological+Reserve&filters%5Bdesignation%5D%5B%5D=National+Park+and+Indigenous+Territory&filters%5Bdesignation%5D%5B%5D=National+Reserve&filters%5Bdesignation%5D%5B%5D=National+River&filters%5Bdesignation%5D%5B%5D=National+Seashore[query] listing 2830 National Parks at the moment. -test testing SITA RAM HANUMAN - -Hello Sita Ram Sita Ram +test testing SITA RAM HANUMAN +ITA RAM HANUMAN + Sita Ram Sita Ram Hello Test Hello World From ea647ce114fef53fc9260a34f481e9cbcbb3dfcc Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Tue, 12 Nov 2024 23:53:20 +0530 Subject: [PATCH 57/68] Update OpenShift.yml --- .github/workflows/OpenShift.yml | 85 +++++++++++++++------------------ 1 file changed, 38 insertions(+), 47 deletions(-) diff --git a/.github/workflows/OpenShift.yml b/.github/workflows/OpenShift.yml index 7af96008..ae09be7e 100644 --- a/.github/workflows/OpenShift.yml +++ b/.github/workflows/OpenShift.yml @@ -1,8 +1,8 @@ name: OpenShift Deployment and Prisma Scan on: - push: - branches: [ master ] + push: + branches: [ main ] jobs: build-and-deploy: @@ -11,45 +11,38 @@ jobs: environment: development steps: - - name: Checkout Code - uses: actions/checkout@v2 - - - name: Build with Maven - run: mvn clean package # Or use ./gradlew build for Gradle - - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - - name: Log in to GitHub Container Registry - uses: docker/login-action@v2 - with: - registry: ghcr.io/${{ github.repository_owner }} - username: ${{ github.actor }} - password: ${{ github.token }} - - - name: Build and Push Docker Image - id: build-and-push - uses: docker/build-push-action@v4 - with: - context: . - file: ./Dockerfile - tags: | - ghcr.io/${{ github.repository_owner }}/nationalparks:latest - ghcr.io/${{ github.repository_owner }}/nationalparks:${{ github.sha }} - push: true - - name: Deploy to OpenShift + - name: Checkout Code + uses: actions/checkout@v2 -on: - push: - branches: - - main + - name: Build with Maven + run: mvn clean package # Or use ./gradlew build for Gradle + + - name: Set up QEMU + uses: docker/setup-qemu-action@v2 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + + - name: Log in to GitHub Container Registry + uses: docker/login-action@v2 + with: + registry: ghcr.io/${{ github.repository_owner }} + username: ${{ github.actor }} + password: ${{ github.token }} + + - name: Build and Push Docker Image + id: build-and-push + uses: docker/build-push-action@v4 + with: + context: . + file: ./Dockerfile + tags: | + ghcr.io/${{ github.repository_owner }}/nationalparks:latest + ghcr.io/${{ github.repository_owner }}/nationalparks:${{ github.sha }} + push: true -jobs: deploy: + name: Deploy to OpenShift and Run Prisma Scan runs-on: ubuntu-latest env: @@ -91,12 +84,10 @@ jobs: "${{ env.IMAGE_REGISTRY }}/${{ env.OPENSHIFT_NAMESPACE }}/${{ env.APP_NAME }}:${{ github.sha }}" \ "${{ env.OPENSHIFT_NAMESPACE }}" - - # Run Prisma Cloud Scan - - name: Scan image - uses: PaloAltoNetworks/prisma-cloud-scan@v1 - with: - pcc_console_url: ${{ env.pcc_console_url }} - pcc_user: ${{ env.pcc_user }} - pcc_pass: ${{ env.pcc_pass }} - image_name: ${{ env.IMAGE_REGISTRY }}/${{ env.APP_NAME }}:${{ github.sha }} + - name: Prisma Cloud Scan + uses: PaloAltoNetworks/prisma-cloud-scan@v1 + with: + pcc_console_url: ${{ secrets.PCC_CONSOLE_URL }} + pcc_user: ${{ secrets.PCC_USER }} + pcc_pass: ${{ secrets.PCC_PASS }} + image_name: ${{ env.IMAGE_REGISTRY }}/${{ env.APP_NAME }}:${{ github.sha }} From 0c7b48db3fd225816dbab3fb0385229221ebca0d Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Tue, 12 Nov 2024 23:55:14 +0530 Subject: [PATCH 58/68] Update README.adoc --- README.adoc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.adoc b/README.adoc index 13ab9f62..19db66da 100644 --- a/README.adoc +++ b/README.adoc @@ -45,7 +45,8 @@ National Parks data comes from link:https://protectedplanet.net[ProtectedPlanet] We used this link:https://www.protectedplanet.net/en/search-areas?filters%5Bis_type%5D%5B%5D=terrestrial&filters%5Bdesignation%5D%5B%5D=Nacional+Park&filters%5Bdesignation%5D%5B%5D=National+Forest+Park&filters%5Bdesignation%5D%5B%5D=National+Historic+Park&filters%5Bdesignation%5D%5B%5D=National+Battlefield&filters%5Bdesignation%5D%5B%5D=National+Historic+Site&filters%5Bdesignation%5D%5B%5D=National+Historical+Park&filters%5Bdesignation%5D%5B%5D=National+Lakeshore&filters%5Bdesignation%5D%5B%5D=National+Military+Park&filters%5Bdesignation%5D%5B%5D=National+Monument&filters%5Bdesignation%5D%5B%5D=National+Park&filters%5Bdesignation%5D%5B%5D=National+Park+%28Category+Ii%29&filters%5Bdesignation%5D%5B%5D=National+Park+%28Commonwealth%29&filters%5Bdesignation%5D%5B%5D=National+Park+%28Fbih+Law%29&filters%5Bdesignation%5D%5B%5D=National+Park+%28PN%29&filters%5Bdesignation%5D%5B%5D=National+Park+%28Rs+Law%29&filters%5Bdesignation%5D%5B%5D=National+Park+%28Scientific%29&filters%5Bdesignation%5D%5B%5D=National+Park+%28Svalbard%29&filters%5Bdesignation%5D%5B%5D=National+Park+%28project%29&filters%5Bdesignation%5D%5B%5D=National+Park+-+Buffer+Zone&filters%5Bdesignation%5D%5B%5D=National+Park+-+Buffer+Zone%2FArea+Of+Adhesion&filters%5Bdesignation%5D%5B%5D=National+Park+-+Core+Area&filters%5Bdesignation%5D%5B%5D=National+Park+-+Integrale+Reserve&filters%5Bdesignation%5D%5B%5D=National+Park+-+Peripheral+Zone&filters%5Bdesignation%5D%5B%5D=National+Park+Aboriginal&filters%5Bdesignation%5D%5B%5D=National+Park+and+ASEAN+Heritage+Park&filters%5Bdesignation%5D%5B%5D=National+Park+and+Ecological+Reserve&filters%5Bdesignation%5D%5B%5D=National+Park+and+Indigenous+Territory&filters%5Bdesignation%5D%5B%5D=National+Reserve&filters%5Bdesignation%5D%5B%5D=National+River&filters%5Bdesignation%5D%5B%5D=National+Seashore[query] listing 2830 National Parks at the moment. test testing SITA RAM HANUMAN -ITA RAM HANUMAN +SITA RAM HANUMAN +SITA RAM HANUMAN Sita Ram Sita Ram Hello Test Hello World From 385c2b9b42841a83a62ac61135caaaa8c2e43c72 Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Wed, 13 Nov 2024 00:08:13 +0530 Subject: [PATCH 59/68] Update OpenShift.yml --- .github/workflows/OpenShift.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/OpenShift.yml b/.github/workflows/OpenShift.yml index ae09be7e..5ed55230 100644 --- a/.github/workflows/OpenShift.yml +++ b/.github/workflows/OpenShift.yml @@ -1,4 +1,4 @@ -name: OpenShift Deployment and Prisma Scan +name: OpenShift Deployment and Prisma Cloud Scan on: push: From 0dff7942186b17de352b590cb65406fe04c6d4a8 Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Wed, 13 Nov 2024 00:09:32 +0530 Subject: [PATCH 60/68] Delete .github/workflows directory --- .github/workflows/OpenShift.yml | 93 --------------------------------- 1 file changed, 93 deletions(-) delete mode 100644 .github/workflows/OpenShift.yml diff --git a/.github/workflows/OpenShift.yml b/.github/workflows/OpenShift.yml deleted file mode 100644 index 5ed55230..00000000 --- a/.github/workflows/OpenShift.yml +++ /dev/null @@ -1,93 +0,0 @@ -name: OpenShift Deployment and Prisma Cloud Scan - -on: - push: - branches: [ main ] - -jobs: - build-and-deploy: - name: Build, Push, Deploy to OpenShift, and Scan - runs-on: ubuntu-22.04 - environment: development - - steps: - - name: Checkout Code - uses: actions/checkout@v2 - - - name: Build with Maven - run: mvn clean package # Or use ./gradlew build for Gradle - - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - - name: Log in to GitHub Container Registry - uses: docker/login-action@v2 - with: - registry: ghcr.io/${{ github.repository_owner }} - username: ${{ github.actor }} - password: ${{ github.token }} - - - name: Build and Push Docker Image - id: build-and-push - uses: docker/build-push-action@v4 - with: - context: . - file: ./Dockerfile - tags: | - ghcr.io/${{ github.repository_owner }}/nationalparks:latest - ghcr.io/${{ github.repository_owner }}/nationalparks:${{ github.sha }} - push: true - - deploy: - name: Deploy to OpenShift and Run Prisma Scan - runs-on: ubuntu-latest - - env: - APP_NAME: nationalparks-new - IMAGE_REGISTRY: my-registry-url - OPENSHIFT_NAMESPACE: manoj-singh8-dev - OPENSHIFT_SERVER: https://api.sandbox-m3.1530.p1.openshiftapps.com:6443 - - steps: - - name: Checkout code - uses: actions/checkout@v2 - - - name: Set up OpenShift CLI - run: | - curl -LO https://mirror.openshift.com/pub/openshift-v4/clients/ocp/stable/openshift-client-linux.tar.gz - tar -xzf openshift-client-linux.tar.gz -C /usr/local/bin/ - oc version - - - name: Login to OpenShift - env: - OPENSHIFT_TOKEN: ${{ secrets.OPENSHIFT_TOKEN }} - run: | - if [ -z "$OPENSHIFT_TOKEN" ]; then - echo "OpenShift token is not set." - exit 1 - fi - oc login "${{ env.OPENSHIFT_SERVER }}" --token="$OPENSHIFT_TOKEN" --insecure-skip-tls-verify - - - name: Build and push image to OpenShift registry - run: | - IMAGE="${{ env.IMAGE_REGISTRY }}/${{ env.OPENSHIFT_NAMESPACE }}/${{ env.APP_NAME }}:${{ github.sha }}" - docker build -t "$IMAGE" . - docker push "$IMAGE" - - - name: Deploy to OpenShift - run: | - bash "${GITHUB_WORKSPACE}/.github/script.sh" \ - "${{ env.APP_NAME }}" \ - "${{ env.IMAGE_REGISTRY }}/${{ env.OPENSHIFT_NAMESPACE }}/${{ env.APP_NAME }}:${{ github.sha }}" \ - "${{ env.OPENSHIFT_NAMESPACE }}" - - - name: Prisma Cloud Scan - uses: PaloAltoNetworks/prisma-cloud-scan@v1 - with: - pcc_console_url: ${{ secrets.PCC_CONSOLE_URL }} - pcc_user: ${{ secrets.PCC_USER }} - pcc_pass: ${{ secrets.PCC_PASS }} - image_name: ${{ env.IMAGE_REGISTRY }}/${{ env.APP_NAME }}:${{ github.sha }} From 3ca840f0289e263ecd02fc3ba3896cf0f7944b7b Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Wed, 13 Nov 2024 00:10:10 +0530 Subject: [PATCH 61/68] Create OpenshiftDeploy.yml --- .github/workflows/OpenshiftDeploy.yml | 93 +++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) create mode 100644 .github/workflows/OpenshiftDeploy.yml diff --git a/.github/workflows/OpenshiftDeploy.yml b/.github/workflows/OpenshiftDeploy.yml new file mode 100644 index 00000000..ae09be7e --- /dev/null +++ b/.github/workflows/OpenshiftDeploy.yml @@ -0,0 +1,93 @@ +name: OpenShift Deployment and Prisma Scan + +on: + push: + branches: [ main ] + +jobs: + build-and-deploy: + name: Build, Push, Deploy to OpenShift, and Scan + runs-on: ubuntu-22.04 + environment: development + + steps: + - name: Checkout Code + uses: actions/checkout@v2 + + - name: Build with Maven + run: mvn clean package # Or use ./gradlew build for Gradle + + - name: Set up QEMU + uses: docker/setup-qemu-action@v2 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + + - name: Log in to GitHub Container Registry + uses: docker/login-action@v2 + with: + registry: ghcr.io/${{ github.repository_owner }} + username: ${{ github.actor }} + password: ${{ github.token }} + + - name: Build and Push Docker Image + id: build-and-push + uses: docker/build-push-action@v4 + with: + context: . + file: ./Dockerfile + tags: | + ghcr.io/${{ github.repository_owner }}/nationalparks:latest + ghcr.io/${{ github.repository_owner }}/nationalparks:${{ github.sha }} + push: true + + deploy: + name: Deploy to OpenShift and Run Prisma Scan + runs-on: ubuntu-latest + + env: + APP_NAME: nationalparks-new + IMAGE_REGISTRY: my-registry-url + OPENSHIFT_NAMESPACE: manoj-singh8-dev + OPENSHIFT_SERVER: https://api.sandbox-m3.1530.p1.openshiftapps.com:6443 + + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Set up OpenShift CLI + run: | + curl -LO https://mirror.openshift.com/pub/openshift-v4/clients/ocp/stable/openshift-client-linux.tar.gz + tar -xzf openshift-client-linux.tar.gz -C /usr/local/bin/ + oc version + + - name: Login to OpenShift + env: + OPENSHIFT_TOKEN: ${{ secrets.OPENSHIFT_TOKEN }} + run: | + if [ -z "$OPENSHIFT_TOKEN" ]; then + echo "OpenShift token is not set." + exit 1 + fi + oc login "${{ env.OPENSHIFT_SERVER }}" --token="$OPENSHIFT_TOKEN" --insecure-skip-tls-verify + + - name: Build and push image to OpenShift registry + run: | + IMAGE="${{ env.IMAGE_REGISTRY }}/${{ env.OPENSHIFT_NAMESPACE }}/${{ env.APP_NAME }}:${{ github.sha }}" + docker build -t "$IMAGE" . + docker push "$IMAGE" + + - name: Deploy to OpenShift + run: | + bash "${GITHUB_WORKSPACE}/.github/script.sh" \ + "${{ env.APP_NAME }}" \ + "${{ env.IMAGE_REGISTRY }}/${{ env.OPENSHIFT_NAMESPACE }}/${{ env.APP_NAME }}:${{ github.sha }}" \ + "${{ env.OPENSHIFT_NAMESPACE }}" + + - name: Prisma Cloud Scan + uses: PaloAltoNetworks/prisma-cloud-scan@v1 + with: + pcc_console_url: ${{ secrets.PCC_CONSOLE_URL }} + pcc_user: ${{ secrets.PCC_USER }} + pcc_pass: ${{ secrets.PCC_PASS }} + image_name: ${{ env.IMAGE_REGISTRY }}/${{ env.APP_NAME }}:${{ github.sha }} From 44f4652eb480a5e5f8437c042fa4bb44638e21a5 Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Wed, 13 Nov 2024 00:11:11 +0530 Subject: [PATCH 62/68] Update OpenshiftDeploy.yml --- .github/workflows/OpenshiftDeploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/OpenshiftDeploy.yml b/.github/workflows/OpenshiftDeploy.yml index ae09be7e..2498f2cd 100644 --- a/.github/workflows/OpenshiftDeploy.yml +++ b/.github/workflows/OpenshiftDeploy.yml @@ -2,7 +2,7 @@ name: OpenShift Deployment and Prisma Scan on: push: - branches: [ main ] + branches: [ master] jobs: build-and-deploy: From 1a1660328d108764b797cf54405c109b4d52a4bc Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Wed, 13 Nov 2024 00:25:36 +0530 Subject: [PATCH 63/68] Update OpenshiftDeploy.yml --- .github/workflows/OpenshiftDeploy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/OpenshiftDeploy.yml b/.github/workflows/OpenshiftDeploy.yml index 2498f2cd..4ba134ea 100644 --- a/.github/workflows/OpenshiftDeploy.yml +++ b/.github/workflows/OpenshiftDeploy.yml @@ -50,6 +50,7 @@ jobs: IMAGE_REGISTRY: my-registry-url OPENSHIFT_NAMESPACE: manoj-singh8-dev OPENSHIFT_SERVER: https://api.sandbox-m3.1530.p1.openshiftapps.com:6443 + OPENSHIFT_TOKEN: sha256~5W0lZBuwF2Oz_DAcxyChe3K9rmz7XZZYj_RR0qc5YKo steps: - name: Checkout code From edfe34f1e72966b155bc68117167fe243825d8ce Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Wed, 13 Nov 2024 00:30:16 +0530 Subject: [PATCH 64/68] Update OpenshiftDeploy.yml --- .github/workflows/OpenshiftDeploy.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/OpenshiftDeploy.yml b/.github/workflows/OpenshiftDeploy.yml index 4ba134ea..7235b239 100644 --- a/.github/workflows/OpenshiftDeploy.yml +++ b/.github/workflows/OpenshiftDeploy.yml @@ -2,13 +2,13 @@ name: OpenShift Deployment and Prisma Scan on: push: - branches: [ master] + branches: [ main ] jobs: build-and-deploy: name: Build, Push, Deploy to OpenShift, and Scan runs-on: ubuntu-22.04 - environment: development + environment: development # Set the environment to 'development' steps: - name: Checkout Code @@ -28,7 +28,7 @@ jobs: with: registry: ghcr.io/${{ github.repository_owner }} username: ${{ github.actor }} - password: ${{ github.token }} + password: ${{ secrets.GITHUB_TOKEN }} # Use environment secret - name: Build and Push Docker Image id: build-and-push @@ -44,13 +44,13 @@ jobs: deploy: name: Deploy to OpenShift and Run Prisma Scan runs-on: ubuntu-latest + environment: development # Set the environment to 'development' env: APP_NAME: nationalparks-new IMAGE_REGISTRY: my-registry-url OPENSHIFT_NAMESPACE: manoj-singh8-dev OPENSHIFT_SERVER: https://api.sandbox-m3.1530.p1.openshiftapps.com:6443 - OPENSHIFT_TOKEN: sha256~5W0lZBuwF2Oz_DAcxyChe3K9rmz7XZZYj_RR0qc5YKo steps: - name: Checkout code @@ -64,7 +64,7 @@ jobs: - name: Login to OpenShift env: - OPENSHIFT_TOKEN: ${{ secrets.OPENSHIFT_TOKEN }} + OPENSHIFT_TOKEN: ${{ secrets.OPENSHIFT_TOKEN }} # Use environment secret run: | if [ -z "$OPENSHIFT_TOKEN" ]; then echo "OpenShift token is not set." @@ -88,7 +88,7 @@ jobs: - name: Prisma Cloud Scan uses: PaloAltoNetworks/prisma-cloud-scan@v1 with: - pcc_console_url: ${{ secrets.PCC_CONSOLE_URL }} - pcc_user: ${{ secrets.PCC_USER }} - pcc_pass: ${{ secrets.PCC_PASS }} + pcc_console_url: ${{ secrets.PCC_CONSOLE_URL }} # Use environment secret + pcc_user: ${{ secrets.PCC_USER }} # Use environment secret + pcc_pass: ${{ secrets.PCC_PASS }} # Use environment secret image_name: ${{ env.IMAGE_REGISTRY }}/${{ env.APP_NAME }}:${{ github.sha }} From e7583b41393c948563a38604519a09b1896f3d7e Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Wed, 13 Nov 2024 00:34:59 +0530 Subject: [PATCH 65/68] Update OpenshiftDeploy.yml --- .github/workflows/OpenshiftDeploy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/OpenshiftDeploy.yml b/.github/workflows/OpenshiftDeploy.yml index 7235b239..456e8aed 100644 --- a/.github/workflows/OpenshiftDeploy.yml +++ b/.github/workflows/OpenshiftDeploy.yml @@ -51,6 +51,7 @@ jobs: IMAGE_REGISTRY: my-registry-url OPENSHIFT_NAMESPACE: manoj-singh8-dev OPENSHIFT_SERVER: https://api.sandbox-m3.1530.p1.openshiftapps.com:6443 + OPENSHIFT_TOKEN: ${{ env.OPENSHIFT_TOKEN }} steps: - name: Checkout code From 957b451b1893c2f481d9af928c751731eb4620ea Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Wed, 13 Nov 2024 00:41:11 +0530 Subject: [PATCH 66/68] Update OpenshiftDeploy.yml --- .github/workflows/OpenshiftDeploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/OpenshiftDeploy.yml b/.github/workflows/OpenshiftDeploy.yml index 456e8aed..47c74d99 100644 --- a/.github/workflows/OpenshiftDeploy.yml +++ b/.github/workflows/OpenshiftDeploy.yml @@ -2,7 +2,7 @@ name: OpenShift Deployment and Prisma Scan on: push: - branches: [ main ] + branches: [ master] jobs: build-and-deploy: From 74b990a86a269dde58b9538f42d328bae11b4998 Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Wed, 13 Nov 2024 00:44:23 +0530 Subject: [PATCH 67/68] Update OpenshiftDeploy.yml --- .github/workflows/OpenshiftDeploy.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/OpenshiftDeploy.yml b/.github/workflows/OpenshiftDeploy.yml index 47c74d99..fda10fec 100644 --- a/.github/workflows/OpenshiftDeploy.yml +++ b/.github/workflows/OpenshiftDeploy.yml @@ -51,8 +51,7 @@ jobs: IMAGE_REGISTRY: my-registry-url OPENSHIFT_NAMESPACE: manoj-singh8-dev OPENSHIFT_SERVER: https://api.sandbox-m3.1530.p1.openshiftapps.com:6443 - OPENSHIFT_TOKEN: ${{ env.OPENSHIFT_TOKEN }} - + OPENSHIFT_TOKEN: sha256~5W0lZBuwF2Oz_DAcxyChe3K9rmz7XZZYj_RR0qc5YKo steps: - name: Checkout code uses: actions/checkout@v2 @@ -65,7 +64,7 @@ jobs: - name: Login to OpenShift env: - OPENSHIFT_TOKEN: ${{ secrets.OPENSHIFT_TOKEN }} # Use environment secret + OPENSHIFT_TOKEN: sha256~5W0lZBuwF2Oz_DAcxyChe3K9rmz7XZZYj_RR0qc5YKo # Use environment secret run: | if [ -z "$OPENSHIFT_TOKEN" ]; then echo "OpenShift token is not set." From a927b00df0ffeb2b2206ee098c96d860da8b1493 Mon Sep 17 00:00:00 2001 From: devopscicd17 <86373586+devopscicd17@users.noreply.github.com> Date: Wed, 13 Nov 2024 00:46:03 +0530 Subject: [PATCH 68/68] Update OpenshiftDeploy.yml --- .github/workflows/OpenshiftDeploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/OpenshiftDeploy.yml b/.github/workflows/OpenshiftDeploy.yml index fda10fec..68cf7726 100644 --- a/.github/workflows/OpenshiftDeploy.yml +++ b/.github/workflows/OpenshiftDeploy.yml @@ -51,7 +51,7 @@ jobs: IMAGE_REGISTRY: my-registry-url OPENSHIFT_NAMESPACE: manoj-singh8-dev OPENSHIFT_SERVER: https://api.sandbox-m3.1530.p1.openshiftapps.com:6443 - OPENSHIFT_TOKEN: sha256~5W0lZBuwF2Oz_DAcxyChe3K9rmz7XZZYj_RR0qc5YKo + OPENSHIFT_TOKEN: sha256~nL8HZTc43467qXnWYhYJPnAOEP0CywTJOE422kL-b3Q steps: - name: Checkout code uses: actions/checkout@v2 @@ -64,7 +64,7 @@ jobs: - name: Login to OpenShift env: - OPENSHIFT_TOKEN: sha256~5W0lZBuwF2Oz_DAcxyChe3K9rmz7XZZYj_RR0qc5YKo # Use environment secret + OPENSHIFT_TOKEN: sha256~nL8HZTc43467qXnWYhYJPnAOEP0CywTJOE422kL-b3Q # Use environment secret run: | if [ -z "$OPENSHIFT_TOKEN" ]; then echo "OpenShift token is not set."