merged

Signed-off-by: Alex Jones <alexsimonjones@gmail.com>

.goreleaser.yaml

@@ -15,8 +15,6 @@ builds:
       - darwin
     ldflags:
           - -s -w -X main.version={{.Version}}
-          - -s -w -X main.commit={{.ShortCommit}}
-          - -s -w -X main.Date={{.CommitDate}}
 
 nfpms:
   - file_name_template: '{{ .ProjectName }}_{{ .Arch }}'

.release-please-manifest.json

@@ -1 +1 @@
-{".":"0.3.4"}
+{".":"0.3.2"}

CHANGELOG.md

@@ -1,35 +1,5 @@
 # Changelog
 
-## [0.3.4](https://github.com/k8sgpt-ai/k8sgpt/compare/v0.3.3...v0.3.4) (2023-05-22)
-
-
-### Bug Fixes
-
-* **deps:** update module github.com/aws/aws-sdk-go to v1.44.266 ([#446](https://github.com/k8sgpt-ai/k8sgpt/issues/446)) ([edda743](https://github.com/k8sgpt-ai/k8sgpt/commit/edda743fa2bf4b5ae2551c981447a5912a459bb4))
-* **deps:** update module github.com/stretchr/testify to v1.8.3 ([#442](https://github.com/k8sgpt-ai/k8sgpt/issues/442)) ([fe450eb](https://github.com/k8sgpt-ai/k8sgpt/commit/fe450eb69da0645328e60e2d7b0852ffdb996dee))
-
-
-### Other
-
-* add more filter releavent UT in analysis_test.go ([#435](https://github.com/k8sgpt-ai/k8sgpt/issues/435)) ([36995fd](https://github.com/k8sgpt-ai/k8sgpt/commit/36995fd4ed41c8c83ebc308f8ec2a4bfe530f7dc))
-
-## [0.3.3](https://github.com/k8sgpt-ai/k8sgpt/compare/v0.3.2...v0.3.3) (2023-05-20)
-
-
-### Features
-
-* caching ([#439](https://github.com/k8sgpt-ai/k8sgpt/issues/439)) ([948dae5](https://github.com/k8sgpt-ai/k8sgpt/commit/948dae5e288ec3bb0165eb3ce32171b12003f9c7))
-* rework auth commands ([#438](https://github.com/k8sgpt-ai/k8sgpt/issues/438)) ([c659a87](https://github.com/k8sgpt-ai/k8sgpt/commit/c659a875fc296849a3703bfd7f0c4796f44bdf5a))
-
-
-### Bug Fixes
-
-* append coreAnalyzer if active_filter is empty and integration is added ([#441](https://github.com/k8sgpt-ai/k8sgpt/issues/441)) ([b7dc384](https://github.com/k8sgpt-ai/k8sgpt/commit/b7dc3845476759bedb3a55f77c8779e4a9f460dd))
-* **deps:** update kubernetes packages to v0.27.2 ([#436](https://github.com/k8sgpt-ai/k8sgpt/issues/436)) ([d13b913](https://github.com/k8sgpt-ai/k8sgpt/commit/d13b91301cab5e05349b68716cd506fa1705f36f))
-* **deps:** update module github.com/aws/aws-sdk-go to v1.44.265 ([#445](https://github.com/k8sgpt-ai/k8sgpt/issues/445)) ([c588e96](https://github.com/k8sgpt-ai/k8sgpt/commit/c588e963de3f238f07200d6cf09fe6f9781484f5))
-* docker version ([#444](https://github.com/k8sgpt-ai/k8sgpt/issues/444)) ([1f767eb](https://github.com/k8sgpt-ai/k8sgpt/commit/1f767ebd2e31e61decab36218b1b85f2b3b6207d))
-* use coreAnalyzer if there are no filters selected and no active_filters ([#432](https://github.com/k8sgpt-ai/k8sgpt/issues/432)) ([f0d3f36](https://github.com/k8sgpt-ai/k8sgpt/commit/f0d3f36f6d56bd76248590c0b841dffb7769a2ee))
-
 ## [0.3.2](https://github.com/k8sgpt-ai/k8sgpt/compare/v0.3.1...v0.3.2) (2023-05-16)
 
 

Makefile

@@ -54,7 +54,7 @@ all: tidy add-copyright lint cover build
 build: 
 	@echo "$(shell go version)"
 	@echo "===========> Building binary $(BUILDAPP) *[Git Info]: $(VERSION)-$(GIT_COMMIT)"
-	@export CGO_ENABLED=0 && go build -o $(BUILDAPP) -ldflags "-s -w -X main.version=dev -X main.commit=$$(git rev-parse --short HEAD) -X main.date=$$(date +%FT%TZ)" $(BUILDFILE)
+	@export CGO_ENABLED=0 && go build -o $(BUILDAPP) -ldflags '-s -w' $(BUILDFILE)
 
 ## tidy: tidy go.mod
 .PHONY: tidy

README.md

@@ -34,7 +34,7 @@ brew install k8sgpt
   **32 bit:**
   <!---x-release-please-start-version-->
   ```
-  curl -LO https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.3.4/k8sgpt_386.rpm
+  curl -LO https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.3.2/k8sgpt_386.rpm
   sudo rpm -ivh k8sgpt_386.rpm
   ```
   <!---x-release-please-end-->
@@ -43,7 +43,7 @@ brew install k8sgpt
 
   <!---x-release-please-start-version-->
   ```
-  curl -LO https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.3.4/k8sgpt_amd64.rpm
+  curl -LO https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.3.2/k8sgpt_amd64.rpm
   sudo rpm -ivh -i k8sgpt_amd64.rpm
   ```
   <!---x-release-please-end-->
@@ -55,7 +55,7 @@ brew install k8sgpt
   **32 bit:**
   <!---x-release-please-start-version-->
   ```
-  curl -LO https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.3.4/k8sgpt_386.deb
+  curl -LO https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.3.2/k8sgpt_386.deb
   sudo dpkg -i k8sgpt_386.deb
   ```
   <!---x-release-please-end-->
@@ -63,7 +63,7 @@ brew install k8sgpt
 
   <!---x-release-please-start-version-->
   ```
-  curl -LO https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.3.4/k8sgpt_amd64.deb
+  curl -LO https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.3.2/k8sgpt_amd64.deb
   sudo dpkg -i k8sgpt_amd64.deb
   ```
   <!---x-release-please-end-->
@@ -76,14 +76,14 @@ brew install k8sgpt
   **32 bit:**
   <!---x-release-please-start-version-->
   ```
-  curl -LO https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.3.4/k8sgpt_386.apk
+  curl -LO https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.3.2/k8sgpt_386.apk
   apk add k8sgpt_386.apk
   ```
   <!---x-release-please-end-->
   **64 bit:**
   <!---x-release-please-start-version-->
   ```
-  curl -LO https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.3.4/k8sgpt_amd64.apk
+  curl -LO https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.3.2/k8sgpt_amd64.apk
   apk add k8sgpt_amd64.apk
   ```
   <!---x-release-please-end-->x

cmd/root.go

@@ -34,9 +34,7 @@ var (
 	cfgFile     string
 	kubecontext string
 	kubeconfig  string
-	Version     string
-	Commit      string
-	Date        string
+	version     string
 )
 
 // rootCmd represents the base command when called without any subcommands
@@ -51,10 +49,8 @@ var rootCmd = &cobra.Command{
 
 // Execute adds all child commands to the root command and sets flags appropriately.
 // This is called by main.main(). It only needs to happen once to the rootCmd.
-func Execute(v string, c string, d string) {
-	Version = v
-	Commit = c
-	Date = d
+func Execute(v string) {
+	version = v
 	err := rootCmd.Execute()
 	if err != nil {
 		os.Exit(1)

cmd/version.go

@@ -14,9 +14,6 @@ limitations under the License.
 package cmd
 
 import (
-	"fmt"
-	"runtime/debug"
-
 	"github.com/spf13/cobra"
 )
 
@@ -26,21 +23,7 @@ var versionCmd = &cobra.Command{
 	Short: "Print the version number of k8sgpt",
 	Long:  `All software has versions. This is k8sgpt's`,
 	Run: func(cmd *cobra.Command, args []string) {
-		if Version == "dev" {
-			details, ok := debug.ReadBuildInfo()
-			if ok && details.Main.Version != "" && details.Main.Version != "(devel)" {
-				Version = details.Main.Version
-				for _, i := range details.Settings {
-					if i.Key == "vcs.time" {
-						Date = i.Value
-					}
-					if i.Key == "vcs.revision" {
-						Commit = i.Value
-					}
-				}
-			}
-		}
-		fmt.Printf("ks8gpt: %s (%s), built at: %s\n", Version, Commit, Date)
+		cmd.Printf("k8sgpt version %s\n", version)
 	},
 }
 

container/Dockerfile

@@ -12,9 +12,7 @@
 FROM golang:1.20.4-alpine3.16 AS builder
 
 ENV CGO_ENABLED=0
-ARG VERSION
-ARG COMMIT
-ARG DATE
+
 WORKDIR /workspace
 
 COPY go.mod go.sum ./
@@ -22,7 +20,7 @@ RUN go mod download
 
 COPY ./ ./
 
-RUN go build -o /workspace/k8sgpt -ldflags "-X main.version=${VERSION} -X main.commit=${COMMIT} -X main.date=${DATE}" ./ 
+RUN go build -o /workspace/k8sgpt ./
 
 FROM gcr.io/distroless/static AS production
 

go.mod

@@ -11,7 +11,7 @@ require (
 	github.com/schollz/progressbar/v3 v3.13.1
 	github.com/spf13/cobra v1.7.0
 	github.com/spf13/viper v1.15.0
-	github.com/stretchr/testify v1.8.3
+	github.com/stretchr/testify v1.8.2
 	golang.org/x/term v0.8.0
 	helm.sh/helm/v3 v3.12.0
 	k8s.io/api v0.27.2
@@ -26,7 +26,7 @@ require github.com/adrg/xdg v0.4.0
 require (
 	buf.build/gen/go/k8sgpt-ai/k8sgpt/grpc/go v1.3.0-20230515081240-6b5b845c638e.1
 	buf.build/gen/go/k8sgpt-ai/k8sgpt/protocolbuffers/go v1.30.0-20230514071713-3d78cb8bbc06.1
-	github.com/aws/aws-sdk-go v1.44.266
+	github.com/aws/aws-sdk-go v1.44.265
 )
 
 require github.com/jmespath/go-jmespath v0.4.0 // indirect

go.sum

@@ -450,8 +450,8 @@ github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgI
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
 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.44.266 h1:MWd775dcYf7NrwgcHLtlsIbWoWkX8p4vomfNHr88zH0=
-github.com/aws/aws-sdk-go v1.44.266/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
+github.com/aws/aws-sdk-go v1.44.265 h1:rlBuD8OYjM5Vfcf7jDa264oVHqlPqY7y7o+JmrjNFUc=
+github.com/aws/aws-sdk-go v1.44.265/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
 github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
@@ -1063,8 +1063,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY=
-github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
+github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
 github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8=
 github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0=

main.go

@@ -15,12 +15,8 @@ package main
 
 import "github.com/k8sgpt-ai/k8sgpt/cmd"
 
-var (
-	version = "dev"
-	commit  = "HEAD"
-	date    = "unknown"
-)
+var version = "dev"
 
 func main() {
-	cmd.Execute(version, commit, date)
+	cmd.Execute(version)
 }

pkg/analysis/analysis_test.go

@@ -14,127 +14,14 @@ limitations under the License.
 package analysis
 
 import (
-	"context"
 	"encoding/json"
 	"fmt"
-	"github.com/k8sgpt-ai/k8sgpt/pkg/common"
-	"github.com/k8sgpt-ai/k8sgpt/pkg/kubernetes"
-	"github.com/magiconair/properties/assert"
-	"github.com/spf13/viper"
-	"github.com/stretchr/testify/require"
-	v1 "k8s.io/api/core/v1"
-	networkingv1 "k8s.io/api/networking/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/client-go/kubernetes/fake"
-	"strings"
 	"testing"
+
+	"github.com/k8sgpt-ai/k8sgpt/pkg/common"
+	"github.com/stretchr/testify/require"
 )
 
-// sub-function
-func analysis_RunAnalysisFilterTester(t *testing.T, filterFlag string) []common.Result {
-	clientset := fake.NewSimpleClientset(
-		&v1.Pod{
-			ObjectMeta: metav1.ObjectMeta{
-				Name:      "example",
-				Namespace: "default",
-			},
-			Status: v1.PodStatus{
-				Phase: v1.PodPending,
-				Conditions: []v1.PodCondition{
-					{
-						Type:    v1.PodScheduled,
-						Reason:  "Unschedulable",
-						Message: "0/1 nodes are available: 1 node(s) had taint {node-role.kubernetes.io/master: }, that the pod didn't tolerate.",
-					},
-				},
-			},
-		},
-		&v1.Endpoints{
-			ObjectMeta: metav1.ObjectMeta{
-				Name:        "example",
-				Namespace:   "default",
-				Annotations: map[string]string{},
-			},
-		},
-		&v1.Service{
-			ObjectMeta: metav1.ObjectMeta{
-				Name:        "example",
-				Namespace:   "default",
-				Annotations: map[string]string{},
-			},
-			Spec: v1.ServiceSpec{
-				Selector: map[string]string{
-					"app": "example",
-				},
-			},
-		},
-		&networkingv1.Ingress{
-			ObjectMeta: metav1.ObjectMeta{
-				Name:        "example",
-				Namespace:   "default",
-				Annotations: map[string]string{},
-			},
-		},
-	)
-
-	analysis := Analysis{
-		Context:        context.Background(),
-		Results:        []common.Result{},
-		Namespace:      "default",
-		MaxConcurrency: 1,
-		Client: &kubernetes.Client{
-			Client: clientset,
-		},
-	}
-	if len(filterFlag) > 0 {
-		// `--filter` is explicitly given
-		analysis.Filters = strings.Split(filterFlag, ",")
-	}
-	analysis.RunAnalysis()
-	return analysis.Results
-
-}
-
-// Test: Filter logic with running different Analyzers
-func TestAnalysis_RunAnalysisWithFilter(t *testing.T) {
-	var results []common.Result
-	var filterFlag string
-
-	//1. Neither --filter flag Nor active filter is specified, only the "core analyzers"
-	results = analysis_RunAnalysisFilterTester(t, "")
-	assert.Equal(t, len(results), 3) // all built-in resource will be analyzed
-
-	//2. When the --filter flag is specified
-
-	filterFlag = "Pod" // --filter=Pod
-	results = analysis_RunAnalysisFilterTester(t, filterFlag)
-	assert.Equal(t, len(results), 1)
-	assert.Equal(t, results[0].Kind, filterFlag)
-
-	filterFlag = "Ingress,Pod" // --filter=Ingress,Pod
-	results = analysis_RunAnalysisFilterTester(t, filterFlag)
-	assert.Equal(t, len(results), 2)
-}
-
-// Test:  Filter logic with Active Filter
-func TestAnalysis_RunAnalysisActiveFilter(t *testing.T) {
-
-	//When the --filter flag is not specified but has actived filter in config
-	var results []common.Result
-
-	viper.SetDefault("active_filters", "Ingress")
-	results = analysis_RunAnalysisFilterTester(t, "")
-	assert.Equal(t, len(results), 1)
-
-	viper.SetDefault("active_filters", []string{"Ingress", "Service"})
-	results = analysis_RunAnalysisFilterTester(t, "")
-	assert.Equal(t, len(results), 2)
-
-	viper.SetDefault("active_filters", []string{"Ingress", "Service", "Pod"})
-	results = analysis_RunAnalysisFilterTester(t, "")
-	assert.Equal(t, len(results), 3)
-}
-
 func TestAnalysis_NoProblemJsonOutput(t *testing.T) {
 
 	analysis := Analysis{
@@ -163,7 +50,6 @@ func TestAnalysis_NoProblemJsonOutput(t *testing.T) {
 	fmt.Println(expected)
 
 	require.Equal(t, got, expected)
-
 }
 
 func TestAnalysis_ProblemJsonOutput(t *testing.T) {