Compare commits
2 Commits
main
...
2a80c733b3
Author | SHA1 | Date | |
---|---|---|---|
2a80c733b3 | |||
3764970082 |
72
Jenkinsfile
vendored
Normal file
72
Jenkinsfile
vendored
Normal file
@ -0,0 +1,72 @@
|
|||||||
|
pipeline {
|
||||||
|
agent any
|
||||||
|
environment {
|
||||||
|
DOCKER_REGISTRY_URL = 'marcin00.azurecr.io'
|
||||||
|
DOCKER_IMAGE = "${DOCKER_REGISTRY_URL}/user-microservice:${GIT_COMMIT}"
|
||||||
|
ACR_NAME = 'marcin00'
|
||||||
|
}
|
||||||
|
stages {
|
||||||
|
stage('Checkout') {
|
||||||
|
steps {
|
||||||
|
checkout scm
|
||||||
|
}
|
||||||
|
}
|
||||||
|
stage('Test python app') {
|
||||||
|
steps {
|
||||||
|
script {
|
||||||
|
dir('api') {
|
||||||
|
sh '''
|
||||||
|
python3 -m venv env
|
||||||
|
source env/bin/activate
|
||||||
|
pip install -r requirements.txt pytest
|
||||||
|
python3 -m pytest --junit-xml=pytest_junit.xml
|
||||||
|
'''
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
post {
|
||||||
|
always {
|
||||||
|
junit testResults: '**/*pytest_junit.xml'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
stage('Build & test docker image') {
|
||||||
|
steps {
|
||||||
|
script {
|
||||||
|
appImage = docker.build("${DOCKER_IMAGE}")
|
||||||
|
|
||||||
|
sh label: 'Install dgoss', script: '''
|
||||||
|
curl -s -L https://github.com/aelsabbahy/goss/releases/latest/download/goss-linux-amd64 -o goss
|
||||||
|
curl -s -L https://github.com/aelsabbahy/goss/releases/latest/download/dgoss -o dgoss
|
||||||
|
chmod +rx *goss
|
||||||
|
'''
|
||||||
|
|
||||||
|
withEnv(['GOSS_OPTS=-f junit', 'GOSS_PATH=./goss', 'GOSS_SLEEP=3', 'SQLALCHEMY_DATABASE_URI=sqlite:///:memory:']) {
|
||||||
|
sh label: 'run image tests', script: './dgoss run -e SQLALCHEMY_DATABASE_URI=sqlite:///:memory: ${DOCKER_IMAGE} > goss_junit.xml'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
post {
|
||||||
|
always {
|
||||||
|
junit testResults: '**/*goss_junit.xml'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
stage('Deploy') {
|
||||||
|
steps {
|
||||||
|
script {
|
||||||
|
sh '''
|
||||||
|
az login --identity
|
||||||
|
az acr login --name ${ACR_NAME}
|
||||||
|
docker push ${DOCKER_IMAGE}
|
||||||
|
'''
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
post {
|
||||||
|
cleanup {
|
||||||
|
script { cleanWs() }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -4,7 +4,7 @@ from flask_jwt_extended import JWTManager
|
|||||||
from jwt import ExpiredSignatureError
|
from jwt import ExpiredSignatureError
|
||||||
from models import db, RevokedToken
|
from models import db, RevokedToken
|
||||||
import os
|
import os
|
||||||
from utils import init_db, wait_for_db
|
from utils import init_db
|
||||||
from views import user_bp
|
from views import user_bp
|
||||||
from werkzeug.exceptions import HTTPException
|
from werkzeug.exceptions import HTTPException
|
||||||
|
|
||||||
@ -53,7 +53,6 @@ def create_app(config_name="default"):
|
|||||||
|
|
||||||
# Fill database by initial values (only if we are not testing)
|
# Fill database by initial values (only if we are not testing)
|
||||||
with app.app_context():
|
with app.app_context():
|
||||||
wait_for_db()
|
|
||||||
db.create_all()
|
db.create_all()
|
||||||
if config_name != "testing":
|
if config_name != "testing":
|
||||||
init_db()
|
init_db()
|
||||||
|
19
api/utils.py
19
api/utils.py
@ -2,9 +2,6 @@ from flask import abort
|
|||||||
from flask_jwt_extended import get_jwt_identity
|
from flask_jwt_extended import get_jwt_identity
|
||||||
from models import User, db
|
from models import User, db
|
||||||
import os
|
import os
|
||||||
from sqlalchemy import text
|
|
||||||
from sqlalchemy.exc import DatabaseError
|
|
||||||
import time
|
|
||||||
from werkzeug.security import generate_password_hash
|
from werkzeug.security import generate_password_hash
|
||||||
|
|
||||||
|
|
||||||
@ -30,22 +27,6 @@ def get_user_or_404(user_id):
|
|||||||
return user
|
return user
|
||||||
|
|
||||||
|
|
||||||
MAX_RETRIES = 100
|
|
||||||
|
|
||||||
def wait_for_db():
|
|
||||||
for retries in range(MAX_RETRIES):
|
|
||||||
try:
|
|
||||||
with db.engine.connect() as connection:
|
|
||||||
connection.execute(text("SELECT 1"))
|
|
||||||
print("Successfully connected with database.")
|
|
||||||
return
|
|
||||||
except DatabaseError:
|
|
||||||
print(f"Waiting for database... (retry {retries + 1})")
|
|
||||||
time.sleep(3)
|
|
||||||
print("Failed to connect to database.")
|
|
||||||
raise Exception("Database not ready after multiple retries.")
|
|
||||||
|
|
||||||
|
|
||||||
def init_db():
|
def init_db():
|
||||||
"""Create default admin account if database is empty"""
|
"""Create default admin account if database is empty"""
|
||||||
with db.session.begin():
|
with db.session.begin():
|
||||||
|
5
argo-workflows/acr-pusher.yaml
Normal file
5
argo-workflows/acr-pusher.yaml
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
apiVersion: v1
|
||||||
|
kind: ServiceAccount
|
||||||
|
metadata:
|
||||||
|
name: edu-agentpool
|
||||||
|
namespace: argo
|
12
argo-workflows/argo-workflow-manager-role.yaml
Normal file
12
argo-workflows/argo-workflow-manager-role.yaml
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
|
kind: Role
|
||||||
|
metadata:
|
||||||
|
namespace: argo
|
||||||
|
name: argo-workflow-manager
|
||||||
|
rules:
|
||||||
|
- apiGroups: ["argoproj.io"]
|
||||||
|
resources: ["workflowtaskresults"]
|
||||||
|
verbs: ["create", "get", "list", "update", "patch", "delete"]
|
||||||
|
- apiGroups: ["argoproj.io"]
|
||||||
|
resources: ["workflows"]
|
||||||
|
verbs: ["create", "get", "list", "update", "patch", "delete"]
|
99
argo-workflows/build.yaml
Normal file
99
argo-workflows/build.yaml
Normal file
@ -0,0 +1,99 @@
|
|||||||
|
apiVersion: argoproj.io/v1alpha1
|
||||||
|
kind: Workflow
|
||||||
|
metadata:
|
||||||
|
generateName: build-workflow-
|
||||||
|
spec:
|
||||||
|
entrypoint: main
|
||||||
|
serviceAccountName: edu-agentpool
|
||||||
|
volumeClaimTemplates:
|
||||||
|
- metadata:
|
||||||
|
name: workspace
|
||||||
|
spec:
|
||||||
|
accessModes: [ "ReadWriteOnce" ]
|
||||||
|
resources:
|
||||||
|
requests:
|
||||||
|
storage: 1Gi
|
||||||
|
templates:
|
||||||
|
|
||||||
|
# 🔁 Main steps sequence
|
||||||
|
- name: main
|
||||||
|
steps:
|
||||||
|
- - name: checkout
|
||||||
|
template: git-checkout
|
||||||
|
arguments: {}
|
||||||
|
- - name: test-python
|
||||||
|
template: python-tests
|
||||||
|
- - name: build-and-test-image
|
||||||
|
template: docker-goss-test
|
||||||
|
- - name: deploy
|
||||||
|
template: push-docker-image
|
||||||
|
|
||||||
|
# 📦 GIT CHECKOUT
|
||||||
|
- name: git-checkout
|
||||||
|
script:
|
||||||
|
image: alpine/git
|
||||||
|
command: [sh]
|
||||||
|
source: |
|
||||||
|
git clone https://gitea.marcin00.pl/pikram/user-microservice.git /workspace/repo
|
||||||
|
cd /workspace/repo
|
||||||
|
git checkout main
|
||||||
|
volumeMounts:
|
||||||
|
- name: workspace
|
||||||
|
mountPath: /workspace
|
||||||
|
|
||||||
|
# 🧪 PYTHON TESTS
|
||||||
|
- name: python-tests
|
||||||
|
script:
|
||||||
|
image: python:3.11.7-alpine
|
||||||
|
command: [sh]
|
||||||
|
source: |
|
||||||
|
cd /workspace/repo/api
|
||||||
|
python3 -m venv env
|
||||||
|
. env/bin/activate
|
||||||
|
pip install -r requirements.txt pytest
|
||||||
|
python3 -m pytest --junit-xml=pytest_junit.xml
|
||||||
|
volumeMounts:
|
||||||
|
- name: workspace
|
||||||
|
mountPath: /workspace
|
||||||
|
|
||||||
|
# 🐳 BUILDS AND GOSS TESTS
|
||||||
|
- name: docker-goss-test
|
||||||
|
script:
|
||||||
|
image: docker:cli
|
||||||
|
command: [sh]
|
||||||
|
source: |
|
||||||
|
cd /workspace/repo
|
||||||
|
docker build -t ${DOCKER_IMAGE} .
|
||||||
|
|
||||||
|
curl -s -L https://github.com/aelsabbahy/goss/releases/latest/download/goss-linux-amd64 -o goss
|
||||||
|
curl -s -L https://github.com/aelsabbahy/goss/releases/latest/download/dgoss -o dgoss
|
||||||
|
chmod +rx *goss
|
||||||
|
|
||||||
|
export GOSS_OPTS="-f junit"
|
||||||
|
export GOSS_PATH=./goss
|
||||||
|
export GOSS_SLEEP=3
|
||||||
|
./dgoss run -e SQLALCHEMY_DATABASE_URI=sqlite:///:memory: ${DOCKER_IMAGE} > /workspace/goss_junit.xml
|
||||||
|
env:
|
||||||
|
- name: DOCKER_IMAGE
|
||||||
|
value: marcin00.azurecr.io/user-microservice:$(WORKFLOW_ID)
|
||||||
|
volumeMounts:
|
||||||
|
- name: workspace
|
||||||
|
mountPath: /workspace
|
||||||
|
|
||||||
|
# 🚀 DEPLOY
|
||||||
|
- name: push-docker-image
|
||||||
|
script:
|
||||||
|
image: mcr.microsoft.com/azure-cli
|
||||||
|
command: [sh]
|
||||||
|
source: |
|
||||||
|
az login --identity
|
||||||
|
az acr login --name ${ACR_NAME}
|
||||||
|
docker push ${DOCKER_IMAGE}
|
||||||
|
env:
|
||||||
|
- name: ACR_NAME
|
||||||
|
value: marcin00
|
||||||
|
- name: DOCKER_IMAGE
|
||||||
|
value: marcin00.azurecr.io/user-microservice:$(WORKFLOW_ID)
|
||||||
|
volumeMounts:
|
||||||
|
- name: workspace
|
||||||
|
mountPath: /workspace
|
13
argo-workflows/role-binding.yaml
Normal file
13
argo-workflows/role-binding.yaml
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
|
kind: RoleBinding
|
||||||
|
metadata:
|
||||||
|
name: argo-edu-agentpool-binding
|
||||||
|
namespace: argo
|
||||||
|
subjects:
|
||||||
|
- kind: ServiceAccount
|
||||||
|
name: edu-agentpool
|
||||||
|
namespace: argo
|
||||||
|
roleRef:
|
||||||
|
kind: Role
|
||||||
|
name: argo-workflow-manager
|
||||||
|
apiGroup: rbac.authorization.k8s.io
|
Reference in New Issue
Block a user