Skip to content

Commit 90c7e53

Browse files
authored
Removed pluto v5 references (#534)
* Bumped golang.org/x/net to v0.17.0 to fix HIGH vulnerabilities * Removed all v5 references * Removed all v5 references * Removed all v5 references
1 parent b7e095e commit 90c7e53

8 files changed

Lines changed: 20 additions & 20 deletions

File tree

cmd/pluto/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// you may not use this file except in compliance with the License.
55
// You may obtain a copy of the License at
66
//
7-
// http://www.apache.org/licenses/LICENSE-2.0
7+
// http://www.apache.org/licenses/LICENSE-2.0
88
//
99
// Unless required by applicable law or agreed to in writing, software
1010
// distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,7 +14,7 @@
1414
package main
1515

1616
import (
17-
plutoversionsfile "github.com/fairwindsops/pluto/v5"
17+
plutoversionsfile "github.com/fairwindsops/pluto"
1818
"github.com/fairwindsops/pluto/v5/cmd"
1919
)
2020

cmd/root.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ import (
3535
"os"
3636
"strings"
3737

38-
"github.com/fairwindsops/pluto/v5/pkg/api"
39-
discoveryapi "github.com/fairwindsops/pluto/v5/pkg/discovery-api"
40-
"github.com/fairwindsops/pluto/v5/pkg/finder"
41-
"github.com/fairwindsops/pluto/v5/pkg/helm"
42-
"github.com/rogpeppe/go-internal/semver"
38+
"golang.org/x/mod/semver"
4339

40+
"github.com/fairwindsops/pluto/pkg/api"
41+
discoveryapi "github.com/fairwindsops/pluto/pkg/discovery-api"
42+
"github.com/fairwindsops/pluto/pkg/finder"
43+
"github.com/fairwindsops/pluto/pkg/helm"
4444
"github.com/spf13/cobra"
4545
"github.com/spf13/pflag"
4646
"github.com/spf13/viper"

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ go 1.21
55
require (
66
github.com/fairwindsops/pluto/v5 v5.18.4
77
github.com/olekukonko/tablewriter v0.0.5
8-
github.com/rogpeppe/go-internal v1.11.0
98
github.com/spf13/cobra v1.7.0
109
github.com/spf13/pflag v1.0.5
1110
github.com/spf13/viper v1.17.0
@@ -62,6 +61,7 @@ require (
6261
github.com/pkg/errors v0.9.1 // indirect
6362
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
6463
github.com/rivo/uniseg v0.4.4 // indirect
64+
github.com/rogpeppe/go-internal v1.11.0 // indirect
6565
github.com/rubenv/sql-migrate v1.5.2 // indirect
6666
github.com/sagikazarmark/locafero v0.3.0 // indirect
6767
github.com/sagikazarmark/slog-shim v0.1.0 // indirect

pkg/discovery-api/discovery_api.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ import (
4040
"k8s.io/client-go/rest"
4141
"k8s.io/klog/v2"
4242

43-
"github.com/fairwindsops/pluto/v5/pkg/api"
44-
"github.com/fairwindsops/pluto/v5/pkg/kube"
43+
"github.com/fairwindsops/pluto/pkg/api"
44+
"github.com/fairwindsops/pluto/pkg/kube"
4545
)
4646

4747
// DiscoveryClient is the declaration to hold objects needed for client-go/discovery.

pkg/finder/finder.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import (
3535

3636
"k8s.io/klog/v2"
3737

38-
"github.com/fairwindsops/pluto/v5/pkg/api"
38+
"github.com/fairwindsops/pluto/pkg/api"
3939
)
4040

4141
// Dir is the finder dirlication

pkg/finder/finder_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import (
3232
"os"
3333
"testing"
3434

35-
"github.com/fairwindsops/pluto/v5/pkg/api"
35+
"github.com/fairwindsops/pluto/pkg/api"
3636
"github.com/stretchr/testify/assert"
3737
)
3838

pkg/helm/helm.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ import (
4242
"k8s.io/client-go/kubernetes"
4343
"k8s.io/klog/v2"
4444

45-
"github.com/fairwindsops/pluto/v5/pkg/api"
46-
"github.com/fairwindsops/pluto/v5/pkg/kube"
45+
"github.com/fairwindsops/pluto/pkg/api"
46+
"github.com/fairwindsops/pluto/pkg/kube"
4747
)
4848

4949
// Helm represents all current releases that we can find in the cluster

pkg/helm/helm_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ import (
3232
"context"
3333
"testing"
3434

35-
"github.com/fairwindsops/pluto/v5/pkg/api"
36-
"github.com/fairwindsops/pluto/v5/pkg/kube"
35+
"github.com/fairwindsops/pluto/pkg/api"
36+
"github.com/fairwindsops/pluto/pkg/kube"
3737
"github.com/stretchr/testify/assert"
3838
v1 "k8s.io/api/core/v1"
3939
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -45,10 +45,10 @@ import (
4545
var kubeClient *kube.Kube
4646

4747
func getMockConfigInstance() *kube.Kube {
48-
kubeClient = &kube.Kube{
49-
Client: testclient.NewSimpleClientset(),
50-
}
51-
return kubeClient
48+
kubeClient = &kube.Kube{
49+
Client: testclient.NewSimpleClientset(),
50+
}
51+
return kubeClient
5252
}
5353

5454
var (

0 commit comments

Comments
 (0)