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.

Sign up for GitHub

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

Jump to bottom

feat: QAT-549 setup policy files #75

Merged
merged 13 commits into from
Aug 22, 2024
Merged

feat: QAT-549 setup policy files #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ba3af31
setup policy files and add to kustomization
kunle-johnson Aug 20, 2024
66ff586
modify query to update http_route file
kunle-johnson Aug 20, 2024
c24ac8b
amend http_route shell command
kunle-johnson Aug 21, 2024
6fcb7f8
fix index out of range error
kunle-johnson Aug 21, 2024
295acd7
fix parsing error
kunle-johnson Aug 21, 2024
a4c2791
fix parsing error
kunle-johnson Aug 21, 2024
741245e
fix parsing error
kunle-johnson Aug 21, 2024
d35b294
fix parsing error
kunle-johnson Aug 21, 2024
290b8db
update preview path
kunle-johnson Aug 21, 2024
e944d1b
disable ingress_patch update due to gateway migration
kunle-johnson Aug 21, 2024
d92ffdd
modify the check_path query
kunle-johnson Aug 22, 2024
6e1c2e8
cleanup of policy files for preview env
kunle-johnson Aug 22, 2024
66c2cec
correct typo
kunle-johnson Aug 22, 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
56 changes: 50 additions & 6 deletions .github/workflows/preview-cleanup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ jobs:
cd frontend/dashboard-frontend/overlay/${K8S_ENV_NAME}
rm -f $preview_branch_name-deployment.yaml
rm -f $preview_branch_name-service.yaml
rm -f $preview_branch_name-backend_policy.yaml
rm -f $preview_branch_name-health_check_policy.yaml
env:
preview_branch_name: ${{inputs.preview_branch_name}}
K8S_ENV_NAME: development
Expand All @@ -50,22 +52,52 @@ jobs:
else
echo "Entries found for $preview_branch_name-service.yaml. Executing Cleanup"
sed -i "/$preview_branch_name-service.yaml/d" kustomization.yaml
fi
check_backend_policy_file=$(preview_backend_policy_file=$preview_branch_name-backend_policy.yaml yq '(.resources[] | select (test(env(preview_backend_policy_file)))' kustomization.yaml)
if [[ -z $check_backend_policy_file ]];then
echo "No entries found for $preview_branch_name-backend_policy.yaml."
else
echo "Entries found for $preview_branch_name-backend_policy.yaml. Executing Cleanup"
sed -i "/$preview_branch_name-backend_policy.yaml/d" kustomization.yaml
fi
check_health_check_policy_file=$(preview_health_check_policy_file=$preview_branch_name-health_check_policy.yaml yq '(.resources[] | select (test(env(preview_health_check_policy_file)))' kustomization.yaml)
if [[ -z $check_health_check_policy_file ]];then
echo "No entries found for $preview_branch_name-health_check_policy.yaml."
else
echo "Entries found for $preview_branch_name-health_check_policy.yaml. Executing Cleanup"
sed -i "/$preview_branch_name-health_check_policy.yaml/d" kustomization.yaml
fi
env:
K8S_ENV_NAME: development
preview_branch_name: ${{inputs.preview_branch_name}}
shell: bash

- name: Remove the preview path from ingress file
# - name: Remove the preview path from ingress file
# run: |-
# cd frontend/dashboard-frontend/overlay/${K8S_ENV_NAME}
# preview_path=$preview_branch_name
# check_path=$(yq '.. | select(has("path")) | select (.path == "*'$preview_path'*")' ingress-patch.yaml)
# if [[ -z $check_path ]]; then
# echo "No Entries found /$preview_branch_name in ingress path no action required"
# else
# echo "Entries found for /$preview_branch_name in path ingress.yaml. Doing the clean up"
# preview_path=/$preview_branch_name/.* preview_service=dashboard-frontend-dev-$preview_branch_name-service yq -i '.spec.rules.[0].http.paths -=[{"path":env(preview_path),"pathType": "Prefix","backend": {"service": {"name":env(preview_service),"port":{"number":3000}}}}]' ingress-patch.yaml
# fi
# env:
# K8S_ENV_NAME: development
# preview_branch_name: ${{inputs.preview_branch_name}}
# shell: bash

