Split image versions from URLs to make overriding easier

vexxhost · Dec 10, 2024 · 91c845f · 91c845f
1 parent 1b51e52
commit 91c845f
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 10 deletions.
diff --git a/roles/cert_manager/defaults/main.yml b/roles/cert_manager/defaults/main.yml
@@ -21,8 +21,9 @@ cert_manager_helm_values: {}
 
 cert_manager_node_selector: {}
 
-cert_manager_image_cli: quay.io/jetstack/cert-manager-ctl:v1.11.5
-cert_manager_image_controller: quay.io/jetstack/cert-manager-controller:v1.11.5
-cert_manager_image_cainjector: quay.io/jetstack/cert-manager-cainjector:v1.11.5
-cert_manager_image_webhook: quay.io/jetstack/cert-manager-webhook:v1.11.5
-cert_manager_image_acmesolver: quay.io/jetstack/cert-manager-acmesolver:v1.11.5
+cert_manager_image_tag: "v1.11.5"
+cert_manager_image_cli: "quay.io/jetstack/cert-manager-ctl:{{ cert_manager_image_tag }}"
+cert_manager_image_controller: "quay.io/jetstack/cert-manager-controller:{{ cert_manager_image_tag }}"
+cert_manager_image_cainjector: "quay.io/jetstack/cert-manager-cainjector:{{ cert_manager_image_tag }}"
+cert_manager_image_webhook: "quay.io/jetstack/cert-manager-webhook:{{ cert_manager_image_tag }}"
+cert_manager_image_acmesolver: "quay.io/jetstack/cert-manager-acmesolver:{{ cert_manager_image_tag }}"
diff --git a/roles/cilium/defaults/main.yml b/roles/cilium/defaults/main.yml
@@ -5,5 +5,6 @@ cilium_helm_chart_ref: /usr/local/src/cilium
 cilium_helm_release_namespace: kube-system
 cilium_helm_values: {}
 
-cilium_node_image: quay.io/cilium/cilium:v1.14.8@sha256:7fca3ba4b04af066e8b086b5c1a52e30f52db01ffc642e7db0a439514aed3ada
-cilium_operator_image: quay.io/cilium/operator-generic:v1.14.8@sha256:56d373c12483c09964a00a29246595917603a077a298aa90a98e4de32c86b7dc
+cilium_image_tag: "v1.14.8"
+cilium_node_image: "quay.io/cilium/cilium:{{ cilium_image_tag }}"
+cilium_operator_image: "quay.io/cilium/operator-generic:{{ cilium_image_tag }}"
diff --git a/roles/haproxy/defaults/main.yml b/roles/haproxy/defaults/main.yml
@@ -12,6 +12,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-haproxy_image: docker.io/library/haproxy:2.5
+haproxy_image_tag: "2.5"
+haproxy_image: "docker.io/library/haproxy:{{ haproxy_image_tag }}"
 
 haproxy_group: "{{ kubernetes_control_plane_group | default('controllers') }}"
diff --git a/roles/keepalived/defaults/main.yml b/roles/keepalived/defaults/main.yml
@@ -12,7 +12,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-keepalived_image: us-docker.pkg.dev/vexxhost-infra/openstack/keepalived:2.0.19
+keepalived_image_tag: "2.0.19"
+keepalived_image: "us-docker.pkg.dev/vexxhost-infra/openstack/keepalived:{{ keepalived_image_tag }}"
 
 # NOTE(mnaser): These are some transitionary variables to make sure
 #               we don't break existing deployments.

diff --git a/roles/kube_vip/defaults/main.yml b/roles/kube_vip/defaults/main.yml
@@ -13,7 +13,8 @@
 # under the License.
 
 # Image to use for kube-vip
-kube_vip_image: ghcr.io/kube-vip/kube-vip:v0.6.4
+kube_vip_image_tag: "v0.6.4"
+kube_vip_image: "ghcr.io/kube-vip/kube-vip:{{ kube_vip_image_tag }}"
 
 # Interface to use for kube-vip
 kube_vip_interface: "{{ keepalived_interface | default(kubernetes_keepalived_interface) }}"