From c19a452d1bc40577f2ae7d6a34ed97935f226350 Mon Sep 17 00:00:00 2001
From: Nir Soffer <nsoffer@redhat.com>
Date: Tue, 30 May 2023 22:02:01 +0300
Subject: [PATCH] Rename ramen s3 secret

We need to add a velero s3 secret for the velero bucket. Rename the
ramen s3 secret to so we can have consistent and clear names.

Signed-off-by: Nir Soffer <nsoffer@redhat.com>
---
 ramenctl/ramenctl/config.py                                   | 2 +-
 ramenctl/ramenctl/resources/configmap.yaml                    | 4 ++--
 .../resources/{s3-secret.yaml => ramen-s3-secret.yaml}        | 2 +-
 ramenctl/ramenctl/unconfig.py                                 | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename ramenctl/ramenctl/resources/{s3-secret.yaml => ramen-s3-secret.yaml} (92%)

diff --git a/ramenctl/ramenctl/config.py b/ramenctl/ramenctl/config.py
index 4b729af073..412a2ac2a7 100644
--- a/ramenctl/ramenctl/config.py
+++ b/ramenctl/ramenctl/config.py
@@ -34,7 +34,7 @@ def run(args):
     command.info("Creating s3 secret in ramen hub namespace")
     kubectl.apply(
         "--filename",
-        command.resource("s3-secret.yaml"),
+        command.resource("ramen-s3-secret.yaml"),
         context=env["hub"],
         log=command.debug,
     )
diff --git a/ramenctl/ramenctl/resources/configmap.yaml b/ramenctl/ramenctl/resources/configmap.yaml
index 3f42c8f963..a8274bbca2 100644
--- a/ramenctl/ramenctl/resources/configmap.yaml
+++ b/ramenctl/ramenctl/resources/configmap.yaml
@@ -36,12 +36,12 @@ data:
       s3CompatibleEndpoint: $minio_url_dr1
       s3Region: us-west-1
       s3SecretRef:
-        name: s3secret
+        name: ramen-s3
         namespace: ramen-system
     - s3ProfileName: minio-on-dr2
       s3Bucket: bucket
       s3CompatibleEndpoint: $minio_url_dr2
       s3Region: us-east-1
       s3SecretRef:
-        name: s3secret
+        name: ramen-s3
         namespace: ramen-system
diff --git a/ramenctl/ramenctl/resources/s3-secret.yaml b/ramenctl/ramenctl/resources/ramen-s3-secret.yaml
similarity index 92%
rename from ramenctl/ramenctl/resources/s3-secret.yaml
rename to ramenctl/ramenctl/resources/ramen-s3-secret.yaml
index d8a45c8f43..9f91a26394 100644
--- a/ramenctl/ramenctl/resources/s3-secret.yaml
+++ b/ramenctl/ramenctl/resources/ramen-s3-secret.yaml
@@ -4,7 +4,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: s3secret
+  name: ramen-s3
   namespace: ramen-system
 stringData:
   AWS_ACCESS_KEY_ID: minio
diff --git a/ramenctl/ramenctl/unconfig.py b/ramenctl/ramenctl/unconfig.py
index 9d8780d15b..9556744d0d 100644
--- a/ramenctl/ramenctl/unconfig.py
+++ b/ramenctl/ramenctl/unconfig.py
@@ -42,7 +42,7 @@ def run(args):
     command.info("Deleting s3 secret in ramen hub namespace")
     kubectl.delete(
         "--filename",
-        command.resource("s3-secret.yaml"),
+        command.resource("ramen-s3-secret.yaml"),
         "--ignore-not-found",
         context=env["hub"],
         log=command.debug,