Merge pull request #2713 from dtantsur/use-irso

✨ Integrate with IrSO for getting Ironic details

Author: metal3-io-bot

Makefile

@@ -92,6 +92,9 @@ IMG_NAME ?= baremetal-operator
 IMG_TAG ?= latest
 IMG ?= $(REGISTRY)/$(IMG_NAME)
 
+# Which configuration to use when deploying (from the config directory)
+DEPLOY_CONFIG ?= default
+
 ## --------------------------------------
 ## Test Targets
 ## --------------------------------------
@@ -194,7 +197,7 @@ uninstall: $(KUSTOMIZE) manifests ## Uninstall CRDs from a cluster
 .PHONY: deploy
 deploy: $(KUSTOMIZE) manifests  ## Deploy controller in the configured Kubernetes cluster in ~/.kube/config
 	make set-manifest-image-bmo MANIFEST_IMG=$(IMG_NAME) MANIFEST_TAG=$(IMG_TAG)
-	$< build config/default | kubectl apply -f -
+	$< build config/$(DEPLOY_CONFIG) | kubectl apply -f -
 
 $(CONTROLLER_GEN): hack/tools/go.mod
 	cd hack/tools; go build -o $(abspath $@) sigs.k8s.io/controller-tools/cmd/controller-gen

config/base/rbac/role.yaml

@@ -25,6 +25,14 @@ rules:
   - list
   - update
   - watch
+- apiGroups:
+  - ironic.metal3.io
+  resources:
+  - ironics
+  verbs:
+  - get
+  - list
+  - watch
 - apiGroups:
   - metal3.io
   resources:

config/overlays/e2e/roles-rolebindings/roles-rolebindings.yaml

@@ -24,6 +24,14 @@ rules:
   - list
   - update
   - watch
+- apiGroups:
+  - ironic.metal3.io
+  resources:
+  - ironics
+  verbs:
+  - get
+  - list
+  - watch
 - apiGroups:
   - metal3.io
   resources:

config/render/capm3.yaml

@@ -2396,6 +2396,14 @@ rules:
   - list
   - update
   - watch
+- apiGroups:
+  - ironic.metal3.io
+  resources:
+  - ironics
+  verbs:
+  - get
+  - list
+  - watch
 - apiGroups:
   - metal3.io
   resources:

config/use-irso/ironic.env

@@ -0,0 +1 @@
+IRONIC_NAME=ironic

config/use-irso/kustomization.yaml

@@ -0,0 +1,14 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: baremetal-operator-system
+resources:
+- ../base
+
+generatorOptions:
+  disableNameSuffixHash: true
+
+configMapGenerator:
+- name: ironic
+  behavior: create
+  envs:
+  - ironic.env

go.mod

@@ -9,6 +9,7 @@ require (
 	github.com/gophercloud/gophercloud/v2 v2.8.0
 	github.com/metal3-io/baremetal-operator/apis v0.5.1
 	github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.5.1
+	github.com/metal3-io/ironic-standalone-operator/api v0.6.0
 	github.com/onsi/gomega v1.38.2
 	github.com/prometheus/client_golang v1.23.2
 	github.com/stretchr/testify v1.11.1

go.sum

@@ -94,6 +94,8 @@ github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
 github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
 github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
+github.com/metal3-io/ironic-standalone-operator/api v0.6.0 h1:u2BDGpGdJqzzZAr4pL4LywKcxfjHXPQNxuJ47ej/6Cc=
+github.com/metal3-io/ironic-standalone-operator/api v0.6.0/go.mod h1:V2uX3UR0gK0J8IvF8msNRcdWKviZRrvDCCFMF0uVPQY=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=

internal/controller/metal3.io/baremetalhost_controller.go

@@ -106,6 +106,9 @@ func (info *reconcileInfo) publishEvent(reason, message string) {
 // Allow for updating hostupdatepolicies
 // +kubebuilder:rbac:groups=metal3.io,resources=hostupdatepolicies,verbs=get;list;watch;update
 
+// Allow reading Ironic resources
+// +kubebuilder:rbac:groups=ironic.metal3.io,resources=ironics,verbs=get;list;watch
+
 // Reconcile handles changes to BareMetalHost resources.
 func (r *BareMetalHostReconciler) Reconcile(ctx context.Context, request ctrl.Request) (result ctrl.Result, err error) {
 	reconcileCounters.With(hostMetricLabels(request)).Inc()

main.go

@@ -35,13 +35,15 @@ import (
 	"github.com/metal3-io/baremetal-operator/pkg/provisioner/ironic"
 	"github.com/metal3-io/baremetal-operator/pkg/secretutils"
 	"github.com/metal3-io/baremetal-operator/pkg/version"
+	ironicv1alpha1 "github.com/metal3-io/ironic-standalone-operator/api/v1alpha1"
 	"go.uber.org/zap/zapcore"
 	k8sruntime "k8s.io/apimachinery/pkg/runtime"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
 	_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
 	cliflag "k8s.io/component-base/cli/flag"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/cache"
+	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/healthz"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 	"sigs.k8s.io/controller-runtime/pkg/metrics/filters"
@@ -75,6 +77,7 @@ func init() {
 	_ = clientgoscheme.AddToScheme(scheme)
 
 	_ = metal3api.AddToScheme(scheme)
+	_ = ironicv1alpha1.AddToScheme(scheme)
 }
 
 func printVersion() {
@@ -215,6 +218,24 @@ func main() {
 		setupLog.Info("Manager set up with cluster scope")
 	}
 
+	// Setup cache options
+	var byObject map[client.Object]cache.ByObject
+
+	ironicName := os.Getenv("IRONIC_NAME")
+	ironicNamespace := os.Getenv("IRONIC_NAMESPACE")
+	if ironicNamespace == "" {
+		ironicNamespace = leaderElectionNamespace
+	}
+	if ironicName != "" && ironicNamespace != "" {
+		byObject = map[client.Object]cache.ByObject{
+			&ironicv1alpha1.Ironic{}: {
+				Namespaces: map[string]cache.Config{
+					ironicNamespace: {},
+				},
+			},
+		}
+	}
+
 	ctrlOpts := ctrl.Options{
 		Scheme: scheme,
 		Metrics: metricsserver.Options{
@@ -233,7 +254,7 @@ func main() {
 		LeaderElectionReleaseOnCancel: true,
 		HealthProbeBindAddress:        healthAddr,
 		Cache: cache.Options{
-			ByObject:          secretutils.AddSecretSelector(nil),
+			ByObject:          secretutils.AddSecretSelector(byObject),
 			DefaultNamespaces: watchNamespaces,
 		},
 	}
@@ -288,7 +309,13 @@ func main() {
 		provisionerFactory = &demo.Demo{}
 	} else {
 		provLog := zap.New(zap.UseFlagOptions(&logOpts)).WithName("provisioner")
-		provisionerFactory, err = ironic.NewProvisionerFactory(provLog, preprovImgEnable)
+		// Check if we should use Ironic CR integration
+		if ironicName != "" && ironicNamespace != "" {
+			provisionerFactory, err = ironic.NewProvisionerFactoryWithClient(provLog, preprovImgEnable,
+				mgr.GetClient(), mgr.GetAPIReader(), ironicName, ironicNamespace)
+		} else {
+			provisionerFactory, err = ironic.NewProvisionerFactory(provLog, preprovImgEnable)
+		}
 		if err != nil {
 			setupLog.Error(err, "cannot start ironic provisioner")
 			os.Exit(1)