Add OperatorConfig to all controllers
This commit is contained in:
@@ -40,6 +40,7 @@ import (
|
|||||||
goUnifi "github.com/vegardengen/go-unifi/unifi"
|
goUnifi "github.com/vegardengen/go-unifi/unifi"
|
||||||
unifiv1beta1 "github.com/vegardengen/unifi-network-operator/api/v1beta1"
|
unifiv1beta1 "github.com/vegardengen/unifi-network-operator/api/v1beta1"
|
||||||
"github.com/vegardengen/unifi-network-operator/internal/unifi"
|
"github.com/vegardengen/unifi-network-operator/internal/unifi"
|
||||||
|
"github.com/vegardengen/unifi-network-operator/internal/config"
|
||||||
)
|
)
|
||||||
|
|
||||||
// FirewallGroupReconciler reconciles a FirewallGroup object
|
// FirewallGroupReconciler reconciles a FirewallGroup object
|
||||||
@@ -47,6 +48,7 @@ type FirewallGroupReconciler struct {
|
|||||||
client.Client
|
client.Client
|
||||||
Scheme *runtime.Scheme
|
Scheme *runtime.Scheme
|
||||||
UnifiClient *unifi.UnifiClient
|
UnifiClient *unifi.UnifiClient
|
||||||
|
OperatorConfig *config.OperatorConfig
|
||||||
}
|
}
|
||||||
|
|
||||||
// +kubebuilder:rbac:groups=unifi.engen.priv.no,resources=firewallgroups,verbs=get;list;watch;create;update;patch;delete
|
// +kubebuilder:rbac:groups=unifi.engen.priv.no,resources=firewallgroups,verbs=get;list;watch;create;update;patch;delete
|
||||||
|
|||||||
@@ -25,12 +25,16 @@ import (
|
|||||||
"sigs.k8s.io/controller-runtime/pkg/log"
|
"sigs.k8s.io/controller-runtime/pkg/log"
|
||||||
|
|
||||||
unifiv1beta1 "github.com/vegardengen/unifi-network-operator/api/v1beta1"
|
unifiv1beta1 "github.com/vegardengen/unifi-network-operator/api/v1beta1"
|
||||||
|
"github.com/vegardengen/unifi-network-operator/internal/unifi"
|
||||||
|
"github.com/vegardengen/unifi-network-operator/internal/config"
|
||||||
)
|
)
|
||||||
|
|
||||||
// FirewallRuleReconciler reconciles a FirewallRule object
|
// FirewallRuleReconciler reconciles a FirewallRule object
|
||||||
type FirewallRuleReconciler struct {
|
type FirewallRuleReconciler struct {
|
||||||
client.Client
|
client.Client
|
||||||
Scheme *runtime.Scheme
|
Scheme *runtime.Scheme
|
||||||
|
UnifiClient *unifi.UnifiClient
|
||||||
|
OperatorConfig *config.OperatorConfig
|
||||||
}
|
}
|
||||||
|
|
||||||
// +kubebuilder:rbac:groups=unifi.engen.priv.no,resources=firewallrules,verbs=get;list;watch;create;update;patch;delete
|
// +kubebuilder:rbac:groups=unifi.engen.priv.no,resources=firewallrules,verbs=get;list;watch;create;update;patch;delete
|
||||||
|
|||||||
@@ -30,6 +30,7 @@ import (
|
|||||||
|
|
||||||
unifiv1beta1 "github.com/vegardengen/unifi-network-operator/api/v1beta1"
|
unifiv1beta1 "github.com/vegardengen/unifi-network-operator/api/v1beta1"
|
||||||
"github.com/vegardengen/unifi-network-operator/internal/unifi"
|
"github.com/vegardengen/unifi-network-operator/internal/unifi"
|
||||||
|
"github.com/vegardengen/unifi-network-operator/internal/config"
|
||||||
)
|
)
|
||||||
|
|
||||||
// FirewallZoneReconciler reconciles a FirewallZone object
|
// FirewallZoneReconciler reconciles a FirewallZone object
|
||||||
@@ -37,6 +38,7 @@ type FirewallZoneReconciler struct {
|
|||||||
client.Client
|
client.Client
|
||||||
Scheme *runtime.Scheme
|
Scheme *runtime.Scheme
|
||||||
UnifiClient *unifi.UnifiClient
|
UnifiClient *unifi.UnifiClient
|
||||||
|
OperatorConfig *config.OperatorConfig
|
||||||
}
|
}
|
||||||
|
|
||||||
func toKubeName(input string) string {
|
func toKubeName(input string) string {
|
||||||
|
|||||||
@@ -27,6 +27,7 @@ import (
|
|||||||
|
|
||||||
unifiv1 "github.com/vegardengen/unifi-network-operator/api/v1beta1"
|
unifiv1 "github.com/vegardengen/unifi-network-operator/api/v1beta1"
|
||||||
"github.com/vegardengen/unifi-network-operator/internal/unifi"
|
"github.com/vegardengen/unifi-network-operator/internal/unifi"
|
||||||
|
"github.com/vegardengen/unifi-network-operator/internal/config"
|
||||||
)
|
)
|
||||||
|
|
||||||
// NetworkconfigurationReconciler reconciles a Networkconfiguration object
|
// NetworkconfigurationReconciler reconciles a Networkconfiguration object
|
||||||
@@ -34,6 +35,7 @@ type NetworkconfigurationReconciler struct {
|
|||||||
client.Client
|
client.Client
|
||||||
Scheme *runtime.Scheme
|
Scheme *runtime.Scheme
|
||||||
UnifiClient *unifi.UnifiClient
|
UnifiClient *unifi.UnifiClient
|
||||||
|
OperatorConfig *config.OperatorConfig
|
||||||
}
|
}
|
||||||
|
|
||||||
// +kubebuilder:rbac:groups=unifi.engen.priv.no,resources=networkconfigurations,verbs=get;list;watch;create;update;patch;delete
|
// +kubebuilder:rbac:groups=unifi.engen.priv.no,resources=networkconfigurations,verbs=get;list;watch;create;update;patch;delete
|
||||||
@@ -103,6 +105,14 @@ func (r *NetworkconfigurationReconciler) Reconcile(ctx context.Context, req ctrl
|
|||||||
|
|
||||||
// SetupWithManager sets up the controller with the Manager.
|
// SetupWithManager sets up the controller with the Manager.
|
||||||
func (r *NetworkconfigurationReconciler) SetupWithManager(mgr ctrl.Manager) error {
|
func (r *NetworkconfigurationReconciler) SetupWithManager(mgr ctrl.Manager) error {
|
||||||
|
ctx := context.Background()
|
||||||
|
cfgLoader := config.New(mgr.GetClient(), "unifi-operator-config", "unifi-network-operator-system")
|
||||||
|
|
||||||
|
cfg, err := cfgLoader.Load(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
r.OperatorConfig = cfg
|
||||||
return ctrl.NewControllerManagedBy(mgr).
|
return ctrl.NewControllerManagedBy(mgr).
|
||||||
For(&unifiv1.Networkconfiguration{}).
|
For(&unifiv1.Networkconfiguration{}).
|
||||||
Named("networkconfiguration").
|
Named("networkconfiguration").
|
||||||
|
|||||||
Reference in New Issue
Block a user