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.

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

Bump github.com/docker/distribution from 2.8.1+incompatible to 2.8.2+incompatible #508

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ linters:
# - forbidigo # forbids identifiers
# - funlen # tool for detection of long functions
# - gochecknoglobals # checks that no global variables exist
- gochecknoinits # checks that no init functions are present in Go code
# - gochecknoinits # checks that no init functions are present in Go code
# - gocognit # computes and checks the cognitive complexity of functions
- goconst # finds repeated strings that could be replaced by a constant
- gocritic # provides diagnostics that check for bugs, performance and style issues
Expand Down
2 changes: 1 addition & 1 deletion build/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const Component = "Linkerd"

var Meshmodelmetadata = make(map[string]interface{})

var MeshModelConfig = adapter.MeshModelConfig{ //Move to build/config.go
var MeshModelConfig = adapter.MeshModelConfig{ // Move to build/config.go
Category: "Cloud Native Network",
Metadata: Meshmodelmetadata,
}
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ require (
github.com/cyphar/filepath-securejoin v0.2.3 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/docker/cli v20.10.21+incompatible // indirect
github.com/docker/distribution v2.8.1+incompatible // indirect
github.com/docker/distribution v2.8.2+incompatible // indirect
github.com/docker/docker v20.10.21+incompatible // indirect
github.com/docker/docker-credential-helpers v0.7.0 // indirect
github.com/docker/go-connections v0.4.0 // indirect
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,8 @@ github.com/distribution/distribution/v3 v3.0.0-20221208165359-362910506bc2 h1:aB
github.com/docker/cli v20.10.21+incompatible h1:qVkgyYUnOLQ98LtXBrwd/duVqPT2X4SHndOuGsfwyhU=
github.com/docker/cli v20.10.21+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
github.com/docker/distribution v2.8.1+incompatible h1:Q50tZOPR6T/hjNsyc9g8/syEs6bk8XXApsHjKukMl68=
github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8=
github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
github.com/docker/docker v1.4.2-0.20190916154449-92cc603036dd/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
github.com/docker/docker v20.10.21+incompatible h1:UTLdBmHk3bEY+w8qeO5KttOhy6OmXWsl/FEet9Uswog=
Expand Down
2 changes: 1 addition & 1 deletion internal/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ func threadSafeAppend(fs *map[string]string, name string, url string, m *sync.RW
}

// GetFileNames takes the url of a github repo and the path to a directory. Then returns all the filenames->URL from that directory
func GetFileNames(owner string, repo string, path string) (map[string]string, error) {
func GetFileNames(owner, repo, path string) (map[string]string, error) {
g := walker.NewGithub()
var filenames = make(map[string]string)
var m sync.RWMutex
Expand Down
2 changes: 1 addition & 1 deletion linkerd/addons.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
)

// installAddon installs/uninstalls an addon in the given namespace
func (linkerd *Linkerd) installAddon(namespace string, del bool, service string, patches []string, helmChartURL string, addon string, kubeconfigs []string) (string, error) {
func (linkerd *Linkerd) installAddon(namespace string, del bool, service string, patches []string, helmChartURL, addon string, kubeconfigs []string) (string, error) {
act := mesherykube.INSTALL
st := status.Installing

Expand Down
2 changes: 1 addition & 1 deletion linkerd/oam.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package linkerd

import (
"errors"
"fmt"
"strings"
"errors"

"github.com/google/uuid"
"github.com/layer5io/meshery-adapter-library/common"
Expand Down
4 changes: 2 additions & 2 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ func main() {
os.Exit(1)
}

// // Initialize Tracing instance
// Initialize Tracing instance
// tracer, err := tracing.New(service.Name, service.TraceURL)
// if err != nil {
// log.Err("Tracing Init Failed", err.Error())
Expand Down Expand Up @@ -191,7 +191,7 @@ func registerWorkloads(port string, log logger.Handler) {
return
}

//If a URL is passed from env variable, it will be used for component generation with default method being "using manifests"
// If a URL is passed from env variable, it will be used for component generation with default method being "using manifests"
// In case a helm chart URL is passed, COMP_GEN_METHOD env variable should be set to Helm otherwise the component generation fails
if os.Getenv("COMP_GEN_URL") != "" && (os.Getenv("COMP_GEN_METHOD") == "Helm" || os.Getenv("COMP_GEN_METHOD") == "Manifest") {
url = os.Getenv("COMP_GEN_URL")
Expand Down
Loading