From 824e23c23425e6083a951e62e9dd38dd610f9e21 Mon Sep 17 00:00:00 2001
From: Tamilanban Rajendran <tamilanban.rajendran@ibm.com>
Date: Thu, 7 Nov 2024 10:36:00 +0530
Subject: [PATCH 1/3] Added orm for opensearch

Signed-off-by: Tamilanban Rajendran <tamilanban.rajendran@ibm.com>
---
 turbonomic/opensearch-operand-orm.yaml  | 28 +++++++++++++++++++++++++
 turbonomic/opensearch-operator-orm.yaml | 18 ++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 turbonomic/opensearch-operand-orm.yaml
 create mode 100644 turbonomic/opensearch-operator-orm.yaml

diff --git a/turbonomic/opensearch-operand-orm.yaml b/turbonomic/opensearch-operand-orm.yaml
new file mode 100644
index 000000000..4a0762300
--- /dev/null
+++ b/turbonomic/opensearch-operand-orm.yaml
@@ -0,0 +1,28 @@
+apiVersion: devops.turbonomic.io/v1alpha1
+kind: OperatorResourceMapping
+metadata:
+  name: opensearch-orm
+  namespace: $namespace
+spec:
+  mappings:
+    patterns:
+      - owned:
+          apiVersion: apps/v1
+          kind: StatefulSet
+          path: .spec.spec.containers[?(@.name=="elasticsearch")].resources
+        ownerPath: .spec.resources
+        selector: os_deploy
+      - owned:
+          apiVersion: apps/v1
+          kind: StatefulSet
+          path: .spec.spec.containers[?(@.name=="haproxy")].resources
+        ownerPath: .spec.resources
+        selector: os_deploy
+    selectors:
+      os_deploy:
+        matchLabels:
+          app.kubernetes.io/name: opensearch
+  owner:
+    apiVersion: elasticsearch.opencontent.ibm.com/v1
+    kind: ElasticsearchCluster
+    name: opensearch
\ No newline at end of file
diff --git a/turbonomic/opensearch-operator-orm.yaml b/turbonomic/opensearch-operator-orm.yaml
new file mode 100644
index 000000000..abf3f6d3b
--- /dev/null
+++ b/turbonomic/opensearch-operator-orm.yaml
@@ -0,0 +1,18 @@
+apiVersion: devops.turbonomic.io/v1alpha1
+kind: OperatorResourceMapping
+metadata:
+  name: opensearch-operator-rm
+  namespace: $namespace
+spec:
+  mappings:
+    patterns:
+    - owned:
+        apiVersion: apps/v1
+        kind: Deployment
+        path: .spec.template.spec.containers[?(@.name=="manager")].resources
+        name: ibm-elasticsearch-operator-ibm-es-controller-manager
+      ownerPath: .spec.install.spec.deployments[?(@.name=="ibm-elasticsearch-operator-ibm-es-controller-manager")].spec.template.spec.containers[?(@.name=="manager")].resources
+  owner:
+    apiVersion: operators.coreos.com/v1alpha1
+    kind: ClusterServiceVersion
+    name: ibm-elasticsearch-operator.v1.1.2346
\ No newline at end of file

From ca0690fee86809a834643c5ff6cb8c7d9f6813f2 Mon Sep 17 00:00:00 2001
From: Tamilanban Rajendran <tamilanban.rajendran@ibm.com>
Date: Tue, 12 Nov 2024 15:18:49 +0530
Subject: [PATCH 2/3] Added orm for opensearch

Signed-off-by: Tamilanban Rajendran <tamilanban.rajendran@ibm.com>
---
 turbonomic/{ => operands}/opensearch-operand-orm.yaml   | 0
 turbonomic/{ => operators}/opensearch-operator-orm.yaml | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename turbonomic/{ => operands}/opensearch-operand-orm.yaml (100%)
 rename turbonomic/{ => operators}/opensearch-operator-orm.yaml (100%)

diff --git a/turbonomic/opensearch-operand-orm.yaml b/turbonomic/operands/opensearch-operand-orm.yaml
similarity index 100%
rename from turbonomic/opensearch-operand-orm.yaml
rename to turbonomic/operands/opensearch-operand-orm.yaml
diff --git a/turbonomic/opensearch-operator-orm.yaml b/turbonomic/operators/opensearch-operator-orm.yaml
similarity index 100%
rename from turbonomic/opensearch-operator-orm.yaml
rename to turbonomic/operators/opensearch-operator-orm.yaml

From 3ae86f2029272ff524769d192d39f9153643c6b8 Mon Sep 17 00:00:00 2001
From: Tamilanban Rajendran <tamilanban.rajendran@ibm.com>
Date: Wed, 20 Nov 2024 08:45:18 +0530
Subject: [PATCH 3/3] Removed operator orm for opensearch and updated operand
 namespace placeholder

Signed-off-by: Tamilanban Rajendran <tamilanban.rajendran@ibm.com>
---
 .../operands/opensearch-operand-orm.yaml       |  2 +-
 .../operators/opensearch-operator-orm.yaml     | 18 ------------------
 2 files changed, 1 insertion(+), 19 deletions(-)
 delete mode 100644 turbonomic/operators/opensearch-operator-orm.yaml

diff --git a/turbonomic/operands/opensearch-operand-orm.yaml b/turbonomic/operands/opensearch-operand-orm.yaml
index 4a0762300..2bdbc81c3 100644
--- a/turbonomic/operands/opensearch-operand-orm.yaml
+++ b/turbonomic/operands/opensearch-operand-orm.yaml
@@ -2,7 +2,7 @@ apiVersion: devops.turbonomic.io/v1alpha1
 kind: OperatorResourceMapping
 metadata:
   name: opensearch-orm
-  namespace: $namespace
+  namespace: {{ placeholder_namespace }}
 spec:
   mappings:
     patterns:
diff --git a/turbonomic/operators/opensearch-operator-orm.yaml b/turbonomic/operators/opensearch-operator-orm.yaml
deleted file mode 100644
index abf3f6d3b..000000000
--- a/turbonomic/operators/opensearch-operator-orm.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-apiVersion: devops.turbonomic.io/v1alpha1
-kind: OperatorResourceMapping
-metadata:
-  name: opensearch-operator-rm
-  namespace: $namespace
-spec:
-  mappings:
-    patterns:
-    - owned:
-        apiVersion: apps/v1
-        kind: Deployment
-        path: .spec.template.spec.containers[?(@.name=="manager")].resources
-        name: ibm-elasticsearch-operator-ibm-es-controller-manager
-      ownerPath: .spec.install.spec.deployments[?(@.name=="ibm-elasticsearch-operator-ibm-es-controller-manager")].spec.template.spec.containers[?(@.name=="manager")].resources
-  owner:
-    apiVersion: operators.coreos.com/v1alpha1
-    kind: ClusterServiceVersion
-    name: ibm-elasticsearch-operator.v1.1.2346
\ No newline at end of file