Skip to content

Commit 35ff825

Browse files
committed
override go-openapi/spec to avoid new project dep solve errors
1 parent d8108ef commit 35ff825

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

pkg/scaffold/cr_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"github.com/operator-framework/operator-sdk/internal/util/diffutil"
2121
)
2222

23-
func TestCr(t *testing.T) {
23+
func TestCR(t *testing.T) {
2424
r, err := NewResource(appApiVersion, appKind)
2525
if err != nil {
2626
t.Fatal(err)
@@ -37,13 +37,13 @@ func TestCr(t *testing.T) {
3737
}
3838
}
3939

40-
func TestCrCustomSpec(t *testing.T) {
40+
func TestCRCustomSpec(t *testing.T) {
4141
r, err := NewResource(appApiVersion, appKind)
4242
if err != nil {
4343
t.Fatal(err)
4444
}
4545
s, buf := setupScaffoldAndWriter()
46-
err = s.Execute(appConfig, &Cr{
46+
err = s.Execute(appConfig, &CR{
4747
Resource: r,
4848
Spec: "# Custom spec here\ncustomSize: 6",
4949
})

pkg/scaffold/gopkgtoml.go

+4
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,10 @@ required = [
6363
name = "k8s.io/kube-openapi"
6464
revision = "0cf8f7e6ed1d2e3d47d02e3b6e559369af24d803"
6565
66+
[[override]]
67+
name = "github.com/go-openapi/spec"
68+
branch = "master"
69+
6670
[[override]]
6771
name = "sigs.k8s.io/controller-tools"
6872
version = "=v0.1.8"

pkg/scaffold/gopkgtoml_test.go

+4
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,10 @@ required = [
5555
name = "k8s.io/kube-openapi"
5656
revision = "0cf8f7e6ed1d2e3d47d02e3b6e559369af24d803"
5757
58+
[[override]]
59+
name = "github.com/go-openapi/spec"
60+
branch = "master"
61+
5862
[[override]]
5963
name = "sigs.k8s.io/controller-tools"
6064
version = "=v0.1.8"

0 commit comments

Comments
 (0)