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

Fix service name URL #1

Open
wants to merge 44 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
e4d6eba
Fix service name URL
Jul 24, 2022
f6d8dec
Merge pull request #1 from ktaf/dev
ktaf Jul 24, 2022
0b08d83
Create github-ci.yml
ktaf Jul 24, 2022
0edd98d
Merge pull request #2 from ktaf/ci
ktaf Jul 24, 2022
dfc67c6
ci test
Jul 24, 2022
c5e97f8
ci build
Jul 24, 2022
6c6064b
Merge pull request #3 from ktaf/ci
ktaf Jul 24, 2022
5b612c9
ci publish
Jul 24, 2022
caa1c6c
Merge pull request #4 from ktaf/ci
ktaf Jul 24, 2022
e71e4ed
fix dockerhub username
Jul 24, 2022
81ba8c7
change CI name
Jul 24, 2022
4b458ef
Merge pull request #5 from ktaf/ci
ktaf Jul 24, 2022
ae4e7a9
Add product_review helmchart
Jul 25, 2022
d3b980f
Add product_service helmchart
Jul 25, 2022
5099990
Small fixes on product_review HelmChart
Jul 25, 2022
60e13c2
Merge pull request #6 from ktaf/dev
ktaf Jul 25, 2022
f9fcbba
Add Semver Docker Tags
Jul 25, 2022
d009841
Merge pull request #7 from ktaf/ci
ktaf Jul 25, 2022
da84dd8
Change Semver Docker Tags
Jul 25, 2022
557e9e4
Change Semver Docker Tags
Jul 25, 2022
dd2ffa9
Fix Typo
Jul 25, 2022
b20be33
Merge pull request #8 from ktaf/ci
ktaf Jul 25, 2022
e37e8c7
Fix TAG in Dockerfile
Jul 25, 2022
569ae90
Fix tags in ci
Jul 25, 2022
b7c4e0a
Merge pull request #9 from ktaf/ci
ktaf Jul 25, 2022
71dcb7c
Fix tags in ci
Jul 25, 2022
0e706b7
Merge pull request #10 from ktaf/ci
ktaf Jul 25, 2022
52031b6
Fix tags in ci
Jul 25, 2022
6b29d21
Fix tags in ci
Jul 25, 2022
cd97949
Change Image Tags
Jul 25, 2022
b686001
Add Flux v0.31.4 component manifests
Jul 25, 2022
5608d50
Add Flux sync manifests
Jul 25, 2022
aef70e7
Merge pull request #12 from ktaf/dev
ktaf Jul 25, 2022
6191fbb
Change Image Tags
Jul 25, 2022
5ac9fb9
Merge pull request #11 from ktaf/ci
ktaf Jul 25, 2022
9a0cf79
Merge branch 'dev' of github.com:ktaf/product-manage-challenge into dev
Jul 25, 2022
8d75fc1
Merge pull request #13 from ktaf/dev
ktaf Jul 25, 2022
7770db1
Add gitops directories and staging gitsources
Jul 26, 2022
ba85425
Restructure helmcharts directory
Jul 26, 2022
f19fac5
Add staging HelmReleases
Jul 26, 2022
4099d19
Add production Gitsource and HelmReleases
Jul 26, 2022
c13cb24
Fix addresses
Jul 26, 2022
74eb8fa
Fix addresses
Jul 26, 2022
723cda7
Fix addresses
Jul 26, 2022
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
78 changes: 78 additions & 0 deletions .github/workflows/github-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven

name: CI

on:
push:
branches: [ "main" ]
pull_request:
branches: [ "main" ]
tags:
- 'v*'
jobs:
test:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- name: Set up JDK 11
uses: actions/setup-java@v3
with:
java-version: '11'
distribution: 'temurin'
cache: maven
- name: Test Product Review Service
run: mvn clean test -f ./product_review/pom.xml
- name: Test Product API
run: mvn clean test -f ./product_service/pom.xml

build:

needs: test
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- name: Set up JDK 11
uses: actions/setup-java@v3
with:
java-version: '11'
distribution: 'temurin'
cache: maven
- name: Build Product Review Service
run: mvn clean package -f ./product_review/pom.xml
- name: Build Product API
run: mvn clean package -f ./product_service/pom.xml

publish-on-docker:

needs: build
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2

- name: Login to DockerHub
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Build and push Product Review
uses: docker/build-push-action@v3
with:
context: ./product_review
push: true
tags: kouroshtaf/product_review:0.0.1, kouroshtaf/product_review:latest

- name: Build and push Product API
uses: docker/build-push-action@v3
with:
context: ./product_service
push: true
tags: kouroshtaf/product_service:0.0.1, kouroshtaf/product_service:latest
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
.idea/
**/*.iml
**/target/




gitops/clusters/staging/gitsources/repo-secret.yaml
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ services:
ports:
- "8080:8080"
environment:
- REVIEW_SERVICE_URL=http://product-review-service:8081
- REVIEW_SERVICE_URL=http://product-review:8081
13 changes: 13 additions & 0 deletions gitops/clusters/production/gitsources/helmcharts-repo.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
---
apiVersion: source.toolkit.fluxcd.io/v1beta2
kind: GitRepository
metadata:
name: helmcharts-repo-production
namespace: flux-system
spec:
interval: 5m
ref:
branch: main
url: ssh://[email protected]/ktaf/product-manage-challenge
secretRef:
name: product-manage-challenge-repo
22 changes: 22 additions & 0 deletions gitops/clusters/production/helmrelease/product-review.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
---
apiVersion: helm.toolkit.fluxcd.io/v2beta1
kind: HelmRelease
metadata:
name: product-review
namespace: flux-system
spec:
chart:
spec:
chart: ./helmcharts/product-review
reconcileStrategy: Revision
version: 1.0.0
sourceRef:
kind: GitRepository
name: helmcharts-repo-production
namespace: flux-system
valuesFiles:
- ./helmcharts/product-review/values.yaml
targetNamespace: production
releaseName: product-review
interval: 24h
timeout: 5m
22 changes: 22 additions & 0 deletions gitops/clusters/production/helmrelease/product-service.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
---
apiVersion: helm.toolkit.fluxcd.io/v2beta1
kind: HelmRelease
metadata:
name: product-service
namespace: flux-system
spec:
chart:
spec:
chart: ./helmcharts/product-service
reconcileStrategy: Revision
version: 1.0.0
sourceRef:
kind: GitRepository
name: helmcharts-repo-production
namespace: flux-system
valuesFiles:
- ./helmcharts/product-service/values.yaml
targetNamespace: production
releaseName: product-service
interval: 24h
timeout: 5m
13 changes: 13 additions & 0 deletions gitops/clusters/staging/gitsources/helmcharts-repo.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
---
apiVersion: source.toolkit.fluxcd.io/v1beta2
kind: GitRepository
metadata:
name: helmcharts-repo-staging
namespace: flux-system
spec:
interval: 5m
ref:
branch: dev
url: ssh://[email protected]/ktaf/product-manage-challenge
secretRef:
name: product-manage-challenge-repo
24 changes: 24 additions & 0 deletions gitops/clusters/staging/helmrelease/product-review.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
---
apiVersion: helm.toolkit.fluxcd.io/v2beta1
kind: HelmRelease
metadata:
name: product-review
namespace: flux-system
spec:
chart:
spec:
chart: ./helmcharts/product-review
reconcileStrategy: Revision
version: 1.0.0
sourceRef:
kind: GitRepository
name: helmcharts-repo-staging
namespace: flux-system
valuesFiles:
- ./helmcharts/product-review/values.yaml
test:
enable: true
targetNamespace: staging
releaseName: product-review
interval: 30m
timeout: 5m
24 changes: 24 additions & 0 deletions gitops/clusters/staging/helmrelease/product-service.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
---
apiVersion: helm.toolkit.fluxcd.io/v2beta1
kind: HelmRelease
metadata:
name: product-service
namespace: flux-system
spec:
chart:
spec:
chart: ./helmcharts/product-service
reconcileStrategy: Revision
version: 1.0.0
sourceRef:
kind: GitRepository
name: helmcharts-repo-staging
namespace: flux-system
valuesFiles:
- ./helmcharts/product-service/values.yaml
test:
enable: true
targetNamespace: staging
releaseName: product-service
interval: 30m
timeout: 5m
Loading