- name: Remove the preview path from http_route file
run: |-
cd frontend/dashboard-frontend/overlay/${K8S_ENV_NAME}
preview_path=$preview_branch_name
check_path=$(yq '.. | select(has("path")) | select (.path == "*'$preview_path'*")' ingress-patch.yaml)
if [[ -z $check_path ]]; then
echo "No Entries found /$preview_branch_name in ingress path no action required"
check_path_route=$(yq '.. | select(has("value")) | select (.value == "*'$preview_path'")' http_route.yaml)
if [[ -z $check_path_route ]]; then
echo "No Entries found /$preview_branch_name in http_route path, no action required"
else
echo "Entries found for /$preview_branch_name in path ingress.yaml. Doing the clean up"
preview_path=/$preview_branch_name/.* preview_service=dashboard-frontend-dev-$preview_branch_name-service yq -i '.spec.rules.[0].http.paths -=[{"path":env(preview_path),"pathType": "Prefix","backend": {"service": {"name":env(preview_service),"port":{"number":3000}}}}]' ingress-patch.yaml
echo "Entries found for /$preview_branch_name in path http_route.yaml. Doing the clean up"
preview_path=/$preview_branch_name preview_service=dashboard-frontend-dev-$preview_branch_name-service yq -i '.spec.rules += [{"matches": [{"path":{"type": "PathPrefix", "value": env(preview_path)}}] , "backendRefs": [{"kind": "Service", "name": env(preview_service), "port": 3000 }]}]' http_route.yaml
fi
env:
K8S_ENV_NAME: development
Expand All @@ -88,6 +120,18 @@ jobs:
else
echo "File $preview_branch_name-service.yaml not found. No action required."
fi
if [ -e $preview_branch_name-backend_policy.yaml ]; then
echo "File $preview_branch_name-backend_policy.yaml found. Executing git rm for $preview_branch_name-backend_policy.yaml."
git rm $preview_branch_name-backend_policy.yaml
else
echo "File $preview_branch_name-backend_policy.yaml not found. No action required."
fi
if [ -e $preview_branch_name-health_check_policy.yaml ]; then
echo "File $preview_branch_name-health_check_policy.yaml found. Executing git rm for $preview_branch_name-health_check_policy.yaml."
git rm $preview_branch_name-health_check_policy.yaml
else
echo "File $preview_branch_name-health_check_policy.yaml not found. No action required."
fi
git config --local user.name "ultimateai-bot"
git commit -m "Doing the clean up for Preview Env for ${preview_branch_name}" -a || echo "Nothing to commit for ${preview_branch_name}, already cleaned!" >> $GITHUB_STEP_SUMMARY
git push ${REMOTE_REPO} HEAD:main --force
Expand Down
86 changes: 76 additions & 10 deletions .github/workflows/preview-deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,12 @@ jobs:
echo "configmap_name=$configmap_name" >> $GITHUB_OUTPUT
shell: bash

- name: Update the apps in deployment file and service file with branch names
- name: Update the apps in deployment, service, backend_policy & health_check_policy files with branch names
run: |-
sed -i "s/branch-name/$preview_branch_name/g" "preview_deploy/deployment.yaml"
sed -i "s/branch-name/$preview_branch_name/g" "preview_deploy/service.yaml"
sed -i "s/branch-name/$preview_branch_name/g" "preview_deploy/backend_policy.yaml"
sed -i "s/branch-name/$preview_branch_name/g" "preview_deploy/health_check_policy.yaml"
env:
preview_branch_name: ${{ inputs.preview_branch_name }}
shell: bash
Expand All @@ -67,7 +69,7 @@ jobs:
current_configmap_name: ${{ steps.get_configmap.outputs.configmap_name }}
shell: bash

