From a7a9a8b64355223da97434d5c2491b470ec083f5 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Sun, 26 Jan 2025 15:05:06 +0100 Subject: [PATCH] Respect defined version and source of mcapi driver At the moment proxy and main mcapi versions are not related in any way, which means that there can be a conflict between installed versions of proxy with mcapi. One of examples was triggered by [1], when proxy was issuing a requests towards API which does not exist yet in the central cluster. This resulted in HTTPError: 404 Client Error: Not Found for url when proxy tried to fetch list of clusters. [1] https://github.com/vexxhost/magnum-cluster-api/commit/8e375c414ab3e2027486b105b12765891850c8ac Change-Id: Iba1f34e7b79e34f23b8169ecd20907832626d540 --- .../files/openstack_deploy/group_vars/magnum_all/main.yml | 3 ++- mcapi_vexxhost/roles/proxy/defaults/main.yml | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/mcapi_vexxhost/playbooks/files/openstack_deploy/group_vars/magnum_all/main.yml b/mcapi_vexxhost/playbooks/files/openstack_deploy/group_vars/magnum_all/main.yml index 00dbf7b9..c170d933 100644 --- a/mcapi_vexxhost/playbooks/files/openstack_deploy/group_vars/magnum_all/main.yml +++ b/mcapi_vexxhost/playbooks/files/openstack_deploy/group_vars/magnum_all/main.yml @@ -14,10 +14,11 @@ # limitations under the License. magnum_magnum_cluster_api_git_install_branch: v0.24.2 +magnum_magnum_cluster_api_git_repo: "{{ openstack_github_base_url | default('https://github.com') ~ '/vexxhost/magnum-cluster-api' }}" # install magnum-cluster-api and kubernetes python package into magnum venv magnum_user_pip_packages: - - "git+https://github.com/vexxhost/magnum-cluster-api@{{ magnum_magnum_cluster_api_git_install_branch }}#egg=magnum-cluster-api" + - "git+{{ magnum_magnum_cluster_api_git_repo }}@{{ magnum_magnum_cluster_api_git_install_branch }}#egg=magnum-cluster-api" - kubernetes # ensure that the internal VIP CA is trusted by the CAPI driver diff --git a/mcapi_vexxhost/roles/proxy/defaults/main.yml b/mcapi_vexxhost/roles/proxy/defaults/main.yml index f5034f9a..a595e2d9 100644 --- a/mcapi_vexxhost/roles/proxy/defaults/main.yml +++ b/mcapi_vexxhost/roles/proxy/defaults/main.yml @@ -18,9 +18,9 @@ mcapi_vexxhost_proxy_upper_constraints_url: >- macpi_vexxhost_proxy_git_constraints: - "--constraint {{ mcapi_vexxhost_proxy_upper_constraints_url }}" -mcapi_vexxhost_proxy_install_branch: main -mcapi_vexxhost_proxy_git_repo: "{{ openstack_github_base_url | default('https://github.com') ~ '/vexxhost/magnum-cluster-api' }}" +mcapi_vexxhost_proxy_install_branch: "{{ magnum_magnum_cluster_api_git_install_branch | default('main') }}" +mcapi_vexxhost_proxy_git_repo: >- + {{ magnum_magnum_cluster_api_git_repo | default(openstack_github_base_url | default('https://github.com') ~ '/vexxhost/magnum-cluster-api') }} mcapi_vexxhost_proxy_pip_packages: - - "{{ 'git+' ~ mcapi_vexxhost_proxy_git_repo ~ '@' ~ mcapi_vexxhost_proxy_install_branch ~ '#egg=magnum-cluster-api' }}" - + - "{{ 'git+' ~ mcapi_vexxhost_proxy_git_repo ~ '@' ~ mcapi_vexxhost_proxy_install_branch ~ '#egg=magnum-cluster-api' }}"