Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Native JWT Verification added. And merged with latest develop #2

Merged
merged 55 commits into from
Nov 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
29bcea7
Merge branch 'develop' into 1.2.0.1
urviljoshi May 6, 2022
ce82633
Merge branch '1.2.0.1' into develop
urviljoshi May 6, 2022
179bb3a
version reverted
urviljoshi May 6, 2022
098674f
[DSD-1039] Commented out slack notifications from push_trigger.yml.
gaganama May 25, 2022
31d76fc
Merge pull request #191 from gaganamadival/develop
ckm007 Jun 9, 2022
01553a1
conflict resolve while cherry-pick
urviljoshi Aug 4, 2022
02d3386
health check added to both consolidator and hub
urviljoshi Aug 4, 2022
eac84c1
health check added to both consolidator and hub
urviljoshi Aug 4, 2022
f4421e8
port 9192 exposed from dockerfile
urviljoshi Aug 4, 2022
66c0774
review comments implemented
urviljoshi Aug 5, 2022
79d120b
review comments implemented
urviljoshi Aug 5, 2022
09fe2f4
modulke name refactored
urviljoshi Aug 9, 2022
49fa263
consolidator status is assigned from json resp
urviljoshi Aug 10, 2022
60e295d
503 respstatus added in case of status as down
urviljoshi Aug 19, 2022
324269a
version for dependency modified
urviljoshi Sep 22, 2022
fd8f71c
Merge pull request #198 from urviljoshi/healcheck-consol-dev
urviljoshi Sep 23, 2022
82948b3
push trigger modified to build admin client before hub
urviljoshi Sep 23, 2022
4913ca1
Merge pull request #199 from urviljoshi/healcheck-consol-dev
urviljoshi Sep 23, 2022
fe15009
[MOSIP-28241] Added build details in Dockerfile and docker build in p…
Prafulrakhade Jul 31, 2023
ebadf6e
[MOSIP-29261] Updated workflows as per reusable workflows templates (…
syedsalman3753 Sep 12, 2023
b52fab9
[MOSIP-29261] Updated PROJECT_KEY for kafka-admin-client (#220)
syedsalman3753 Sep 13, 2023
b282336
[MOSIP-29261] Updated release-changes.yml (#221)
syedsalman3753 Sep 26, 2023
36143b3
[DSD-3932] removed release-changes.yml, tag.yml and updated push-trig…
Prafulrakhade Dec 25, 2023
13589c3
Temp verison update to test the semver verioning
vishwa-vyom Dec 26, 2023
c2d485c
Merge pull request #229 from mosip/vishwa-vyom-patch-2
vishwa-vyom Dec 26, 2023
ec55dc8
[DSD-4312] Update push-trigger.yml
Prafulrakhade Jan 24, 2024
cf5849d
Merge pull request #231 from Prafulrakhade/develop
ckm007 Jan 24, 2024
e62f210
Merge remote-tracking branch 'origin/release-1.2.0.1' into develop_12…
Mar 20, 2024
70a3b69
Rolledback change
Mar 20, 2024
db5d3d0
MOSIP-31977: Modified branch name
Apr 23, 2024
2743969
Merge pull request #250 from HimajaDhanyamraju2/develop_1201merge
ckm007 Apr 23, 2024
d075928
MOSIP-33042: Merging java17 changes (#272)
HimajaDhanyamraju2 Jul 2, 2024
1cd23ec
[MOSIP-34233] added helm lint and publish workflow
ckm007 Jul 16, 2024
3810f8a
[MOSIP-34233] added deployment script for websub
ckm007 Jul 16, 2024
3ee57f7
[MOSIP-34233] added helm chart for websub
ckm007 Jul 16, 2024
3f12b22
[MOSIP-34233] corrected helm chart version
ckm007 Jul 16, 2024
049befb
Merge pull request #276 from ckm007/develop
ckm007 Jul 18, 2024
90caa75
[DSD-5599]added changes for sonar coverage. (#279)
Mahesh-Binayak Jul 25, 2024
b98be60
fix: kafka-admin-client/pom.xml to reduce vulnerabilities (#278)
rajapandi1234 Jul 31, 2024
9532387
[MOSIP-35160] Updated URL from https://github.com/mosip/mosip-infra/b…
Prafulrakhade Sep 9, 2024
f9f32f7
Merge pull request #281 from Prafulrakhade/develop
ckm007 Sep 10, 2024
169c3a3
MOSIP-31248 (#244)
HimajaDhanyamraju2 Sep 11, 2024
27ea5e0
[MOSIP-35892] Updated helm charts to add range
Rakshithb1 Oct 18, 2024
a791f11
[MOSIP-35892] Updated download-artifact version
Rakshithb1 Oct 28, 2024
599c4b5
In-house JWT Validation added. Removed MOSIP_AUTH dependency. Fixed k…
lalithkota Nov 10, 2024
c4041d2
Github action version upgrade
lalithkota Nov 10, 2024
7f5863c
Docker build process simplified
lalithkota Nov 10, 2024
0d239d8
Docker build github action paths updated
lalithkota Nov 10, 2024
714ca76
Incorrect docker base image updated
lalithkota Nov 10, 2024
0b3cb98
Merge pull request #283 from Rakshithb1/develop
ckm007 Nov 13, 2024
61e3472
Security Auth: Bearer fixed
lalithkota Nov 14, 2024
36e76fb
Fixed github actions paths
lalithkota Nov 14, 2024
0c4a3c4
Fixed minor bugs
lalithkota Nov 14, 2024
5c1d361
Merge remote-tracking branch 'upstream/develop' into develop-1.2.0.1-…
lalithkota Nov 18, 2024
8c89876
Added openg2p helm charts. Changed all versions to develop
lalithkota Nov 18, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed .github/keys/mosipgpgkey_pub.gpg
Binary file not shown.
Binary file removed .github/keys/mosipgpgkey_sec.gpg
Binary file not shown.
62 changes: 0 additions & 62 deletions .github/workflows/chart-lint-publish.yml

This file was deleted.

95 changes: 95 additions & 0 deletions .github/workflows/docker-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
name: Docker build and push

on:
push:
branches:
- "**"
tags-ignore:
- "**"
paths:
- "consolidator/**"
- "hub/**"
- "kafka-admin-client/**"
- "*.Dockerfile"
pull_request:
branches:
- "**"
paths:
- "consolidator/**"
- "hub/**"
- "kafka-admin-client/**"
- "*.Dockerfile"
workflow_dispatch:

jobs:
docker-build-consolidator:
name: Docker Build Consolidator
runs-on: ubuntu-latest
env:
NAMESPACE: ${{ secrets.docker_hub_organisation || 'mosipdev' }}
SERVICE_NAME: 'consolidator-websub-service'
steps:
- uses: actions/checkout@v3
- name: Docker build
run: |
BRANCH_NAME=$(echo ${{ github.ref }} | sed -e 's,.*/\(.*\),\1,')
IMAGE_ID=$NAMESPACE/$SERVICE_NAME

# Change all uppercase to lowercase
IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
VERSION=$BRANCH_NAME
if [[ $BRANCH_NAME == master || $BRANCH_NAME == main ]]; then
VERSION=develop
fi
echo IMAGE_ID=$IMAGE_ID
echo VERSION=$VERSION
echo IMAGE_ID=$IMAGE_ID >> $GITHUB_ENV
echo VERSION=$VERSION >> $GITHUB_ENV

docker build . \
--file consolidator.Dockerfile \
--tag $IMAGE_ID:$VERSION
if [[ '${{ secrets.docker_hub_token }}' != '' && '${{ secrets.docker_hub_actor }}' != '' && '${{ github.event_name }}' != 'pull_request' ]]; then
echo DOCKER_PUSH=true >> $GITHUB_ENV
fi
- name: Docker Push
if: env.DOCKER_PUSH == 'true'
run: |
echo "${{ secrets.docker_hub_token }}" | docker login -u ${{ secrets.docker_hub_actor }} --password-stdin
docker push ${{ env.IMAGE_ID }}:${{ env.VERSION }}

docker-build-websub:
name: Docker Build Websub
runs-on: ubuntu-latest
env:
NAMESPACE: ${{ secrets.docker_hub_organisation || 'mosipdev' }}
SERVICE_NAME: 'websub-service'
steps:
- uses: actions/checkout@v3
- name: Docker build
run: |
BRANCH_NAME=$(echo ${{ github.ref }} | sed -e 's,.*/\(.*\),\1,')
IMAGE_ID=$NAMESPACE/$SERVICE_NAME

# Change all uppercase to lowercase
IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
VERSION=$BRANCH_NAME
if [[ $BRANCH_NAME == master || $BRANCH_NAME == main ]]; then
VERSION=develop
fi
echo IMAGE_ID=$IMAGE_ID
echo VERSION=$VERSION
echo IMAGE_ID=$IMAGE_ID >> $GITHUB_ENV
echo VERSION=$VERSION >> $GITHUB_ENV

docker build . \
--file hub.Dockerfile \
--tag $IMAGE_ID:$VERSION
if [[ '${{ secrets.docker_hub_token }}' != '' && '${{ secrets.docker_hub_actor }}' != '' && '${{ github.event_name }}' != 'pull_request' ]]; then
echo DOCKER_PUSH=true >> $GITHUB_ENV
fi
- name: Docker Push
if: env.DOCKER_PUSH == 'true'
run: |
echo "${{ secrets.docker_hub_token }}" | docker login -u ${{ secrets.docker_hub_actor }} --password-stdin
docker push ${{ env.IMAGE_ID }}:${{ env.VERSION }}
134 changes: 134 additions & 0 deletions .github/workflows/helm-charts-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,134 @@
name: Build and Publish Helm charts

on:
push:
tags-ignore:
- '**'
branches:
- 1.*
- develop
- main
workflow_dispatch:
inputs:
forcePublishCharts:
description: "Force publish Charts?"
default: "*"
type: string

jobs:
generate-charts:
runs-on: ubuntu-latest
env:
SKIP: 'FALSE'
RANCHER_CHART_FILTER: "openg2p.org/add-to-rancher"
FORCE_PUBLISH_CHARTS: "${{ inputs.forcePublishCharts || '' }}"
defaults:
run:
shell: bash
steps:
- name: Checkout Repository
uses: actions/checkout@v3

- id: files
if: env.FORCE_PUBLISH_CHARTS == ''
uses: jitterbit/get-changed-files@v1

- name: save helm/charts to tmp.txt file
run: |
touch charts-list.txt
if [ -n "${FORCE_PUBLISH_CHARTS}" ]; then
for chart in charts/${FORCE_PUBLISH_CHARTS}/; do
chart="${chart#charts/}"
chart="${chart%/}"
echo "$chart" >> charts-list.txt
done
else
for changed_file in ${{ steps.files.outputs.all }}; do
if [[ ${changed_file} =~ ^charts ]]; then
chart_name=$(echo "${changed_file}" | awk -F/ '/^[charts]/{print $2}')
echo $chart_name >> charts-list.txt;
echo "Saved $chart_name chart to charts-list.txt"
fi
done
cat charts-list.txt | sort | uniq > charts-list-unique.txt
mv charts-list-unique.txt charts-list.txt
fi
echo "List of charts to be published";
cat charts-list.txt

- name: Generate tar files
run: |
if [[ ! -s charts-list.txt ]]; then
echo "::warning::No Charts to publish";
echo "SKIP=TRUE" >> $GITHUB_ENV
else
for chartpath in charts/*/; do
if [ -f ${chartpath}Chart.yaml ]; then
helm dep up $chartpath
fi
done
RANCHER_CHARTS=()
while IFS= read -r chartpath; do
echo "chartpath: $chartpath"
chartname=$(basename "$chartpath")
if [ -f charts/${chartname}/Chart.yaml ]; then
echo "Chartname: $chartname"
helm package charts/$chartpath
is_rancher_chart=$(grep "$RANCHER_CHART_FILTER" charts/${chartpath%*/}/Chart.yaml || true)
if [ -n "$is_rancher_chart" ]; then
RANCHER_CHARTS+=("$chartname")
fi
fi
done < charts-list.txt
echo "RANCHER_CHARTS=${RANCHER_CHARTS[@]}" >> $GITHUB_ENV
rm charts-list.txt
fi

shopt -s nocasematch
if [[ '${{ github.repository_owner }}' != 'OpenG2P' ]]; then
echo "SKIP=TRUE" >> $GITHUB_ENV
fi
- name: Upload tar as Artifact
uses: actions/upload-artifact@v4
with:
name: charts
path: ./*.tgz
if: env.SKIP != 'TRUE'

- name: Checkout branch for publishing
uses: actions/checkout@v3
with:
repository: 'openg2p/openg2p-helm'
ref: gh-pages
token: ${{ secrets.OPENG2P_BOT_GITHUB_PAT }}
if: env.SKIP != 'TRUE'

- name: Download tar from Artifacts
uses: actions/download-artifact@v4
with:
name: charts
path: ./
if: env.SKIP != 'TRUE'

- name: Update index.yaml
run: |
helm repo index --url https://openg2p.github.io/openg2p-helm/ .
for chartname in $RANCHER_CHARTS; do
cp ${chartname}*.tgz rancher/
done
helm repo index --url https://openg2p.github.io/openg2p-helm/ --merge rancher/index.yaml rancher
for chartname in $RANCHER_CHARTS; do
rm rancher/${chartname}*.tgz || true
done
if: env.SKIP != 'TRUE'

- name: Commit Changes to repository
uses: EndBug/add-and-commit@v7
with:
branch: gh-pages
author_name: openg2pbot
author_email: [email protected]
default_author: user_info
message: 'added common helm charts for publish openg2p/websub@${{ github.sha }}'
add: './*.tgz ./index.yaml rancher/index.yaml'
if: env.SKIP != 'TRUE'
Loading
Loading