- name: Update the image tag in deploymet file
- name: Update the image tag in deployment file
run: |-
sed -i "s/tag-name/$image_tag/g" "preview_deploy/deployment.yaml"
env:
Expand All @@ -88,6 +90,22 @@ jobs:
path: preview_deploy/service.yaml
- name: Echo service file
run: echo "${{ steps.service_file.outputs.content }}"
shell: bash
- name: Read backend policy file
id: backend_policy_file
uses: juliangruber/read-file-action@v1
with:
path: preview_deploy/backend_policy.yaml
- name: Echo backend policy file
run: echo "${{ steps.backend_policy_file.outputs.content }}"
shell: bash
- name: Read health check policy file
id: health_check_policy_file
uses: juliangruber/read-file-action@v1
with:
path: preview_deploy/health_check_policy.yaml
- name: Echo health check policy file
run: echo "${{ steps.health_check_policy_file.outputs.content }}"
shell: bash
- name: "Checkout dashboard-frontend k8s manifests"
uses: actions/checkout@v3
Expand All @@ -100,13 +118,21 @@ jobs:
cd frontend/dashboard-frontend/overlay/${K8S_ENV_NAME}
touch $preview_branch_name-deployment.yaml
touch $preview_branch_name-service.yaml
touch $preview_branch_name-backend_policy.yaml
touch $preview_branch_name-health_check_policy.yaml
cat /dev/null > $preview_branch_name-deployment.yaml
cat /dev/null > $preview_branch_name-service.yaml
cat /dev/null > $preview_branch_name-backend_policy.yaml
cat /dev/null > $preview_branch_name-health_check_policy.yaml
echo -e "$deployment_file" >> $preview_branch_name-deployment.yaml
echo -e "$service_file" >> $preview_branch_name-service.yaml
echo -e "$backend_policy_file" >> $preview_branch_name-backend_policy.yaml
echo -e "$health_check_policy_file" >> $preview_branch_name-health_check_policy.yaml
env:
service_file: ${{ steps.service_file.outputs.content }}
deployment_file: ${{ steps.deployment_file.outputs.content }}
backend_policy_file: ${{ steps.backend_policy_file.outputs.content }}
health_check_policy_file: ${{ steps.health_check_policy_file.outputs.content }}
preview_branch_name: ${{ inputs.preview_branch_name }}
K8S_ENV_NAME: development
shell: bash
Expand All @@ -126,26 +152,66 @@ jobs:
preview_service_file=$preview_branch_name-service.yaml yq -i '.resources += env(preview_service_file)' kustomization.yaml
else
echo "Entries found for $preview_branch_name-service.yaml. No action required."
fi
check_backend_policy_file=$(preview_backend_policy_file=$preview_branch_name-backend_policy.yaml yq '(.resources[] | select (test(env(preview_backend_policy_file)))' kustomization.yaml)
if [[ -z $check_backend_policy_file ]];then
echo "Entries Not found for $preview_branch_name-backend_policy.yaml. Adding Entry for $preview_branch_name-backend_policy.yaml."
preview_backend_policy_file=$preview_branch_name-backend_policy.yaml yq -i '.resources += env(preview_backend_policy_file)' kustomization.yaml
else
echo "Entries found for $preview_branch_name-backend_policy.yaml. No action required."
fi
check_health_check_policy_file=$(preview_health_check_policy_file=$preview_branch_name-health_check_policy.yaml yq '(.resources[] | select (test(env(preview_health_check_policy_file)))' kustomization.yaml)
if [[ -z $check_health_check_policy_file ]];then
echo "Entries Not found for $preview_branch_name-health_check_policy.yaml. Adding Entry for $preview_branch_name-health_check_policy.yaml."
preview_health_check_policy_file=$preview_branch_name-health_check_policy.yaml yq -i '.resources += env(preview_health_check_policy_file)' kustomization.yaml
else
echo "Entries found for $preview_branch_name-health_check_policy.yaml. No action required."
fi
env:
K8S_ENV_NAME: development
preview_branch_name: ${{ inputs.preview_branch_name }}
shell: bash

