fix: set deploy job workdir to ./ansible, add ansible.cfg, other fixes

Author: JakubDurkac

.github/workflows/ci-cd.yaml

@@ -169,9 +169,13 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
+      - name: Install required Python libraries
+        run: pip install kubernetes openshift
+
       - name: Run Ansible deployment for stage
+        working-directory: ./ansible
         run: |
-          ansible-playbook ansible/playbooks/deploy.yml \
+          ansible-playbook playbooks/deploy.yml \
             ${{ needs.set-ansible-tags.outputs.ansible_tags }} \
             -e "env=stage" \
             -e "openshift_server=${{ secrets.OPENSHIFT_SERVER_STAGE }}" \
@@ -188,9 +192,13 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
+      - name: Install required Python libraries
+        run: pip install kubernetes openshift
+
       - name: Run Ansible deployment for production
+        working-directory: ./ansible
         run: |
-          ansible-playbook ansible/playbooks/deploy.yml \
+          ansible-playbook playbooks/deploy.yml \
             ${{ needs.set-ansible-tags.outputs.ansible_tags }} \
             -e "env=prod" \
             -e "openshift_server=${{ secrets.OPENSHIFT_SERVER_PROD }}" \

ansible/ansible.cfg

@@ -0,0 +1,3 @@
+[defaults]
+inventory = inventories/
+roles_path = roles/

ansible/inventories/prod.yml

@@ -3,7 +3,7 @@ pullsar-prod:
     localhost:
       ansible_connection: local
   vars:
-    namespace: "pullsar-prod"
+    project_namespace: "pullsar-prod"
     api_replicas: 2
     web_replicas: 2
     api_all_operators_catalog: "All Operators"

ansible/inventories/stage.yml

@@ -3,7 +3,7 @@ pullsar-stage:
     localhost:
       ansible_connection: local
   vars:
-    namespace: "pullsar-stage"
+    project_namespace: "pullsar-stage"
     api_replicas: 1
     web_replicas: 1
     api_all_operators_catalog: "All Operators"

ansible/roles/project_setup/tasks/main.yml

@@ -1,15 +1,8 @@
 ---
-- name: "Ensure project namespace '{{ namespace }}' exists"
-  kubernetes.core.k8s:
-    name: "{{ namespace }}"
-    api_version: v1
-    kind: Namespace
-    state: present
-
 - name: "Create or update the API configuration"
   kubernetes.core.k8s:
     state: present
-    namespace: "{{ namespace }}"
+    namespace: "{{ project_namespace }}"
     definition:
       apiVersion: v1
       kind: ConfigMap
@@ -22,7 +15,7 @@
 - name: "Create or update PostgreSQL credentials secret"
   kubernetes.core.k8s:
     state: present
-    namespace: "{{ namespace }}"
+    namespace: "{{ project_namespace }}"
     definition:
       apiVersion: v1
       kind: Secret
@@ -33,7 +26,7 @@
 - name: "Create or update Quay API token secret"
   kubernetes.core.k8s:
     state: present
-    namespace: "{{ namespace }}"
+    namespace: "{{ project_namespace }}"
     definition:
       apiVersion: v1
       kind: Secret
@@ -45,7 +38,7 @@
 - name: "Create or update worker registry auth secret"
   kubernetes.core.k8s:
     state: present
-    namespace: "{{ namespace }}"
+    namespace: "{{ project_namespace }}"
     definition:
       apiVersion: v1
       kind: Secret
@@ -57,7 +50,7 @@
 - name: "Create or update service account TLS secret"
   kubernetes.core.k8s:
     state: present
-    namespace: "{{ namespace }}"
+    namespace: "{{ project_namespace }}"
     definition:
       apiVersion: v1
       kind: Secret
@@ -71,7 +64,7 @@
 - name: "Create or update PostgreSQL from official OpenShift template"
   kubernetes.core.k8s:
     state: present
-    namespace: "{{ namespace }}"
+    namespace: "{{ project_namespace }}"
     definition: "{{ lookup('template', 'postgresql-persistent.yml') }}"
     parameters:
       POSTGRESQL_USER: "{{ postgres_credentials.DB_USER }}"
@@ -85,7 +78,7 @@
 - name: "Create ConfigMap for database migration script"
   kubernetes.core.k8s:
     state: present
-    namespace: "{{ namespace }}"
+    namespace: "{{ project_namespace }}"
     definition:
       apiVersion: v1
       kind: ConfigMap
@@ -97,5 +90,5 @@
 - name: "Run database migration job"
   kubernetes.core.k8s:
     state: present
-    namespace: "{{ namespace }}"
+    namespace: "{{ project_namespace }}"
     definition: "{{ lookup('template', 'postgresql-migration-job.yml') }}"

ansible/roles/web/tasks/main.yml

@@ -5,7 +5,7 @@
     definition: "{{ lookup('template', 'web-deployment.yml') }}"
 
 - name: "Create or update Web Service"
-  kubernetes.core._k8s:
+  kubernetes.core.k8s:
     state: present
     definition: "{{ lookup('template', 'web-service.yml') }}"
 

ansible/templates/api-deployment.yml

@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: pullsar-api
-  namespace: "{{ namespace }}"
+  namespace: "{{ project_namespace }}"
   labels:
     app: pullsar-api
 spec:

ansible/templates/api-service.yml

@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: api
-  namespace: "{{ namespace }}"
+  namespace: "{{ project_namespace }}"
 spec:
   selector:
     app: pullsar-api

ansible/templates/postgresql-migration-job.yml

@@ -2,7 +2,7 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   generateName: "postgresql-migration-job-"
-  namespace: "{{ namespace }}"
+  namespace: "{{ project_namespace }}"
 spec:
   template:
     spec:

ansible/templates/web-deployment.yml

@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: pullsar-web
-  namespace: "{{ namespace }}"
+  namespace: "{{ project_namespace }}"
   labels:
     app: pullsar-web
 spec: