From 60e5c972fcb9217275893fdf6b99de58ea36ebd1 Mon Sep 17 00:00:00 2001
From: Francesco Pantano <fpantano@redhat.com>
Date: Thu, 7 May 2026 21:59:38 +0200
Subject: [PATCH] Use server-side apply for swift-ring-files ConfigMap

Client-side `oc apply` writes the entire manifest into the
last-applied-configuration annotation, which can exceed the limit when Swift
ring files are large. Using `oc apply --server-side` avoids this annotation
entirely while remaining idempotent, unlike `oc create` which would fail on
retries if the resource already exists.

Closes: OSPRH-25258

Co-Authored-By: Claude Opus <noreply@anthropic.com>
Signed-off-by: Francesco Pantano <fpantano@redhat.com>
---
 .../proc_adopting-the-object-storage-service.adoc        | 9 ++++++++-
 tests/roles/swift_adoption/tasks/main.yaml               | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/docs_user/modules/proc_adopting-the-object-storage-service.adoc b/docs_user/modules/proc_adopting-the-object-storage-service.adoc
index 85d1d89dd..6c6ddf767 100644
--- a/docs_user/modules/proc_adopting-the-object-storage-service.adoc
+++ b/docs_user/modules/proc_adopting-the-object-storage-service.adoc
@@ -30,7 +30,7 @@ EOF
 . Create the `swift-ring-files` `ConfigMap` that includes the {object_storage} ring files:
 +
 ----
-$ oc apply -f - <<EOF
+$ oc apply --server-side -f - <<EOF
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -42,6 +42,13 @@ binaryData:
   object.ring.gz: $($CONTROLLER1_SSH "base64 -w0 /var/lib/config-data/puppet-generated/swift/etc/swift/object.ring.gz")
 EOF
 ----
++
+[NOTE]
+====
+The `--server-side` flag is required if the {object_storage} ring files
+are large enough to exceed the annotation size limit imposed by the
+client-side `oc apply`.
+====
 
 . Patch the `OpenStackControlPlane` custom resource to deploy the {object_storage}:
 +
diff --git a/tests/roles/swift_adoption/tasks/main.yaml b/tests/roles/swift_adoption/tasks/main.yaml
index 069bb6bc4..3ccd66c73 100644
--- a/tests/roles/swift_adoption/tasks/main.yaml
+++ b/tests/roles/swift_adoption/tasks/main.yaml
@@ -18,7 +18,7 @@
     {{ shell_header }}
     {{ oc_header }}
     CONTROLLER1_SSH="{{ controller1_ssh }}"
-    oc apply -f - <<EOF
+    oc apply --server-side -f - <<EOF
     apiVersion: v1
     kind: ConfigMap
     metadata: