environment(kubernetes): fix stats err bug

Author: andrei0465

cmd/diagnostics.go

@@ -1,7 +1,6 @@
 package cmd
 
 import (
-	"context"
 	"errors"
 	"fmt"
 	"io"
@@ -16,14 +15,12 @@ import (
 	"github.com/AlecAivazis/survey/v2"
 	"github.com/AlecAivazis/survey/v2/terminal"
 	"github.com/apex/log"
-	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/pkg/parsers/kernel"
 	"github.com/docker/docker/pkg/parsers/operatingsystem"
 	"github.com/goccy/go-json"
 	"github.com/spf13/cobra"
 
 	"github.com/pterodactyl/wings/config"
-	"github.com/pterodactyl/wings/environment"
 	"github.com/pterodactyl/wings/loggers/cli"
 	"github.com/pterodactyl/wings/system"
 )
@@ -91,15 +88,15 @@ func diagnosticsCmdRun(*cobra.Command, []string) {
 		panic(err)
 	}
 
-	dockerVersion, dockerInfo, dockerErr := getDockerInfo()
+	// dockerVersion, dockerInfo, dockerErr := getDockerInfo()
 
 	output := &strings.Builder{}
 	fmt.Fprintln(output, "Pterodactyl Wings - Diagnostics Report")
 	printHeader(output, "Versions")
 	fmt.Fprintln(output, "               Wings:", system.Version)
-	if dockerErr == nil {
-		fmt.Fprintln(output, "              Docker:", dockerVersion.Version)
-	}
+	// if dockerErr == nil {
+	// 	fmt.Fprintln(output, "              Docker:", dockerVersion.Version)
+	// }
 	if v, err := kernel.GetKernelVersion(); err == nil {
 		fmt.Fprintln(output, "              Kernel:", v)
 	}
@@ -131,30 +128,30 @@ func diagnosticsCmdRun(*cobra.Command, []string) {
 	fmt.Fprintln(output, "         Server Time:", time.Now().Format(time.RFC1123Z))
 	fmt.Fprintln(output, "          Debug Mode:", cfg.Debug)
 
-	printHeader(output, "Docker: Info")
-	if dockerErr == nil {
-		fmt.Fprintln(output, "Server Version:", dockerInfo.ServerVersion)
-		fmt.Fprintln(output, "Storage Driver:", dockerInfo.Driver)
-		if dockerInfo.DriverStatus != nil {
-			for _, pair := range dockerInfo.DriverStatus {
-				fmt.Fprintf(output, "  %s: %s\n", pair[0], pair[1])
-			}
-		}
-		if dockerInfo.SystemStatus != nil {
-			for _, pair := range dockerInfo.SystemStatus {
-				fmt.Fprintf(output, " %s: %s\n", pair[0], pair[1])
-			}
-		}
-		fmt.Fprintln(output, "LoggingDriver:", dockerInfo.LoggingDriver)
-		fmt.Fprintln(output, " CgroupDriver:", dockerInfo.CgroupDriver)
-		if len(dockerInfo.Warnings) > 0 {
-			for _, w := range dockerInfo.Warnings {
-				fmt.Fprintln(output, w)
-			}
-		}
-	} else {
-		fmt.Fprintln(output, dockerErr.Error())
-	}
+	// printHeader(output, "Docker: Info")
+	// if dockerErr == nil {
+	// 	fmt.Fprintln(output, "Server Version:", dockerInfo.ServerVersion)
+	// 	fmt.Fprintln(output, "Storage Driver:", dockerInfo.Driver)
+	// 	if dockerInfo.DriverStatus != nil {
+	// 		for _, pair := range dockerInfo.DriverStatus {
+	// 			fmt.Fprintf(output, "  %s: %s\n", pair[0], pair[1])
+	// 		}
+	// 	}
+	// 	if dockerInfo.SystemStatus != nil {
+	// 		for _, pair := range dockerInfo.SystemStatus {
+	// 			fmt.Fprintf(output, " %s: %s\n", pair[0], pair[1])
+	// 		}
+	// 	}
+	// 	fmt.Fprintln(output, "LoggingDriver:", dockerInfo.LoggingDriver)
+	// 	fmt.Fprintln(output, " CgroupDriver:", dockerInfo.CgroupDriver)
+	// 	if len(dockerInfo.Warnings) > 0 {
+	// 		for _, w := range dockerInfo.Warnings {
+	// 			fmt.Fprintln(output, w)
+	// 		}
+	// 	}
+	// } else {
+	// 	fmt.Fprintln(output, dockerErr.Error())
+	// }
 
 	printHeader(output, "Docker: Running Containers")
 	c := exec.Command("docker", "ps")
@@ -206,22 +203,6 @@ func diagnosticsCmdRun(*cobra.Command, []string) {
 	}
 }
 
-func getDockerInfo() (types.Version, types.Info, error) {
-	client, err := environment.Docker()
-	if err != nil {
-		return types.Version{}, types.Info{}, err
-	}
-	dockerVersion, err := client.ServerVersion(context.Background())
-	if err != nil {
-		return types.Version{}, types.Info{}, err
-	}
-	dockerInfo, err := client.Info(context.Background())
-	if err != nil {
-		return types.Version{}, types.Info{}, err
-	}
-	return dockerVersion, dockerInfo, nil
-}
-
 func uploadToHastebin(hbUrl, content string) (string, error) {
 	r := strings.NewReader(content)
 	u, err := url.Parse(hbUrl)

environment/docker.go

@@ -58,19 +58,16 @@ func (e *Environment) pollResources(ctx context.Context) error {
 			break
 		}
 
+		// Don't throw an error if pod metrics are not available, just keep trying.
 		podMetrics, err := mc.MetricsV1beta1().PodMetricses(config.Get().System.Namespace).Get(ctx, e.Id, metav1.GetOptions{})
-		if err != nil {
-			return err
-		}
-
-		podContainers := podMetrics.Containers
-		for _, container := range podContainers {
-			if container.Name != "process" {
-				continue
-			}
 
-			cpuQuantity := container.Usage.Cpu().AsDec().String()
-			memQuantity, ok := container.Usage.Memory().AsInt64()
+		// Check if container index 0 is not out of range,
+		// if it is then send only the uptime stats.
+		//
+		// @see https://stackoverflow.com/questions/26126235/panic-runtime-error-index-out-of-range-in-go
+		if len(podMetrics.Containers) != 0 {
+			cpuQuantity := podMetrics.Containers[0].Usage.Cpu().AsDec().String()
+			memQuantity, ok := podMetrics.Containers[0].Usage.Memory().AsInt64()
 			if !ok {
 				break
 			}
@@ -82,15 +79,19 @@ func (e *Environment) pollResources(ctx context.Context) error {
 				break
 			}
 
-			// msg := fmt.Sprintf("CPU usage: %f \n Memory usage: %d", f, memQuantity)
-			// fmt.Println(msg)
-
 			st := environment.Stats{
 				Uptime:      uptime,
 				Memory:      uint64(memQuantity),
 				CpuAbsolute: f * 100,
 			}
 			e.Events().Publish(environment.ResourceEvent, st)
+		} else {
+			uptime = uptime + 1000
+
+			st := environment.Stats{
+				Uptime: uptime,
+			}
+			e.Events().Publish(environment.ResourceEvent, st)
 		}
 
 		time.Sleep(time.Second)