From a4d2989db5aa3ed0e421caa3896e69f0b11f70c9 Mon Sep 17 00:00:00 2001
From: David Luong <dluong@redhat.com>
Date: Thu, 1 Aug 2024 14:58:23 -0700
Subject: [PATCH] [noissue] Change apiVersion to avoid failure while deploying
 hub

---
 roles/postgres/tasks/main.yml                                | 2 +-
 roles/postgres/tasks/upgrade_postgres.yml                    | 2 +-
 roles/postgres/templates/postgres.yaml.j2                    | 2 +-
 roles/pulp-api/templates/pulp-api.deployment.yaml.j2         | 2 +-
 roles/pulp-content/templates/pulp-content.deployment.yaml.j2 | 2 +-
 roles/pulp-status/tasks/main.yml                             | 2 +-
 roles/pulp-web/templates/pulp-web.deployment.yaml.j2         | 2 +-
 roles/pulp-worker/templates/pulp-worker.deployment.yaml.j2   | 2 +-
 roles/redis/templates/redis.deployment.yaml.j2               | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/roles/postgres/tasks/main.yml b/roles/postgres/tasks/main.yml
index ad78e96a8..7164a3d68 100644
--- a/roles/postgres/tasks/main.yml
+++ b/roles/postgres/tasks/main.yml
@@ -218,7 +218,7 @@
 
 - name: Check PostgreSQL status
   k8s_info:
-    api_version: v1
+    api_version: apps/v1
     kind: StatefulSet
     namespace: '{{ ansible_operator_meta.namespace }}'
     name: '{{ ansible_operator_meta.name }}-postgres-{{ postgres_version }}'
diff --git a/roles/postgres/tasks/upgrade_postgres.yml b/roles/postgres/tasks/upgrade_postgres.yml
index 2578cc905..c20892f2d 100644
--- a/roles/postgres/tasks/upgrade_postgres.yml
+++ b/roles/postgres/tasks/upgrade_postgres.yml
@@ -218,7 +218,7 @@
 - name: Remove old Postgres StatefulSet
   k8s:
     kind: StatefulSet
-    api_version: v1
+    api_version: apps/v1
     namespace: "{{ ansible_operator_meta.namespace }}"
     name: "{{ ansible_operator_meta.name }}-postgres"
     state: absent
diff --git a/roles/postgres/templates/postgres.yaml.j2 b/roles/postgres/templates/postgres.yaml.j2
index a8eafa446..e65264197 100644
--- a/roles/postgres/templates/postgres.yaml.j2
+++ b/roles/postgres/templates/postgres.yaml.j2
@@ -1,6 +1,6 @@
 # Postgres StatefulSet.
 ---
-apiVersion: v1
+apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: '{{ ansible_operator_meta.name }}-postgres-{{ postgres_version }}'
diff --git a/roles/pulp-api/templates/pulp-api.deployment.yaml.j2 b/roles/pulp-api/templates/pulp-api.deployment.yaml.j2
index c45f1257b..66d428a21 100644
--- a/roles/pulp-api/templates/pulp-api.deployment.yaml.j2
+++ b/roles/pulp-api/templates/pulp-api.deployment.yaml.j2
@@ -1,5 +1,5 @@
 ---
-apiVersion: v1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: "{{ ansible_operator_meta.name }}-api"
diff --git a/roles/pulp-content/templates/pulp-content.deployment.yaml.j2 b/roles/pulp-content/templates/pulp-content.deployment.yaml.j2
index 418d1cb7f..a9c7c5c50 100644
--- a/roles/pulp-content/templates/pulp-content.deployment.yaml.j2
+++ b/roles/pulp-content/templates/pulp-content.deployment.yaml.j2
@@ -1,5 +1,5 @@
 ---
-apiVersion: v1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: "{{ ansible_operator_meta.name }}-content"
diff --git a/roles/pulp-status/tasks/main.yml b/roles/pulp-status/tasks/main.yml
index 331b1dcfa..b6192ff5f 100644
--- a/roles/pulp-status/tasks/main.yml
+++ b/roles/pulp-status/tasks/main.yml
@@ -103,7 +103,7 @@
 
 - name: Remove resource manager deployment
   kubernetes.core.k8s:
-    api_version: v1
+    api_version: apps/v1
     kind: Deployment
     name: "{{ ansible_operator_meta.name }}-resource-manager"
     namespace: "{{ ansible_operator_meta.namespace }}"
diff --git a/roles/pulp-web/templates/pulp-web.deployment.yaml.j2 b/roles/pulp-web/templates/pulp-web.deployment.yaml.j2
index 4b7093865..9f35d79b8 100644
--- a/roles/pulp-web/templates/pulp-web.deployment.yaml.j2
+++ b/roles/pulp-web/templates/pulp-web.deployment.yaml.j2
@@ -1,5 +1,5 @@
 ---
-apiVersion: v1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: "{{ ansible_operator_meta.name }}-web"
diff --git a/roles/pulp-worker/templates/pulp-worker.deployment.yaml.j2 b/roles/pulp-worker/templates/pulp-worker.deployment.yaml.j2
index 5c2c13a0a..b389cf897 100644
--- a/roles/pulp-worker/templates/pulp-worker.deployment.yaml.j2
+++ b/roles/pulp-worker/templates/pulp-worker.deployment.yaml.j2
@@ -1,5 +1,5 @@
 ---
-apiVersion: v1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: "{{ ansible_operator_meta.name }}-worker"
diff --git a/roles/redis/templates/redis.deployment.yaml.j2 b/roles/redis/templates/redis.deployment.yaml.j2
index 6ac36ba1e..ef2aa22c4 100644
--- a/roles/redis/templates/redis.deployment.yaml.j2
+++ b/roles/redis/templates/redis.deployment.yaml.j2
@@ -1,5 +1,5 @@
 ---
-apiVersion: v1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: "{{ ansible_operator_meta.name }}-redis"