Merge pull request #17 from redhat-sa-brazil/v0.1c

V0.1c

Makefile

@@ -1,9 +1,17 @@
-.PHONY: aro rosa
+.PHONY: aro rosa vsphere agnostic-odf
 
 aro:
 	ansible-playbook --extra-vars "@vars.yml" --extra-vars "storage_class=managed-csi" playbooks/pre_deploy.yml
-	ansible-playbook --extra-vars "@vars.yml" --extra-vars "storage_class=managed-csi"  --extra-vars "loadbalancer=azure: stdlb" playbooks/deploy_besu.yml
+	ansible-playbook --extra-vars "@vars.yml" --extra-vars "storage_class=managed-csi" --extra-vars "service=service.beta.kubernetes.io/azure-lb" --extra-vars "loadbalancer=azure: stdlb" --extra-vars "typelb=LoadBalancer" playbooks/deploy_besu.yml
 
 rosa:
 	ansible-playbook --extra-vars "@vars.yml" --extra-vars "storage_class=gp3-csi" playbooks/pre_deploy.yml
-	ansible-playbook --extra-vars "@vars.yml" --extra-vars "storage_class=gp3-csi" --extra-vars "service=service.beta.kubernetes.io/aws-load-balancer-type" --extra-vars loadbalancer="external" playbooks/deploy_besu.yml
+	ansible-playbook --extra-vars "@vars.yml" --extra-vars "storage_class=gp3-csi" --extra-vars "service=service.beta.kubernetes.io/aws-load-balancer-type" --extra-vars loadbalancer="external" --extra-vars "typelb=LoadBalancer" playbooks/deploy_besu.yml
+
+vsphere:
+	ansible-playbook --extra-vars "@vars.yml" --extra-vars "storage_class=thin" playbooks/pre_deploy.yml
+	ansible-playbook --extra-vars "@vars.yml" --extra-vars "storage_class=thin" --extra-vars "service=service.beta.kubernetes.io/aws-load-balancer-type" --extra-vars "loadbalancer=NodePort" --extra-vars "typelb=NodePort" playbooks/deploy_besu.yml
+
+agnostic-odf:
+	ansible-playbook --extra-vars "@vars.yml" --extra-vars "storage_class=ocs-storagecluster-cephfs" playbooks/pre_deploy.yml
+	ansible-playbook --extra-vars "@vars.yml" --extra-vars "storage_class=ocs-storagecluster-cephfs" --extra-vars "service=agnostic" --extra-vars "loadbalancer=NodePort" --extra-vars "typelb=NodePort" playbooks/deploy_besu.yml

README.md

@@ -17,7 +17,17 @@ Versão de openshift que está sendo utilizado para este deploy.
   - 4.12
   - 4.13
 
-**Pre-req: ter o aws loadbalancer operator instalado no cluster ROSA verifique no [link mobb.ninja](https://mobb.ninja/docs/rosa/aws-load-balancer-operator/ "link mobb.ninja")*
+- vsphere
+  - 4.12
+  - 4.13
+  - 4.14
+
+- Agnostic Plataform
+  - 4.12
+  - 4.13
+  - 4.14
+
+**Pre-req: ter o aws loadbalancer operator instalado no cluster ROSA verifique no [link redhat experts](https://cloud.redhat.com/experts/rosa/aws-load-balancer-operator/ "link redhat experts")*
 
 > *outros ambientes serão disponibilizados em breve*
 
@@ -79,4 +89,12 @@ project_description: "bla" # informe o descritivo do projeto a ser criado no Ope
 
 ``
   make rosa
+``
+
+``
+  make vsphere
+``
+
+``
+  make agnostic-odf
 ``

yaml/besu/besu-svc.yml

@@ -3,7 +3,7 @@ kind: Service
 metadata:
   name: besu-svc
   annotations:
-    service.beta.kubernetes.io/aws-load-balancer-type: "external"
+    agnostic: "NodePort"
 spec:
   ports:
   - name: http-json-rpc
@@ -37,4 +37,4 @@ spec:
   selector:
     app: besu
   sessionAffinity: None
-  type: LoadBalancer
+  type: NodePort

yaml/besu/besu-svc.yml.j2

@@ -37,4 +37,4 @@ spec:
   selector:
     app: besu
   sessionAffinity: None
-  type: LoadBalancer
+  type: {{ typelb }}

yaml/besu/pvc-besu-data.yml

@@ -8,4 +8,4 @@ spec:
   resources:
     requests:
       storage: 20Gi
-  storageClassName: gp3-csi
+  storageClassName: ocs-storagecluster-cephfs

yaml/metrics/grafana/01_grafana-instance-pvc.yml

@@ -8,5 +8,4 @@ spec:
   resources:
     requests:
       storage: 10Gi
-  storageClassName: gp3-csi
-
+  storageClassName: ocs-storagecluster-cephfs

yaml/metrics/grafana/01_grafana-instance-pvc.yml.j2

@@ -9,4 +9,3 @@ spec:
     requests:
       storage: 10Gi
   storageClassName: {{ storage_class }}
-

yaml/metrics/prometheus/00_operator.yml

@@ -3,5 +3,5 @@ apiVersion: operators.coreos.com/v1
 kind: Operator
 metadata:
   generation: 1
-  name: rhods-prometheus-operator.besu-11
+  name: rhods-prometheus-operator.besu-baremetal
 spec: {}

yaml/metrics/prometheus/01_subscription.yml

@@ -1,21 +1,21 @@
 apiVersion: operators.coreos.com/v1
 kind: OperatorGroup
 metadata:
-    name: besu-11-opg
-    namespace: besu-11
+    name: besu-baremetal-opg
+    namespace: besu-baremetal
 spec:
   targetNamespaces:
-    - besu-11
+    - besu-baremetal
   upgradeStrategy: Default
 ---
 apiVersion: operators.coreos.com/v1alpha1
 kind: Subscription
 metadata:
   generation: 1
   labels:
-    operators.coreos.com/rhods-prometheus-operator.besu-11: ""
+    operators.coreos.com/rhods-prometheus-operator.besu-baremetal: ""
   name: rhods-prometheus-operator
-  namespace: besu-11
+  namespace: besu-baremetal
 spec:
   channel: beta
   installPlanApproval: Automatic