Skip to content

Commit 2b7c520

Browse files
committed
Import machine-config-operator/apis module.
run ``` go mod tidy go mod vendor ``` Use replace directive in go.mod to fix a known issue [1] in MCO. [1] openshift/machine-config-operator#848 Signed-off-by: Mohammad Heib <[email protected]>
1 parent 68de0f6 commit 2b7c520

File tree

19 files changed

+1986
-25
lines changed

19 files changed

+1986
-25
lines changed

go.mod

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ require (
1515
github.com/openshift/build-machinery-go v0.0.0-20211213093930-7e33a7eb4ce3
1616
github.com/openshift/client-go v0.0.0-20220525160904-9e1acff93e4a
1717
github.com/openshift/library-go v0.0.0-20220525173854-9b950a41acdc
18+
github.com/openshift/machine-config-operator v0.0.1-0.20200913004441-7eba765c69c9
1819
github.com/pkg/errors v0.9.1
1920
github.com/prometheus/client_golang v1.12.1
2021
github.com/spf13/cobra v1.4.0
@@ -51,7 +52,7 @@ require (
5152
github.com/coreos/go-semver v0.3.0 // indirect
5253
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
5354
github.com/davecgh/go-spew v1.1.1 // indirect
54-
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
55+
github.com/emicklei/go-restful v2.10.0+incompatible // indirect
5556
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
5657
github.com/felixge/httpsnoop v1.0.1 // indirect
5758
github.com/fsnotify/fsnotify v1.5.1 // indirect
@@ -140,6 +141,7 @@ require (
140141

141142
replace (
142143
github.com/openshift/hypershift/api => github.com/openshift/hypershift v0.0.0-20220323152148-c356b8b72d66
144+
github.com/openshift/machine-config-operator => github.com/openshift/machine-config-operator v0.0.1-0.20200913004441-7eba765c69c9
143145

144146
// for Hypershift
145147
kubevirt.io/containerized-data-importer-api => github.com/kubevirt/containerized-data-importer-api v1.41.1-0.20211201033752-05520fb9f18d

go.sum

Lines changed: 291 additions & 2 deletions
Large diffs are not rendered by default.

pkg/client/client.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323
osoperclient "github.com/openshift/client-go/operator/clientset/versioned"
2424
osoperinformer "github.com/openshift/client-go/operator/informers/externalversions"
2525
operatorv1helpers "github.com/openshift/library-go/pkg/operator/v1helpers"
26+
mcfgv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1"
2627

2728
configv1 "github.com/openshift/api/config/v1"
2829
machineapi "github.com/openshift/api/machine/v1beta1"
@@ -45,6 +46,7 @@ func init() {
4546
utilruntime.Must(netopv1.Install(scheme.Scheme))
4647
utilruntime.Must(machineapi.AddToScheme(scheme.Scheme))
4748
utilruntime.Must(op_netopv1.Install(scheme.Scheme))
49+
utilruntime.Must(mcfgv1.Install(scheme.Scheme))
4850
}
4951

5052
// OperatorClusterClient is a bag of holding for object clients & informers.

vendor/github.com/emicklei/go-restful/.gitignore

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/emicklei/go-restful/CHANGES.md

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/emicklei/go-restful/README.md

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/emicklei/go-restful/container.go

Lines changed: 3 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/emicklei/go-restful/curly.go

Lines changed: 11 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/emicklei/go-restful/custom_verb.go

Lines changed: 29 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/emicklei/go-restful/path_processor.go

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)