Skip to content

Commit 5eed1ef

Browse files
committed
Add metal3 support
1 parent c9af64b commit 5eed1ef

File tree

87 files changed

+11952
-4
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+11952
-4
lines changed

cmd/cluster-capi-operator/main.go

+5
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
"os"
2121
"time"
2222

23+
metal3v1 "github.com/metal3-io/cluster-api-provider-metal3/api/v1beta1"
2324
"github.com/spf13/pflag"
2425
admissionregistrationv1 "k8s.io/api/admissionregistration/v1"
2526
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
@@ -79,6 +80,7 @@ func initScheme(scheme *runtime.Scheme) {
7980
utilruntime.Must(clusterctlv1.AddToScheme(scheme))
8081
utilruntime.Must(ibmpowervsv1.AddToScheme(scheme))
8182
utilruntime.Must(vspherev1.AddToScheme(scheme))
83+
utilruntime.Must(metal3v1.AddToScheme(scheme))
8284
}
8385

8486
//nolint:funlen
@@ -230,6 +232,9 @@ func main() {
230232
case configv1.OpenStackPlatformType:
231233
setupReconcilers(mgr, infra, platform, &openstackv1.OpenStackCluster{}, containerImages, applyClient, apiextensionsClient, *managedNamespace)
232234
setupWebhooks(mgr)
235+
case configv1.BareMetalPlatformType:
236+
setupReconcilers(mgr, infra, platform, &metal3v1.Metal3Cluster{}, containerImages, applyClient, apiextensionsClient, *managedNamespace)
237+
setupWebhooks(mgr)
233238
default:
234239
klog.Infof("detected platform %q is not supported, skipping capi controllers setup", platform)
235240

e2e/e2e_test.go

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"context"
55
"testing"
66

7+
metal3v1 "github.com/metal3-io/cluster-api-provider-metal3/api/v1beta1"
78
. "github.com/onsi/ginkgo/v2"
89
. "github.com/onsi/gomega"
910
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
@@ -42,6 +43,7 @@ func init() {
4243
utilruntime.Must(mapiv1.AddToScheme(scheme.Scheme))
4344
utilruntime.Must(ibmpowervsv1.AddToScheme(scheme.Scheme))
4445
utilruntime.Must(vspherev1.AddToScheme(scheme.Scheme))
46+
utilruntime.Must(metal3v1.AddToScheme(scheme.Scheme))
4547
}
4648

4749
func TestAPIs(t *testing.T) {

e2e/go.mod

+2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ go 1.21
55
require (
66
github.com/aws/aws-sdk-go v1.51.17
77
github.com/google/go-cmp v0.6.0
8+
github.com/metal3-io/cluster-api-provider-metal3/api v1.7.0
89
github.com/onsi/ginkgo/v2 v2.19.0
910
github.com/onsi/gomega v1.33.1
1011
github.com/openshift/api v0.0.0-20220921125526-1866ef90edbf
@@ -59,6 +60,7 @@ require (
5960
github.com/json-iterator/go v1.1.12 // indirect
6061
github.com/leodido/go-urn v1.4.0 // indirect
6162
github.com/mailru/easyjson v0.7.7 // indirect
63+
github.com/metal3-io/ip-address-manager/api v1.7.0 // indirect
6264
github.com/mitchellh/mapstructure v1.5.0 // indirect
6365
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6466
github.com/modern-go/reflect2 v1.0.2 // indirect

e2e/go.sum

+4
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,10 @@ github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
9898
github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
9999
github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
100100
github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
101+
github.com/metal3-io/cluster-api-provider-metal3/api v1.7.0 h1:9ALpFlMFacUTCZVChphg49xU/urSB+vvlAlxuICWLqU=
102+
github.com/metal3-io/cluster-api-provider-metal3/api v1.7.0/go.mod h1:c0M3xS4zQxJpHDVNEb53wLdbYa0/kuWJHw6d9a9CjGQ=
103+
github.com/metal3-io/ip-address-manager/api v1.7.0 h1:ie9SQPWDWTjBnnxnG+qSfoqIOs+4vp5k0tVI+/0HNGo=
104+
github.com/metal3-io/ip-address-manager/api v1.7.0/go.mod h1:6q41s9Y1P1lGSlMxMwRbIFzfy/XBRX4stvugGx1Jp5o=
101105
github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
102106
github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
103107
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=

e2e/vendor/github.com/metal3-io/cluster-api-provider-metal3/api/LICENSE

+201
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2e/vendor/github.com/metal3-io/cluster-api-provider-metal3/api/v1beta1/common_types.go

+109
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)