Remove on-cluster object storage deployment support

ansible/roles/create-inventory/defaults/main/dns.yml

@@ -30,7 +30,6 @@ etc_hosts_ingress_routes:
 - hcp-cli-download-multicluster-engine
 - images-multicluster-engine
 - kam-openshift-gitops
-- object-store-object-store
 - multicloud-console
 - multicluster-global-hub-grafana-multicluster-global-hub
 - oauth-openshift

ansible/roles/mno-post-cluster-install/defaults/main/main.yml

@@ -59,12 +59,6 @@ prometheus_retention_period: 15d
 prometheus_storage_class: localstorage-sc
 prometheus_storage_size: 50Gi
 
-# RustFS deployment is an S3-compatible object storage pod for use with ACM
-# (replaces the archived MinIO project)
-setup_object_store: false
-object_store_image_tag: 1.0.0-rc.6
-object_store_pv_storageclass: localstorage2-sc
-
 # Custom CatalogSources to apply post-install
 # Each entry creates a CatalogSource resource in openshift-marketplace
 # custom_catalogsources:

ansible/roles/mno-post-cluster-install/tasks/main.yml

@@ -11,7 +11,6 @@
   - "{{ bastion_cluster_config_dir }}/catalogsources"
   - "{{ bastion_cluster_config_dir }}/gitops"
   - "{{ bastion_cluster_config_dir }}/localstorage"
-  - "{{ bastion_cluster_config_dir }}/object-store"
   - "{{ bastion_cluster_config_dir }}/odf"
   - "{{ bastion_cluster_config_dir }}/openshift-monitoring"
 
@@ -99,8 +98,6 @@
     dest: "{{ bastion_cluster_config_dir }}/localstorage/localvolume-lvm.yml"
   - src: localvolume-disk.yml.j2
     dest: "{{ bastion_cluster_config_dir }}/localstorage/localvolume-disk.yml"
-  - src: object-store.yml.j2
-    dest: "{{ bastion_cluster_config_dir }}/object-store/object-store.yml"
   - src: odf.yml.j2
     dest: "{{ bastion_cluster_config_dir }}/odf/odf.yml"
   - src: odf-storagecluster.yml.j2
@@ -267,11 +264,6 @@
       KUBECONFIG={{ bastion_cluster_config_dir }}/kubeconfig oc wait storagecluster/ocs-storagecluster -n openshift-storage --for=jsonpath='{.status.phase}'=Ready --timeout={{ wait_for_odf_storagecluster_ready_timeout }}
     when: wait_for_odf_storagecluster_ready | bool
 
-- name: Setup object store
-  when: setup_object_store | bool
-  shell: |
-    KUBECONFIG={{ bastion_cluster_config_dir }}/kubeconfig oc apply -f {{ bastion_cluster_config_dir }}/object-store/object-store.yml
-
 - name: Migrate ingresscontrollers (OpenShift Router) to master nodes
   when: migrate_ingresscontrollers | bool
   shell: |

ansible/roles/sno-post-cluster-install/defaults/main/main.yml

@@ -21,12 +21,6 @@ gitops_catalogsource: redhat-operators
 # Local Storage Operator (LSO) catalog source
 lso_catalogsource: redhat-operators
 
-# RustFS deployment is an S3-compatible object storage pod for use with ACM
-# (replaces the archived MinIO project)
-setup_object_store: false
-object_store_image_tag: 1.0.0-rc.6
-object_store_pv_storageclass: localstorage2-sc
-
 # Install Local Storage Operator (LSO) and create LocalVolume resources
 setup_lso: false
 

ansible/roles/sno-post-cluster-install/tasks/main.yml

@@ -12,7 +12,6 @@
   - "{{ bastion_cluster_config_dir }}/{{ groups['sno'][0] }}/gitops"
   - "{{ bastion_cluster_config_dir }}/{{ groups['sno'][0] }}/localstorage"
   - "{{ bastion_cluster_config_dir }}/{{ groups['sno'][0] }}/metal3"
-  - "{{ bastion_cluster_config_dir }}/{{ groups['sno'][0] }}/object-store"
   - "{{ bastion_cluster_config_dir }}/{{ groups['sno'][0] }}/openshift-monitoring"
   - "{{ bastion_cluster_config_dir }}/{{ groups['sno'][0] }}/performance-profile"
   - "{{ bastion_cluster_config_dir }}/{{ groups['sno'][0] }}/tunedPerformancePatch"
@@ -59,8 +58,6 @@
     dest: "{{ bastion_cluster_config_dir }}/{{ groups['sno'][0] }}/localstorage/localvolume-lvm.yml"
   - src: localvolume-disk.yml.j2
     dest: "{{ bastion_cluster_config_dir }}/{{ groups['sno'][0] }}/localstorage/localvolume-disk.yml"
-  - src: object-store.yml.j2
-    dest: "{{ bastion_cluster_config_dir }}/{{ groups['sno'][0] }}/object-store/object-store.yml"
   - src: metal3.yml
     dest: "{{ bastion_cluster_config_dir }}/{{ groups['sno'][0] }}/metal3/metal3.yml"
   - src: openshift-marketplace-ns.yaml
@@ -181,17 +178,11 @@
     delay: 2
     when: controlplane_localstorage_disk_devices | length > 0
 
-
 - name: Setup Metal3
   when: sno_metal3 | bool
   shell: |
     KUBECONFIG={{ bastion_cluster_config_dir }}/{{ groups['sno'][0] }}/kubeconfig oc apply -f {{ bastion_cluster_config_dir }}/{{ groups['sno'][0] }}/metal3/metal3.yml
 
-- name: Setup object store
-  when: setup_object_store | bool
-  shell: |
-    KUBECONFIG={{ bastion_cluster_config_dir }}/{{ groups['sno'][0] }}/kubeconfig oc apply -f {{ bastion_cluster_config_dir }}/{{ groups['sno'][0] }}/object-store/object-store.yml
-
 - name: Apply OpenShift-Monitoring configuration options
   when: (apply_cluster_monitoring_config | bool) and (setup_lso | bool)
   shell:

ansible/roles/sync-acm-d/tasks/main.yml

@@ -122,7 +122,3 @@
 - name: Mirror recert image
   shell: |
     oc image mirror -a {{ sync_path }}/pull-secret-bastion.acm-d.txt {{ recert_image }}:{{ recert_image_tag }} {{ registry_host }}:{{ registry_port }}/edge-infrastructure/recert:{{ recert_image_tag }} --keep-manifest-list --continue-on-error=true
-
-- name: Mirror object store image
-  shell: |
-    oc image mirror -a {{ sync_path }}/pull-secret-bastion.acm-d.txt {{ object_store_image }}:{{ object_store_image_tag }} {{ registry_host }}:{{ registry_port }}/rustfs/rustfs:{{ object_store_image_tag }} --keep-manifest-list --continue-on-error=true

ansible/vars/sync-acm-d.sample.yml

@@ -37,8 +37,4 @@ origin_kube_rbac_proxy_image_tag: 4.17
 recert_image: quay.io/edge-infrastructure/recert
 recert_image_tag: latest
 
-# RustFS provides an S3 storage service for ACM's OBS and s3 storage for OADP
-object_store_image: quay.io/rustfs/rustfs
-object_store_image_tag: 1.0.0-rc.6
-
 acm_d_pull_secret: "{{ lookup('file', '../pull-secret.acm-d.txt') }}"