Skip to content

✨ Uplift controller runtime, controller-tools , CAPI, IPAM and BMO modules #307

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

Merged
metal3-io-bot merged 3 commits into from
Oct 4, 2021
Merged

✨ Uplift controller runtime, controller-tools , CAPI, IPAM and BMO modules #307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
11058cb
Uplift Controller Runtime to v0.10.1
kashifest Sep 27, 2021
078c089
Uplift CAPI, BMO and IPAM references in go.mod
kashifest Sep 29, 2021
af5ad3f
Uplift controller-tools to v0.7.0
kashifest Sep 29, 2021
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
18 changes: 9 additions & 9 deletions api/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@ go 1.16

require (
github.com/google/gofuzz v1.2.0
github.com/metal3-io/ip-address-manager/api v0.0.0-20210609163946-48b0ce9a1ac0
github.com/metal3-io/ip-address-manager/api v0.0.0-20210929111944-d66dc8cb0347
github.com/onsi/gomega v1.15.0
github.com/pkg/errors v0.9.1
golang.org/x/net v0.0.0-20210428140749-89ef3d95e781
k8s.io/api v0.21.4
k8s.io/apimachinery v0.21.4
k8s.io/client-go v0.21.4
k8s.io/utils v0.0.0-20210802155522-efc7438f0176
sigs.k8s.io/cluster-api v0.4.2
sigs.k8s.io/controller-runtime v0.9.7
golang.org/x/net v0.0.0-20210520170846-37e1c6afe023
k8s.io/api v0.22.2
k8s.io/apimachinery v0.22.2
k8s.io/client-go v0.22.2
k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a
sigs.k8s.io/cluster-api v0.4.3
sigs.k8s.io/controller-runtime v0.10.1

)

replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v0.4.2
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v0.4.3
156 changes: 76 additions & 80 deletions api/go.sum
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion config/crd/bases/infrastructure.cluster.x-k8s.io_metal3clusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.2
controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null
name: metal3clusters.infrastructure.cluster.x-k8s.io
spec:
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/infrastructure.cluster.x-k8s.io_metal3dataclaims.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.2
controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null
name: metal3dataclaims.infrastructure.cluster.x-k8s.io
spec:
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/infrastructure.cluster.x-k8s.io_metal3datas.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.2
controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null
name: metal3datas.infrastructure.cluster.x-k8s.io
spec:
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/infrastructure.cluster.x-k8s.io_metal3datatemplates.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.2
controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null
name: metal3datatemplates.infrastructure.cluster.x-k8s.io
spec:
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/infrastructure.cluster.x-k8s.io_metal3machines.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.2
controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null
name: metal3machines.infrastructure.cluster.x-k8s.io
spec:
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/infrastructure.cluster.x-k8s.io_metal3machinetemplates.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.2
controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null
name: metal3machinetemplates.infrastructure.cluster.x-k8s.io
spec:
Expand Down
23 changes: 11 additions & 12 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,28 +8,27 @@ require (
github.com/golang/mock v1.5.0
github.com/gorilla/mux v1.7.3 // indirect
github.com/jinzhu/copier v0.3.2
github.com/metal3-io/baremetal-operator/apis v0.0.0-20210416073321-c927d1d8da76
github.com/metal3-io/baremetal-operator/apis v0.0.0-20210928111743-2abb8f3d5aa5
github.com/metal3-io/cluster-api-provider-metal3/api v0.0.0-00010101000000-000000000000
github.com/metal3-io/ip-address-manager/api v0.0.0-20210609163946-48b0ce9a1ac0
github.com/metal3-io/ip-address-manager/api v0.0.0-20210929111944-d66dc8cb0347
github.com/onsi/ginkgo v1.16.4
github.com/onsi/gomega v1.15.0
github.com/pkg/errors v0.9.1
github.com/spf13/pflag v1.0.5
gopkg.in/yaml.v2 v2.4.0
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
k8s.io/api v0.21.4
k8s.io/apiextensions-apiserver v0.21.4
k8s.io/apimachinery v0.21.4
k8s.io/client-go v0.21.4
k8s.io/api v0.22.2
k8s.io/apiextensions-apiserver v0.22.2
k8s.io/apimachinery v0.22.2
k8s.io/client-go v0.22.2
k8s.io/klog/v2 v2.9.0
k8s.io/kube-openapi v0.0.0-20210305164622-f622666832c1 // indirect
k8s.io/utils v0.0.0-20210802155522-efc7438f0176
sigs.k8s.io/cluster-api v0.4.2
sigs.k8s.io/cluster-api/test v0.4.2
sigs.k8s.io/controller-runtime v0.9.7
k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a
sigs.k8s.io/cluster-api v0.4.3
sigs.k8s.io/cluster-api/test v0.4.3
sigs.k8s.io/controller-runtime v0.10.1
sigs.k8s.io/yaml v1.2.0
)

replace github.com/metal3-io/cluster-api-provider-metal3/api => ./api

replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v0.4.2
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v0.4.3
194 changes: 85 additions & 109 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions hack/tools/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ require (
github.com/golang/mock v1.5.0
github.com/golangci/golangci-lint v1.40.0
github.com/jteeuwen/go-bindata v3.0.7+incompatible
k8s.io/code-generator v0.21.3
sigs.k8s.io/controller-tools v0.6.2
k8s.io/code-generator v0.22.2
sigs.k8s.io/controller-tools v0.7.0
sigs.k8s.io/kustomize/kustomize/v3 v3.10.0
sigs.k8s.io/testing_frameworks v0.1.1
)
Loading