Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add pluto module v5 back #535

Merged
merged 2 commits into from
May 14, 2024
Merged

Add pluto module v5 back #535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cbd343c
Revert "Removed pluto v5 references (#534)"
jdesouza May 14, 2024
348662b
Added v5 back
jdesouza May 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmd/pluto/main.go
View file
Open in desktop
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
View file
Open in desktop
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
5 changes: 2 additions & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
module github.com/fairwindsops/pluto
module github.com/fairwindsops/pluto/v5

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 +61,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
2 changes: 0 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,6 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.m
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U=
github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
github.com/fairwindsops/pluto/v5 v5.18.4 h1:jwSWs5zl+yu3uRuzsiZ0huKo1U4p/B8lxGBtuDF2jbU=
github.com/fairwindsops/pluto/v5 v5.18.4/go.mod h1:X1S9WoMBn2bReAYjoGDZpdaoLI2CHb787IlDaDKsYYU=
github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY=
github.com/frankban/quicktest v1.14.4/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
Expand Down
4 changes: 2 additions & 2 deletions pkg/discovery-api/discovery_api.go
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading