Skip to content

S4 variable cleanup #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
treddy08 merged 15 commits into from
Mar 13, 2026
Merged

S4 variable cleanup #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
9bd59a5
Add ocp4_workload_s4 role and integrate S4 storage with Quay
treddy08 Mar 13, 2026
1ce7296
Make S4 storage opt-in for Quay operator with full backward compatibi…
treddy08 Mar 13, 2026
3d345a4
Revert changes to ocp4_workload_openshift_gitops role
treddy08 Mar 13, 2026
8cb4fef
Remove config bundle deletion step
treddy08 Mar 13, 2026
30bd204
Add agnosticd.core prefix to agnosticd_user_info calls in S4 role
treddy08 Mar 13, 2026
b995fed
Rename variable to ocp4_workload_quay_operator_s4_storage_enabled
treddy08 Mar 13, 2026
1145af8
Remove unused S4 credentials secret and simplify resource creation
treddy08 Mar 13, 2026
5355ef9
Update S4 image tag to 0.3.2 and optimize pull policy
treddy08 Mar 13, 2026
9c8ea83
Update S4 Helm chart revision to v0.3.2
treddy08 Mar 13, 2026
896a87a
Rename S3 route variable to include 'api' for clarity
treddy08 Mar 13, 2026
c461565
Rename S3 route host variable to include 'api' for consistency
treddy08 Mar 13, 2026
030a009
Rename S3 endpoint variables to include 'api' for consistency
treddy08 Mar 13, 2026
10b45b0
Hard code wait retry and delay values in S4 role
treddy08 Mar 13, 2026
920fbec
Merge branch 'main' into feature-ocp4-workload-s4
treddy08 Mar 13, 2026
9064003
Remove 'route_' from S3 variable names for simplicity
treddy08 Mar 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions roles/ocp4_workload_s4/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@ ocp4_workload_s4_route_tls_termination: edge
ocp4_workload_s4_route_tls_insecure_policy: Redirect

# S3 API Route (enabled by default for S3 API access)
ocp4_workload_s4_route_s3_api_enabled: true
ocp4_workload_s4_route_s3_api_host: "" # Auto-generated if empty
ocp4_workload_s4_s3_api_enabled: true
ocp4_workload_s4_s3_api_host: "" # Auto-generated if empty

# --------------------------------------------------
# Bucket creation configuration
Expand Down
4 changes: 2 additions & 2 deletions roles/ocp4_workload_s4/readme.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ Username and password can be passed in as parameters. If not provided, username
* `ocp4_workload_s4_route_enabled`: Enable OpenShift Route for UI (default: `true`)
* `ocp4_workload_s4_route_host`: Custom hostname (default: auto-generated)
* `ocp4_workload_s4_route_tls_termination`: TLS termination (default: `edge`)
* `ocp4_workload_s4_route_s3_api_enabled`: Enable Route for S3 API (default: `true`)
* `ocp4_workload_s4_s3_api_enabled`: Enable Route for S3 API (default: `true`)

=== Bucket Creation

Expand Down Expand Up @@ -142,7 +142,7 @@ Username and password can be passed in as parameters. If not provided, username
ocp4_workload_s4_storage_data_storage_class: ocs-storagecluster-ceph-rbd
ocp4_workload_s4_access_key_id: my-access-key
ocp4_workload_s4_secret_access_key: my-secret-key
ocp4_workload_s4_route_s3_api_enabled: true
ocp4_workload_s4_s3_api_enabled: true
ocp4_workload_s4_buckets:
- production-data
----
Expand Down
6 changes: 3 additions & 3 deletions roles/ocp4_workload_s4/tasks/workload.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
_ocp4_workload_s4_route_url: "https://{{ r_s4_route.resources[0].spec.host }}"

- name: Get S3 API route (if enabled)
when: ocp4_workload_s4_route_s3_api_enabled | bool
when: ocp4_workload_s4_s3_api_enabled | bool
kubernetes.core.k8s_info:
api_version: route.openshift.io/v1
kind: Route
Expand All @@ -104,7 +104,7 @@

- name: Set S3 API endpoint URL
when:
- ocp4_workload_s4_route_s3_api_enabled | bool
- ocp4_workload_s4_s3_api_enabled | bool
- r_s4_api_route.resources | length > 0
ansible.builtin.set_fact:
_ocp4_workload_s4_s3_api_endpoint_external: "https://{{ r_s4_api_route.resources[0].spec.host }}"
Expand Down Expand Up @@ -152,7 +152,7 @@
- msg: "S3 Endpoint (internal): {{ _ocp4_workload_s4_s3_api_endpoint_internal }}"
when: true
- msg: "S3 Endpoint (external): {{ _ocp4_workload_s4_s3_api_endpoint_external }}"
when: "{{ ocp4_workload_s4_route_s3_api_enabled | bool and _ocp4_workload_s4_s3_api_endpoint_external is defined }}"
when: "{{ ocp4_workload_s4_s3_api_enabled | bool and _ocp4_workload_s4_s3_api_endpoint_external is defined }}"
- msg: "S3 Buckets Created: {{ ocp4_workload_s4_buckets | join(', ') }}"
when: "{{ ocp4_workload_s4_buckets | default([]) | length > 0 }}"

Expand Down
8 changes: 4 additions & 4 deletions roles/ocp4_workload_s4/templates/application.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,10 @@ spec:

# S3 API Route
s3Api:
enabled: {{ ocp4_workload_s4_route_s3_api_enabled | lower }}
{% if ocp4_workload_s4_route_s3_api_enabled %}
{% if ocp4_workload_s4_route_s3_api_host | length > 0 %}
host: {{ ocp4_workload_s4_route_s3_api_host }}
enabled: {{ ocp4_workload_s4_s3_api_enabled | lower }}
{% if ocp4_workload_s4_s3_api_enabled %}
{% if ocp4_workload_s4_s3_api_host | length > 0 %}
host: {{ ocp4_workload_s4_s3_api_host }}
{% endif %}
tls:
termination: {{ ocp4_workload_s4_route_tls_termination }}
Expand Down
Loading