Add variables used for CICD instead of modifying the source files

Author: vprivat-ads

.github/workflows/test-deployment.yml

@@ -79,6 +79,7 @@ jobs:
           mv inventory/mycluster/openrc.sh.template inventory/mycluster/openrc.sh
           sed -i 's!<changeme_with_full_path>/miniforge3/envs/rspy!/usr/share/miniconda/envs/rspy!g' inventory/mycluster/hosts.yaml
           sed -i 's!https://s3.gra.io.cloud.ovh.net!http://minio.minio.svc.cluster.local:9000!' inventory/mycluster/host_vars/setup/main.yaml
+          sed -i -e 's!cinder.csi.openstack.org!k8s.io/minikube-hostpath!g' -e 's!instances: 3!instances: 1!g' inventory/mycluster/host_vars/setup/apps.yml
           conda run -n rspy --no-capture-output env PYTHONUNBUFFERED=1 ANSIBLE_FORCE_COLOR=1 ansible-playbook registry.yaml -i inventory/mycluster/hosts.yaml -e ci_mode=true
           conda run -n rspy --no-capture-output env PYTHONUNBUFFERED=1 ANSIBLE_FORCE_COLOR=1 ansible-playbook generate_inventory.yaml -i inventory/mycluster/hosts.yaml
         shell: bash
@@ -89,8 +90,6 @@ jobs:
       - name: Deploy the apps (for real)
         run: |
           sed -i 's!debug: false!debug: true!g' roles/app-installer/defaults/main.yaml
-          sed -i 's!cinder.csi.openstack.org!k8s.io/minikube-hostpath!g' apps/00-storage-class/sc-retain.yaml
-          sed -i 's!instances: 3!instances: 1!g' apps/03-cloudnative-pg/cluster.yaml
           sed -i -e 's!https://iam.{{ platform_domain_name }}!http://keycloak-service.iam.svc.cluster.local:8080!g' -e 's!insecure_oidc_skip_issuer_verification="false"!insecure_oidc_skip_issuer_verification="true"!g' apps/oauth2-proxy/values.yaml
 
           conda run -n rspy --no-capture-output env PYTHONUNBUFFERED=1 ANSIBLE_FORCE_COLOR=1 ansible-playbook apps.yaml -i inventory/mycluster/hosts.yaml

apps/00-storage-class/sc-retain.yaml

@@ -23,6 +23,6 @@ parameters:
   availability: nova
   fsType: ext4
   type: high-speed
-provisioner: cinder.csi.openstack.org
+provisioner: "{{ cinder.provisioner }}"
 reclaimPolicy: Retain
 volumeBindingMode: Immediate

apps/03-cloudnative-pg/cluster.yaml

@@ -20,7 +20,7 @@ metadata:
     app.kubernetes.io/instance: '{{ app_name }}'
     wait-for-deployment: Ready
 spec:
-  instances: 3
+  instances: {{ postgresql.instances }}
 
   enableSuperuserAccess: true
 

inventory/sample/host_vars/setup/apps.yml

@@ -36,6 +36,9 @@ apikeymanager:
     password: "{{ lookup('password', '/dev/null length=30 chars=ascii_letters') }}"
     secret: apikeymanager-database-password
 
+cinder:
+  provisioner: cinder.csi.openstack.org
+
 certmanager:
   clusterissuer:
     acme:
@@ -67,6 +70,7 @@ postgresql:
   replication_password: "{{ lookup('password', '/dev/null length=30 chars=ascii_letters') }}"
   replication_user: "{{ lookup('password', '/dev/null length=30 chars=ascii_letters') }}"
   bucket: "{{ cluster_name }}-psql"
+  instances: 3
 
 keycloak:
   image: quay.io/keycloak/keycloak:23.0.6