Skip to content

Commit

Permalink
Merge pull request #51 from kubeslice/hotfix-enterprise-demo-apps
Browse files Browse the repository at this point in the history
fix(): added iperf app in ent-demo
  • Loading branch information
priyank-upadhyay authored May 4, 2023
2 parents a56a8b8 + 9cbbf33 commit 76f379a
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 4 deletions.
18 changes: 14 additions & 4 deletions pkg/internal/print-next-steps.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,22 @@ Note: The DNS propagation may take a minute or two.
`
const printEntVerificationStepsTemplate = `
========================================================================
KubeSlice Enterprise Setup (1 Controller + 2 Worker) is complete.
KubeSlice Enterprise Setup (1 Controller + 2 Worker) is complete
with a sample iPerf deployment.
You can now access Kubeslice Manager UI using the following URL:
%s %s
To access Kubeslice Manager use the following token in the login screen:
%s %s
Verify the iPerf Connectivity.
Here, the iPerf client, which is installed on Worker 1, will attempt to
reach out to iPerf service, which is installed on Worker 2.
Note: The DNS propagation may take a minute or two.
%s %s
`

Expand Down Expand Up @@ -104,6 +113,9 @@ func PrintNextSteps(verificationOnly bool, ApplicationConfiguration *Configurati
func printVerificationSteps(ApplicationConfiguration *ConfigurationSpecs) {
var template string
username := "admin"
clusters := ApplicationConfiguration.Configuration.ClusterConfiguration.WorkerClusters
iperfCommand := exec.Command(util.ExecutablePaths["kubectl"], "--context="+clusters[1].ContextName, "--kubeconfig="+clusters[1].KubeConfigPath, "exec", "-it", "deploy/iperf-sleep", "-c", "iperf", "-n", "iperf", "--", "iperf", "-c", "iperf-server.iperf.svc.slice.local", "-p", "5201", "-i", "1", "-b", "10Mb;")

if ApplicationConfiguration.Configuration.ClusterConfiguration.Profile == ProfileEntDemo {
token := GetUIAdminToken(
&ApplicationConfiguration.Configuration.ClusterConfiguration.ControllerCluster,
Expand All @@ -113,12 +125,10 @@ func printVerificationSteps(ApplicationConfiguration *ConfigurationSpecs) {
template = fmt.Sprintf(printEntVerificationStepsTemplate,
util.Globe, endpoint,
util.Lock, token,
util.Run, iperfCommand.String(),
)

} else {

clusters := ApplicationConfiguration.Configuration.ClusterConfiguration.WorkerClusters
iperfCommand := exec.Command(util.ExecutablePaths["kubectl"], "--context="+clusters[1].ContextName, "--kubeconfig="+clusters[1].KubeConfigPath, "exec", "-it", "deploy/iperf-sleep", "-c", "iperf", "-n", "iperf", "--", "iperf", "-c", "iperf-server.iperf.svc.slice.local", "-p", "5201", "-i", "1", "-b", "10Mb;")
template = fmt.Sprintf(printVerificationStepsTemplate,
util.Run, iperfCommand.String(),
)
Expand Down
7 changes: 7 additions & 0 deletions pkg/slicectl.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,13 @@ func entDemo() {
internal.ApplySliceConfiguration(ApplicationConfiguration)
util.Printf("%s Waiting for configuration propagation", util.Wait)
time.Sleep(20 * time.Second)
internal.GenerateIPerfManifests()
internal.GenerateIPerfServiceExportManifest(ApplicationConfiguration)
internal.InstallIPerf(ApplicationConfiguration)
internal.ApplyIPerfServiceExportManifest(ApplicationConfiguration)
util.Printf("%s Waiting for configuration propagation", util.Wait)
time.Sleep(20 * time.Second)
internal.RolloutRestartIPerf(ApplicationConfiguration)
internal.PrintNextSteps(true, ApplicationConfiguration)
}

Expand Down

0 comments on commit 76f379a

Please sign in to comment.