зеркало из https://github.com/Azure/ARO-RP.git
Fix some drift from multiple merges (#2317)
This commit is contained in:
Родитель
d4391e55c7
Коммит
2b58d89e3e
2
go.mod
2
go.mod
|
@ -21,7 +21,6 @@ require (
|
|||
github.com/coreos/go-systemd/v22 v22.3.2
|
||||
github.com/coreos/ignition/v2 v2.14.0
|
||||
github.com/coreos/stream-metadata-go v0.2.0
|
||||
github.com/davecgh/go-spew v1.1.1
|
||||
github.com/form3tech-oss/jwt-go v3.2.5+incompatible
|
||||
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
|
||||
github.com/go-bindata/go-bindata v3.1.2+incompatible
|
||||
|
@ -124,6 +123,7 @@ require (
|
|||
github.com/coreos/ignition v0.35.0 // indirect
|
||||
github.com/coreos/vcontext v0.0.0-20220326205524-7fcaf69e7050 // indirect
|
||||
github.com/daixiang0/gci v0.2.9 // indirect
|
||||
github.com/davecgh/go-spew v1.1.1 // indirect
|
||||
github.com/denis-tingajkin/go-header v0.4.2 // indirect
|
||||
github.com/dimchansky/utfbom v1.1.1 // indirect
|
||||
github.com/dnephin/pflag v1.0.7 // indirect
|
||||
|
|
|
@ -5,6 +5,7 @@ package cluster
|
|||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче