Compare commits

...

6 Commits

Author SHA1 Message Date
Marcin-Ramotowski
f7e9b0bd90 Updated image - added wait_for_db and healthcheck to app 2025-06-13 18:25:41 +00:00
Marcin-Ramotowski
bcfb0897bf Add client id of managed identity 2025-06-12 21:37:56 +00:00
Marcin-Ramotowski
c09d7c448f Merged tasks for both containers 2025-06-12 21:35:07 +00:00
Marcin-Ramotowski
cbd77b8bb1 Prepared Docker image to run for pod agent 2025-06-12 21:31:45 +00:00
Marcin-Ramotowski
4901890d0e Created pipeline for Jenkins in Kubernetes cluster 2025-06-12 19:02:29 +00:00
Marcin-Ramotowski
f55776916e Updated managed identity 2025-06-11 18:42:21 +00:00
7 changed files with 146 additions and 38 deletions

32
.jenkins/Dockerfile Normal file
View File

@ -0,0 +1,32 @@
FROM debian:bookworm-slim
# Zapobiega interaktywnym promptom
ENV DEBIAN_FRONTEND=noninteractive
# Instalacja zależności systemowych
RUN apt-get update && apt-get install -y \
ca-certificates \
curl \
gnupg \
lsb-release \
apt-transport-https \
software-properties-common \
unzip \
bash \
&& rm -rf /var/lib/apt/lists/*
# Instalacja Azure CLI
RUN curl -sL https://aka.ms/InstallAzureCLIDeb | bash
# Instalacja kubectl (najświeższa stabilna wersja)
RUN curl -sLo /usr/local/bin/kubectl https://dl.k8s.io/release/v1.33.1/bin/linux/amd64/kubectl \
&& chmod +x /usr/local/bin/kubectl
# Instalacja kubelogin
RUN curl -sLo /tmp/kubelogin.zip https://github.com/Azure/kubelogin/releases/latest/download/kubelogin-linux-amd64.zip \
&& unzip -j /tmp/kubelogin.zip -d /usr/local/bin \
&& chmod +x /usr/local/bin/kubelogin \
&& rm /tmp/kubelogin.zip
# Domyślna komenda po starcie kontenera
CMD ["bash"]

86
.jenkins/Jenkinsfile vendored Normal file
View File

@ -0,0 +1,86 @@
pipeline {
agent {
kubernetes {
yamlFile '.jenkins/podTemplate.yaml'
}
}
environment {
RESOURCE_GROUP = 'tst-aks-rg'
CLUSTER_NAME = 'build'
DEPLOY_FILES = 'namespace.yaml secret-store.yaml deploy.yaml ingress.yaml'
NAMESPACE = 'user-microservice'
DEPLOYMENT = 'api'
CLIENT_ID = 'c302726f-fafb-4143-94c1-67a70975574a'
}
stages {
stage('Checkout') {
steps {
container('kubectl') {
checkout scm
}
}
}
stage('Login to Azure & Get Kubeconfig') {
steps {
container('kubectl') {
sh '''
az login --identity --client-id ${CLIENT_ID}
az aks get-credentials --resource-group $RESOURCE_GROUP --name $CLUSTER_NAME --overwrite-existing
kubelogin convert-kubeconfig -l azurecli
'''
}
}
}
stage('Apply Kubernetes Resources') {
steps {
container('kubectl') {
script {
def files = DEPLOY_FILES.tokenize()
for (file in files) {
sh "kubectl apply -f ${file}"
}
}
}
}
}
stage('Verify Deployment') {
steps {
container('kubectl') {
script {
// Waiting until all pods reach "ready" status
sh '''
echo "Waiting for deployment rollout..."
kubectl rollout status deployment/$DEPLOYMENT -n $NAMESPACE --timeout=60s
'''
}
}
}
}
stage('Health Check') {
steps {
container('kubectl') {
script {
// Check if app is healthy
def ingressUrl = "https://user-microservice.marcin00.pl/health"
sh """
echo "Checking app health ${ingressUrl}..."
for i in {1..30}; do
if curl -sf $ingressUrl; then
echo "Health check OK"
exit 0
else
echo "Health check failed. Retry \$i..."
sleep 5
fi
done
echo "Health check failed."
exit 1
"""
}
}
}
}
}
}

24
.jenkins/podTemplate.yaml Normal file
View File

@ -0,0 +1,24 @@
apiVersion: v1
kind: Pod
metadata:
labels:
some-label: jenkins-agent
spec:
containers:
- name: kubectl
image: marcin00.azurecr.io/azure-cli-kubectl:latest
command:
- cat
tty: true
volumeMounts:
- name: workspace-volume
mountPath: /home/jenkins/agent
volumes:
- name: workspace-volume
emptyDir: {}
nodeSelector:
kubernetes.io/os: linux
restartPolicy: Never

34
Jenkinsfile vendored
View File

@ -1,34 +0,0 @@
pipeline {
agent any
stages {
stage('Checkout') {
steps {
checkout scm
}
}
stage('Get credentials to Cluster') {
steps {
sh '''
az login --identity
az aks get-credentials --resource-group tst-aks-rg --name edu
kubelogin convert-kubeconfig -l azurecli
'''
}
}
stage('Apply to Cluster') {
steps {
sh '''
kubectl apply -f namespace.yaml
kubectl apply -f secret-store.yaml
kubectl apply -f deploy.yaml
kubectl apply -f ingress.yaml
'''
}
}
}
post {
cleanup {
sh 'rm -f ~/.kube/config || true'
}
}
}

View File

@ -81,7 +81,7 @@ spec:
spec: spec:
containers: containers:
- name: api - name: api
image: marcin00.azurecr.io/user-microservice:76a351710fffe2be1ae10471bc1a2f511f481126 image: marcin00.azurecr.io/user-microservice:a79ae2d50f2fc3dfcf976eb2a8ebe32511ae4a33
ports: ports:
- containerPort: 80 - containerPort: 80
env: env:

View File

@ -4,7 +4,7 @@ metadata:
name: deployer-binding name: deployer-binding
subjects: subjects:
- kind: User - kind: User
name: daabce80-f745-413f-8377-00472517521c name: f91aef65-7d2a-4df8-a884-e33b05d54a31
apiGroup: rbac.authorization.k8s.io apiGroup: rbac.authorization.k8s.io
roleRef: roleRef:
kind: ClusterRole kind: ClusterRole

View File

@ -24,8 +24,8 @@ spec:
parameters: parameters:
usePodIdentity: "false" usePodIdentity: "false"
useVMManagedIdentity: "true" useVMManagedIdentity: "true"
userAssignedIdentityID: "0c2780e4-8594-4aab-8f1a-8a19f71924bd" # client_id of the user-assigned managed identity userAssignedIdentityID: "f91aef65-7d2a-4df8-a884-e33b05d54a31" # client_id of the user-assigned managed identity
clientID: "0c2780e4-8594-4aab-8f1a-8a19f71924bd" # client_id of the user-assigned managed identity clientID: "f91aef65-7d2a-4df8-a884-e33b05d54a31" # client_id of the user-assigned managed identity
keyvaultName: "dev-aks" keyvaultName: "dev-aks"
objects: | objects: |
array: array: