Skip to content

Commit

Permalink
Revert "Removed pluto v5 references (#534)"
Browse files Browse the repository at this point in the history
This reverts commit 90c7e53.
  • Loading branch information
jdesouza committed May 14, 2024
1 parent 90c7e53 commit cbd343c
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 20 deletions.
4 changes: 2 additions & 2 deletions cmd/pluto/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
Expand All @@ -14,7 +14,7 @@
package main

import (
plutoversionsfile "github.com/fairwindsops/pluto"
plutoversionsfile "github.com/fairwindsops/pluto/v5"
"github.com/fairwindsops/pluto/v5/cmd"
)

Expand Down
10 changes: 5 additions & 5 deletions cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@ import (
"os"
"strings"

"golang.org/x/mod/semver"
"github.com/fairwindsops/pluto/v5/pkg/api"
discoveryapi "github.com/fairwindsops/pluto/v5/pkg/discovery-api"
"github.com/fairwindsops/pluto/v5/pkg/finder"
"github.com/fairwindsops/pluto/v5/pkg/helm"
"github.com/rogpeppe/go-internal/semver"

"github.com/fairwindsops/pluto/pkg/api"
discoveryapi "github.com/fairwindsops/pluto/pkg/discovery-api"
"github.com/fairwindsops/pluto/pkg/finder"
"github.com/fairwindsops/pluto/pkg/helm"
"github.com/spf13/cobra"
"github.com/spf13/pflag"
"github.com/spf13/viper"
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ go 1.21
require (
github.com/fairwindsops/pluto/v5 v5.18.4
github.com/olekukonko/tablewriter v0.0.5
github.com/rogpeppe/go-internal v1.11.0
github.com/spf13/cobra v1.7.0
github.com/spf13/pflag v1.0.5
github.com/spf13/viper v1.17.0
Expand Down Expand Up @@ -61,7 +62,6 @@ require (
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/rivo/uniseg v0.4.4 // indirect
github.com/rogpeppe/go-internal v1.11.0 // indirect
github.com/rubenv/sql-migrate v1.5.2 // indirect
github.com/sagikazarmark/locafero v0.3.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
Expand Down
4 changes: 2 additions & 2 deletions pkg/discovery-api/discovery_api.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ import (
"k8s.io/client-go/rest"
"k8s.io/klog/v2"

"github.com/fairwindsops/pluto/pkg/api"
"github.com/fairwindsops/pluto/pkg/kube"
"github.com/fairwindsops/pluto/v5/pkg/api"
"github.com/fairwindsops/pluto/v5/pkg/kube"
)

// DiscoveryClient is the declaration to hold objects needed for client-go/discovery.
Expand Down
2 changes: 1 addition & 1 deletion pkg/finder/finder.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import (

"k8s.io/klog/v2"

"github.com/fairwindsops/pluto/pkg/api"
"github.com/fairwindsops/pluto/v5/pkg/api"
)

// Dir is the finder dirlication
Expand Down
2 changes: 1 addition & 1 deletion pkg/finder/finder_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import (
"os"
"testing"

"github.com/fairwindsops/pluto/pkg/api"
"github.com/fairwindsops/pluto/v5/pkg/api"
"github.com/stretchr/testify/assert"
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/helm/helm.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ import (
"k8s.io/client-go/kubernetes"
"k8s.io/klog/v2"

"github.com/fairwindsops/pluto/pkg/api"
"github.com/fairwindsops/pluto/pkg/kube"
"github.com/fairwindsops/pluto/v5/pkg/api"
"github.com/fairwindsops/pluto/v5/pkg/kube"
)

// Helm represents all current releases that we can find in the cluster
Expand Down
12 changes: 6 additions & 6 deletions pkg/helm/helm_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ import (
"context"
"testing"

"github.com/fairwindsops/pluto/pkg/api"
"github.com/fairwindsops/pluto/pkg/kube"
"github.com/fairwindsops/pluto/v5/pkg/api"
"github.com/fairwindsops/pluto/v5/pkg/kube"
"github.com/stretchr/testify/assert"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand All @@ -45,10 +45,10 @@ import (
var kubeClient *kube.Kube

func getMockConfigInstance() *kube.Kube {
kubeClient = &kube.Kube{
Client: testclient.NewSimpleClientset(),
}
return kubeClient
kubeClient = &kube.Kube{
Client: testclient.NewSimpleClientset(),
}
return kubeClient
}

var (
Expand Down

0 comments on commit cbd343c

Please sign in to comment.