Skip to content

Commit f132d72

Browse files
authored
[Backport stable/zed] feat(cert_manager): configure OCI chart version (#4087)
Signed-off-by: Mohammed Naser <mnaser@vexxhost.com>
1 parent 5217190 commit f132d72

4 files changed

Lines changed: 16 additions & 1 deletion

File tree

galaxy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ dependencies:
1818
openstack.cloud: 1.7.0
1919
atmosphere.common: ">=0.6.0,<0.7.0"
2020
vexxhost.ceph: ">=3.1.2"
21-
vexxhost.kubernetes: ">=3.2.0"
21+
vexxhost.kubernetes: ">=3.3.0"
2222
tags:
2323
- application
2424
- cloud
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
features:
3+
- |
4+
The cert-manager Helm chart is now managed through
5+
``atmosphere_images['cert_manager_helm_chart']`` and installed from OCI.

roles/cert_manager/tasks/main.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,19 @@
4343
ansible.builtin.include_role:
4444
name: vexxhost.kubernetes.cert_manager
4545
vars:
46+
cert_manager_helm_chart_repository: >-
47+
oci://{{ atmosphere_images['cert_manager_helm_chart'] |
48+
vexxhost.kubernetes.docker_image('name') }}
49+
cert_manager_helm_chart_version: >-
50+
{{ atmosphere_images['cert_manager_helm_chart'] |
51+
vexxhost.kubernetes.docker_image('tag') }}
4652
cert_manager_image_cli: "{{ atmosphere_images['cert_manager_cli'] }}"
4753
cert_manager_image_controller: "{{ atmosphere_images['cert_manager_controller'] }}"
4854
cert_manager_image_cainjector: "{{ atmosphere_images['cert_manager_cainjector'] }}"
4955
cert_manager_image_webhook: "{{ atmosphere_images['cert_manager_webhook'] }}"
5056
cert_manager_image_acmesolver: "{{ atmosphere_images['cert_manager_acmesolver'] }}"
57+
cert_manager_image_startupapicheck: >-
58+
{{ atmosphere_images['cert_manager_startupapicheck'] |
59+
default(atmosphere_images['cert_manager_cli']) }}
5160
cert_manager_node_selector:
5261
openstack-control-plane: enabled

roles/defaults/vars/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ _atmosphere_images:
2121
bootstrap: "{{ atmosphere_image_prefix }}ghcr.io/vexxhost/heat:zed@sha256:634678556c04e8e52ec7ea731705bd8c3219e689d5dc1262bf12b3640a06af14"
2222
ceph_config_helper: "{{ atmosphere_image_prefix }}ghcr.io/vexxhost/libvirtd:zed@sha256:a985d35be1a2343a5d0d17a0172474807b07cb81506824f871761b0d7e8760be"
2323
ceph: "{{ atmosphere_image_prefix }}quay.io/ceph/ceph:v18.2.1"
24+
cert_manager_helm_chart: "{{ atmosphere_image_prefix }}ghcr.io/vexxhost/charts/cert-manager:v1.11.5"
2425
cert_manager_cainjector: "{{ atmosphere_image_prefix }}quay.io/jetstack/cert-manager-cainjector:v1.12.10"
2526
cert_manager_cli: "{{ atmosphere_image_prefix }}quay.io/jetstack/cert-manager-ctl:v1.12.10"
2627
cert_manager_controller: "{{ atmosphere_image_prefix }}quay.io/jetstack/cert-manager-controller:v1.12.10"

0 commit comments

Comments
 (0)