change es install namespace

files/servicemesh/cr.yaml

@@ -3,78 +3,42 @@ kind: ServiceMeshControlPlane
 metadata:
   name: basic-install
 spec:
-  template: default
-  # NOTE, if you remove all children from an element, you should remove the
-  # element too.  An empty element is interpreted as null and will override all
-  # default values (i.e. no values will be specified for that element, not even
-  # the defaults baked into the chart values.yaml).
   istio:
     global:
-      # the following lines disable tls across the control and data planes
-      controlPlaneSecurityEnabled: false
-      mtls:
-        enabled: false
-
       proxy:
-        # constrain resources for use in smaller environments
         resources:
           requests:
             cpu: 100m
             memory: 128Mi
           limits:
             cpu: 500m
             memory: 128Mi
-
     gateways:
       istio-egressgateway:
-        # disable autoscaling for use in smaller environments
         autoscaleEnabled: false
       istio-ingressgateway:
-        # disable autoscaling for use in smaller environments
         autoscaleEnabled: false
-        # set to true to enable IOR
         ior_enabled: false
-
     mixer:
       policy:
-        # disable autoscaling for use in smaller environments
         autoscaleEnabled: false
-
       telemetry:
-        # disable autoscaling for use in smaller environments
         autoscaleEnabled: false
-        # constrain resources for use in smaller environments
         resources:
           requests:
             cpu: 100m
             memory: 1G
           limits:
             cpu: 500m
             memory: 4G
-
     pilot:
-      # disable autoscaling for use in smaller environments
       autoscaleEnabled: false
-      # increase random sampling rate for development/testing
-      traceSampling: 100.0
-
+      traceSampling: 100
     kiali:
-      # change to false to disable kiali
       enabled: true
-      # create a secret for accessing kiali dashboard with the following credentials
-      # dashboard:
-      #   user: admin
-      #   passphrase: admin
-
+    grafana:
+      enabled: true
     tracing:
-      # change to false to disable tracing (i.e. jaeger)
       enabled: true
       jaeger:
-        # simple, all-in-one strategy
         template: all-in-one
-        # production strategy, utilizing elasticsearch
-        #template: production-elasticsearch
-        # if required. only one instance may use agentStrategy=DaemonSet
-        #agentStrategy: DaemonSet
-  threeScale:
-    enabled: false

tasks/deploy_servicemesh.yml

@@ -1,10 +1,4 @@
 ---
-- name: Create openshift-operators-redhat Namespace
-  community.kubernetes.k8s:
-    state: present
-    kind: Namespace
-    name: "openshift-operators-redhat"
-
 - name: "Install Red Hat Servicemesh Components::ElasticSearch"
   community.kubernetes.k8s:
     state: present
@@ -15,7 +9,6 @@
   include_tasks: utils/wait_for_operator_and_sub.yml
   vars:
     subscription_name: elasticsearch-operator
-    sub_namespace: "openshift-operators-redhat"
 
 - name: "Install Red Hat Servicemesh Components::Jaeger"
   community.kubernetes.k8s:
@@ -67,7 +60,6 @@
     wait_condition:
       type: Ready
   with_file: "{{ servicemesh_cr }}"
-  no_log: "{{ supress_log }}"
   register: istio_control_plane_status
 
 - name: Create ServiceMesh projects

tasks/undeploy_servicemesh.yml

@@ -29,7 +29,6 @@
       type: Ready
       status: False
   with_file: "{{ servicemesh_cr }}"
-  no_log: "{{ supress_log }}"
   register: istio_control_plane_status
 
 - name: Delete istio-system Namespace

templates/servicemesh/elasticsearch.yaml.j2

@@ -3,7 +3,7 @@ apiVersion: operators.coreos.com/v1alpha1
 kind: Subscription
 metadata:
   name: elasticsearch-operator
-  namespace: openshift-operators-redhat
+  namespace: openshift-operators
 spec:
   channel: '{{ servicemesh_es_channel }}'
   source: redhat-operators