Skip to content

Commit

Permalink
Merge branch 'master' into usamaidrsk-patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
usamaidrsk authored Jan 9, 2025
2 parents 6766187 + af4b8bc commit 5f616f4
Show file tree
Hide file tree
Showing 12 changed files with 109 additions and 15 deletions.
1 change: 1 addition & 0 deletions docs/_meetings/week-of-01-06-2025/.gitkeep
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

5 changes: 5 additions & 0 deletions docs/_meetings/week-of-01-06-2025/Srishti_Chugh
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Hi Srishti this side, I am a third-year Computer Science student at IGDTUW with experience in web development and deep learning.
I have built dynamic web applications and worked on deep learning projects. As a newcomer to open source, I'm excited to learn and contribute to Layer5 community.
Sharing some links to my LinkedIn and Github profiles:
LinkedIn- https://www.linkedin.com/in/srishti-chugh-3a2496239
Github- https://github.com/Srishti-Chugh
7 changes: 7 additions & 0 deletions docs/_meetings/week-of-01-06-2025/aadarsh-nagrath.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Aadarsh Nagrath

**Contact:**
- Email: [[email protected]](mailto:[email protected])
- GitHub: [aadarsh-nagrath](https://github.com/aadarsh-nagrath)
- Blogs: [here](https://dev.to/aadarsh-nagrath)
<img align="right" height="200px" width="350px" src="https://i.pinimg.com/originals/28/d9/a5/28d9a5107af5d4c4da117c05b4393b83.gif">
4 changes: 4 additions & 0 deletions docs/_meetings/week-of-01-06-2025/ks-mahadevan.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
K S Mahadevan

[Linkedin](https://www.linkedin.com/in/ksmahadevan)
[Twitter](https://www.x.com/mdev_1)
3 changes: 3 additions & 0 deletions docs/_meetings/week-of-01-06-2025/riya-garg.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Hi! I am Riya Garg.

You can connect wih me [here](https://www.linkedin.com/in/riya-garg-rg14/)
2 changes: 2 additions & 0 deletions docs/_meetings/week-of-01-06-2025/shubhendra-kushwaha.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Hi, I am Shubhendra.
You can connect me through [X/TheShubhendra](https://x.com/theshubhendra)
1 change: 1 addition & 0 deletions docs/_meetings/week-of-01-06-2025/vivek-vishal.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Vivek Vishal
43 changes: 43 additions & 0 deletions docs/_releases/v0.8.8.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
---
layout: release
date: 2025-01-09
tag: v0.8.8
prerelease: false
---

## What's New
## 🔤 General
- Add staging-playground ns to valid_namespaces @sangramrath (#13180)

## ⌨️ Meshery CLI

- Enhance Meshery CLI dashboard commands and error messages for clarity and consistency @leecalcote (#13200)
- fix(mesheryctl): unittest failing due to missing update after removing `successfully` word @lekaf974 (#13039)

## 🖥 Meshery UI

- fix: test for dashboard charts failing @amitamrutiya (#13187)
- Enhance the dashboard resource detail view @amitamrutiya (#13183)
- [Chore]: Bump Sistent v0.14.137 @l5io (#13185)
- Update 404.js @aabidsofi19 (#13179)

## 🧰 Maintenance

- fix(mesheryctl): unittest failing due to missing update after removing `successfully` word @lekaf974 (#13039)
- bump ubuntu for docker build and push @aabidsofi19 (#13182)

## 📖 Documentation

- marking-my-attendance-for-the-week-of-01-06-2025 @TheShubhendra (#13192)
- marking-my-attendance-for-the-week-of-01-06-2025 @M-DEV-1 (#13194)
- marking my attendance for the week of 01-06-2025 @Srishti-Chugh (#13195)
- marking-my-attendance-for-the-week-of-01-06-2025 @riyaa14 (#13196)
- marking-my-attendance-for-the-week-of-01-06-2025 @aadarsh-nagrath (#13197)
- marking-my-attendance-for-the-week-of-01-06-2025 @vishalvivekm (#13191)
- Update gitops-with-meshery.md @leecalcote (#13188)

## 👨🏽‍💻 Contributors

Thank you to our contributors for making this release possible:
@Jougan-0, @M-DEV-1, @Srishti-Chugh, @TheShubhendra, @Touriist, @aabidsofi19, @aadarsh-nagrath, @amitamrutiya, @l5io, @leecalcote, @lekaf974, @riyaa14, @sangramrath, @vishalvivekm, @winkletinkle and MUzairS15

17 changes: 17 additions & 0 deletions docs/pages/installation/quick-start.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,23 @@ You may now proceed to managed any cloud native infrastructure supported by Mesh
<img class="center" style="width:min(100%,650px);" src="{{site.baseurl}}/assets/img/platforms/meshery-designs.png" />
</a>

# Next Steps

🧑‍🔬 Explore these tutorials to learn how to use Meshery for collaboratively managing infrastructure.

{% assign tutorials = site.pages | where: "category", "tutorials" %}

{% assign items_grouped = tutorials | group_by: 'model' %}
{% for group in items_grouped %}
{% if group.name != "" %}
<h2>{{ group.name | capitalize }} </h2>

{% for item in group.items %}
1. [{{ item.title }}]({{ site.baseurl }}{{ item.url }})
{% endfor %}
{% endif %}
{% endfor %}

# Additional Guides

<div class="section">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,13 @@ mesheryctl system dashboard --skip-browser
</div>
</pre>

<pre class='codeblock-pre'>
<div class='codeblock'>
Note: Meshery's web-based user interface is embedded in Meshery Server and is available as soon as Meshery starts. The location and port that Meshery UI is exposed varies depending upon your mode of deployment. See accessing \"Meshery UI\" for additional deployment-specific options: https://docs.meshery.io/installation/accessing-meshery-ui.

</div>
</pre>

## Options

<pre class='codeblock-pre'>
Expand Down
17 changes: 10 additions & 7 deletions mesheryctl/internal/cli/root/system/dashboard.go
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,10 @@ mesheryctl system dashboard --port-forward
mesheryctl system dashboard --port-forward -p 9081
// (optional) skip opening of MesheryUI in browser.
mesheryctl system dashboard --skip-browser`,
mesheryctl system dashboard --skip-browser
Note: Meshery's web-based user interface is embedded in Meshery Server and is available as soon as Meshery starts. The location and port that Meshery UI is exposed varies depending upon your mode of deployment. See accessing \"Meshery UI\" for additional deployment-specific options: https://docs.meshery.io/installation/accessing-meshery-ui.`,

PreRunE: func(cmd *cobra.Command, args []string) error {
// check if meshery is running or not
mctlCfg, err := config.GetMesheryCtl(viper.GetViper())
Expand All @@ -91,7 +94,7 @@ mesheryctl system dashboard --skip-browser`,
}
running, _ := utils.IsMesheryRunning(currCtx.GetPlatform())
if !running {
return errors.New(`meshery server is not running. run "mesheryctl system start" to start meshery`)
return errors.New("Meshery Server is not running. Please run `mesheryctl system start` to start Meshery Server.")
}

return nil
Expand Down Expand Up @@ -147,7 +150,7 @@ mesheryctl system dashboard --skip-browser`,
// TODO: consider falling back to an ephemeral port if defaultPort is taken
return ErrRunPortForward(err)
}
log.Info("Starting Port-forwarding for Meshery UI")
log.Info("Port-forwarding for Meshery UI...")

mesheryURL := portforward.URLFor("")

Expand All @@ -167,10 +170,10 @@ mesheryctl system dashboard --skip-browser`,
}()
log.Info(fmt.Sprintf("Forwarding port %v -> %v", options.podPort, localPort))
log.Info("Meshery UI available at: ", mesheryURL)
log.Info("Opening Meshery UI in the default browser.")
log.Info("Opening Meshery UI in default browser...")
err = utils.NavigateToBrowser(mesheryURL)
if err != nil {
log.Warn("Failed to open Meshery in browser, please point your browser to " + currCtx.GetEndpoint() + " to access Meshery.")
log.Warn("Opening Meshery UI in browser at " + currCtx.GetEndpoint() + ".")
}

<-portforward.GetStop()
Expand Down Expand Up @@ -224,10 +227,10 @@ mesheryctl system dashboard --skip-browser`,
}

if !skipBrowserFlag {
log.Info("Opening Meshery (" + currCtx.GetEndpoint() + ") in browser.")
log.Info("Opening Meshery UI in browser at " + currCtx.GetEndpoint() + ".")
err = utils.NavigateToBrowser(currCtx.GetEndpoint())
if err != nil {
log.Warn("Failed to open Meshery in your browser, please point your browser to " + currCtx.GetEndpoint() + " to access Meshery.")
log.Warn("Failed to open Meshery UI in your browser, please point your browser to " + currCtx.GetEndpoint() + " to access Meshery UI.\n\nOr run `mesheryctl system dashboard --port-forward` to access Meshery UI via port-forwarding.")
}
} else {
log.Info("Meshery UI available at: ", currCtx.GetEndpoint())
Expand Down
17 changes: 9 additions & 8 deletions mesheryctl/internal/cli/root/system/start.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,15 @@ import (
"bufio"
"context"
"fmt"
"github.com/pkg/errors"
"os"
"os/exec"
"path"
"strconv"
"strings"
"time"

"github.com/pkg/errors"

"github.com/layer5io/meshery/mesheryctl/internal/cli/root/config"
"github.com/layer5io/meshery/mesheryctl/internal/cli/root/constants"
pkgconstants "github.com/layer5io/meshery/mesheryctl/pkg/constants"
Expand Down Expand Up @@ -336,7 +337,7 @@ func start() error {
start.Stderr = os.Stderr

if err := start.Run(); err != nil {
return errors.Wrap(err, utils.SystemError("failed to run meshery server"))
return errors.Wrap(err, utils.SystemError("failed to run Meshery Server"))
}

checkFlag := 0 //flag to check
Expand Down Expand Up @@ -407,7 +408,7 @@ func start() error {
return err
}

log.Info("Starting Meshery...")
// log.Info("Starting Meshery...")

spinner := utils.CreateDefaultSpinner("Deploying Meshery on Kubernetes", "\nMeshery deployed on Kubernetes.")
spinner.Start()
Expand All @@ -423,7 +424,7 @@ func start() error {
}

// checking if Meshery is ready
time.Sleep(10 * time.Second) // sleeping 10 seconds to countermeasure time to apply helm charts
time.Sleep(20 * time.Second) // sleeping 10 seconds to countermeasure time to apply helm charts
ready, err := mesheryReadinessHealthCheck()
if err != nil {
log.Info(err)
Expand All @@ -432,7 +433,7 @@ func start() error {
spinner.Stop()

if !ready {
log.Info("\nFew Meshery pods have not come up yet.\nPlease check the status of the pods by executing “mesheryctl system status” and Meshery-UI endpoint with mesheryctl system dashboard” before using meshery.")
log.Info("\nTimeout. Meshery pod(s) is not running, yet.\nCheck status of Meshery pod(s) by executing “mesheryctl system status`. Expose Meshery UI with `mesheryctl system dashboard` as needed.")
return nil
}
log.Info("Meshery is starting...")
Expand Down Expand Up @@ -498,13 +499,13 @@ func applyHelmCharts(kubeClient *meshkitkube.Client, currCtx *config.Context, me
DryRun: dryRun,
})
if errServer != nil && errOperator != nil {
return fmt.Errorf("could not %s meshery server: %s\ncould not %s meshery-operator: %s", action, errServer.Error(), action, errOperator.Error())
return fmt.Errorf("could not %s Meshery Server: %s\ncould not %s meshery-operator: %s", action, errServer.Error(), action, errOperator.Error())
}
if errServer != nil {
return fmt.Errorf("%s success for operator but failed for meshery server: %s", action, errServer.Error())
return fmt.Errorf("%s success for Meshery Operator, but failed for Meshery Server: %s", action, errServer.Error())
}
if errOperator != nil {
return fmt.Errorf("%s success for meshery server but failed for meshery operator: %s", action, errOperator.Error())
return fmt.Errorf("%s success for Meshery Server, but failed for Meshery Operator: %s", action, errOperator.Error())
}
return nil
}

0 comments on commit 5f616f4

Please sign in to comment.