- name: Update the ingress file of the preview environment path
# - name: Update the ingress file of the preview environment path
# run: |-
# cd frontend/dashboard-frontend/overlay/${K8S_ENV_NAME}
# preview_path=$preview_branch_name
# check_path=$(yq '.. | select(has("path")) | select (.path == "*'$preview_path'*")' ingress-patch.yaml)
# if [[ -z $check_path ]]; then
# echo "No Entries found /$preview_branch_name in ingress path. Adding the required path."
# preview_path=/$preview_branch_name/.* preview_service=dashboard-frontend-dev-$preview_branch_name-service yq -i '.spec.rules.[0].http.paths +=[{"path":env(preview_path),"pathType": "Prefix","backend": {"service": {"name":env(preview_service),"port":{"number":3000}}}}]' ingress-patch.yaml
# else
# echo "Entries found for /$preview_branch_name in path ingress.yaml. No action required."
# fi
# git config --local user.email "86783263+ultimateai-bot@users.noreply.github.com"
# git add $preview_branch_name-deployment.yaml
# git add $preview_branch_name-service.yaml
# git config --local user.name "ultimateai-bot"
# git commit -m "Adding $preview_branch_name-deployment.yaml file with ${IMAGE_NAME}:${TAGS} & $preview_branch_name-service.yaml file" -a
# git push ${REMOTE_REPO} HEAD:main --force
# env:
# REMOTE_REPO: https://${{ secrets.repo_token }}@github.com/ultimateai/k8s-manifests.git
# K8S_ENV_NAME: development
# preview_branch_name: ${{ inputs.preview_branch_name }}
# TAGS: ${{ inputs.image_tag }}
# shell: bash

- name: Update the http-route file of the preview environment path
run: |-
cd frontend/dashboard-frontend/overlay/${K8S_ENV_NAME}
preview_path=$preview_branch_name
check_path=$(yq '.. | select(has("path")) | select (.path == "*'$preview_path'*")' ingress-patch.yaml)
if [[ -z $check_path ]]; then
echo "No Entries found /$preview_branch_name in ingress path. Adding the required path."
preview_path=/$preview_branch_name/.* preview_service=dashboard-frontend-dev-$preview_branch_name-service yq -i '.spec.rules.[0].http.paths +=[{"path":env(preview_path),"pathType": "Prefix","backend": {"service": {"name":env(preview_service),"port":{"number":3000}}}}]' ingress-patch.yaml
check_path_route=$(yq '.. | select(has("value")) | select (.value == "*'$preview_path'")' http_route.yaml)
if [[ -z $check_path_route ]]; then
echo "No Entries found /$preview_branch_name in http_route path. Adding the required path."
preview_path=/$preview_branch_name preview_service=dashboard-frontend-dev-$preview_branch_name-service yq -i '.spec.rules += [{"matches": [{"path":{"type": "PathPrefix", "value": env(preview_path)}}] , "backendRefs": [{"kind": "Service", "name": env(preview_service), "port": 3000 }]}]' http_route.yaml
else
echo "Entries found for /$preview_branch_name in path ingress.yaml. No action required."
fi
echo "Entries found for /$preview_branch_name in path http_route.yaml. No action required."
fi
git config --local user.email "86783263+ultimateai-bot@users.noreply.github.com"
git add $preview_branch_name-deployment.yaml
git add $preview_branch_name-service.yaml
git add $preview_branch_name-backend_policy.yaml
git add $preview_branch_name-health_check_policy.yaml
git config --local user.name "ultimateai-bot"
git commit -m "Adding $preview_branch_name-deployment.yaml file with ${IMAGE_NAME}:${TAGS} & $preview_branch_name-service.yaml file" -a
git push ${REMOTE_REPO} HEAD:main --force
Expand All @@ -154,4 +220,4 @@ jobs:
K8S_ENV_NAME: development
preview_branch_name: ${{ inputs.preview_branch_name }}
TAGS: ${{ inputs.image_tag }}
shell: bash
shell: bash