Merge pull request #141 from NVIDIA/main

release v0.2.2

.github/workflows/e2e.yml

@@ -35,6 +35,8 @@ jobs:
       with:
         go-version: 'stable'
         check-latest: true
+    - name: Install dependencies
+      run: sudo apt-get update && sudo apt-get install -y make
     - name: Run e2e-aws tests
       run: make -f tests/Makefile e2e-aws
     - name: Run e2e-vsphere tests

action.yml

@@ -31,6 +31,15 @@ inputs:
   aws_ssh_key:
     description: 'AWS SSH Key'
     required: false
+  vsphere_ssh_key:
+    description: 'vSphere SSH Key'
+    required: false
+  vsphere_username:
+    description: 'vSphere Username'
+    required: false
+  vsphere_password:
+    description: 'vSphere Password'
+    required: false
   holodeck_config:
     description: 'Holodeck configuration file'
     required: true

cmd/action/ci/ci.go

@@ -26,15 +26,14 @@ import (
 )
 
 const (
-	cachedir   = "/github/workspace/.cache"
-	cacheFile  = "/github/workspace/.cache/holodeck.yaml"
-	kubeconfig = "/github/workspace/kubeconfig"
-	sshKeyFile = "/github/workspace/.cache/key.pem"
+	cachedir           = "/github/workspace/.cache"
+	cacheFile          = "/github/workspace/.cache/holodeck.yaml"
+	kubeconfig         = "/github/workspace/kubeconfig"
+	sshKeyFile         = "/github/workspace/.cache/key"
+	holodeckSSHKeyFile = "/github/workspace/holodeck_ssh_key"
 )
 
 func Run(log *logger.FunLogger) error {
-	log.Info("Holodeck Settting up test environment")
-
 	// Get GitHub Actions INPUT_* vars
 	err := readInputs()
 	if err != nil {
@@ -65,9 +64,9 @@ func Run(log *logger.FunLogger) error {
 // Users can set the variables on self hosted runners.
 func readInputs() error {
 	// Get INPUT_AWS_SSH_KEY to set AWS_SSH_KEY
-	sshKey := os.Getenv("INPUT_AWS_SSH_KEY")
-	if sshKey != "" {
-		err := os.Setenv("AWS_SSH_KEY", sshKey)
+	awsSshKey := os.Getenv("INPUT_AWS_SSH_KEY")
+	if awsSshKey != "" {
+		err := os.Setenv("AWS_SSH_KEY", awsSshKey)
 		if err != nil {
 			return fmt.Errorf("failed to set AWS_SSH_KEY: %v", err)
 		}
@@ -89,6 +88,31 @@ func readInputs() error {
 		}
 	}
 
+	// For vSphere
+	vsphereSshKey := os.Getenv("INPUT_VSPHERE_SSH_KEY")
+	if vsphereSshKey != "" {
+		err := os.Setenv("VSPHERE_SSH_KEY", vsphereSshKey)
+		if err != nil {
+			return fmt.Errorf("failed to set VSPHERE_SSH_KEY: %v", err)
+		}
+	}
+	// Map INPUT_VSPHERE_USERNAME and INPUT_VSPHERE_PASSWORD
+	// to VSPHERE_USERNAME and VSPHERE_PASSWORD
+	vsphereUsername := os.Getenv("INPUT_VSPHERE_USERNAME")
+	if vsphereUsername != "" {
+		err := os.Setenv("VSPHERE_USERNAME", vsphereUsername)
+		if err != nil {
+			return fmt.Errorf("failed to set VSPHERE_USERNAME: %v", err)
+		}
+	}
+	vspherePassword := os.Getenv("INPUT_VSPHERE_PASSWORD")
+	if vspherePassword != "" {
+		err := os.Setenv("VSPHERE_PASSWORD", vspherePassword)
+		if err != nil {
+			return fmt.Errorf("failed to set VSPHERE_PASSWORD: %v", err)
+		}
+	}
+
 	return nil
 }
 

cmd/action/ci/entrypoint.go

@@ -70,17 +70,24 @@ func entrypoint(log *logger.FunLogger) error {
 
 	// Get the host url
 	var hostUrl string
-	var username string
 	if cfg.Spec.Provider == v1alpha1.ProviderAWS {
-		username = "ubuntu"
+		if err := getSSHKeyFile(log, "AWS_SSH_KEY"); err != nil {
+			return err
+		}
+		cfg.Spec.Auth.PrivateKey = sshKeyFile
+		cfg.Spec.Auth.Username = "ubuntu"
 		for _, p := range cache.Status.Properties {
 			if p.Name == aws.PublicDnsName {
 				hostUrl = p.Value
 				break
 			}
 		}
 	} else if cfg.Spec.Provider == v1alpha1.ProviderVSphere {
-		username = "nvidia"
+		if err := getSSHKeyFile(log, "VSPHERE_SSH_KEY"); err != nil {
+			return err
+		}
+		cfg.Spec.Auth.PrivateKey = sshKeyFile
+		cfg.Spec.Auth.Username = "nvidia"
 		for _, p := range cache.Status.Properties {
 			if p.Name == vsphere.IpAddress {
 				hostUrl = p.Value
@@ -90,7 +97,7 @@ func entrypoint(log *logger.FunLogger) error {
 	}
 
 	// Run the provisioner
-	p, err := provisioner.New(log, sshKeyFile, username, hostUrl)
+	p, err := provisioner.New(log, sshKeyFile, cfg.Spec.Auth.Username, hostUrl)
 	if err != nil {
 		return err
 	}

cmd/action/ci/provider.go

@@ -59,23 +59,6 @@ func newAwsProvider(log *logger.FunLogger, cfg *v1alpha1.Environment) (*aws.Prov
 		}
 	}
 
-	// Get AWS_SSH_KEY and write it to a file
-	sshKey := os.Getenv("AWS_SSH_KEY")
-	if sshKey == "" {
-		log.Error(fmt.Errorf("ssh key not provided"))
-		return nil, fmt.Errorf("ssh key not provided")
-	}
-
-	err := os.WriteFile(sshKeyFile, []byte(sshKey), 0600)
-	if err != nil {
-		log.Error(fmt.Errorf("error writing ssh key to file: %s", err))
-		return nil, err
-	}
-
-	// Set auth.PrivateKey
-	cfg.Spec.Auth.PrivateKey = sshKeyFile
-	cfg.Spec.Auth.Username = "ubuntu"
-
 	// Set env name
 	setCfgName(cfg)
 
@@ -97,23 +80,6 @@ func newVsphereProvider(log *logger.FunLogger, cfg *v1alpha1.Environment) (*vsph
 		}
 	}
 
-	// Get VSPHERE_SSH_KEY and write it to a file
-	sshKey := os.Getenv("VSPHERE_SSH_KEY")
-	if sshKey == "" {
-		log.Error(fmt.Errorf("ssh key not provided"))
-		return nil, fmt.Errorf("ssh key not provided")
-	}
-
-	err := os.WriteFile(sshKeyFile, []byte(sshKey), 0600)
-	if err != nil {
-		log.Error(fmt.Errorf("error writing ssh key to file: %s", err))
-		return nil, err
-	}
-
-	// Set auth.PrivateKey
-	cfg.Spec.Auth.PrivateKey = sshKeyFile
-	cfg.Spec.Auth.Username = "nvidia"
-
 	// Set env name
 	setCfgName(cfg)
 
@@ -124,3 +90,31 @@ func newVsphereProvider(log *logger.FunLogger, cfg *v1alpha1.Environment) (*vsph
 
 	return v, nil
 }
+
+// look for file holodeck_ssh_key in GITHUB_WORKSPACE/holodeck_ssh_key
+// if file not found, look for env var envKey
+// if env var not found, return error
+func getSSHKeyFile(log *logger.FunLogger, envKey string) error {
+	if _, err := os.Stat(holodeckSSHKeyFile); os.IsNotExist(err) {
+		// look for env var set KEY
+		envSshKey := os.Getenv(envKey)
+		if envSshKey == "" {
+			log.Error(fmt.Errorf("ssh key not provided"))
+			return fmt.Errorf("ssh key not provided")
+		}
+		err := os.WriteFile(sshKeyFile, []byte(envSshKey), 0600)
+		if err != nil {
+			log.Error(fmt.Errorf("error writing ssh key to file: %s", err))
+			return err
+		}
+	} else {
+		// copy file to sshKeyFile
+		err := os.Rename(holodeckSSHKeyFile, sshKeyFile)
+		if err != nil {
+			log.Error(fmt.Errorf("error copying ssh key file: %s", err))
+			return err
+		}
+	}
+
+	return nil
+}

go.mod

@@ -6,15 +6,15 @@ toolchain go1.22.5
 
 require (
 	github.com/NVIDIA/k8s-test-infra v0.0.0-20240730082043-e950c133bd0b
-	github.com/aws/aws-sdk-go v1.55.3
+	github.com/aws/aws-sdk-go v1.55.5
 	github.com/aws/aws-sdk-go-v2 v1.30.3
 	github.com/aws/aws-sdk-go-v2/config v1.27.27
 	github.com/aws/aws-sdk-go-v2/service/ec2 v1.173.0
 	github.com/aws/aws-sdk-go-v2/service/route53 v1.42.3
 	github.com/aws/aws-sdk-go-v2/service/ssm v1.52.3
 	github.com/mattn/go-isatty v0.0.20
 	github.com/onsi/ginkgo/v2 v2.19.1
-	github.com/onsi/gomega v1.34.0
+	github.com/onsi/gomega v1.34.1
 	github.com/urfave/cli/v2 v2.27.3
 	github.com/vmware/govmomi v0.39.0
 	golang.org/x/crypto v0.25.0
@@ -143,15 +143,15 @@ require (
 	go.opentelemetry.io/otel/metric v1.21.0 // indirect
 	go.opentelemetry.io/otel/trace v1.21.0 // indirect
 	go.starlark.net v0.0.0-20231121155337-90ade8b19d09 // indirect
-	golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc // indirect
-	golang.org/x/net v0.25.0 // indirect
+	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
+	golang.org/x/net v0.27.0 // indirect
 	golang.org/x/oauth2 v0.15.0 // indirect
 	golang.org/x/sync v0.7.0 // indirect
 	golang.org/x/sys v0.22.0 // indirect
 	golang.org/x/term v0.22.0 // indirect
 	golang.org/x/text v0.16.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
-	golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
+	golang.org/x/tools v0.23.0 // indirect
 	google.golang.org/appengine v1.6.8 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917 // indirect
 	google.golang.org/grpc v1.60.1 // indirect

go.sum

@@ -31,8 +31,8 @@ github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPd
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
 github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so=
 github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
-github.com/aws/aws-sdk-go v1.55.3 h1:0B5hOX+mIx7I5XPOrjrHlKSDQV/+ypFZpIHOx5LOk3E=
-github.com/aws/aws-sdk-go v1.55.3/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU=
+github.com/aws/aws-sdk-go v1.55.5 h1:KKUZBfBoyqy5d3swXyiC7Q76ic40rYcbqH7qjh59kzU=
+github.com/aws/aws-sdk-go v1.55.5/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU=
 github.com/aws/aws-sdk-go-v2 v1.30.3 h1:jUeBtG0Ih+ZIFH0F4UkmL9w3cSpaMv9tYYDbzILP8dY=
 github.com/aws/aws-sdk-go-v2 v1.30.3/go.mod h1:nIQjQVp5sfpQcTc9mPSr1B0PaWK5ByX9MOoDadSN4lc=
 github.com/aws/aws-sdk-go-v2/config v1.27.27 h1:HdqgGt1OAP0HkEDDShEl0oSYa9ZZBSOmKpdpsDMdO90=
@@ -300,8 +300,8 @@ github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J
 github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
 github.com/onsi/ginkgo/v2 v2.19.1 h1:QXgq3Z8Crl5EL1WBAC98A5sEBHARrAJNzAmMxzLcRF0=
 github.com/onsi/ginkgo/v2 v2.19.1/go.mod h1:O3DtEWQkPa/F7fBMgmZQKKsluAy8pd3rEQdrjkPb9zA=
-github.com/onsi/gomega v1.34.0 h1:eSSPsPNp6ZpsG8X1OVmOTxig+CblTc4AxpPBykhe2Os=
-github.com/onsi/gomega v1.34.0/go.mod h1:MIKI8c+f+QLWk+hxbePD4i0LMJSExPaZOVfkoex4cAo=
+github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k=
+github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY=
 github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
 github.com/opencontainers/image-spec v1.1.0-rc6 h1:XDqvyKsJEbRtATzkgItUqBA7QHk58yxX1Ov9HERHNqU=
@@ -416,13 +416,13 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y
 golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
 golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30=
 golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M=
-golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc h1:ao2WRsKSzW6KuUY9IWPwWahcHCgR0s52IfwutMfEbdM=
-golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI=
+golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8=
+golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
-golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/mod v0.19.0 h1:fEdghXQSo20giMthA7cd28ZC+jts4amQ3YMXiP5oMQ8=
+golang.org/x/mod v0.19.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -432,8 +432,8 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
-golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=
-golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
+golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys=
+golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE=
 golang.org/x/oauth2 v0.15.0 h1:s8pnnxNVzjWyrvYdFUQq5llS1PX2zhPXmccZv99h7uQ=
 golang.org/x/oauth2 v0.15.0/go.mod h1:q48ptWNTY5XWf+JNten23lcvHpLJ0ZSxF5ttTHKVCAM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -480,8 +480,8 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn
 golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg=
-golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
+golang.org/x/tools v0.23.0 h1:SGsXPZ+2l4JsgaCKkx+FQ9YZ5XEtA1GZYuoDjenLjvg=
+golang.org/x/tools v0.23.0/go.mod h1:pnu6ufv6vQkll6szChhK3C3L/ruaIv5eBeztNG8wtsI=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=