Merge pull request #687 from PureStorage-OpenConnect/no_post_script

No post script

Author: danpaul81

README.md

@@ -126,19 +126,19 @@ async-dr                     Deploys 2 clusters with Portworx, sets up and confi
                              configures an async DR schedule with a loadbalancer in front of the setup.
 backup-restore               Deploys a Kubernetes cluster, Minio S3 storage, Petclinic Application and
                              Backup/Restore config
-elk                          Deploys an ELK stack of 3 master nodes, 3 data nodes and 2 coordinator nodes, as per
-                             https://docs.portworx.com/portworx-install-with-kubernetes/application-install-with-kubernetes/elastic-search-and-kibana/
-harbor                       Deploys a single K8s cluster with Portworx and Harbor (https://goharbor.io/)
+ceph                         Install and run Ceph on each cluster
+dude                         Deploys clusters with Portworx, sets up and configures a cluster pairing from
+                             odd to even clusters, configures an async DR schedule, installs PX-Backup on the
+                             last cluster
+eks-multicloud-target        setup EKS cluster with PX as clusterpair migration target
+kubevirt                     Install kubevirt on a bare-metal cluster
 metro                        Deploys 2 K8s clusters in AWS with a stretched Portworx cluster. It configures
                              Metro, a GUI and Petclinic, ready for a manual failover demo
 migration                    Deploys 2 clusters with Portworx, sets up and configures a cluster pairing, and
                              deploys a set of apps and a migration template.
+ocp-kubevirt                 Two Cluster OCP Virtualization Demo with Backup & AsyncDR on a aws bare-metal
 px-backup                    A single Kubernetes cluster with Portworx and PX-Backup via Helm installed
-px-fio-example               An example fio benchmark on a gp2 disk and a Portworx volume on a gp2 disk
-px-vs-storageos-fio-example  An example fio benchmark on a gp2 disk, a Portworx volume on a gp2 disk, and a
-                             StorageOS volume on a gp2 disk
 px                           A single Kubernetes cluster with Portworx installed
-storageos                    A single Kubernetes cluster with StorageOS installed
 training                     Deploys training clusters
 ```
 

defaults.yml

@@ -6,7 +6,6 @@ nodes: 3
 k8s_version: 1.31.8
 px_version: 3.3.1.1
 stop_after: 6
-post_script: show-ip
 quiet: false
 tags: "project=pxdeploy"
 

px-deploy.go

@@ -49,7 +49,6 @@ type Config struct {
 	K8s_Version              string
 	Px_Version               string
 	Stop_After               string
-	Post_Script              string
 	DryRun                   bool
 	NoSync                   bool
 	IgnoreVersion            bool
@@ -720,16 +719,6 @@ func validate_config(config *Config) []string {
 			errormsg = append(errormsg, "Script '"+s+"' is not valid Bash")
 		}
 	}
-	if config.Post_Script != "" {
-		if _, err := os.Stat("scripts/" + config.Post_Script); os.IsNotExist(err) {
-			errormsg = append(errormsg, "Postscript '"+config.Post_Script+"' does not exist")
-		}
-		cmd := exec.Command("bash", "-n", "scripts/"+config.Post_Script)
-		err := cmd.Run()
-		if err != nil {
-			errormsg = append(errormsg, "Postscript '"+config.Post_Script+"' is not valid Bash")
-		}
-	}
 
 	if config.Platform == "ocp4" {
 		checkvar := []string{"ocp4_domain", "ocp4_pull_secret"}
@@ -1876,22 +1865,6 @@ func write_nodescripts(config Config) {
 		}
 	}
 
-	// add post_script if defined
-	if config.Post_Script != "" {
-		content, err := os.ReadFile("/px-deploy/.px-deploy/scripts/" + config.Post_Script)
-		if err == nil {
-			tf_post_script = append(tf_post_script, "(\n"...)
-			tf_post_script = append(tf_post_script, "echo \"Started $(date)\"\n"...)
-			tf_post_script = append(tf_post_script, "echo \""+config.Post_Script+"_start,$(date +%s)\" >>/var/log/px-deploy/script_tracking\n"...)
-			tf_post_script = append(tf_post_script, content...)
-			tf_post_script = append(tf_post_script, "\necho \"Finished $(date)\"\n"...)
-			tf_post_script = append(tf_post_script, "echo \""+config.Post_Script+"_stop,$(date +%s)\" >>/var/log/px-deploy/script_tracking\n"...)
-			tf_post_script = append(tf_post_script, "\n) >&/var/log/px-deploy/"+config.Post_Script+"\n"...)
-		}
-	} else {
-		tf_post_script = nil
-	}
-
 	// loop clusters (masters and nodes) to build tfvars and master/node scripts
 	for c := 1; c <= Clusters; c++ {
 		masternum := strconv.Itoa(c)

scripts/cat

@@ -10,3 +10,6 @@ done
 
 # Provision MinIO
 kubectl apply -f /assets/minio/minio-deployment.yml
+
+# Delete AWS keys
+rm -f /root/.aws/credentials