From ba85e5a9884c8827e7c0df89a67da171e1092f78 Mon Sep 17 00:00:00 2001 From: treddy08 <94612779+treddy08@users.noreply.github.com> Date: Sun, 1 Mar 2026 17:53:16 +1000 Subject: [PATCH 1/7] Update quay_registry.yaml.j2 --- .../templates/quay_registry.yaml.j2 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/roles/ocp4_workload_quay_operator/templates/quay_registry.yaml.j2 b/roles/ocp4_workload_quay_operator/templates/quay_registry.yaml.j2 index 20a62ce..fe49ddb 100644 --- a/roles/ocp4_workload_quay_operator/templates/quay_registry.yaml.j2 +++ b/roles/ocp4_workload_quay_operator/templates/quay_registry.yaml.j2 @@ -23,6 +23,9 @@ spec: overrides: volumeSize: {{ ocp4_workload_quay_operator_registry_clair_volume_size }} {% endif %} + - kind: quay + managed: true + overrides: {{ ocp4_workload_quay_operator_registry_quay_overrides | default(omit) }} - kind: horizontalpodautoscaler managed: {{ ocp4_workload_quay_operator_registry_enable_hpa }} - kind: mirror From 392addaf262fcf26267a2b25ff0cdc9a29045642 Mon Sep 17 00:00:00 2001 From: treddy08 <94612779+treddy08@users.noreply.github.com> Date: Sun, 1 Mar 2026 18:00:10 +1000 Subject: [PATCH 2/7] Update main.yml --- .../ocp4_workload_quay_operator/defaults/main.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/roles/ocp4_workload_quay_operator/defaults/main.yml b/roles/ocp4_workload_quay_operator/defaults/main.yml index 067f768..eb921db 100644 --- a/roles/ocp4_workload_quay_operator/defaults/main.yml +++ b/roles/ocp4_workload_quay_operator/defaults/main.yml @@ -86,3 +86,18 @@ ocp4_workload_quay_operator_registry_clair_volume_size: 100Gi ocp4_workload_quay_operator_registry_enable_hpa: false ocp4_workload_quay_operator_registry_enable_mirror: false ocp4_workload_quay_operator_registry_enable_monitoring: false +# ocp4_workload_quay_operator_registry_quay_overrides: +# env: +# - name: WORKER_COUNT +# value: "10" +# - name: WORKER_COUNT_REGISTRY +# value: "20" +# resources: +# requests: +# cpu: "2" +# memory: "8Gi" +# limits: +# cpu: "4" +# memory: "16Gi" + + From 25192367fa187b720e9d7d0625fba16ca7b44f4b Mon Sep 17 00:00:00 2001 From: treddy08 Date: Sun, 1 Mar 2026 19:16:37 +1000 Subject: [PATCH 3/7] Replace complex YAML injection with individual variables for Quay overrides Changed from injecting a complex YAML structure to using individual variables for Quay component overrides, similar to how clair overrides are handled. New boolean flags control sections: - ocp4_workload_quay_operator_registry_quay_overrides - ocp4_workload_quay_operator_registry_quay_overrides_env - ocp4_workload_quay_operator_registry_quay_overrides_resources New variables for values: - Worker counts: worker_count, worker_count_registry - Resources: cpu_request, memory_request, cpu_limit, memory_limit This provides a cleaner interface and follows the existing pattern used for clair configuration. Co-Authored-By: Claude Sonnet 4.5 --- .../defaults/main.yml | 32 +++++++++++++++++-- .../templates/quay_registry.yaml.j2 | 20 +++++++++++- 2 files changed, 48 insertions(+), 4 deletions(-) diff --git a/roles/ocp4_workload_quay_operator/defaults/main.yml b/roles/ocp4_workload_quay_operator/defaults/main.yml index eb921db..d11f6ee 100644 --- a/roles/ocp4_workload_quay_operator/defaults/main.yml +++ b/roles/ocp4_workload_quay_operator/defaults/main.yml @@ -86,7 +86,34 @@ ocp4_workload_quay_operator_registry_clair_volume_size: 100Gi ocp4_workload_quay_operator_registry_enable_hpa: false ocp4_workload_quay_operator_registry_enable_mirror: false ocp4_workload_quay_operator_registry_enable_monitoring: false -# ocp4_workload_quay_operator_registry_quay_overrides: +# Quay component overrides - individual values +# Enable/disable override sections +ocp4_workload_quay_operator_registry_quay_overrides: false +ocp4_workload_quay_operator_registry_quay_overrides_env: false +ocp4_workload_quay_operator_registry_quay_overrides_resources: false + +# Worker counts +ocp4_workload_quay_operator_registry_quay_worker_count: "" +ocp4_workload_quay_operator_registry_quay_worker_count_registry: "" + +# Resource requests and limits +ocp4_workload_quay_operator_registry_quay_cpu_request: "" +ocp4_workload_quay_operator_registry_quay_memory_request: "" +ocp4_workload_quay_operator_registry_quay_cpu_limit: "" +ocp4_workload_quay_operator_registry_quay_memory_limit: "" + +# Example usage: +# ocp4_workload_quay_operator_registry_quay_overrides: true +# ocp4_workload_quay_operator_registry_quay_overrides_env: true +# ocp4_workload_quay_operator_registry_quay_worker_count: "10" +# ocp4_workload_quay_operator_registry_quay_worker_count_registry: "20" +# ocp4_workload_quay_operator_registry_quay_overrides_resources: true +# ocp4_workload_quay_operator_registry_quay_cpu_request: "2" +# ocp4_workload_quay_operator_registry_quay_memory_request: "8Gi" +# ocp4_workload_quay_operator_registry_quay_cpu_limit: "4" +# ocp4_workload_quay_operator_registry_quay_memory_limit: "16Gi" +# +# This will generate the following overrides: # env: # - name: WORKER_COUNT # value: "10" @@ -99,5 +126,4 @@ ocp4_workload_quay_operator_registry_enable_monitoring: false # limits: # cpu: "4" # memory: "16Gi" - - + diff --git a/roles/ocp4_workload_quay_operator/templates/quay_registry.yaml.j2 b/roles/ocp4_workload_quay_operator/templates/quay_registry.yaml.j2 index fe49ddb..9bdfcfa 100644 --- a/roles/ocp4_workload_quay_operator/templates/quay_registry.yaml.j2 +++ b/roles/ocp4_workload_quay_operator/templates/quay_registry.yaml.j2 @@ -25,7 +25,25 @@ spec: {% endif %} - kind: quay managed: true - overrides: {{ ocp4_workload_quay_operator_registry_quay_overrides | default(omit) }} +{% if ocp4_workload_quay_operator_registry_quay_overrides | bool %} + overrides: +{% if ocp4_workload_quay_operator_registry_quay_overrides_env | bool %} + env: + - name: WORKER_COUNT + value: "{{ ocp4_workload_quay_operator_registry_quay_worker_count }}" + - name: WORKER_COUNT_REGISTRY + value: "{{ ocp4_workload_quay_operator_registry_quay_worker_count_registry }}" +{% endif %} +{% if ocp4_workload_quay_operator_registry_quay_overrides_resources | bool %} + resources: + requests: + cpu: "{{ ocp4_workload_quay_operator_registry_quay_cpu_request }}" + memory: "{{ ocp4_workload_quay_operator_registry_quay_memory_request }}" + limits: + cpu: "{{ ocp4_workload_quay_operator_registry_quay_cpu_limit }}" + memory: "{{ ocp4_workload_quay_operator_registry_quay_memory_limit }}" +{% endif %} +{% endif %} - kind: horizontalpodautoscaler managed: {{ ocp4_workload_quay_operator_registry_enable_hpa }} - kind: mirror From fd447472a3fdd7fdbeb4e014e23c034a00768050 Mon Sep 17 00:00:00 2001 From: treddy08 <94612779+treddy08@users.noreply.github.com> Date: Sun, 1 Mar 2026 19:18:28 +1000 Subject: [PATCH 4/7] Update main.yml --- .../ocp4_workload_quay_operator/defaults/main.yml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/roles/ocp4_workload_quay_operator/defaults/main.yml b/roles/ocp4_workload_quay_operator/defaults/main.yml index d11f6ee..8c9a37a 100644 --- a/roles/ocp4_workload_quay_operator/defaults/main.yml +++ b/roles/ocp4_workload_quay_operator/defaults/main.yml @@ -112,18 +112,3 @@ ocp4_workload_quay_operator_registry_quay_memory_limit: "" # ocp4_workload_quay_operator_registry_quay_memory_request: "8Gi" # ocp4_workload_quay_operator_registry_quay_cpu_limit: "4" # ocp4_workload_quay_operator_registry_quay_memory_limit: "16Gi" -# -# This will generate the following overrides: -# env: -# - name: WORKER_COUNT -# value: "10" -# - name: WORKER_COUNT_REGISTRY -# value: "20" -# resources: -# requests: -# cpu: "2" -# memory: "8Gi" -# limits: -# cpu: "4" -# memory: "16Gi" - From 5e7652726e73c412f3d7364c34afbe8858a36cf3 Mon Sep 17 00:00:00 2001 From: treddy08 <94612779+treddy08@users.noreply.github.com> Date: Sun, 1 Mar 2026 19:20:49 +1000 Subject: [PATCH 5/7] Update main.yml --- .../defaults/main.yml | 27 ++++++------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/roles/ocp4_workload_quay_operator/defaults/main.yml b/roles/ocp4_workload_quay_operator/defaults/main.yml index 8c9a37a..d278c7a 100644 --- a/roles/ocp4_workload_quay_operator/defaults/main.yml +++ b/roles/ocp4_workload_quay_operator/defaults/main.yml @@ -89,26 +89,15 @@ ocp4_workload_quay_operator_registry_enable_monitoring: false # Quay component overrides - individual values # Enable/disable override sections ocp4_workload_quay_operator_registry_quay_overrides: false -ocp4_workload_quay_operator_registry_quay_overrides_env: false -ocp4_workload_quay_operator_registry_quay_overrides_resources: false +ocp4_workload_quay_operator_registry_quay_overrides_env: true +ocp4_workload_quay_operator_registry_quay_overrides_resources: true # Worker counts -ocp4_workload_quay_operator_registry_quay_worker_count: "" -ocp4_workload_quay_operator_registry_quay_worker_count_registry: "" +ocp4_workload_quay_operator_registry_quay_worker_count: "10" +ocp4_workload_quay_operator_registry_quay_worker_count_registry: "20" # Resource requests and limits -ocp4_workload_quay_operator_registry_quay_cpu_request: "" -ocp4_workload_quay_operator_registry_quay_memory_request: "" -ocp4_workload_quay_operator_registry_quay_cpu_limit: "" -ocp4_workload_quay_operator_registry_quay_memory_limit: "" - -# Example usage: -# ocp4_workload_quay_operator_registry_quay_overrides: true -# ocp4_workload_quay_operator_registry_quay_overrides_env: true -# ocp4_workload_quay_operator_registry_quay_worker_count: "10" -# ocp4_workload_quay_operator_registry_quay_worker_count_registry: "20" -# ocp4_workload_quay_operator_registry_quay_overrides_resources: true -# ocp4_workload_quay_operator_registry_quay_cpu_request: "2" -# ocp4_workload_quay_operator_registry_quay_memory_request: "8Gi" -# ocp4_workload_quay_operator_registry_quay_cpu_limit: "4" -# ocp4_workload_quay_operator_registry_quay_memory_limit: "16Gi" +ocp4_workload_quay_operator_registry_quay_cpu_request: "2" +ocp4_workload_quay_operator_registry_quay_memory_request: "8Gi" +ocp4_workload_quay_operator_registry_quay_cpu_limit: "4" +ocp4_workload_quay_operator_registry_quay_memory_limit: "16Gi" From 7a6db9f7e7f095933cbbd0065fd2700a13b91a81 Mon Sep 17 00:00:00 2001 From: treddy08 <94612779+treddy08@users.noreply.github.com> Date: Sun, 1 Mar 2026 19:22:01 +1000 Subject: [PATCH 6/7] Update quay_registry.yaml.j2 From 7c37e8a845e1c12c9556ce03f91afdd745152938 Mon Sep 17 00:00:00 2001 From: treddy08 <94612779+treddy08@users.noreply.github.com> Date: Sun, 1 Mar 2026 19:22:18 +1000 Subject: [PATCH 7/7] Update main.yml --- roles/ocp4_workload_quay_operator/defaults/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/ocp4_workload_quay_operator/defaults/main.yml b/roles/ocp4_workload_quay_operator/defaults/main.yml index d278c7a..afea0f9 100644 --- a/roles/ocp4_workload_quay_operator/defaults/main.yml +++ b/roles/ocp4_workload_quay_operator/defaults/main.yml @@ -93,8 +93,8 @@ ocp4_workload_quay_operator_registry_quay_overrides_env: true ocp4_workload_quay_operator_registry_quay_overrides_resources: true # Worker counts -ocp4_workload_quay_operator_registry_quay_worker_count: "10" -ocp4_workload_quay_operator_registry_quay_worker_count_registry: "20" +ocp4_workload_quay_operator_registry_quay_worker_count: "2" +ocp4_workload_quay_operator_registry_quay_worker_count_registry: "8" # Resource requests and limits ocp4_workload_quay_operator_registry_quay_cpu_request: "2"