Merge pull request #637 from PureStorage-OpenConnect/ocp-monitoring

Ocp monitoring

Author: andrewh1978

defaults.yml

@@ -57,7 +57,7 @@ vsphere_repo: "https://px-deploy.s3.eu-west-1.amazonaws.com/templates/"
 #vsphere_folder: ""
 
 ocp4_domain: ""
-ocp4_version: 4.16.17
+ocp4_version: 4.18.8
 ocp4_pull_secret: ""
 
 #env:

scripts/install-px

@@ -84,6 +84,15 @@ spec:
   source: certified-operators
   sourceNamespace: openshift-marketplace
   startingCSV: portworx-operator.v24.2.0
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: cluster-monitoring-config
+  namespace: openshift-monitoring
+data:
+  config.yaml: |
+    enableUserWorkload: true
 EOF
   while ! oc get csv -n portworx  | grep portworx-operator | grep -q Succeeded ; do
     sleep 2
@@ -135,8 +144,16 @@ chmod +x /usr/local/bin/pxc-pxctl
 echo "alias pxctl='kubectl pxc pxctl'" >>/root/.bashrc
 kubectl-pxc config cluster set --portworx-service-namespace=portworx
 
+# Wait for cluster readiness
+while ! kubectl get stc -A -n portworx | grep -q 'Running\|Online'; do
+  echo "Waiting for StorageCluster status online"
+  sleep 3
+done
+
 # Install Grafana
 if [ $platform = ocp4 ]; then
+  kubectl patch StorageCluster px-deploy-$cluster -n portworx --type merge --patch '{"spec": {"monitoring": {"prometheus": {"alertManager": {"enabled": false}}}}}'
+  kubectl patch StorageCluster px-deploy-$cluster -n portworx --type merge --patch '{"spec": {"monitoring": {"prometheus": {"enabled": false}}}}'
   kubectl apply -n portworx -f https://docs.portworx.com/samples/portworx-enterprise/k8s/pxc/grafana-service-account.yaml
   oc -n portworx adm policy add-cluster-role-to-user cluster-monitoring-view -z grafana
   TOKEN=$(oc -n portworx create token grafana --duration=8760h)
@@ -163,10 +180,10 @@ if [ $platform != eks ] && [ $platform != gke ] && [ $platform != ocp4 ] && [ $p
 fi
 
 # Wait for cluster readiness
-while ! kubectl get stc -A -n portworx | grep -q 'Running\|Online'; do
-  echo "Waiting for StorageCluster status online"
-  sleep 3
-done
+#while ! kubectl get stc -A -n portworx | grep -q 'Running\|Online'; do
+#  echo "Waiting for StorageCluster status online"
+#  sleep 3
+#done
 
 # install storkctl
 STORK_POD=$(kubectl get pods -n portworx -l name=stork -o jsonpath='{.items[0].metadata.name}')

terraform/aws/ocp4/ocp4-install-config.tpl

@@ -17,7 +17,7 @@ controlPlane:
   replicas: 3
 metadata:
   creationTimestamp: null
-  name: px-deploy-${tpl_configname}-${tpl_cluster}
+  name: pxd-${tpl_configname}-${tpl_cluster}
 networking:
   clusterNetwork:
   - cidr: 10.128.0.0/14