Skip to content

Commit 07c6de0

Browse files
honzahonza
committed
Add metal3 support
1 parent baa3b31 commit 07c6de0

File tree

87 files changed

+11952
-8
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
-8
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"
@@ -83,6 +84,7 @@ func initScheme(scheme *runtime.Scheme) {
8384
utilruntime.Must(vspherev1.AddToScheme(scheme))
8485
utilruntime.Must(mapiv1.AddToScheme(scheme))
8586
utilruntime.Must(mapiv1beta1.AddToScheme(scheme))
87+
utilruntime.Must(metal3v1.AddToScheme(scheme))
8688
}
8789

8890
//nolint:funlen
@@ -238,6 +240,9 @@ func main() {
238240
case configv1.OpenStackPlatformType:
239241
setupReconcilers(mgr, infra, platform, &openstackv1.OpenStackCluster{}, containerImages, applyClient, apiextensionsClient, *managedNamespace)
240242
setupWebhooks(mgr)
243+
case configv1.BareMetalPlatformType:
244+
setupReconcilers(mgr, infra, platform, &metal3v1.Metal3Cluster{}, containerImages, applyClient, apiextensionsClient, *managedNamespace)
245+
setupWebhooks(mgr)
241246
default:
242247
klog.Infof("detected platform %q is not supported, skipping capi controllers setup", platform)
243248

‎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"
@@ -44,6 +45,7 @@ func init() {
4445
utilruntime.Must(mapiv1.AddToScheme(scheme.Scheme))
4546
utilruntime.Must(ibmpowervsv1.AddToScheme(scheme.Scheme))
4647
utilruntime.Must(vspherev1.AddToScheme(scheme.Scheme))
48+
utilruntime.Must(metal3v1.AddToScheme(scheme.Scheme))
4749
}
4850

4951
func TestAPIs(t *testing.T) {

‎e2e/go.mod

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ toolchain go1.22.5
77
require (
88
github.com/aws/aws-sdk-go v1.51.17
99
github.com/google/go-cmp v0.6.0
10+
github.com/metal3-io/cluster-api-provider-metal3/api v1.7.0
1011
github.com/onsi/ginkgo/v2 v2.19.0
1112
github.com/onsi/gomega v1.33.1
1213
github.com/openshift/api v0.0.0-20220921125526-1866ef90edbf
@@ -65,6 +66,7 @@ require (
6566
github.com/json-iterator/go v1.1.12 // indirect
6667
github.com/leodido/go-urn v1.4.0 // indirect
6768
github.com/mailru/easyjson v0.7.7 // indirect
69+
github.com/metal3-io/ip-address-manager/api v1.7.0 // indirect
6870
github.com/mitchellh/mapstructure v1.5.0 // indirect
6971
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
7072
github.com/modern-go/reflect2 v1.0.2 // indirect

‎e2e/go.sum

+4-4
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,10 @@ github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
126126
github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
127127
github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
128128
github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
129-
github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
130-
github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
131-
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
132-
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
129+
github.com/metal3-io/cluster-api-provider-metal3/api v1.7.0 h1:9ALpFlMFacUTCZVChphg49xU/urSB+vvlAlxuICWLqU=
130+
github.com/metal3-io/cluster-api-provider-metal3/api v1.7.0/go.mod h1:c0M3xS4zQxJpHDVNEb53wLdbYa0/kuWJHw6d9a9CjGQ=
131+
github.com/metal3-io/ip-address-manager/api v1.7.0 h1:ie9SQPWDWTjBnnxnG+qSfoqIOs+4vp5k0tVI+/0HNGo=
132+
github.com/metal3-io/ip-address-manager/api v1.7.0/go.mod h1:6q41s9Y1P1lGSlMxMwRbIFzfy/XBRX4stvugGx1Jp5o=
133133
github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
134134
github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
135135
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)