Compare commits
11 Commits
19-create-
...
12-create-
| Author | SHA1 | Date | |
|---|---|---|---|
| c63d52bb46 | |||
| 89a811bef9 | |||
| 4c873ea723 | |||
| 7e93d04c4a | |||
| 625e8e0423 | |||
| d63566b794 | |||
| 8ec57323fe | |||
| 664e56def8 | |||
| 3f59db13f0 | |||
| a023204d6c | |||
| 72c13517b0 |
41
api/v1beta1/common_types.go
Normal file
41
api/v1beta1/common_types.go
Normal file
@@ -0,0 +1,41 @@
|
||||
package v1beta1
|
||||
|
||||
// EDIT THIS FILE! THIS IS SCAFFOLDING FOR YOU TO OWN!
|
||||
// NOTE: json tags are required. Any new fields you add must have json tags for the fields to be serialized.
|
||||
|
||||
// FirewallRuleSpec defines the desired state of FirewallRule.
|
||||
type NamedUnifiResource struct {
|
||||
Name string `json:"name,omitempty"`
|
||||
ID string `json:"id,omitempty"`
|
||||
}
|
||||
|
||||
type ServiceEntry struct {
|
||||
Namespace string `json:"namespace,omitempty"`
|
||||
Name string `json:"name,omitempty"`
|
||||
}
|
||||
|
||||
type FirewallGroupEntry struct {
|
||||
Namespace string `json:"namespace,omitempty"`
|
||||
Name string `json:"name,omitempty"`
|
||||
}
|
||||
type FirewallZoneEntry struct {
|
||||
Namespace string `json:"namespace,omitempty"`
|
||||
Name string `json:"name,omitempty"`
|
||||
}
|
||||
type FirewallRuleEntry struct {
|
||||
Namespace string `json:"namespace,omitempty"`
|
||||
Name string `json:"name,omitempty"`
|
||||
}
|
||||
type NetworkEntry struct {
|
||||
Namespace string `json:"namespace,omitempty"`
|
||||
Name string `json:"name,omitempty"`
|
||||
}
|
||||
type FirewallSource struct {
|
||||
FirewallZones []FirewallZoneEntry `json:"from_zones,omitempty"`
|
||||
Networks []NetworkEntry `json:"from_networks,omitempty"`
|
||||
}
|
||||
|
||||
type FirewallDestination struct {
|
||||
FirewallGroups []FirewallGroupEntry `json:"firewall_groups,omitempty"`
|
||||
Services []ServiceEntry `json:"services,omitempty"`
|
||||
}
|
||||
@@ -24,28 +24,28 @@ import (
|
||||
// NOTE: json tags are required. Any new fields you add must have json tags for the fields to be serialized.
|
||||
|
||||
// FirewallGroupSpec defines the desired state of FirewallGroup.
|
||||
|
||||
type FirewallGroupSpec struct {
|
||||
// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
|
||||
// Important: Run "make" to regenerate code after modifying this file
|
||||
|
||||
// Foo is an example field of FirewallGroup. Edit firewallgroup_types.go to remove/update
|
||||
// Description is a human-readable explanation for the object
|
||||
ID string `json:"id,omitempty"`
|
||||
Name string `json:"name,omitempty"`
|
||||
|
||||
MatchServicesInAllNamespaces bool `json:"matchServicesInAllNamespaces,omitempty"`
|
||||
// ManualAddresses is a list of manual IPs or CIDRs (IPv4 or IPv6)
|
||||
// +optional
|
||||
ManualAddresses []string `json:"manualAddresses,omitempty"`
|
||||
ManualPorts []string `json:"manualPorts,omitempty"`
|
||||
ManualAddresses []string `json:"manualAddresses,omitempty"`
|
||||
ManualPorts []string `json:"manualPorts,omitempty"`
|
||||
ManualServices []ServiceEntry `json:"manual_services,omitempty"`
|
||||
|
||||
AutoCreatedFrom FirewallRuleEntry `json:"auto_created_from,omitempty"`
|
||||
|
||||
// AutoIncludeSelector defines which services to extract addresses from
|
||||
// +optional
|
||||
AutoIncludeSelector *metav1.LabelSelector `json:"autoIncludeSelector,omitempty"`
|
||||
|
||||
// AddressType can be "ip", "cidr", or "both"
|
||||
// +kubebuilder:validation:Enum=ip;cidr;both
|
||||
// +optional
|
||||
AddressType string `json:"addressType,omitempty"`
|
||||
}
|
||||
|
||||
// FirewallGroupStatus defines the observed state of FirewallGroup.
|
||||
@@ -53,17 +53,29 @@ type FirewallGroupStatus struct {
|
||||
// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
|
||||
// Important: Run "make" to regenerate code after modifying this file
|
||||
|
||||
ResolvedAddresses []string `json:"resolvedAddresses,omitempty"`
|
||||
ResolvedIPV4Addresses []string `json:"resolvedIPV4Addresses,omitempty"`
|
||||
ResolvedIPV6Addresses []string `json:"resolvedIPV6Addresses,omitempty"`
|
||||
ResolvedTCPPorts []string `json:"resolvedTCPorts,omitempty"`
|
||||
ResolvedUDPPorts []string `json:"resolvedUDPorts,omitempty"`
|
||||
|
||||
// SyncedWithUnifi indicates whether the addresses are successfully pushed
|
||||
// +optional
|
||||
SyncedWithUnifi bool `json:"syncedWithUnifi,omitempty"`
|
||||
|
||||
ResourcesManaged *FirewallGroupResourcesManaged `json:"resources_managed,omitempty"`
|
||||
|
||||
// LastSyncTime is the last time the object was synced
|
||||
// +optional
|
||||
LastSyncTime *metav1.Time `json:"lastSyncTime,omitempty"`
|
||||
}
|
||||
|
||||
type FirewallGroupResourcesManaged struct {
|
||||
IPV4Object *NamedUnifiResource `json:"ipv4_object,omitempty"`
|
||||
IPV6Object *NamedUnifiResource `json:"ipv6_object,omitempty"`
|
||||
TCPPortsObject *NamedUnifiResource `json:"tcp_ports_object,omitempty"`
|
||||
UDPPortsObject *NamedUnifiResource `json:"udp_ports_object,omitempty"`
|
||||
}
|
||||
|
||||
// +kubebuilder:object:root=true
|
||||
// +kubebuilder:subresource:status
|
||||
|
||||
|
||||
@@ -24,18 +24,49 @@ import (
|
||||
// NOTE: json tags are required. Any new fields you add must have json tags for the fields to be serialized.
|
||||
|
||||
// FirewallRuleSpec defines the desired state of FirewallRule.
|
||||
// type ServiceSpec struct {
|
||||
// Namespace string `json:"namespace,omitempty"`
|
||||
// Name string `json:"name,omitempty"`
|
||||
// }
|
||||
|
||||
// type FirewallSource struct {
|
||||
// Zones []string `json:"from_zones,omitempty"`
|
||||
// Networks []string `json:"from_networks,omitempty"`
|
||||
//}
|
||||
|
||||
//type FirewallDestination struct {
|
||||
// FirewallGroups []string `json:"firewall_group,omitempty"`
|
||||
// Services []ServiceSpec `json:"service,omitempty"`
|
||||
//}
|
||||
|
||||
type FirewallRuleSpec struct {
|
||||
// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
|
||||
// Important: Run "make" to regenerate code after modifying this file
|
||||
|
||||
// Foo is an example field of FirewallRule. Edit firewallrule_types.go to remove/update
|
||||
Foo string `json:"foo,omitempty"`
|
||||
Name string `json:"name"`
|
||||
Source FirewallSource `json:"source"`
|
||||
Destination FirewallDestination `json:"destination"`
|
||||
MatchFirewallGroupsInAllNamespaces bool `json:"match_firewall_groups_in_all_namespaces,omitempty"`
|
||||
MatchServicesInAllNamespaces bool `json:"match_services_in_all_namespaces,omitempty"`
|
||||
}
|
||||
|
||||
// FirewallRuleStatus defines the observed state of FirewallRule.
|
||||
type FirewallRuleStatus struct {
|
||||
// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
|
||||
// Important: Run "make" to regenerate code after modifying this file
|
||||
|
||||
ResourcesManaged *FirewallRuleResourcesManaged `json:"resources_managed,omitempty"`
|
||||
}
|
||||
|
||||
type FirewallRuleResourcesManaged struct {
|
||||
UnifiFirewallRules []UnifiFirewallRuleEntry `json:"firewall_rules_managed,omitempty"`
|
||||
FirewallGroups []FirewallGroupEntry `json:"firewall_groups_managed,omitempty"`
|
||||
}
|
||||
|
||||
type UnifiFirewallRuleEntry struct {
|
||||
From string `json:"from"`
|
||||
To string `json:"to"`
|
||||
RuleID string `json:"rule_id"`
|
||||
}
|
||||
|
||||
// +kubebuilder:object:root=true
|
||||
|
||||
@@ -28,17 +28,23 @@ type FirewallZoneSpec struct {
|
||||
// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
|
||||
// Important: Run "make" to regenerate code after modifying this file
|
||||
|
||||
Name string `json:"name,omitempty"`
|
||||
ID string `json:"_id,omitempty"`
|
||||
DefaultZone bool `json:"default_zone,omitempty"`
|
||||
ZoneKey string `json:"zone_key,omitempty"`
|
||||
NetworkIDs []string `json:"network_ids,omitempty"`
|
||||
Name string `json:"name,omitempty"`
|
||||
ID string `json:"_id,omitempty"`
|
||||
DefaultZone bool `json:"default_zone,omitempty"`
|
||||
ZoneKey string `json:"zone_key,omitempty"`
|
||||
NetworkIDs []string `json:"network_ids,omitempty"`
|
||||
}
|
||||
|
||||
// FirewallZoneStatus defines the observed state of FirewallZone.
|
||||
type FirewallZoneStatus struct {
|
||||
// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
|
||||
// Important: Run "make" to regenerate code after modifying this file
|
||||
|
||||
ResourcesManaged *FirewallZoneResourcesManaged `json:"resources_managed,omitempty"`
|
||||
}
|
||||
|
||||
type FirewallZoneResourcesManaged struct {
|
||||
UnifiFirewallZones []NamedUnifiResource `json:"firewall_zones_managed,omitempty"`
|
||||
}
|
||||
|
||||
// +kubebuilder:object:root=true
|
||||
|
||||
@@ -29,6 +29,7 @@ type NetworkconfigurationSpec struct {
|
||||
// Important: Run "make" to regenerate code after modifying this file
|
||||
|
||||
// Foo is an example field of Networkconfiguration. Edit networkconfiguration_types.go to remove/update
|
||||
ID string `json:"_id,omitempty"`
|
||||
Enabled bool `json:"enabled,omitempty"`
|
||||
FirewallZone string `json:"firewall_zone,omitempty"`
|
||||
GatewayType string `json:"gateway_type,omitempty"`
|
||||
@@ -39,7 +40,6 @@ type NetworkconfigurationSpec struct {
|
||||
Ipv6SettingPreference string `json:"ipv6_setting_preference,omitempty"`
|
||||
Ipv6Subnet string `json:"ipv6_subnet,omitempty"`
|
||||
Name string `json:"name"`
|
||||
NetworkID string `json:"network_id,omitempty"`
|
||||
Networkgroup string `json:"networkgroup,omitempty"`
|
||||
Purpose string `json:"purpose,omitempty"`
|
||||
SettingPreference string `json:"setting_preference,omitempty"`
|
||||
@@ -51,16 +51,21 @@ type NetworkconfigurationSpec struct {
|
||||
type NetworkconfigurationStatus struct {
|
||||
// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
|
||||
// Important: Run "make" to regenerate code after modifying this file
|
||||
FirewallZoneID string `json:"firewall_zone_id,omitempty"`
|
||||
Ipv6SubnetStatus string `json:"ipv6_subnet_status,omitempty"`
|
||||
FirewallZoneID string `json:"firewall_zone_id,omitempty"`
|
||||
Ipv6SubnetStatus string `json:"ipv6_subnet_status,omitempty"`
|
||||
|
||||
// SyncedWithUnifi indicates whether the addresses are successfully pushed
|
||||
// +optional
|
||||
SyncedWithUnifi bool `json:"syncedWithUnifi,omitempty"`
|
||||
// +optional
|
||||
SyncedWithUnifi bool `json:"syncedWithUnifi,omitempty"`
|
||||
|
||||
ResourcesManaged *NetworkconfigurationResourcesManaged `json:"resources_managed,omitempty"`
|
||||
// LastSyncTime is the last time the object was synced
|
||||
// +optional
|
||||
LastSyncTime *metav1.Time `json:"lastSyncTime,omitempty"`
|
||||
// +optional
|
||||
LastSyncTime *metav1.Time `json:"lastSyncTime,omitempty"`
|
||||
}
|
||||
|
||||
type NetworkconfigurationResourcesManaged struct {
|
||||
UnifiNetworks []NamedUnifiResource `json:"networks_managed,omitempty"`
|
||||
}
|
||||
|
||||
// +kubebuilder:object:root=true
|
||||
|
||||
@@ -25,6 +25,31 @@ import (
|
||||
runtime "k8s.io/apimachinery/pkg/runtime"
|
||||
)
|
||||
|
||||
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
|
||||
func (in *FirewallDestination) DeepCopyInto(out *FirewallDestination) {
|
||||
*out = *in
|
||||
if in.FirewallGroups != nil {
|
||||
in, out := &in.FirewallGroups, &out.FirewallGroups
|
||||
*out = make([]FirewallGroupEntry, len(*in))
|
||||
copy(*out, *in)
|
||||
}
|
||||
if in.Services != nil {
|
||||
in, out := &in.Services, &out.Services
|
||||
*out = make([]ServiceEntry, len(*in))
|
||||
copy(*out, *in)
|
||||
}
|
||||
}
|
||||
|
||||
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FirewallDestination.
|
||||
func (in *FirewallDestination) DeepCopy() *FirewallDestination {
|
||||
if in == nil {
|
||||
return nil
|
||||
}
|
||||
out := new(FirewallDestination)
|
||||
in.DeepCopyInto(out)
|
||||
return out
|
||||
}
|
||||
|
||||
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
|
||||
func (in *FirewallGroup) DeepCopyInto(out *FirewallGroup) {
|
||||
*out = *in
|
||||
@@ -52,6 +77,21 @@ func (in *FirewallGroup) DeepCopyObject() runtime.Object {
|
||||
return nil
|
||||
}
|
||||
|
||||
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
|
||||
func (in *FirewallGroupEntry) DeepCopyInto(out *FirewallGroupEntry) {
|
||||
*out = *in
|
||||
}
|
||||
|
||||
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FirewallGroupEntry.
|
||||
func (in *FirewallGroupEntry) DeepCopy() *FirewallGroupEntry {
|
||||
if in == nil {
|
||||
return nil
|
||||
}
|
||||
out := new(FirewallGroupEntry)
|
||||
in.DeepCopyInto(out)
|
||||
return out
|
||||
}
|
||||
|
||||
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
|
||||
func (in *FirewallGroupList) DeepCopyInto(out *FirewallGroupList) {
|
||||
*out = *in
|
||||
@@ -84,6 +124,41 @@ func (in *FirewallGroupList) DeepCopyObject() runtime.Object {
|
||||
return nil
|
||||
}
|
||||
|
||||
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
|
||||
func (in *FirewallGroupResourcesManaged) DeepCopyInto(out *FirewallGroupResourcesManaged) {
|
||||
*out = *in
|
||||
if in.IPV4Object != nil {
|
||||
in, out := &in.IPV4Object, &out.IPV4Object
|
||||
*out = new(NamedUnifiResource)
|
||||
**out = **in
|
||||
}
|
||||
if in.IPV6Object != nil {
|
||||
in, out := &in.IPV6Object, &out.IPV6Object
|
||||
*out = new(NamedUnifiResource)
|
||||
**out = **in
|
||||
}
|
||||
if in.TCPPortsObject != nil {
|
||||
in, out := &in.TCPPortsObject, &out.TCPPortsObject
|
||||
*out = new(NamedUnifiResource)
|
||||
**out = **in
|
||||
}
|
||||
if in.UDPPortsObject != nil {
|
||||
in, out := &in.UDPPortsObject, &out.UDPPortsObject
|
||||
*out = new(NamedUnifiResource)
|
||||
**out = **in
|
||||
}
|
||||
}
|
||||
|
||||
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FirewallGroupResourcesManaged.
|
||||
func (in *FirewallGroupResourcesManaged) DeepCopy() *FirewallGroupResourcesManaged {
|
||||
if in == nil {
|
||||
return nil
|
||||
}
|
||||
out := new(FirewallGroupResourcesManaged)
|
||||
in.DeepCopyInto(out)
|
||||
return out
|
||||
}
|
||||
|
||||
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
|
||||
func (in *FirewallGroupSpec) DeepCopyInto(out *FirewallGroupSpec) {
|
||||
*out = *in
|
||||
@@ -92,6 +167,17 @@ func (in *FirewallGroupSpec) DeepCopyInto(out *FirewallGroupSpec) {
|
||||
*out = make([]string, len(*in))
|
||||
copy(*out, *in)
|
||||
}
|
||||
if in.ManualPorts != nil {
|
||||
in, out := &in.ManualPorts, &out.ManualPorts
|
||||
*out = make([]string, len(*in))
|
||||
copy(*out, *in)
|
||||
}
|
||||
if in.ManualServices != nil {
|
||||
in, out := &in.ManualServices, &out.ManualServices
|
||||
*out = make([]ServiceEntry, len(*in))
|
||||
copy(*out, *in)
|
||||
}
|
||||
out.AutoCreatedFrom = in.AutoCreatedFrom
|
||||
if in.AutoIncludeSelector != nil {
|
||||
in, out := &in.AutoIncludeSelector, &out.AutoIncludeSelector
|
||||
*out = new(v1.LabelSelector)
|
||||
@@ -112,11 +198,31 @@ func (in *FirewallGroupSpec) DeepCopy() *FirewallGroupSpec {
|
||||
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
|
||||
func (in *FirewallGroupStatus) DeepCopyInto(out *FirewallGroupStatus) {
|
||||
*out = *in
|
||||
if in.ResolvedAddresses != nil {
|
||||
in, out := &in.ResolvedAddresses, &out.ResolvedAddresses
|
||||
if in.ResolvedIPV4Addresses != nil {
|
||||
in, out := &in.ResolvedIPV4Addresses, &out.ResolvedIPV4Addresses
|
||||
*out = make([]string, len(*in))
|
||||
copy(*out, *in)
|
||||
}
|
||||
if in.ResolvedIPV6Addresses != nil {
|
||||
in, out := &in.ResolvedIPV6Addresses, &out.ResolvedIPV6Addresses
|
||||
*out = make([]string, len(*in))
|
||||
copy(*out, *in)
|
||||
}
|
||||
if in.ResolvedTCPPorts != nil {
|
||||
in, out := &in.ResolvedTCPPorts, &out.ResolvedTCPPorts
|
||||
*out = make([]string, len(*in))
|
||||
copy(*out, *in)
|
||||
}
|
||||
if in.ResolvedUDPPorts != nil {
|
||||
in, out := &in.ResolvedUDPPorts, &out.ResolvedUDPPorts
|
||||
*out = make([]string, len(*in))
|
||||
copy(*out, *in)
|
||||
}
|
||||
if in.ResourcesManaged != nil {
|
||||
in, out := &in.ResourcesManaged, &out.ResourcesManaged
|
||||
*out = new(FirewallGroupResourcesManaged)
|
||||
(*in).DeepCopyInto(*out)
|
||||
}
|
||||
if in.LastSyncTime != nil {
|
||||
in, out := &in.LastSyncTime, &out.LastSyncTime
|
||||
*out = (*in).DeepCopy()
|
||||
@@ -138,8 +244,8 @@ func (in *FirewallRule) DeepCopyInto(out *FirewallRule) {
|
||||
*out = *in
|
||||
out.TypeMeta = in.TypeMeta
|
||||
in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
|
||||
out.Spec = in.Spec
|
||||
out.Status = in.Status
|
||||
in.Spec.DeepCopyInto(&out.Spec)
|
||||
in.Status.DeepCopyInto(&out.Status)
|
||||
}
|
||||
|
||||
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FirewallRule.
|
||||
@@ -160,6 +266,21 @@ func (in *FirewallRule) DeepCopyObject() runtime.Object {
|
||||
return nil
|
||||
}
|
||||
|
||||
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
|
||||
func (in *FirewallRuleEntry) DeepCopyInto(out *FirewallRuleEntry) {
|
||||
*out = *in
|
||||
}
|
||||
|
||||
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FirewallRuleEntry.
|
||||
func (in *FirewallRuleEntry) DeepCopy() *FirewallRuleEntry {
|
||||
if in == nil {
|
||||
return nil
|
||||
}
|
||||
out := new(FirewallRuleEntry)
|
||||
in.DeepCopyInto(out)
|
||||
return out
|
||||
}
|
||||
|
||||
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
|
||||
func (in *FirewallRuleList) DeepCopyInto(out *FirewallRuleList) {
|
||||
*out = *in
|
||||
@@ -192,9 +313,36 @@ func (in *FirewallRuleList) DeepCopyObject() runtime.Object {
|
||||
return nil
|
||||
}
|
||||
|
||||
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
|
||||
func (in *FirewallRuleResourcesManaged) DeepCopyInto(out *FirewallRuleResourcesManaged) {
|
||||
*out = *in
|
||||
if in.UnifiFirewallRules != nil {
|
||||
in, out := &in.UnifiFirewallRules, &out.UnifiFirewallRules
|
||||
*out = make([]UnifiFirewallRuleEntry, len(*in))
|
||||
copy(*out, *in)
|
||||
}
|
||||
if in.FirewallGroups != nil {
|
||||
in, out := &in.FirewallGroups, &out.FirewallGroups
|
||||
*out = make([]FirewallGroupEntry, len(*in))
|
||||
copy(*out, *in)
|
||||
}
|
||||
}
|
||||
|
||||
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FirewallRuleResourcesManaged.
|
||||
func (in *FirewallRuleResourcesManaged) DeepCopy() *FirewallRuleResourcesManaged {
|
||||
if in == nil {
|
||||
return nil
|
||||
}
|
||||
out := new(FirewallRuleResourcesManaged)
|
||||
in.DeepCopyInto(out)
|
||||
return out
|
||||
}
|
||||
|
||||
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
|
||||
func (in *FirewallRuleSpec) DeepCopyInto(out *FirewallRuleSpec) {
|
||||
*out = *in
|
||||
in.Source.DeepCopyInto(&out.Source)
|
||||
in.Destination.DeepCopyInto(&out.Destination)
|
||||
}
|
||||
|
||||
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FirewallRuleSpec.
|
||||
@@ -210,6 +358,11 @@ func (in *FirewallRuleSpec) DeepCopy() *FirewallRuleSpec {
|
||||
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
|
||||
func (in *FirewallRuleStatus) DeepCopyInto(out *FirewallRuleStatus) {
|
||||
*out = *in
|
||||
if in.ResourcesManaged != nil {
|
||||
in, out := &in.ResourcesManaged, &out.ResourcesManaged
|
||||
*out = new(FirewallRuleResourcesManaged)
|
||||
(*in).DeepCopyInto(*out)
|
||||
}
|
||||
}
|
||||
|
||||
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FirewallRuleStatus.
|
||||
@@ -222,13 +375,38 @@ func (in *FirewallRuleStatus) DeepCopy() *FirewallRuleStatus {
|
||||
return out
|
||||
}
|
||||
|
||||
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
|
||||
func (in *FirewallSource) DeepCopyInto(out *FirewallSource) {
|
||||
*out = *in
|
||||
if in.FirewallZones != nil {
|
||||
in, out := &in.FirewallZones, &out.FirewallZones
|
||||
*out = make([]FirewallZoneEntry, len(*in))
|
||||
copy(*out, *in)
|
||||
}
|
||||
if in.Networks != nil {
|
||||
in, out := &in.Networks, &out.Networks
|
||||
*out = make([]NetworkEntry, len(*in))
|
||||
copy(*out, *in)
|
||||
}
|
||||
}
|
||||
|
||||
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FirewallSource.
|
||||
func (in *FirewallSource) DeepCopy() *FirewallSource {
|
||||
if in == nil {
|
||||
return nil
|
||||
}
|
||||
out := new(FirewallSource)
|
||||
in.DeepCopyInto(out)
|
||||
return out
|
||||
}
|
||||
|
||||
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
|
||||
func (in *FirewallZone) DeepCopyInto(out *FirewallZone) {
|
||||
*out = *in
|
||||
out.TypeMeta = in.TypeMeta
|
||||
in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
|
||||
in.Spec.DeepCopyInto(&out.Spec)
|
||||
out.Status = in.Status
|
||||
in.Status.DeepCopyInto(&out.Status)
|
||||
}
|
||||
|
||||
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FirewallZone.
|
||||
@@ -249,6 +427,21 @@ func (in *FirewallZone) DeepCopyObject() runtime.Object {
|
||||
return nil
|
||||
}
|
||||
|
||||
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
|
||||
func (in *FirewallZoneEntry) DeepCopyInto(out *FirewallZoneEntry) {
|
||||
*out = *in
|
||||
}
|
||||
|
||||
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FirewallZoneEntry.
|
||||
func (in *FirewallZoneEntry) DeepCopy() *FirewallZoneEntry {
|
||||
if in == nil {
|
||||
return nil
|
||||
}
|
||||
out := new(FirewallZoneEntry)
|
||||
in.DeepCopyInto(out)
|
||||
return out
|
||||
}
|
||||
|
||||
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
|
||||
func (in *FirewallZoneList) DeepCopyInto(out *FirewallZoneList) {
|
||||
*out = *in
|
||||
@@ -281,6 +474,26 @@ func (in *FirewallZoneList) DeepCopyObject() runtime.Object {
|
||||
return nil
|
||||
}
|
||||
|
||||
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
|
||||
func (in *FirewallZoneResourcesManaged) DeepCopyInto(out *FirewallZoneResourcesManaged) {
|
||||
*out = *in
|
||||
if in.UnifiFirewallZones != nil {
|
||||
in, out := &in.UnifiFirewallZones, &out.UnifiFirewallZones
|
||||
*out = make([]NamedUnifiResource, len(*in))
|
||||
copy(*out, *in)
|
||||
}
|
||||
}
|
||||
|
||||
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FirewallZoneResourcesManaged.
|
||||
func (in *FirewallZoneResourcesManaged) DeepCopy() *FirewallZoneResourcesManaged {
|
||||
if in == nil {
|
||||
return nil
|
||||
}
|
||||
out := new(FirewallZoneResourcesManaged)
|
||||
in.DeepCopyInto(out)
|
||||
return out
|
||||
}
|
||||
|
||||
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
|
||||
func (in *FirewallZoneSpec) DeepCopyInto(out *FirewallZoneSpec) {
|
||||
*out = *in
|
||||
@@ -304,6 +517,11 @@ func (in *FirewallZoneSpec) DeepCopy() *FirewallZoneSpec {
|
||||
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
|
||||
func (in *FirewallZoneStatus) DeepCopyInto(out *FirewallZoneStatus) {
|
||||
*out = *in
|
||||
if in.ResourcesManaged != nil {
|
||||
in, out := &in.ResourcesManaged, &out.ResourcesManaged
|
||||
*out = new(FirewallZoneResourcesManaged)
|
||||
(*in).DeepCopyInto(*out)
|
||||
}
|
||||
}
|
||||
|
||||
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FirewallZoneStatus.
|
||||
@@ -316,6 +534,36 @@ func (in *FirewallZoneStatus) DeepCopy() *FirewallZoneStatus {
|
||||
return out
|
||||
}
|
||||
|
||||
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
|
||||
func (in *NamedUnifiResource) DeepCopyInto(out *NamedUnifiResource) {
|
||||
*out = *in
|
||||
}
|
||||
|
||||
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new NamedUnifiResource.
|
||||
func (in *NamedUnifiResource) DeepCopy() *NamedUnifiResource {
|
||||
if in == nil {
|
||||
return nil
|
||||
}
|
||||
out := new(NamedUnifiResource)
|
||||
in.DeepCopyInto(out)
|
||||
return out
|
||||
}
|
||||
|
||||
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
|
||||
func (in *NetworkEntry) DeepCopyInto(out *NetworkEntry) {
|
||||
*out = *in
|
||||
}
|
||||
|
||||
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new NetworkEntry.
|
||||
func (in *NetworkEntry) DeepCopy() *NetworkEntry {
|
||||
if in == nil {
|
||||
return nil
|
||||
}
|
||||
out := new(NetworkEntry)
|
||||
in.DeepCopyInto(out)
|
||||
return out
|
||||
}
|
||||
|
||||
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
|
||||
func (in *Networkconfiguration) DeepCopyInto(out *Networkconfiguration) {
|
||||
*out = *in
|
||||
@@ -375,6 +623,26 @@ func (in *NetworkconfigurationList) DeepCopyObject() runtime.Object {
|
||||
return nil
|
||||
}
|
||||
|
||||
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
|
||||
func (in *NetworkconfigurationResourcesManaged) DeepCopyInto(out *NetworkconfigurationResourcesManaged) {
|
||||
*out = *in
|
||||
if in.UnifiNetworks != nil {
|
||||
in, out := &in.UnifiNetworks, &out.UnifiNetworks
|
||||
*out = make([]NamedUnifiResource, len(*in))
|
||||
copy(*out, *in)
|
||||
}
|
||||
}
|
||||
|
||||
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new NetworkconfigurationResourcesManaged.
|
||||
func (in *NetworkconfigurationResourcesManaged) DeepCopy() *NetworkconfigurationResourcesManaged {
|
||||
if in == nil {
|
||||
return nil
|
||||
}
|
||||
out := new(NetworkconfigurationResourcesManaged)
|
||||
in.DeepCopyInto(out)
|
||||
return out
|
||||
}
|
||||
|
||||
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
|
||||
func (in *NetworkconfigurationSpec) DeepCopyInto(out *NetworkconfigurationSpec) {
|
||||
*out = *in
|
||||
@@ -393,6 +661,11 @@ func (in *NetworkconfigurationSpec) DeepCopy() *NetworkconfigurationSpec {
|
||||
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
|
||||
func (in *NetworkconfigurationStatus) DeepCopyInto(out *NetworkconfigurationStatus) {
|
||||
*out = *in
|
||||
if in.ResourcesManaged != nil {
|
||||
in, out := &in.ResourcesManaged, &out.ResourcesManaged
|
||||
*out = new(NetworkconfigurationResourcesManaged)
|
||||
(*in).DeepCopyInto(*out)
|
||||
}
|
||||
if in.LastSyncTime != nil {
|
||||
in, out := &in.LastSyncTime, &out.LastSyncTime
|
||||
*out = (*in).DeepCopy()
|
||||
@@ -408,3 +681,33 @@ func (in *NetworkconfigurationStatus) DeepCopy() *NetworkconfigurationStatus {
|
||||
in.DeepCopyInto(out)
|
||||
return out
|
||||
}
|
||||
|
||||
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
|
||||
func (in *ServiceEntry) DeepCopyInto(out *ServiceEntry) {
|
||||
*out = *in
|
||||
}
|
||||
|
||||
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ServiceEntry.
|
||||
func (in *ServiceEntry) DeepCopy() *ServiceEntry {
|
||||
if in == nil {
|
||||
return nil
|
||||
}
|
||||
out := new(ServiceEntry)
|
||||
in.DeepCopyInto(out)
|
||||
return out
|
||||
}
|
||||
|
||||
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
|
||||
func (in *UnifiFirewallRuleEntry) DeepCopyInto(out *UnifiFirewallRuleEntry) {
|
||||
*out = *in
|
||||
}
|
||||
|
||||
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new UnifiFirewallRuleEntry.
|
||||
func (in *UnifiFirewallRuleEntry) DeepCopy() *UnifiFirewallRuleEntry {
|
||||
if in == nil {
|
||||
return nil
|
||||
}
|
||||
out := new(UnifiFirewallRuleEntry)
|
||||
in.DeepCopyInto(out)
|
||||
return out
|
||||
}
|
||||
|
||||
28
cmd/main.go
28
cmd/main.go
@@ -38,9 +38,9 @@ import (
|
||||
"sigs.k8s.io/controller-runtime/pkg/webhook"
|
||||
|
||||
unifiv1beta1 "github.com/vegardengen/unifi-network-operator/api/v1beta1"
|
||||
"github.com/vegardengen/unifi-network-operator/internal/config"
|
||||
"github.com/vegardengen/unifi-network-operator/internal/controller"
|
||||
"github.com/vegardengen/unifi-network-operator/internal/unifi"
|
||||
"github.com/vegardengen/unifi-network-operator/internal/config"
|
||||
// +kubebuilder:scaffold:imports
|
||||
)
|
||||
|
||||
@@ -204,7 +204,7 @@ func main() {
|
||||
os.Exit(1)
|
||||
}
|
||||
|
||||
configLoader := config.NewConfigLoader(mgr.GetClient())
|
||||
configLoader := config.NewConfigLoader(mgr.GetClient())
|
||||
|
||||
// Unifi client
|
||||
setupLog.Info("Setting up UniFi client")
|
||||
@@ -216,27 +216,27 @@ func main() {
|
||||
setupLog.Info("Finished Setting up UniFi client")
|
||||
|
||||
if err = (&controller.NetworkconfigurationReconciler{
|
||||
Client: mgr.GetClient(),
|
||||
Scheme: mgr.GetScheme(),
|
||||
UnifiClient: unifiClient,
|
||||
Client: mgr.GetClient(),
|
||||
Scheme: mgr.GetScheme(),
|
||||
UnifiClient: unifiClient,
|
||||
ConfigLoader: configLoader,
|
||||
}).SetupWithManager(mgr); err != nil {
|
||||
setupLog.Error(err, "unable to create controller", "controller", "Networkconfiguration")
|
||||
os.Exit(1)
|
||||
}
|
||||
if err = (&controller.FirewallZoneReconciler{
|
||||
Client: mgr.GetClient(),
|
||||
Scheme: mgr.GetScheme(),
|
||||
UnifiClient: unifiClient,
|
||||
Client: mgr.GetClient(),
|
||||
Scheme: mgr.GetScheme(),
|
||||
UnifiClient: unifiClient,
|
||||
ConfigLoader: configLoader,
|
||||
}).SetupWithManager(mgr); err != nil {
|
||||
setupLog.Error(err, "unable to create controller", "controller", "FirewallZone")
|
||||
os.Exit(1)
|
||||
}
|
||||
if err = (&controller.FirewallRuleReconciler{
|
||||
Client: mgr.GetClient(),
|
||||
Scheme: mgr.GetScheme(),
|
||||
UnifiClient: unifiClient,
|
||||
Client: mgr.GetClient(),
|
||||
Scheme: mgr.GetScheme(),
|
||||
UnifiClient: unifiClient,
|
||||
ConfigLoader: configLoader,
|
||||
}).SetupWithManager(mgr); err != nil {
|
||||
setupLog.Error(err, "unable to create controller", "controller", "FirewallRule")
|
||||
@@ -245,9 +245,9 @@ func main() {
|
||||
// +kubebuilder:scaffold:builder
|
||||
|
||||
if err = (&controller.FirewallGroupReconciler{
|
||||
Client: mgr.GetClient(),
|
||||
Scheme: mgr.GetScheme(),
|
||||
UnifiClient: unifiClient,
|
||||
Client: mgr.GetClient(),
|
||||
Scheme: mgr.GetScheme(),
|
||||
UnifiClient: unifiClient,
|
||||
ConfigLoader: configLoader,
|
||||
}).SetupWithManager(mgr); err != nil {
|
||||
setupLog.Error(err, "unable to create controller", "controller", "FirewallGroup")
|
||||
|
||||
@@ -37,15 +37,14 @@ spec:
|
||||
metadata:
|
||||
type: object
|
||||
spec:
|
||||
description: FirewallGroupSpec defines the desired state of FirewallGroup.
|
||||
properties:
|
||||
addressType:
|
||||
description: AddressType can be "ip", "cidr", or "both"
|
||||
enum:
|
||||
- ip
|
||||
- cidr
|
||||
- both
|
||||
type: string
|
||||
auto_created_from:
|
||||
properties:
|
||||
name:
|
||||
type: string
|
||||
namespace:
|
||||
type: string
|
||||
type: object
|
||||
autoIncludeSelector:
|
||||
description: AutoIncludeSelector defines which services to extract
|
||||
addresses from
|
||||
@@ -93,6 +92,20 @@ spec:
|
||||
type: object
|
||||
type: object
|
||||
x-kubernetes-map-type: atomic
|
||||
id:
|
||||
description: |-
|
||||
Foo is an example field of FirewallGroup. Edit firewallgroup_types.go to remove/update
|
||||
Description is a human-readable explanation for the object
|
||||
type: string
|
||||
manual_services:
|
||||
items:
|
||||
properties:
|
||||
name:
|
||||
type: string
|
||||
namespace:
|
||||
type: string
|
||||
type: object
|
||||
type: array
|
||||
manualAddresses:
|
||||
description: ManualAddresses is a list of manual IPs or CIDRs (IPv4
|
||||
or IPv6)
|
||||
@@ -106,9 +119,6 @@ spec:
|
||||
matchServicesInAllNamespaces:
|
||||
type: boolean
|
||||
name:
|
||||
description: |-
|
||||
Foo is an example field of FirewallGroup. Edit firewallgroup_types.go to remove/update
|
||||
Description is a human-readable explanation for the object
|
||||
type: string
|
||||
type: object
|
||||
status:
|
||||
@@ -118,10 +128,57 @@ spec:
|
||||
description: LastSyncTime is the last time the object was synced
|
||||
format: date-time
|
||||
type: string
|
||||
resolvedAddresses:
|
||||
resolvedIPV4Addresses:
|
||||
items:
|
||||
type: string
|
||||
type: array
|
||||
resolvedIPV6Addresses:
|
||||
items:
|
||||
type: string
|
||||
type: array
|
||||
resolvedTCPorts:
|
||||
items:
|
||||
type: string
|
||||
type: array
|
||||
resolvedUDPorts:
|
||||
items:
|
||||
type: string
|
||||
type: array
|
||||
resources_managed:
|
||||
properties:
|
||||
ipv4_object:
|
||||
description: FirewallRuleSpec defines the desired state of FirewallRule.
|
||||
properties:
|
||||
id:
|
||||
type: string
|
||||
name:
|
||||
type: string
|
||||
type: object
|
||||
ipv6_object:
|
||||
description: FirewallRuleSpec defines the desired state of FirewallRule.
|
||||
properties:
|
||||
id:
|
||||
type: string
|
||||
name:
|
||||
type: string
|
||||
type: object
|
||||
tcp_ports_object:
|
||||
description: FirewallRuleSpec defines the desired state of FirewallRule.
|
||||
properties:
|
||||
id:
|
||||
type: string
|
||||
name:
|
||||
type: string
|
||||
type: object
|
||||
udp_ports_object:
|
||||
description: FirewallRuleSpec defines the desired state of FirewallRule.
|
||||
properties:
|
||||
id:
|
||||
type: string
|
||||
name:
|
||||
type: string
|
||||
type: object
|
||||
type: object
|
||||
syncedWithUnifi:
|
||||
description: SyncedWithUnifi indicates whether the addresses are successfully
|
||||
pushed
|
||||
|
||||
@@ -37,15 +37,90 @@ spec:
|
||||
metadata:
|
||||
type: object
|
||||
spec:
|
||||
description: FirewallRuleSpec defines the desired state of FirewallRule.
|
||||
properties:
|
||||
foo:
|
||||
description: Foo is an example field of FirewallRule. Edit firewallrule_types.go
|
||||
to remove/update
|
||||
destination:
|
||||
properties:
|
||||
firewall_groups:
|
||||
items:
|
||||
properties:
|
||||
name:
|
||||
type: string
|
||||
namespace:
|
||||
type: string
|
||||
type: object
|
||||
type: array
|
||||
services:
|
||||
items:
|
||||
properties:
|
||||
name:
|
||||
type: string
|
||||
namespace:
|
||||
type: string
|
||||
type: object
|
||||
type: array
|
||||
type: object
|
||||
match_firewall_groups_in_all_namespaces:
|
||||
type: boolean
|
||||
match_services_in_all_namespaces:
|
||||
type: boolean
|
||||
name:
|
||||
type: string
|
||||
source:
|
||||
properties:
|
||||
from_networks:
|
||||
items:
|
||||
properties:
|
||||
name:
|
||||
type: string
|
||||
namespace:
|
||||
type: string
|
||||
type: object
|
||||
type: array
|
||||
from_zones:
|
||||
items:
|
||||
properties:
|
||||
name:
|
||||
type: string
|
||||
namespace:
|
||||
type: string
|
||||
type: object
|
||||
type: array
|
||||
type: object
|
||||
required:
|
||||
- destination
|
||||
- name
|
||||
- source
|
||||
type: object
|
||||
status:
|
||||
description: FirewallRuleStatus defines the observed state of FirewallRule.
|
||||
properties:
|
||||
resources_managed:
|
||||
properties:
|
||||
firewall_groups_managed:
|
||||
items:
|
||||
properties:
|
||||
name:
|
||||
type: string
|
||||
namespace:
|
||||
type: string
|
||||
type: object
|
||||
type: array
|
||||
firewall_rules_managed:
|
||||
items:
|
||||
properties:
|
||||
from:
|
||||
type: string
|
||||
rule_id:
|
||||
type: string
|
||||
to:
|
||||
type: string
|
||||
required:
|
||||
- from
|
||||
- rule_id
|
||||
- to
|
||||
type: object
|
||||
type: array
|
||||
type: object
|
||||
type: object
|
||||
type: object
|
||||
served: true
|
||||
|
||||
@@ -54,6 +54,20 @@ spec:
|
||||
type: object
|
||||
status:
|
||||
description: FirewallZoneStatus defines the observed state of FirewallZone.
|
||||
properties:
|
||||
resources_managed:
|
||||
properties:
|
||||
firewall_zones_managed:
|
||||
items:
|
||||
description: FirewallRuleSpec defines the desired state of FirewallRule.
|
||||
properties:
|
||||
id:
|
||||
type: string
|
||||
name:
|
||||
type: string
|
||||
type: object
|
||||
type: array
|
||||
type: object
|
||||
type: object
|
||||
type: object
|
||||
served: true
|
||||
|
||||
@@ -40,9 +40,11 @@ spec:
|
||||
spec:
|
||||
description: NetworkconfigurationSpec defines the desired state of Networkconfiguration.
|
||||
properties:
|
||||
enabled:
|
||||
_id:
|
||||
description: Foo is an example field of Networkconfiguration. Edit
|
||||
networkconfiguration_types.go to remove/update
|
||||
type: string
|
||||
enabled:
|
||||
type: boolean
|
||||
firewall_zone:
|
||||
type: string
|
||||
@@ -62,8 +64,6 @@ spec:
|
||||
type: string
|
||||
name:
|
||||
type: string
|
||||
network_id:
|
||||
type: string
|
||||
networkgroup:
|
||||
type: string
|
||||
purpose:
|
||||
@@ -93,6 +93,19 @@ spec:
|
||||
description: LastSyncTime is the last time the object was synced
|
||||
format: date-time
|
||||
type: string
|
||||
resources_managed:
|
||||
properties:
|
||||
networks_managed:
|
||||
items:
|
||||
description: FirewallRuleSpec defines the desired state of FirewallRule.
|
||||
properties:
|
||||
id:
|
||||
type: string
|
||||
name:
|
||||
type: string
|
||||
type: object
|
||||
type: array
|
||||
type: object
|
||||
syncedWithUnifi:
|
||||
description: SyncedWithUnifi indicates whether the addresses are successfully
|
||||
pushed
|
||||
|
||||
@@ -6,4 +6,3 @@ metadata:
|
||||
app.kubernetes.io/managed-by: kustomize
|
||||
name: firewallrule-sample
|
||||
spec:
|
||||
# TODO(user): Add fields here
|
||||
|
||||
2
go.mod
2
go.mod
@@ -9,7 +9,7 @@ godebug default=go1.23
|
||||
require (
|
||||
github.com/onsi/ginkgo/v2 v2.23.4
|
||||
github.com/onsi/gomega v1.37.0
|
||||
github.com/vegardengen/go-unifi v0.0.1-alpha9
|
||||
github.com/vegardengen/go-unifi v0.0.1-alpha25
|
||||
k8s.io/api v0.32.1
|
||||
k8s.io/apimachinery v0.32.1
|
||||
k8s.io/client-go v0.32.1
|
||||
|
||||
30
go.sum
30
go.sum
@@ -1080,8 +1080,38 @@ github.com/vbatts/tar-split v0.11.5 h1:3bHCTIheBm1qFTcgh9oPu+nNBtX+XJIupG/vacinC
|
||||
github.com/vbatts/tar-split v0.11.5/go.mod h1:yZbwRsSeGjusneWgA781EKej9HF8vme8okylkAeNKLk=
|
||||
github.com/vegardengen/go-unifi v0.0.1-alpha1 h1:PF1Y4NH/bfk6A7PLGxiqAhQkrfPau0B1vSayfmqlbRM=
|
||||
github.com/vegardengen/go-unifi v0.0.1-alpha1/go.mod h1:iwGJACYaRNb8eElwajOM7uYtyZraV9+5171gv3Q1QSc=
|
||||
github.com/vegardengen/go-unifi v0.0.1-alpha11 h1:+2eOU2jkJSji6YYVHUfQht/tjfGeLZCQlNGD2Oh7ndE=
|
||||
github.com/vegardengen/go-unifi v0.0.1-alpha11/go.mod h1:iwGJACYaRNb8eElwajOM7uYtyZraV9+5171gv3Q1QSc=
|
||||
github.com/vegardengen/go-unifi v0.0.1-alpha12 h1:1g0JGmB1FivG0nU9EvZVyZkX5i+HR3qRGto0jk4k8hU=
|
||||
github.com/vegardengen/go-unifi v0.0.1-alpha12/go.mod h1:iwGJACYaRNb8eElwajOM7uYtyZraV9+5171gv3Q1QSc=
|
||||
github.com/vegardengen/go-unifi v0.0.1-alpha13 h1:MEFYSlYGBmbSkxTAJ4i89iV2ji5wrvDsRgx4LmuCz3Y=
|
||||
github.com/vegardengen/go-unifi v0.0.1-alpha13/go.mod h1:iwGJACYaRNb8eElwajOM7uYtyZraV9+5171gv3Q1QSc=
|
||||
github.com/vegardengen/go-unifi v0.0.1-alpha14 h1:O5vrSemL/XbX+9aNmovYNE0xAtdurVa3TawN2wBaUbs=
|
||||
github.com/vegardengen/go-unifi v0.0.1-alpha14/go.mod h1:iwGJACYaRNb8eElwajOM7uYtyZraV9+5171gv3Q1QSc=
|
||||
github.com/vegardengen/go-unifi v0.0.1-alpha15 h1:qjmfOmxDBu8/pSKiWP7YQzh8qZEUUJ9S4vs93GjfeqM=
|
||||
github.com/vegardengen/go-unifi v0.0.1-alpha15/go.mod h1:iwGJACYaRNb8eElwajOM7uYtyZraV9+5171gv3Q1QSc=
|
||||
github.com/vegardengen/go-unifi v0.0.1-alpha16 h1:OVVaOjYO8dh32fF1BQxSrRoV878ZBLtB/KQx9jIe9Ak=
|
||||
github.com/vegardengen/go-unifi v0.0.1-alpha16/go.mod h1:iwGJACYaRNb8eElwajOM7uYtyZraV9+5171gv3Q1QSc=
|
||||
github.com/vegardengen/go-unifi v0.0.1-alpha17 h1:SoSStxP7CV+lxlKg2mqfadpXCQ2xhwRwM78sdxtPmKU=
|
||||
github.com/vegardengen/go-unifi v0.0.1-alpha17/go.mod h1:iwGJACYaRNb8eElwajOM7uYtyZraV9+5171gv3Q1QSc=
|
||||
github.com/vegardengen/go-unifi v0.0.1-alpha18 h1:vUaALQmoRzP1z764GCzfQLt1IjnlG/ODJvNxx0B84D4=
|
||||
github.com/vegardengen/go-unifi v0.0.1-alpha18/go.mod h1:iwGJACYaRNb8eElwajOM7uYtyZraV9+5171gv3Q1QSc=
|
||||
github.com/vegardengen/go-unifi v0.0.1-alpha19 h1:B1U2hXNT/6HHsw92oHElhwpuYvwIUCvCdQ5D/tOik4o=
|
||||
github.com/vegardengen/go-unifi v0.0.1-alpha19/go.mod h1:iwGJACYaRNb8eElwajOM7uYtyZraV9+5171gv3Q1QSc=
|
||||
github.com/vegardengen/go-unifi v0.0.1-alpha2 h1:2aVWpzi+i1X4rVFLOphAp7ZoTvER/rySzvpdB5cul4I=
|
||||
github.com/vegardengen/go-unifi v0.0.1-alpha2/go.mod h1:iwGJACYaRNb8eElwajOM7uYtyZraV9+5171gv3Q1QSc=
|
||||
github.com/vegardengen/go-unifi v0.0.1-alpha20 h1:kQ+QQ1IYGwvjLkoXYBEU4gSD2yQj+9FwHtMf7+GQlok=
|
||||
github.com/vegardengen/go-unifi v0.0.1-alpha20/go.mod h1:iwGJACYaRNb8eElwajOM7uYtyZraV9+5171gv3Q1QSc=
|
||||
github.com/vegardengen/go-unifi v0.0.1-alpha21 h1:a+yPTu97ETRdkhmKltMrJTo28qA0GPWctPFyICLCUZw=
|
||||
github.com/vegardengen/go-unifi v0.0.1-alpha21/go.mod h1:iwGJACYaRNb8eElwajOM7uYtyZraV9+5171gv3Q1QSc=
|
||||
github.com/vegardengen/go-unifi v0.0.1-alpha22 h1:2axPhv/S6bawsh7n3/ik4oBcRHNFjrTykOzgTRd+LnU=
|
||||
github.com/vegardengen/go-unifi v0.0.1-alpha22/go.mod h1:iwGJACYaRNb8eElwajOM7uYtyZraV9+5171gv3Q1QSc=
|
||||
github.com/vegardengen/go-unifi v0.0.1-alpha23 h1:PFKiAKy9u8s04a8cjSRIJa6N3BfPYQW8NmpEtXi+KJM=
|
||||
github.com/vegardengen/go-unifi v0.0.1-alpha23/go.mod h1:iwGJACYaRNb8eElwajOM7uYtyZraV9+5171gv3Q1QSc=
|
||||
github.com/vegardengen/go-unifi v0.0.1-alpha24 h1:0L5aRrQEdXBQAzO/AK/OaA/Gt2ymA8pzA8MoAk12aOc=
|
||||
github.com/vegardengen/go-unifi v0.0.1-alpha24/go.mod h1:iwGJACYaRNb8eElwajOM7uYtyZraV9+5171gv3Q1QSc=
|
||||
github.com/vegardengen/go-unifi v0.0.1-alpha25 h1:GAwtNpMslE6/0IfM80cWFaMqwqsn+NXlUVsvauN7v68=
|
||||
github.com/vegardengen/go-unifi v0.0.1-alpha25/go.mod h1:iwGJACYaRNb8eElwajOM7uYtyZraV9+5171gv3Q1QSc=
|
||||
github.com/vegardengen/go-unifi v0.0.1-alpha3 h1:ppllnTPduJIRZWSVLh9oGNXjo4L2hVzpVzCxvRhLSpM=
|
||||
github.com/vegardengen/go-unifi v0.0.1-alpha3/go.mod h1:iwGJACYaRNb8eElwajOM7uYtyZraV9+5171gv3Q1QSc=
|
||||
github.com/vegardengen/go-unifi v0.0.1-alpha4 h1:ZqdkYf/DRBwc1O+TwNsEAuMiXEv4j82XWbhbcMqUDnU=
|
||||
|
||||
@@ -1,45 +1,44 @@
|
||||
package config
|
||||
|
||||
import (
|
||||
"context"
|
||||
"sync"
|
||||
"context"
|
||||
"sync"
|
||||
|
||||
corev1 "k8s.io/api/core/v1"
|
||||
"k8s.io/apimachinery/pkg/types"
|
||||
"sigs.k8s.io/controller-runtime/pkg/client"
|
||||
corev1 "k8s.io/api/core/v1"
|
||||
"k8s.io/apimachinery/pkg/types"
|
||||
"sigs.k8s.io/controller-runtime/pkg/client"
|
||||
)
|
||||
|
||||
type ConfigLoaderType struct {
|
||||
Client client.Client
|
||||
Client client.Client
|
||||
|
||||
mu sync.Mutex
|
||||
loaded bool
|
||||
config *corev1.ConfigMap
|
||||
err error
|
||||
mu sync.Mutex
|
||||
loaded bool
|
||||
config *corev1.ConfigMap
|
||||
err error
|
||||
}
|
||||
|
||||
func NewConfigLoader(k8sClient client.Client) *ConfigLoaderType {
|
||||
return &ConfigLoaderType{Client: k8sClient}
|
||||
return &ConfigLoaderType{Client: k8sClient}
|
||||
}
|
||||
|
||||
func (c *ConfigLoaderType) GetConfig(ctx context.Context, name string) (*corev1.ConfigMap, error) {
|
||||
c.mu.Lock()
|
||||
defer c.mu.Unlock()
|
||||
c.mu.Lock()
|
||||
defer c.mu.Unlock()
|
||||
|
||||
if c.loaded {
|
||||
return c.config, c.err
|
||||
}
|
||||
if c.loaded {
|
||||
return c.config, c.err
|
||||
}
|
||||
|
||||
cm := &corev1.ConfigMap{}
|
||||
err := c.Client.Get(ctx, types.NamespacedName{
|
||||
Name: name,
|
||||
Namespace: "unifi-network-operator-system",
|
||||
}, cm)
|
||||
cm := &corev1.ConfigMap{}
|
||||
err := c.Client.Get(ctx, types.NamespacedName{
|
||||
Name: name,
|
||||
Namespace: "unifi-network-operator-system",
|
||||
}, cm)
|
||||
|
||||
c.loaded = true
|
||||
c.config = cm
|
||||
c.err = err
|
||||
c.loaded = true
|
||||
c.config = cm
|
||||
c.err = err
|
||||
|
||||
return cm, err
|
||||
return cm, err
|
||||
}
|
||||
|
||||
|
||||
@@ -21,10 +21,10 @@ import (
|
||||
"fmt"
|
||||
"net"
|
||||
"reflect"
|
||||
"regexp"
|
||||
"slices"
|
||||
"strconv"
|
||||
"strings"
|
||||
"regexp"
|
||||
|
||||
corev1 "k8s.io/api/core/v1"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
@@ -39,15 +39,15 @@ import (
|
||||
|
||||
goUnifi "github.com/vegardengen/go-unifi/unifi"
|
||||
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"
|
||||
"github.com/vegardengen/unifi-network-operator/internal/unifi"
|
||||
)
|
||||
|
||||
// FirewallGroupReconciler reconciles a FirewallGroup object
|
||||
type FirewallGroupReconciler struct {
|
||||
client.Client
|
||||
Scheme *runtime.Scheme
|
||||
UnifiClient *unifi.UnifiClient
|
||||
Scheme *runtime.Scheme
|
||||
UnifiClient *unifi.UnifiClient
|
||||
ConfigLoader *config.ConfigLoaderType
|
||||
}
|
||||
|
||||
@@ -69,13 +69,13 @@ type FirewallGroupReconciler struct {
|
||||
|
||||
func (r *FirewallGroupReconciler) Reconcile(ctx context.Context, req reconcile.Request) (reconcile.Result, error) {
|
||||
log := log.FromContext(ctx)
|
||||
|
||||
cfg, err := r.ConfigLoader.GetConfig(ctx, "unifi-operator-config")
|
||||
if err != nil {
|
||||
return ctrl.Result{}, err
|
||||
}
|
||||
|
||||
defaultNs := cfg.Data["defaultNamespace"]
|
||||
cfg, err := r.ConfigLoader.GetConfig(ctx, "unifi-operator-config")
|
||||
if err != nil {
|
||||
return ctrl.Result{}, err
|
||||
}
|
||||
|
||||
defaultNs := cfg.Data["defaultNamespace"]
|
||||
log.Info(defaultNs)
|
||||
|
||||
var nwObj unifiv1beta1.FirewallGroup
|
||||
@@ -118,19 +118,19 @@ func (r *FirewallGroupReconciler) Reconcile(ctx context.Context, req reconcile.R
|
||||
port_type := "tcp"
|
||||
port := portEntry
|
||||
if match, _ := regexp.MatchString("(?:tcp|udp)\\/?)\\d+", string(portEntry)); match {
|
||||
fields := strings.Split("/",portEntry)
|
||||
port_type = fields[0]
|
||||
port = fields[1]
|
||||
fields := strings.Split("/", portEntry)
|
||||
port_type = fields[0]
|
||||
port = fields[1]
|
||||
}
|
||||
if(port_type == "tcp") {
|
||||
if !slices.Contains(tcpports, port) {
|
||||
tcpports = append(tcpports, port)
|
||||
}
|
||||
if port_type == "tcp" {
|
||||
if !slices.Contains(tcpports, port) {
|
||||
tcpports = append(tcpports, port)
|
||||
}
|
||||
}
|
||||
if(port_type == "udp") {
|
||||
if !slices.Contains(udpports, port) {
|
||||
tcpports = append(udpports, port)
|
||||
}
|
||||
if port_type == "udp" {
|
||||
if !slices.Contains(udpports, port) {
|
||||
tcpports = append(udpports, port)
|
||||
}
|
||||
}
|
||||
}
|
||||
var services corev1.ServiceList
|
||||
@@ -146,8 +146,18 @@ func (r *FirewallGroupReconciler) Reconcile(ctx context.Context, req reconcile.R
|
||||
return reconcile.Result{}, err
|
||||
}
|
||||
}
|
||||
serviceNamespaceNames := make(map[string]struct{})
|
||||
for _, serviceEntry := range nwObj.Spec.ManualServices {
|
||||
serviceNamespaceNames[serviceEntry.Namespace+"/"+serviceEntry.Name] = struct{}{}
|
||||
}
|
||||
log.Info(fmt.Sprintf("Manually specified: %+v", serviceNamespaceNames))
|
||||
for _, service := range services.Items {
|
||||
if val, found := service.Annotations["unifi.engen.priv.no/firewall-group"]; found && val == nwObj.Name && service.Status.LoadBalancer.Ingress != nil {
|
||||
_, manually_specified := serviceNamespaceNames[service.Namespace+"/"+service.Name]
|
||||
val, found := service.Annotations["unifi.engen.priv.no/firewall-group"]
|
||||
log.Info(fmt.Sprintf("%s %sv %+v %+v", service.Name, val, manually_specified, found))
|
||||
|
||||
// if val, found := service.Annotations["unifi.engen.priv.no/firewall-group"]; (manually_specified || (found && val == nwObj.Name)) && service.Status.LoadBalancer.Ingress != nil {
|
||||
if (manually_specified || (found && val == nwObj.Name)) && service.Status.LoadBalancer.Ingress != nil {
|
||||
for _, ingress := range service.Status.LoadBalancer.Ingress {
|
||||
if ingress.IP != "" {
|
||||
ip := ingress.IP
|
||||
@@ -162,26 +172,47 @@ func (r *FirewallGroupReconciler) Reconcile(ctx context.Context, req reconcile.R
|
||||
for _, portSpec := range service.Spec.Ports {
|
||||
log.Info(fmt.Sprintf("portSpec: %+v", portSpec))
|
||||
log.Info(fmt.Sprintf("Port: %s %d", strconv.Itoa(int(portSpec.Port)), portSpec.Port))
|
||||
if(portSpec.Protocol == "TCP") {
|
||||
if !slices.Contains(tcpports, strconv.Itoa(int(portSpec.Port))) {
|
||||
tcpports = append(tcpports, strconv.Itoa(int(portSpec.Port)))
|
||||
}
|
||||
if portSpec.Protocol == "TCP" {
|
||||
if !slices.Contains(tcpports, strconv.Itoa(int(portSpec.Port))) {
|
||||
tcpports = append(tcpports, strconv.Itoa(int(portSpec.Port)))
|
||||
}
|
||||
}
|
||||
if(portSpec.Protocol == "UDP") {
|
||||
if !slices.Contains(udpports, strconv.Itoa(int(portSpec.Port))) {
|
||||
udpports = append(udpports, strconv.Itoa(int(portSpec.Port)))
|
||||
}
|
||||
if portSpec.Protocol == "UDP" {
|
||||
if !slices.Contains(udpports, strconv.Itoa(int(portSpec.Port))) {
|
||||
udpports = append(udpports, strconv.Itoa(int(portSpec.Port)))
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
nwObj.Status.ResolvedAddresses = ipv4
|
||||
nwObj.Status.ResolvedAddresses = append(nwObj.Status.ResolvedAddresses, ipv6...)
|
||||
nwObj.Status.ResolvedIPV4Addresses = ipv4
|
||||
nwObj.Status.ResolvedIPV6Addresses = ipv6
|
||||
nwObj.Status.ResolvedTCPPorts = tcpports
|
||||
nwObj.Status.ResolvedUDPPorts = udpports
|
||||
currentTime := metav1.Now()
|
||||
nwObj.Status.LastSyncTime = ¤tTime
|
||||
nwObj.Status.SyncedWithUnifi = true
|
||||
|
||||
if nwObj.Status.ResourcesManaged == nil {
|
||||
nwObj.Status.ResourcesManaged = &unifiv1beta1.FirewallGroupResourcesManaged{
|
||||
IPV4Object: &unifiv1beta1.NamedUnifiResource{
|
||||
ID: "",
|
||||
Name: "",
|
||||
},
|
||||
IPV6Object: &unifiv1beta1.NamedUnifiResource{
|
||||
ID: "",
|
||||
Name: "",
|
||||
},
|
||||
TCPPortsObject: &unifiv1beta1.NamedUnifiResource{
|
||||
ID: "",
|
||||
Name: "",
|
||||
},
|
||||
UDPPortsObject: &unifiv1beta1.NamedUnifiResource{
|
||||
ID: "",
|
||||
Name: "",
|
||||
},
|
||||
}
|
||||
}
|
||||
err = r.UnifiClient.Reauthenticate()
|
||||
if err != nil {
|
||||
return reconcile.Result{}, err
|
||||
@@ -216,10 +247,14 @@ func (r *FirewallGroupReconciler) Reconcile(ctx context.Context, req reconcile.R
|
||||
log.Error(updateerr, "Could neither delete or rename firewall group")
|
||||
return reconcile.Result{}, updateerr
|
||||
}
|
||||
nwObj.Status.ResourcesManaged.IPV4Object.Name = firewall_group.Name
|
||||
} else {
|
||||
log.Error(err, "Could not delete firewall group")
|
||||
return reconcile.Result{}, err
|
||||
}
|
||||
} else {
|
||||
nwObj.Status.ResourcesManaged.IPV4Object.Name = ""
|
||||
nwObj.Status.ResourcesManaged.IPV4Object.ID = ""
|
||||
}
|
||||
ipv4_done = true
|
||||
} else {
|
||||
@@ -251,10 +286,14 @@ func (r *FirewallGroupReconciler) Reconcile(ctx context.Context, req reconcile.R
|
||||
log.Error(updateerr, "Could neither delete or rename firewall group")
|
||||
return reconcile.Result{}, updateerr
|
||||
}
|
||||
nwObj.Status.ResourcesManaged.IPV6Object.Name = firewall_group.Name
|
||||
} else {
|
||||
log.Error(err, "Could not delete firewall group")
|
||||
return reconcile.Result{}, err
|
||||
}
|
||||
} else {
|
||||
nwObj.Status.ResourcesManaged.IPV6Object.Name = ""
|
||||
nwObj.Status.ResourcesManaged.IPV6Object.ID = ""
|
||||
}
|
||||
ipv6_done = true
|
||||
} else {
|
||||
@@ -279,17 +318,21 @@ func (r *FirewallGroupReconciler) Reconcile(ctx context.Context, req reconcile.R
|
||||
log.Info(msg)
|
||||
if strings.Contains(msg, "api.err.objectreferredby") {
|
||||
log.Info("Firewall group is in use. Invoking workaround...!")
|
||||
firewall_group.GroupMembers = []string{"127.0.0.1"}
|
||||
firewall_group.GroupMembers = []string{"0"}
|
||||
firewall_group.Name = firewall_group.Name + "-deleted"
|
||||
_, updateerr := r.UnifiClient.Client.UpdateFirewallGroup(context.Background(), r.UnifiClient.SiteID, &firewall_group)
|
||||
if updateerr != nil {
|
||||
log.Error(updateerr, "Could neither delete or rename firewall group")
|
||||
return reconcile.Result{}, updateerr
|
||||
}
|
||||
nwObj.Status.ResourcesManaged.TCPPortsObject.Name = firewall_group.Name
|
||||
} else {
|
||||
log.Error(err, "Could not delete firewall group")
|
||||
return reconcile.Result{}, err
|
||||
}
|
||||
} else {
|
||||
nwObj.Status.ResourcesManaged.TCPPortsObject.Name = ""
|
||||
nwObj.Status.ResourcesManaged.TCPPortsObject.ID = ""
|
||||
}
|
||||
tcpports_done = true
|
||||
} else {
|
||||
@@ -321,10 +364,14 @@ func (r *FirewallGroupReconciler) Reconcile(ctx context.Context, req reconcile.R
|
||||
log.Error(updateerr, "Could neither delete or rename firewall group")
|
||||
return reconcile.Result{}, updateerr
|
||||
}
|
||||
nwObj.Status.ResourcesManaged.UDPPortsObject.Name = firewall_group.Name
|
||||
} else {
|
||||
log.Error(err, "Could not delete firewall group")
|
||||
return reconcile.Result{}, err
|
||||
}
|
||||
} else {
|
||||
nwObj.Status.ResourcesManaged.UDPPortsObject.Name = ""
|
||||
nwObj.Status.ResourcesManaged.UDPPortsObject.ID = ""
|
||||
}
|
||||
udpports_done = true
|
||||
} else {
|
||||
@@ -349,6 +396,7 @@ func (r *FirewallGroupReconciler) Reconcile(ctx context.Context, req reconcile.R
|
||||
log.Error(err, "Could not update firewall group")
|
||||
return reconcile.Result{}, err
|
||||
}
|
||||
nwObj.Status.ResourcesManaged.IPV4Object.Name = firewall_group.Name
|
||||
ipv4_done = true
|
||||
}
|
||||
if firewall_group.Name == ipv6_name+"-deleted" && len(ipv6) > 0 {
|
||||
@@ -360,6 +408,7 @@ func (r *FirewallGroupReconciler) Reconcile(ctx context.Context, req reconcile.R
|
||||
log.Error(err, "Could not update firewall group")
|
||||
return reconcile.Result{}, err
|
||||
}
|
||||
nwObj.Status.ResourcesManaged.IPV4Object.Name = firewall_group.Name
|
||||
ipv6_done = true
|
||||
}
|
||||
if firewall_group.Name == tcpports_name+"-deleted" && len(tcpports) > 0 {
|
||||
@@ -371,6 +420,7 @@ func (r *FirewallGroupReconciler) Reconcile(ctx context.Context, req reconcile.R
|
||||
log.Error(err, "Could not update firewall group")
|
||||
return reconcile.Result{}, err
|
||||
}
|
||||
nwObj.Status.ResourcesManaged.TCPPortsObject.Name = firewall_group.Name
|
||||
tcpports_done = true
|
||||
}
|
||||
if firewall_group.Name == udpports_name+"-deleted" && len(udpports) > 0 {
|
||||
@@ -382,6 +432,7 @@ func (r *FirewallGroupReconciler) Reconcile(ctx context.Context, req reconcile.R
|
||||
log.Error(err, "Could not update firewall group")
|
||||
return reconcile.Result{}, err
|
||||
}
|
||||
nwObj.Status.ResourcesManaged.UDPPortsObject.Name = firewall_group.Name
|
||||
udpports_done = true
|
||||
}
|
||||
}
|
||||
@@ -392,11 +443,19 @@ func (r *FirewallGroupReconciler) Reconcile(ctx context.Context, req reconcile.R
|
||||
firewall_group.SiteID = r.UnifiClient.SiteID
|
||||
firewall_group.GroupMembers = ipv4
|
||||
firewall_group.GroupType = "address-group"
|
||||
_, err := r.UnifiClient.Client.CreateFirewallGroup(context.Background(), r.UnifiClient.SiteID, &firewall_group)
|
||||
firewall_group_result, err := r.UnifiClient.Client.CreateFirewallGroup(context.Background(), r.UnifiClient.SiteID, &firewall_group)
|
||||
log.Info(fmt.Sprintf("%+v", firewall_group_result))
|
||||
if err != nil {
|
||||
log.Error(err, "Could not create firewall group")
|
||||
return reconcile.Result{}, err
|
||||
} else {
|
||||
firewall_group = *firewall_group_result
|
||||
}
|
||||
|
||||
log.Info(fmt.Sprintf("ID and name: %s %s", firewall_group.ID, firewall_group.Name))
|
||||
log.Info(fmt.Sprintf("%+v", firewall_group))
|
||||
nwObj.Status.ResourcesManaged.IPV4Object.ID = firewall_group.ID
|
||||
nwObj.Status.ResourcesManaged.IPV4Object.Name = firewall_group.Name
|
||||
}
|
||||
if len(ipv6) > 0 && !ipv6_done {
|
||||
log.Info(fmt.Sprintf("Creating %s", ipv6_name))
|
||||
@@ -405,11 +464,17 @@ func (r *FirewallGroupReconciler) Reconcile(ctx context.Context, req reconcile.R
|
||||
firewall_group.SiteID = r.UnifiClient.SiteID
|
||||
firewall_group.GroupMembers = ipv6
|
||||
firewall_group.GroupType = "ipv6-address-group"
|
||||
_, err := r.UnifiClient.Client.CreateFirewallGroup(context.Background(), r.UnifiClient.SiteID, &firewall_group)
|
||||
firewall_group_result, err := r.UnifiClient.Client.CreateFirewallGroup(context.Background(), r.UnifiClient.SiteID, &firewall_group)
|
||||
log.Info(fmt.Sprintf("%+v", firewall_group_result))
|
||||
if err != nil {
|
||||
log.Error(err, "Could not create firewall group")
|
||||
return reconcile.Result{}, err
|
||||
} else {
|
||||
firewall_group = *firewall_group_result
|
||||
}
|
||||
nwObj.Status.ResourcesManaged.IPV6Object.ID = firewall_group.ID
|
||||
nwObj.Status.ResourcesManaged.IPV6Object.Name = firewall_group.Name
|
||||
|
||||
}
|
||||
if len(tcpports) > 0 && !tcpports_done {
|
||||
log.Info(fmt.Sprintf("Creating %s", tcpports_name))
|
||||
@@ -419,11 +484,15 @@ func (r *FirewallGroupReconciler) Reconcile(ctx context.Context, req reconcile.R
|
||||
firewall_group.GroupMembers = tcpports
|
||||
firewall_group.GroupType = "port-group"
|
||||
log.Info(fmt.Sprintf("Trying to apply: %+v", firewall_group))
|
||||
_, err := r.UnifiClient.Client.CreateFirewallGroup(context.Background(), r.UnifiClient.SiteID, &firewall_group)
|
||||
firewall_group_result, err := r.UnifiClient.Client.CreateFirewallGroup(context.Background(), r.UnifiClient.SiteID, &firewall_group)
|
||||
if err != nil {
|
||||
log.Error(err, "Could not create firewall group")
|
||||
return reconcile.Result{}, err
|
||||
} else {
|
||||
firewall_group = *firewall_group_result
|
||||
}
|
||||
nwObj.Status.ResourcesManaged.TCPPortsObject.ID = firewall_group.ID
|
||||
nwObj.Status.ResourcesManaged.TCPPortsObject.Name = firewall_group.Name
|
||||
}
|
||||
if len(udpports) > 0 && !udpports_done {
|
||||
log.Info(fmt.Sprintf("Creating %s", udpports_name))
|
||||
@@ -433,12 +502,18 @@ func (r *FirewallGroupReconciler) Reconcile(ctx context.Context, req reconcile.R
|
||||
firewall_group.GroupMembers = udpports
|
||||
firewall_group.GroupType = "port-group"
|
||||
log.Info(fmt.Sprintf("Trying to apply: %+v", firewall_group))
|
||||
_, err := r.UnifiClient.Client.CreateFirewallGroup(context.Background(), r.UnifiClient.SiteID, &firewall_group)
|
||||
firewall_group_result, err := r.UnifiClient.Client.CreateFirewallGroup(context.Background(), r.UnifiClient.SiteID, &firewall_group)
|
||||
log.Info(fmt.Sprintf("%+v", firewall_group_result))
|
||||
if err != nil {
|
||||
log.Error(err, "Could not create firewall group")
|
||||
return reconcile.Result{}, err
|
||||
} else {
|
||||
firewall_group = *firewall_group_result
|
||||
}
|
||||
nwObj.Status.ResourcesManaged.UDPPortsObject.ID = firewall_group.ID
|
||||
nwObj.Status.ResourcesManaged.UDPPortsObject.Name = firewall_group.Name
|
||||
}
|
||||
log.Info(fmt.Sprintf("Updating status for %s: %+v", nwObj.Name, nwObj.Status))
|
||||
if err := r.Status().Update(ctx, &nwObj); err != nil {
|
||||
log.Error(err, "unable to update FirewallGroup status")
|
||||
return reconcile.Result{}, err
|
||||
|
||||
@@ -18,22 +18,30 @@ package controller
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
// "strings"
|
||||
"encoding/json"
|
||||
"time"
|
||||
|
||||
corev1 "k8s.io/api/core/v1"
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
"k8s.io/apimachinery/pkg/types"
|
||||
ctrl "sigs.k8s.io/controller-runtime"
|
||||
"sigs.k8s.io/controller-runtime/pkg/client"
|
||||
"sigs.k8s.io/controller-runtime/pkg/handler"
|
||||
"sigs.k8s.io/controller-runtime/pkg/log"
|
||||
|
||||
goUnifi "github.com/vegardengen/go-unifi/unifi"
|
||||
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"
|
||||
"github.com/vegardengen/unifi-network-operator/internal/unifi"
|
||||
)
|
||||
|
||||
// FirewallRuleReconciler reconciles a FirewallRule object
|
||||
type FirewallRuleReconciler struct {
|
||||
client.Client
|
||||
Scheme *runtime.Scheme
|
||||
UnifiClient *unifi.UnifiClient
|
||||
Scheme *runtime.Scheme
|
||||
UnifiClient *unifi.UnifiClient
|
||||
ConfigLoader *config.ConfigLoaderType
|
||||
}
|
||||
|
||||
@@ -41,6 +49,7 @@ type FirewallRuleReconciler struct {
|
||||
// +kubebuilder:rbac:groups=unifi.engen.priv.no,resources=firewallrules/status,verbs=get;update;patch
|
||||
// +kubebuilder:rbac:groups=unifi.engen.priv.no,resources=firewallrules/finalizers,verbs=update
|
||||
// +kubebuilder:rbac:groups="",resources=configmaps,verbs=list;get;watch
|
||||
// +kubebuilder:rbac:groups="",resources=services,verbs=list;get;watch
|
||||
|
||||
// Reconcile is part of the main kubernetes reconciliation loop which aims to
|
||||
// move the current state of the cluster closer to the desired state.
|
||||
@@ -51,26 +60,601 @@ type FirewallRuleReconciler struct {
|
||||
//
|
||||
// For more details, check Reconcile and its Result here:
|
||||
// - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.20.2/pkg/reconcile
|
||||
|
||||
func fillDefaultRule() goUnifi.FirewallPolicy {
|
||||
var firewallRule goUnifi.FirewallPolicy
|
||||
firewallRule.Action = "ALLOW"
|
||||
firewallRule.CreateAllowRespond = true
|
||||
firewallRule.ConnectionStateType = "ALL"
|
||||
firewallRule.ConnectionStates = []string{}
|
||||
firewallRule.Destination = goUnifi.FirewallDestination{
|
||||
MatchOppositePorts: false,
|
||||
MatchingTarget: "IP",
|
||||
MatchingTargetType: "OBJECT",
|
||||
}
|
||||
firewallRule.Enabled = true
|
||||
firewallRule.ICMPTypename = "ANY"
|
||||
firewallRule.ICMPV6Typename = "ANY"
|
||||
firewallRule.MatchIPSec = false
|
||||
firewallRule.MatchOppositeProtocol = false
|
||||
firewallRule.Predefined = false
|
||||
firewallRule.Schedule = goUnifi.FirewallSchedule{
|
||||
Mode: "ALWAYS",
|
||||
RepeatOnDays: []string{},
|
||||
TimeAllDay: false,
|
||||
}
|
||||
firewallRule.Source = goUnifi.FirewallSource{
|
||||
MatchMac: false,
|
||||
MatchOppositePorts: false,
|
||||
MatchOppositeNetworks: false,
|
||||
}
|
||||
|
||||
return firewallRule
|
||||
}
|
||||
|
||||
func (r *FirewallRuleReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
|
||||
log := log.FromContext(ctx)
|
||||
|
||||
// TODO(user): your logic here
|
||||
|
||||
cfg, err := r.ConfigLoader.GetConfig(ctx, "unifi-operator-config")
|
||||
if err != nil {
|
||||
return ctrl.Result{}, err
|
||||
}
|
||||
if err != nil {
|
||||
return ctrl.Result{}, err
|
||||
}
|
||||
|
||||
defaultNs := cfg.Data["defaultNamespace"]
|
||||
defaultNs := cfg.Data["defaultNamespace"]
|
||||
kubernetesZone := cfg.Data["kubernetesUnifiZone"]
|
||||
var kubernetesZoneID string
|
||||
log.Info(defaultNs)
|
||||
log.Info(kubernetesZone)
|
||||
|
||||
var firewallRule unifiv1beta1.FirewallRule
|
||||
|
||||
if err := r.Get(ctx, req.NamespacedName, &firewallRule); err != nil {
|
||||
return ctrl.Result{}, client.IgnoreNotFound(err)
|
||||
}
|
||||
log.Info(firewallRule.Spec.Name)
|
||||
|
||||
if firewallRule.Status.ResourcesManaged == nil {
|
||||
firewallGroupsManaged := []unifiv1beta1.FirewallGroupEntry{}
|
||||
unifiFirewallRules := []unifiv1beta1.UnifiFirewallRuleEntry{}
|
||||
firewallRule.Status.ResourcesManaged = &unifiv1beta1.FirewallRuleResourcesManaged{
|
||||
UnifiFirewallRules: unifiFirewallRules,
|
||||
FirewallGroups: firewallGroupsManaged,
|
||||
}
|
||||
}
|
||||
err = r.UnifiClient.Reauthenticate()
|
||||
if err != nil {
|
||||
return ctrl.Result{}, err
|
||||
}
|
||||
|
||||
var zoneCRDs unifiv1beta1.FirewallZoneList
|
||||
var networkCRDs unifiv1beta1.NetworkconfigurationList
|
||||
|
||||
err = r.List(ctx, &zoneCRDs)
|
||||
if err != nil {
|
||||
log.Error(err, "Could not list firewall zones")
|
||||
return ctrl.Result{RequeueAfter: 10 * time.Minute}, err
|
||||
}
|
||||
|
||||
zoneCRDNames := make(map[string]int)
|
||||
|
||||
for i, zoneCRD := range zoneCRDs.Items {
|
||||
namespace := defaultNs
|
||||
if len(zoneCRD.Namespace) > 0 {
|
||||
namespace = zoneCRD.Namespace
|
||||
}
|
||||
if kubernetesZone == zoneCRD.Name {
|
||||
kubernetesZoneID = zoneCRD.Spec.ID
|
||||
log.Info(fmt.Sprintf("Zone for kubernetes resources: %s with ID %s", kubernetesZone, kubernetesZoneID))
|
||||
}
|
||||
zoneCRDNames[namespace+"/"+zoneCRD.Name] = i
|
||||
}
|
||||
|
||||
err = r.List(ctx, &networkCRDs)
|
||||
if err != nil {
|
||||
log.Error(err, "Could not list networks")
|
||||
return ctrl.Result{RequeueAfter: 10 * time.Minute}, err
|
||||
}
|
||||
|
||||
networkCRDNames := make(map[string]int)
|
||||
|
||||
for i, networkCRD := range networkCRDs.Items {
|
||||
namespace := defaultNs
|
||||
if len(networkCRD.Namespace) > 0 {
|
||||
namespace = networkCRD.Namespace
|
||||
}
|
||||
networkCRDNames[namespace+"/"+networkCRD.Name] = i
|
||||
}
|
||||
|
||||
destination_services := make(map[string]struct{})
|
||||
destination_groups := make(map[string]struct{})
|
||||
|
||||
for _, dest_group := range firewallRule.Spec.Destination.FirewallGroups {
|
||||
namespace := defaultNs
|
||||
if len(dest_group.Namespace) > 0 {
|
||||
namespace = dest_group.Namespace
|
||||
}
|
||||
destination_groups[namespace+"/"+dest_group.Name] = struct{}{}
|
||||
}
|
||||
for _, dest_service := range firewallRule.Spec.Destination.Services {
|
||||
namespace := defaultNs
|
||||
if len(dest_service.Namespace) > 0 {
|
||||
namespace = dest_service.Namespace
|
||||
}
|
||||
destination_services[namespace+"/"+dest_service.Name] = struct{}{}
|
||||
}
|
||||
log.Info(fmt.Sprintf("%+v", destination_services))
|
||||
var firewallGroupCRDs unifiv1beta1.FirewallGroupList
|
||||
var myFirewallGroups []unifiv1beta1.FirewallGroup
|
||||
if err = r.List(ctx, &firewallGroupCRDs); err != nil {
|
||||
log.Error(err, "Failed to list firewall groups")
|
||||
return ctrl.Result{RequeueAfter: 10 * time.Minute}, err
|
||||
}
|
||||
|
||||
for _, firewallGroup := range firewallGroupCRDs.Items {
|
||||
if val, found := firewallGroup.Annotations["unifi.engen.priv.no/firewall-rule"]; found && val == firewallRule.Name {
|
||||
myFirewallGroups = append(myFirewallGroups, firewallGroup)
|
||||
} else if _, found := destination_groups[firewallGroup.Namespace+"/"+firewallGroup.Name]; found {
|
||||
myFirewallGroups = append(myFirewallGroups, firewallGroup)
|
||||
}
|
||||
}
|
||||
myFirewallGroupNames := make(map[string]struct{})
|
||||
for _, firewallGroup := range myFirewallGroups {
|
||||
myFirewallGroupNames[firewallGroup.Name] = struct{}{}
|
||||
}
|
||||
var serviceCRDs corev1.ServiceList
|
||||
var myServices []corev1.Service
|
||||
if err = r.List(ctx, &serviceCRDs); err != nil {
|
||||
log.Error(err, "Failed to list services")
|
||||
return ctrl.Result{RequeueAfter: 10 * time.Minute}, err
|
||||
}
|
||||
for _, service := range serviceCRDs.Items {
|
||||
skipService := false
|
||||
if val, found := service.Annotations["unifi.engen.priv.no/firewall-group"]; found {
|
||||
if _, found := myFirewallGroupNames[val]; found {
|
||||
skipService = true
|
||||
}
|
||||
}
|
||||
if val, found := service.Annotations["unifi.engen.priv.no/firewall-rule"]; found && val == firewallRule.Name && !skipService {
|
||||
myServices = append(myServices, service)
|
||||
} else if _, found := destination_services[service.Namespace+"/"+service.Name]; found && !skipService {
|
||||
myServices = append(myServices, service)
|
||||
}
|
||||
}
|
||||
|
||||
for _, service := range myServices {
|
||||
log.Info(fmt.Sprintf("Should handle service %s", service.Name))
|
||||
var firewallGroupCRD unifiv1beta1.FirewallGroup
|
||||
if err := r.Get(ctx, types.NamespacedName{
|
||||
Name: toKubeName("k8s-auto" + "_" + service.Namespace + "/" + service.Name),
|
||||
Namespace: firewallRule.Namespace,
|
||||
}, &firewallGroupCRD); err == nil {
|
||||
myFirewallGroups = append(myFirewallGroups, firewallGroupCRD)
|
||||
} else {
|
||||
log.Info("Going to create firewall group")
|
||||
var manualServices []unifiv1beta1.ServiceEntry
|
||||
manualServices = append(manualServices, unifiv1beta1.ServiceEntry{
|
||||
Name: service.Name,
|
||||
Namespace: service.Namespace,
|
||||
})
|
||||
createdFirewallGroupCRD := &unifiv1beta1.FirewallGroup{
|
||||
ObjectMeta: ctrl.ObjectMeta{
|
||||
Name: toKubeName("k8s-auto" + "_" + service.Namespace + "/" + service.Name),
|
||||
Namespace: firewallRule.Namespace,
|
||||
},
|
||||
Spec: unifiv1beta1.FirewallGroupSpec{
|
||||
Name: "auto-" + service.Namespace + "/" + service.Name,
|
||||
AutoCreatedFrom: unifiv1beta1.FirewallRuleEntry{
|
||||
Name: firewallRule.Name,
|
||||
Namespace: firewallRule.Namespace,
|
||||
},
|
||||
ManualServices: manualServices,
|
||||
MatchServicesInAllNamespaces: true,
|
||||
},
|
||||
}
|
||||
log.Info(fmt.Sprintf("%+v", createdFirewallGroupCRD))
|
||||
if err := r.Create(ctx, createdFirewallGroupCRD); err != nil {
|
||||
log.Error(err, fmt.Sprintf("Failed to create %s", createdFirewallGroupCRD.Name))
|
||||
return ctrl.Result{RequeueAfter: 10 * time.Minute}, err
|
||||
} else {
|
||||
_ = r.Get(ctx, types.NamespacedName{Name: createdFirewallGroupCRD.Name, Namespace: createdFirewallGroupCRD.Namespace}, &firewallGroupCRD)
|
||||
}
|
||||
log.Info("Adding %+v", firewallGroupCRD)
|
||||
myFirewallGroups = append(myFirewallGroups, firewallGroupCRD)
|
||||
found := false
|
||||
for _, managedFirewallGroup := range firewallRule.Status.ResourcesManaged.FirewallGroups {
|
||||
if managedFirewallGroup.Name == firewallGroupCRD.Name && managedFirewallGroup.Namespace == firewallGroupCRD.Namespace {
|
||||
found = true
|
||||
}
|
||||
}
|
||||
if !found {
|
||||
firewallRule.Status.ResourcesManaged.FirewallGroups = append(firewallRule.Status.ResourcesManaged.FirewallGroups, unifiv1beta1.FirewallGroupEntry{Name: firewallGroupCRD.Name, Namespace: firewallGroupCRD.Namespace})
|
||||
if err := r.Status().Update(ctx, &firewallRule); err != nil {
|
||||
log.Error(err, "Failed to update status with added firewallgroup")
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
unifi_firewall_rules, err := r.UnifiClient.Client.ListFirewallPolicy(context.Background(), r.UnifiClient.SiteID)
|
||||
if err != nil {
|
||||
log.Error(err, "Could not list firewall rules")
|
||||
return ctrl.Result{}, err
|
||||
}
|
||||
unifiFirewallruleNames := make(map[string]struct{})
|
||||
for _, unifi_firewall_rule := range unifi_firewall_rules {
|
||||
unifiFirewallruleNames[unifi_firewall_rule.Name] = struct{}{}
|
||||
}
|
||||
log.Info(fmt.Sprintf("Number of firewall rules: %d", len(unifi_firewall_rules)))
|
||||
|
||||
for _, zoneEntry := range firewallRule.Spec.Source.FirewallZones {
|
||||
namespace := defaultNs
|
||||
if len(zoneEntry.Namespace) > 0 {
|
||||
namespace = zoneEntry.Namespace
|
||||
}
|
||||
if i, found := zoneCRDNames[namespace+"/"+zoneEntry.Name]; found {
|
||||
log.Info(fmt.Sprintf("Creating firewallrules for %s", zoneCRDs.Items[i].Name))
|
||||
for _, firewallGroup := range myFirewallGroups {
|
||||
if len(firewallGroup.Status.ResolvedIPV4Addresses) > 0 {
|
||||
if len(firewallGroup.Status.ResolvedTCPPorts) > 0 {
|
||||
rulename := "k8s-fw-" + firewallRule.Name + "-" + zoneCRDs.Items[i].Name + "-" + firewallGroup.Name + "-ipv4-tcp"
|
||||
if _, found := unifiFirewallruleNames[rulename]; !found {
|
||||
log.Info(fmt.Sprintf("Creating ipv4 tcp firewallrule for %s to %s: %s", zoneCRDs.Items[i].Name, firewallGroup.Name, rulename))
|
||||
firewallRule := fillDefaultRule()
|
||||
firewallRule.Name = rulename
|
||||
firewallRule.Source.PortMatchingType = "ANY"
|
||||
firewallRule.Source.ZoneID = zoneCRDs.Items[i].Spec.ID
|
||||
firewallRule.Source.MatchingTarget = "ANY"
|
||||
firewallRule.Protocol = "tcp"
|
||||
firewallRule.IPVersion = "IPV4"
|
||||
firewallRule.Description = fmt.Sprintf("Allow tcp IPV4 from %s to %s", zoneCRDs.Items[i].Name, firewallGroup.Name)
|
||||
firewallRule.Destination.MatchingTargetType = "OBJECT"
|
||||
firewallRule.Destination.IPGroupID = firewallGroup.Status.ResourcesManaged.IPV4Object.ID
|
||||
firewallRule.Destination.MatchingTarget = "IP"
|
||||
firewallRule.Destination.PortMatchingType = "OBJECT"
|
||||
firewallRule.Destination.PortGroupID = firewallGroup.Status.ResourcesManaged.TCPPortsObject.ID
|
||||
firewallRule.Destination.ZoneID = kubernetesZoneID
|
||||
|
||||
log.Info(fmt.Sprintf("Trying to create firewall rule from zone %s to %s: %+v", zoneCRDs.Items[i].Name, firewallGroup.Name, firewallRule))
|
||||
pretty, _ := json.MarshalIndent(firewallRule, "", " ")
|
||||
log.Info(string(pretty))
|
||||
_, err := r.UnifiClient.Client.CreateFirewallPolicy(context.Background(), r.UnifiClient.SiteID, &firewallRule)
|
||||
if err != nil {
|
||||
log.Error(err, "Could not create firewall policy")
|
||||
return ctrl.Result{}, err
|
||||
}
|
||||
|
||||
} else {
|
||||
log.Info(fmt.Sprintf("Firewall rule for ipv4 tcp %s to %s already exists", zoneCRDs.Items[i].Name, firewallGroup.Name))
|
||||
}
|
||||
}
|
||||
if len(firewallGroup.Status.ResolvedUDPPorts) > 0 {
|
||||
rulename := "k8s-fw-" + firewallRule.Name + "-" + zoneCRDs.Items[i].Name + "-" + firewallGroup.Name + "-ipv4-udp"
|
||||
if _, found := unifiFirewallruleNames[rulename]; !found {
|
||||
log.Info(fmt.Sprintf("Creating ipv4 udp firewallrule for %s to %s: %s", zoneCRDs.Items[i].Name, firewallGroup.Name, rulename))
|
||||
firewallRule := fillDefaultRule()
|
||||
firewallRule.Name = rulename
|
||||
firewallRule.Source.PortMatchingType = "ANY"
|
||||
firewallRule.Source.ZoneID = zoneCRDs.Items[i].Spec.ID
|
||||
firewallRule.Source.MatchingTarget = "ANY"
|
||||
firewallRule.Protocol = "udp"
|
||||
firewallRule.IPVersion = "IPV4"
|
||||
firewallRule.Description = fmt.Sprintf("Allow udp IPV4 from %s to %s", zoneCRDs.Items[i].Name, firewallGroup.Name)
|
||||
firewallRule.Destination.MatchingTargetType = "OBJECT"
|
||||
firewallRule.Destination.IPGroupID = firewallGroup.Status.ResourcesManaged.IPV4Object.ID
|
||||
firewallRule.Destination.MatchingTarget = "IP"
|
||||
firewallRule.Destination.PortMatchingType = "OBJECT"
|
||||
firewallRule.Destination.PortGroupID = firewallGroup.Status.ResourcesManaged.UDPPortsObject.ID
|
||||
firewallRule.Destination.ZoneID = kubernetesZoneID
|
||||
|
||||
log.Info(fmt.Sprintf("Trying to create firewall rule from zone %s to %s: %+v", zoneCRDs.Items[i].Name, firewallGroup.Name, firewallRule))
|
||||
pretty, _ := json.MarshalIndent(firewallRule, "", " ")
|
||||
log.Info(string(pretty))
|
||||
_, err := r.UnifiClient.Client.CreateFirewallPolicy(context.Background(), r.UnifiClient.SiteID, &firewallRule)
|
||||
if err != nil {
|
||||
log.Error(err, "Could not create firewall policy")
|
||||
return ctrl.Result{}, err
|
||||
}
|
||||
|
||||
} else {
|
||||
log.Info(fmt.Sprintf("Firewall rule for ipv4 udp %s to %s already exists", zoneCRDs.Items[i].Name, firewallGroup.Name))
|
||||
}
|
||||
}
|
||||
}
|
||||
if len(firewallGroup.Status.ResolvedIPV6Addresses) > 0 {
|
||||
if len(firewallGroup.Status.ResolvedTCPPorts) > 0 {
|
||||
rulename := "k8s-fw-" + firewallRule.Name + "-" + zoneCRDs.Items[i].Name + "-" + firewallGroup.Name + "-ipv6-tcp"
|
||||
if _, found := unifiFirewallruleNames[rulename]; !found {
|
||||
log.Info(fmt.Sprintf("Creating ipv6 tcp firewallrule for %s to %s: %s", zoneCRDs.Items[i].Name, firewallGroup.Name, rulename))
|
||||
firewallRule := fillDefaultRule()
|
||||
firewallRule.Name = rulename
|
||||
firewallRule.Source.PortMatchingType = "ANY"
|
||||
firewallRule.Source.ZoneID = zoneCRDs.Items[i].Spec.ID
|
||||
firewallRule.Source.MatchingTarget = "ANY"
|
||||
firewallRule.Protocol = "tcp"
|
||||
firewallRule.IPVersion = "IPV6"
|
||||
firewallRule.Description = fmt.Sprintf("Allow tcp IPV6 from %s to %s", zoneCRDs.Items[i].Name, firewallGroup.Name)
|
||||
firewallRule.Destination.MatchingTargetType = "OBJECT"
|
||||
firewallRule.Destination.IPGroupID = firewallGroup.Status.ResourcesManaged.IPV6Object.ID
|
||||
firewallRule.Destination.MatchingTarget = "IP"
|
||||
firewallRule.Destination.PortMatchingType = "OBJECT"
|
||||
firewallRule.Destination.PortGroupID = firewallGroup.Status.ResourcesManaged.TCPPortsObject.ID
|
||||
firewallRule.Destination.ZoneID = kubernetesZoneID
|
||||
|
||||
log.Info(fmt.Sprintf("Trying to create firewall rule from zone %s to %s: %+v", zoneCRDs.Items[i].Name, firewallGroup.Name, firewallRule))
|
||||
pretty, _ := json.MarshalIndent(firewallRule, "", " ")
|
||||
log.Info(string(pretty))
|
||||
_, err := r.UnifiClient.Client.CreateFirewallPolicy(context.Background(), r.UnifiClient.SiteID, &firewallRule)
|
||||
if err != nil {
|
||||
log.Error(err, "Could not create firewall policy")
|
||||
return ctrl.Result{}, err
|
||||
}
|
||||
|
||||
} else {
|
||||
log.Info(fmt.Sprintf("Firewall rule for ipv6 tcp %s to %s already exists", zoneCRDs.Items[i].Name, firewallGroup.Name))
|
||||
}
|
||||
}
|
||||
if len(firewallGroup.Status.ResolvedUDPPorts) > 0 {
|
||||
rulename := "k8s-fw-" + firewallRule.Name + "-" + zoneCRDs.Items[i].Name + "-" + firewallGroup.Name + "-ipv6-udp"
|
||||
if _, found := unifiFirewallruleNames[rulename]; !found {
|
||||
log.Info(fmt.Sprintf("Creating ipv6 udp firewallrule for %s to %s: %s", zoneCRDs.Items[i].Name, firewallGroup.Name, rulename))
|
||||
firewallRule := fillDefaultRule()
|
||||
firewallRule.Name = rulename
|
||||
firewallRule.Source.PortMatchingType = "ANY"
|
||||
firewallRule.Source.ZoneID = zoneCRDs.Items[i].Spec.ID
|
||||
firewallRule.Source.MatchingTarget = "ANY"
|
||||
firewallRule.Protocol = "udp"
|
||||
firewallRule.IPVersion = "IPV6"
|
||||
firewallRule.Description = fmt.Sprintf("Allow udp IPV6 from %s to %s", zoneCRDs.Items[i].Name, firewallGroup.Name)
|
||||
firewallRule.Destination.MatchingTargetType = "OBJECT"
|
||||
firewallRule.Destination.IPGroupID = firewallGroup.Status.ResourcesManaged.IPV6Object.ID
|
||||
firewallRule.Destination.MatchingTarget = "IP"
|
||||
firewallRule.Destination.PortMatchingType = "OBJECT"
|
||||
firewallRule.Destination.PortGroupID = firewallGroup.Status.ResourcesManaged.UDPPortsObject.ID
|
||||
firewallRule.Destination.ZoneID = kubernetesZoneID
|
||||
|
||||
log.Info(fmt.Sprintf("Trying to create firewall rule from zone %s to %s: %+v", zoneCRDs.Items[i].Name, firewallGroup.Name, firewallRule))
|
||||
pretty, _ := json.MarshalIndent(firewallRule, "", " ")
|
||||
log.Info(string(pretty))
|
||||
_, err := r.UnifiClient.Client.CreateFirewallPolicy(context.Background(), r.UnifiClient.SiteID, &firewallRule)
|
||||
if err != nil {
|
||||
log.Error(err, "Could not create firewall policy")
|
||||
return ctrl.Result{}, err
|
||||
}
|
||||
|
||||
} else {
|
||||
log.Info(fmt.Sprintf("Firewall rule for ipv6 udp %s to %s already exists", zoneCRDs.Items[i].Name, firewallGroup.Name))
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
for _, networkEntry := range firewallRule.Spec.Source.Networks {
|
||||
namespace := defaultNs
|
||||
if len(networkEntry.Namespace) > 0 {
|
||||
namespace = networkEntry.Namespace
|
||||
}
|
||||
if i, found := networkCRDNames[namespace+"/"+networkEntry.Name]; found {
|
||||
log.Info(fmt.Sprintf("Creating firewallrules for %s", networkCRDs.Items[i].Name))
|
||||
for _, firewallGroup := range myFirewallGroups {
|
||||
if len(firewallGroup.Status.ResolvedIPV4Addresses) > 0 {
|
||||
if len(firewallGroup.Status.ResolvedTCPPorts) > 0 {
|
||||
rulename := "k8s-fw-" + firewallRule.Name + "-" + networkCRDs.Items[i].Name + "-" + firewallGroup.Name + "-ipv4-tcp"
|
||||
if _, found := unifiFirewallruleNames[rulename]; !found {
|
||||
log.Info(fmt.Sprintf("Creating ipv4 tcp firewallrule for %s to %s: %s", networkCRDs.Items[i].Name, firewallGroup.Name, rulename))
|
||||
firewallRule := fillDefaultRule()
|
||||
firewallRule.Name = rulename
|
||||
firewallRule.Source.NetworkIDs = []string{networkCRDs.Items[i].Spec.ID}
|
||||
firewallRule.Source.PortMatchingType = "ANY"
|
||||
firewallRule.Source.ZoneID = networkCRDs.Items[i].Status.FirewallZoneID
|
||||
firewallRule.Source.MatchingTarget = "NETWORK"
|
||||
firewallRule.Protocol = "tcp"
|
||||
firewallRule.IPVersion = "IPV4"
|
||||
firewallRule.Description = fmt.Sprintf("Allow tcp IPV4 from %s to %s", networkCRDs.Items[i].Name, firewallGroup.Name)
|
||||
firewallRule.Destination.MatchingTargetType = "OBJECT"
|
||||
firewallRule.Destination.IPGroupID = firewallGroup.Status.ResourcesManaged.IPV4Object.ID
|
||||
firewallRule.Destination.MatchingTarget = "IP"
|
||||
firewallRule.Destination.PortMatchingType = "OBJECT"
|
||||
firewallRule.Destination.PortGroupID = firewallGroup.Status.ResourcesManaged.TCPPortsObject.ID
|
||||
firewallRule.Destination.ZoneID = kubernetesZoneID
|
||||
|
||||
log.Info(fmt.Sprintf("Trying to create firewall rule from network %s to %s: %+v", networkCRDs.Items[i].Name, firewallGroup.Name, firewallRule))
|
||||
pretty, _ := json.MarshalIndent(firewallRule, "", " ")
|
||||
log.Info(string(pretty))
|
||||
_, err := r.UnifiClient.Client.CreateFirewallPolicy(context.Background(), r.UnifiClient.SiteID, &firewallRule)
|
||||
if err != nil {
|
||||
log.Error(err, "Could not create firewall policy")
|
||||
return ctrl.Result{}, err
|
||||
}
|
||||
|
||||
} else {
|
||||
log.Info(fmt.Sprintf("Firewall rule for ipv4 tcp %s to %s already exists", networkCRDs.Items[i].Name, firewallGroup.Name))
|
||||
}
|
||||
}
|
||||
if len(firewallGroup.Status.ResolvedUDPPorts) > 0 {
|
||||
rulename := "k8s-fw-" + firewallRule.Name + "-" + networkCRDs.Items[i].Name + "-" + firewallGroup.Name + "-ipv4-udp"
|
||||
if _, found := unifiFirewallruleNames[rulename]; !found {
|
||||
log.Info(fmt.Sprintf("Creating ipv4 udp firewallrule for %s to %s: %s", networkCRDs.Items[i].Name, firewallGroup.Name, rulename))
|
||||
firewallRule := fillDefaultRule()
|
||||
firewallRule.Name = rulename
|
||||
firewallRule.Source.NetworkIDs = []string{networkCRDs.Items[i].Spec.ID}
|
||||
firewallRule.Source.PortMatchingType = "ANY"
|
||||
firewallRule.Source.ZoneID = networkCRDs.Items[i].Status.FirewallZoneID
|
||||
firewallRule.Source.MatchingTarget = "NETWORK"
|
||||
firewallRule.Protocol = "udp"
|
||||
firewallRule.IPVersion = "IPV4"
|
||||
firewallRule.Description = fmt.Sprintf("Allow udp IPV4 from %s to %s", networkCRDs.Items[i].Name, firewallGroup.Name)
|
||||
firewallRule.Destination.MatchingTargetType = "OBJECT"
|
||||
firewallRule.Destination.IPGroupID = firewallGroup.Status.ResourcesManaged.IPV4Object.ID
|
||||
firewallRule.Destination.MatchingTarget = "IP"
|
||||
firewallRule.Destination.PortMatchingType = "OBJECT"
|
||||
firewallRule.Destination.PortGroupID = firewallGroup.Status.ResourcesManaged.UDPPortsObject.ID
|
||||
firewallRule.Destination.ZoneID = kubernetesZoneID
|
||||
|
||||
log.Info(fmt.Sprintf("Trying to create firewall rule from network %s to %s: %+v", networkCRDs.Items[i].Name, firewallGroup.Name, firewallRule))
|
||||
pretty, _ := json.MarshalIndent(firewallRule, "", " ")
|
||||
log.Info(string(pretty))
|
||||
_, err := r.UnifiClient.Client.CreateFirewallPolicy(context.Background(), r.UnifiClient.SiteID, &firewallRule)
|
||||
if err != nil {
|
||||
log.Error(err, "Could not create firewall policy")
|
||||
return ctrl.Result{}, err
|
||||
}
|
||||
|
||||
} else {
|
||||
log.Info(fmt.Sprintf("Firewall rule for ipv4 udp %s to %s already exists", networkCRDs.Items[i].Name, firewallGroup.Name))
|
||||
}
|
||||
}
|
||||
}
|
||||
if len(firewallGroup.Status.ResolvedIPV6Addresses) > 0 {
|
||||
if len(firewallGroup.Status.ResolvedTCPPorts) > 0 {
|
||||
rulename := "k8s-fw-" + firewallRule.Name + "-" + networkCRDs.Items[i].Name + "-" + firewallGroup.Name + "-ipv6-tcp"
|
||||
if _, found := unifiFirewallruleNames[rulename]; !found {
|
||||
log.Info(fmt.Sprintf("Creating ipv6 tcp firewallrule for %s to %s: %s", networkCRDs.Items[i].Name, firewallGroup.Name, rulename))
|
||||
firewallRule := fillDefaultRule()
|
||||
firewallRule.Name = rulename
|
||||
firewallRule.Source.NetworkIDs = []string{networkCRDs.Items[i].Spec.ID}
|
||||
firewallRule.Source.PortMatchingType = "ANY"
|
||||
firewallRule.Source.ZoneID = networkCRDs.Items[i].Status.FirewallZoneID
|
||||
firewallRule.Source.MatchingTarget = "NETWORK"
|
||||
firewallRule.Protocol = "tcp"
|
||||
firewallRule.IPVersion = "IPV6"
|
||||
firewallRule.Description = fmt.Sprintf("Allow tcp IPV6 from %s to %s", networkCRDs.Items[i].Name, firewallGroup.Name)
|
||||
firewallRule.Destination.MatchingTargetType = "OBJECT"
|
||||
firewallRule.Destination.IPGroupID = firewallGroup.Status.ResourcesManaged.IPV6Object.ID
|
||||
firewallRule.Destination.MatchingTarget = "IP"
|
||||
firewallRule.Destination.PortMatchingType = "OBJECT"
|
||||
firewallRule.Destination.PortGroupID = firewallGroup.Status.ResourcesManaged.TCPPortsObject.ID
|
||||
firewallRule.Destination.ZoneID = kubernetesZoneID
|
||||
|
||||
log.Info(fmt.Sprintf("Trying to create firewall rule from network %s to %s: %+v", networkCRDs.Items[i].Name, firewallGroup.Name, firewallRule))
|
||||
pretty, _ := json.MarshalIndent(firewallRule, "", " ")
|
||||
log.Info(string(pretty))
|
||||
_, err := r.UnifiClient.Client.CreateFirewallPolicy(context.Background(), r.UnifiClient.SiteID, &firewallRule)
|
||||
if err != nil {
|
||||
log.Error(err, "Could not create firewall policy")
|
||||
return ctrl.Result{}, err
|
||||
}
|
||||
|
||||
} else {
|
||||
log.Info(fmt.Sprintf("Firewall rule for ipv6 tcp %s to %s already exists", networkCRDs.Items[i].Name, firewallGroup.Name))
|
||||
}
|
||||
}
|
||||
if len(firewallGroup.Status.ResolvedUDPPorts) > 0 {
|
||||
rulename := "k8s-fw-" + firewallRule.Name + "-" + networkCRDs.Items[i].Name + "-" + firewallGroup.Name + "-ipv6-udp"
|
||||
if _, found := unifiFirewallruleNames[rulename]; !found {
|
||||
log.Info(fmt.Sprintf("Creating ipv6 udp firewallrule for %s to %s: %s", networkCRDs.Items[i].Name, firewallGroup.Name, rulename))
|
||||
firewallRule := fillDefaultRule()
|
||||
firewallRule.Name = rulename
|
||||
firewallRule.Source.NetworkIDs = []string{networkCRDs.Items[i].Spec.ID}
|
||||
firewallRule.Source.PortMatchingType = "ANY"
|
||||
firewallRule.Source.ZoneID = networkCRDs.Items[i].Status.FirewallZoneID
|
||||
firewallRule.Source.MatchingTarget = "NETWORK"
|
||||
firewallRule.Protocol = "udp"
|
||||
firewallRule.IPVersion = "IPV6"
|
||||
firewallRule.Description = fmt.Sprintf("Allow udp IPV6 from %s to %s", networkCRDs.Items[i].Name, firewallGroup.Name)
|
||||
firewallRule.Destination.MatchingTargetType = "OBJECT"
|
||||
firewallRule.Destination.IPGroupID = firewallGroup.Status.ResourcesManaged.IPV6Object.ID
|
||||
firewallRule.Destination.MatchingTarget = "IP"
|
||||
firewallRule.Destination.PortMatchingType = "OBJECT"
|
||||
firewallRule.Destination.PortGroupID = firewallGroup.Status.ResourcesManaged.UDPPortsObject.ID
|
||||
firewallRule.Destination.ZoneID = kubernetesZoneID
|
||||
|
||||
log.Info(fmt.Sprintf("Trying to create firewall rule from network %s to %s: %+v", networkCRDs.Items[i].Name, firewallGroup.Name, firewallRule))
|
||||
pretty, _ := json.MarshalIndent(firewallRule, "", " ")
|
||||
log.Info(string(pretty))
|
||||
_, err := r.UnifiClient.Client.CreateFirewallPolicy(context.Background(), r.UnifiClient.SiteID, &firewallRule)
|
||||
if err != nil {
|
||||
log.Error(err, "Could not create firewall policy")
|
||||
return ctrl.Result{}, err
|
||||
}
|
||||
|
||||
} else {
|
||||
log.Info(fmt.Sprintf("Firewall rule for ipv6 udp %s to %s already exists", networkCRDs.Items[i].Name, firewallGroup.Name))
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return ctrl.Result{}, nil
|
||||
}
|
||||
|
||||
func (r *FirewallRuleReconciler) mapFirewallGroupToFirewallRules(ctx context.Context, obj client.Object) []ctrl.Request {
|
||||
var requests []ctrl.Request
|
||||
firewallGroup, ok := obj.(*unifiv1beta1.FirewallGroup)
|
||||
if !ok {
|
||||
return requests
|
||||
}
|
||||
|
||||
var allFirewallRules unifiv1beta1.FirewallRuleList
|
||||
|
||||
if err := r.List(ctx, &allFirewallRules); err != nil {
|
||||
return nil
|
||||
}
|
||||
|
||||
for _, rule := range allFirewallRules.Items {
|
||||
if rule.Spec.MatchFirewallGroupsInAllNamespaces || rule.Namespace == firewallGroup.Namespace {
|
||||
annotationKey := "unifi.engen.priv.no/firewall-rule"
|
||||
annotationVal := rule.Name
|
||||
if val, ok := firewallGroup.Annotations[annotationKey]; ok && (annotationVal == "" || val == annotationVal) {
|
||||
requests = append(requests, ctrl.Request{
|
||||
NamespacedName: types.NamespacedName{
|
||||
Name: rule.Name,
|
||||
Namespace: rule.Namespace,
|
||||
},
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return requests
|
||||
}
|
||||
|
||||
func (r *FirewallRuleReconciler) mapServiceToFirewallRules(ctx context.Context, obj client.Object) []ctrl.Request {
|
||||
var requests []ctrl.Request
|
||||
service, ok := obj.(*corev1.Service)
|
||||
if !ok {
|
||||
return requests
|
||||
}
|
||||
|
||||
var allFirewallRules unifiv1beta1.FirewallRuleList
|
||||
|
||||
if err := r.List(ctx, &allFirewallRules); err != nil {
|
||||
return nil
|
||||
}
|
||||
|
||||
for _, rule := range allFirewallRules.Items {
|
||||
if rule.Spec.MatchServicesInAllNamespaces || rule.Namespace == service.Namespace {
|
||||
annotationKey := "unifi.engen.priv.no/firewall-rule"
|
||||
annotationVal := rule.Name
|
||||
if val, ok := service.Annotations[annotationKey]; ok && (annotationVal == "" || val == annotationVal) {
|
||||
requests = append(requests, ctrl.Request{
|
||||
NamespacedName: types.NamespacedName{
|
||||
Name: rule.Name,
|
||||
Namespace: rule.Namespace,
|
||||
},
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return requests
|
||||
}
|
||||
|
||||
// SetupWithManager sets up the controller with the Manager.
|
||||
func (r *FirewallRuleReconciler) SetupWithManager(mgr ctrl.Manager) error {
|
||||
return ctrl.NewControllerManagedBy(mgr).
|
||||
For(&unifiv1beta1.FirewallRule{}).
|
||||
Named("firewallrule").
|
||||
Watches(
|
||||
&corev1.Service{},
|
||||
handler.EnqueueRequestsFromMapFunc(r.mapServiceToFirewallRules),
|
||||
).
|
||||
Watches(
|
||||
&unifiv1beta1.FirewallGroup{},
|
||||
handler.EnqueueRequestsFromMapFunc(r.mapFirewallGroupToFirewallRules),
|
||||
).
|
||||
Complete(r)
|
||||
}
|
||||
|
||||
@@ -19,8 +19,8 @@ package controller
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"strings"
|
||||
"regexp"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
@@ -29,40 +29,39 @@ import (
|
||||
"sigs.k8s.io/controller-runtime/pkg/log"
|
||||
|
||||
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"
|
||||
"github.com/vegardengen/unifi-network-operator/internal/unifi"
|
||||
)
|
||||
|
||||
// FirewallZoneReconciler reconciles a FirewallZone object
|
||||
type FirewallZoneReconciler struct {
|
||||
client.Client
|
||||
Scheme *runtime.Scheme
|
||||
UnifiClient *unifi.UnifiClient
|
||||
Scheme *runtime.Scheme
|
||||
UnifiClient *unifi.UnifiClient
|
||||
ConfigLoader *config.ConfigLoaderType
|
||||
}
|
||||
|
||||
func toKubeName(input string) string {
|
||||
// Lowercase the input
|
||||
name := strings.ToLower(input)
|
||||
// Lowercase the input
|
||||
name := strings.ToLower(input)
|
||||
|
||||
// Replace any non-alphanumeric characters with dashes
|
||||
re := regexp.MustCompile(`[^a-z0-9\-\.]+`)
|
||||
name = re.ReplaceAllString(name, "-")
|
||||
// Replace any non-alphanumeric characters with dashes
|
||||
re := regexp.MustCompile(`[^a-z0-9\-\.]+`)
|
||||
name = re.ReplaceAllString(name, "-")
|
||||
|
||||
// Trim leading and trailing non-alphanumerics
|
||||
name = strings.Trim(name, "-.")
|
||||
// Trim leading and trailing non-alphanumerics
|
||||
name = strings.Trim(name, "-.")
|
||||
|
||||
// Ensure it's not empty and doesn't exceed 253 characters
|
||||
if len(name) == 0 {
|
||||
name = "default"
|
||||
} else if len(name) > 253 {
|
||||
name = name[:253]
|
||||
}
|
||||
// Ensure it's not empty and doesn't exceed 253 characters
|
||||
if len(name) == 0 {
|
||||
name = "default"
|
||||
} else if len(name) > 253 {
|
||||
name = name[:253]
|
||||
}
|
||||
|
||||
return name
|
||||
return name
|
||||
}
|
||||
|
||||
|
||||
// +kubebuilder:rbac:groups=unifi.engen.priv.no,resources=firewallzones,verbs=get;list;watch;create;update;patch;delete
|
||||
// +kubebuilder:rbac:groups=unifi.engen.priv.no,resources=firewallzones/status,verbs=get;update;patch
|
||||
// +kubebuilder:rbac:groups=unifi.engen.priv.no,resources=firewallzones/finalizers,verbs=update
|
||||
@@ -81,11 +80,71 @@ func (r *FirewallZoneReconciler) Reconcile(ctx context.Context, req ctrl.Request
|
||||
log := log.FromContext(ctx)
|
||||
|
||||
cfg, err := r.ConfigLoader.GetConfig(ctx, "unifi-operator-config")
|
||||
if err != nil {
|
||||
return ctrl.Result{}, err
|
||||
}
|
||||
if err != nil {
|
||||
return ctrl.Result{}, err
|
||||
}
|
||||
|
||||
defaultNs := cfg.Data["defaultNamespace"]
|
||||
defaultNs := cfg.Data["defaultNamespace"]
|
||||
|
||||
err = r.UnifiClient.Reauthenticate()
|
||||
if err != nil {
|
||||
return ctrl.Result{}, err
|
||||
}
|
||||
|
||||
fullSyncZone := "gateway"
|
||||
if cfg.Data["fullSyncZone"] != "" {
|
||||
fullSyncZone = cfg.Data["fullSyncZone"]
|
||||
}
|
||||
|
||||
fullSync := false
|
||||
var zoneObj unifiv1beta1.FirewallZone
|
||||
if err := r.Get(ctx, req.NamespacedName, &zoneObj); err != nil {
|
||||
return ctrl.Result{}, client.IgnoreNotFound(err)
|
||||
}
|
||||
|
||||
log.Info(fmt.Sprintf("fullSyncZone: %s Zone: %s", fullSyncZone, zoneObj.Name))
|
||||
if zoneObj.Name == fullSyncZone {
|
||||
fullSync = true
|
||||
log.Info("Going into fullsync mode")
|
||||
}
|
||||
|
||||
err = r.UnifiClient.Reauthenticate()
|
||||
if err != nil {
|
||||
return ctrl.Result{}, err
|
||||
}
|
||||
|
||||
if !fullSync {
|
||||
firewallzones, err := r.UnifiClient.Client.ListFirewallZones(context.Background(), r.UnifiClient.SiteID)
|
||||
if err != nil {
|
||||
log.Error(err, "Could not list firewall zones")
|
||||
return ctrl.Result{}, err
|
||||
}
|
||||
found := false
|
||||
for _, unifizone := range firewallzones {
|
||||
if unifizone.Name == zoneObj.Spec.Name {
|
||||
found = true
|
||||
zoneSpec := unifiv1beta1.FirewallZoneSpec{
|
||||
Name: unifizone.Name,
|
||||
ID: unifizone.ID,
|
||||
DefaultZone: unifizone.DefaultZone,
|
||||
NetworkIDs: unifizone.NetworkIDs,
|
||||
}
|
||||
zoneObj.Spec = zoneSpec
|
||||
err := r.Update(ctx, &zoneObj)
|
||||
if err != nil {
|
||||
return ctrl.Result{}, err
|
||||
}
|
||||
}
|
||||
}
|
||||
if !found {
|
||||
err := r.Delete(ctx, &zoneObj)
|
||||
if err != nil {
|
||||
return ctrl.Result{}, err
|
||||
}
|
||||
}
|
||||
return ctrl.Result{}, nil
|
||||
}
|
||||
log.Info("Starting fullsync mode")
|
||||
|
||||
var fwzCRDs unifiv1beta1.FirewallZoneList
|
||||
_ = r.List(ctx, &fwzCRDs, client.InNamespace(defaultNs))
|
||||
@@ -118,17 +177,17 @@ func (r *FirewallZoneReconciler) Reconcile(ctx context.Context, req ctrl.Request
|
||||
for _, unifizone := range firewall_zones {
|
||||
log.Info(fmt.Sprintf("%+v\n", unifizone))
|
||||
if _, found := firewallZoneNamesCRDs[unifizone.Name]; !found {
|
||||
zoneCRD := &unifiv1beta1.FirewallZone {
|
||||
ObjectMeta : ctrl.ObjectMeta {
|
||||
Name: toKubeName(unifizone.Name),
|
||||
Namespace: defaultNs,
|
||||
},
|
||||
Spec: unifiv1beta1.FirewallZoneSpec {
|
||||
Name : unifizone.Name,
|
||||
ID : unifizone.ID,
|
||||
zoneCRD := &unifiv1beta1.FirewallZone{
|
||||
ObjectMeta: ctrl.ObjectMeta{
|
||||
Name: toKubeName(unifizone.Name),
|
||||
Namespace: defaultNs,
|
||||
},
|
||||
Spec: unifiv1beta1.FirewallZoneSpec{
|
||||
Name: unifizone.Name,
|
||||
ID: unifizone.ID,
|
||||
DefaultZone: unifizone.DefaultZone,
|
||||
ZoneKey : unifizone.ZoneKey,
|
||||
NetworkIDs : unifizone.NetworkIDs,
|
||||
ZoneKey: unifizone.ZoneKey,
|
||||
NetworkIDs: unifizone.NetworkIDs,
|
||||
},
|
||||
}
|
||||
err := r.Create(ctx, zoneCRD)
|
||||
@@ -136,22 +195,22 @@ func (r *FirewallZoneReconciler) Reconcile(ctx context.Context, req ctrl.Request
|
||||
return ctrl.Result{RequeueAfter: 10 * time.Minute}, err
|
||||
}
|
||||
} else {
|
||||
for _, zoneCRD := range fwzCRDs.Items {
|
||||
if zoneCRD.Spec.Name == unifizone.Name {
|
||||
zoneCRD.Spec = unifiv1beta1.FirewallZoneSpec {
|
||||
Name : unifizone.Name,
|
||||
ID : unifizone.ID,
|
||||
DefaultZone: unifizone.DefaultZone,
|
||||
ZoneKey : unifizone.ZoneKey,
|
||||
NetworkIDs : unifizone.NetworkIDs,
|
||||
}
|
||||
err := r.Update(ctx, &zoneCRD)
|
||||
if err != nil {
|
||||
return ctrl.Result{RequeueAfter: 10 * time.Minute}, err
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
for _, zoneCRD := range fwzCRDs.Items {
|
||||
if zoneCRD.Spec.Name == unifizone.Name {
|
||||
zoneCRD.Spec = unifiv1beta1.FirewallZoneSpec{
|
||||
Name: unifizone.Name,
|
||||
ID: unifizone.ID,
|
||||
DefaultZone: unifizone.DefaultZone,
|
||||
ZoneKey: unifizone.ZoneKey,
|
||||
NetworkIDs: unifizone.NetworkIDs,
|
||||
}
|
||||
err := r.Update(ctx, &zoneCRD)
|
||||
if err != nil {
|
||||
return ctrl.Result{RequeueAfter: 10 * time.Minute}, err
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return ctrl.Result{RequeueAfter: 10 * time.Minute}, nil
|
||||
|
||||
@@ -19,22 +19,24 @@ package controller
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"time"
|
||||
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
"k8s.io/apimachinery/pkg/types"
|
||||
ctrl "sigs.k8s.io/controller-runtime"
|
||||
"sigs.k8s.io/controller-runtime/pkg/client"
|
||||
"sigs.k8s.io/controller-runtime/pkg/log"
|
||||
|
||||
unifiv1 "github.com/vegardengen/unifi-network-operator/api/v1beta1"
|
||||
"github.com/vegardengen/unifi-network-operator/internal/unifi"
|
||||
"github.com/vegardengen/unifi-network-operator/internal/config"
|
||||
"github.com/vegardengen/unifi-network-operator/internal/unifi"
|
||||
)
|
||||
|
||||
// NetworkconfigurationReconciler reconciles a Networkconfiguration object
|
||||
type NetworkconfigurationReconciler struct {
|
||||
client.Client
|
||||
Scheme *runtime.Scheme
|
||||
UnifiClient *unifi.UnifiClient
|
||||
Scheme *runtime.Scheme
|
||||
UnifiClient *unifi.UnifiClient
|
||||
ConfigLoader *config.ConfigLoaderType
|
||||
}
|
||||
|
||||
@@ -55,60 +57,174 @@ type NetworkconfigurationReconciler struct {
|
||||
func (r *NetworkconfigurationReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
|
||||
log := log.FromContext(ctx)
|
||||
cfg, err := r.ConfigLoader.GetConfig(ctx, "unifi-operator-config")
|
||||
if err != nil {
|
||||
return ctrl.Result{}, err
|
||||
}
|
||||
|
||||
defaultNs := cfg.Data["defaultNamespace"]
|
||||
log.Info(defaultNs)
|
||||
|
||||
var networkCRDs unifiv1.NetworkconfigurationList
|
||||
if err := r.List(ctx, &networkCRDs); err != nil {
|
||||
if err != nil {
|
||||
return ctrl.Result{}, err
|
||||
}
|
||||
k8sNetworks := make(map[string]*unifiv1.Networkconfiguration)
|
||||
for i := range networkCRDs.Items {
|
||||
log.Info(fmt.Sprintf("Inserting network %s\n", networkCRDs.Items[i].Spec.NetworkID))
|
||||
k8sNetworks[networkCRDs.Items[i].Spec.NetworkID] = &networkCRDs.Items[i]
|
||||
|
||||
defaultNs := cfg.Data["defaultNamespace"]
|
||||
log.Info(defaultNs)
|
||||
|
||||
fullSyncNetwork := "core"
|
||||
if cfg.Data["fullSyncNetwork"] != "" {
|
||||
fullSyncNetwork = cfg.Data["fullSyncNetwork"]
|
||||
}
|
||||
|
||||
fullSync := false
|
||||
var networkObj unifiv1.Networkconfiguration
|
||||
if err := r.Get(ctx, req.NamespacedName, &networkObj); err != nil {
|
||||
return ctrl.Result{}, client.IgnoreNotFound(err)
|
||||
}
|
||||
|
||||
log.Info(fmt.Sprintf("fullSyncNetwork: %s Network: %s", fullSyncNetwork, networkObj.Name))
|
||||
if networkObj.Name == fullSyncNetwork {
|
||||
fullSync = true
|
||||
log.Info("Going into fullsync mode")
|
||||
}
|
||||
|
||||
err = r.UnifiClient.Reauthenticate()
|
||||
if err != nil {
|
||||
return ctrl.Result{}, err
|
||||
}
|
||||
|
||||
if !fullSync {
|
||||
networks, err := r.UnifiClient.Client.ListNetwork(context.Background(), r.UnifiClient.SiteID)
|
||||
if err != nil {
|
||||
log.Error(err, "Could not list netwrorks")
|
||||
return ctrl.Result{}, err
|
||||
}
|
||||
found := false
|
||||
for _, unifinetwork := range networks {
|
||||
if unifinetwork.Name == networkObj.Spec.Name {
|
||||
found = true
|
||||
networkSpec := unifiv1.NetworkconfigurationSpec{
|
||||
Name: unifinetwork.Name,
|
||||
ID: unifinetwork.ID,
|
||||
IPSubnet: unifinetwork.IPSubnet,
|
||||
Ipv6InterfaceType: unifinetwork.IPV6InterfaceType,
|
||||
Ipv6PdAutoPrefixidEnabled: unifinetwork.IPV6PDAutoPrefixidEnabled,
|
||||
Ipv6RaEnabled: unifinetwork.IPV6RaEnabled,
|
||||
Ipv6SettingPreference: unifinetwork.IPV6SettingPreference,
|
||||
Ipv6Subnet: unifinetwork.IPV6Subnet,
|
||||
Purpose: unifinetwork.Purpose,
|
||||
Networkgroup: unifinetwork.NetworkGroup,
|
||||
SettingPreference: unifinetwork.SettingPreference,
|
||||
Vlan: int64(unifinetwork.VLAN),
|
||||
VlanEnabled: unifinetwork.VLANEnabled,
|
||||
}
|
||||
networkObj.Spec = networkSpec
|
||||
err := r.Update(ctx, &networkObj)
|
||||
if err != nil {
|
||||
return ctrl.Result{}, err
|
||||
}
|
||||
}
|
||||
}
|
||||
if !found {
|
||||
err := r.Delete(ctx, &networkObj)
|
||||
if err != nil {
|
||||
return ctrl.Result{}, err
|
||||
}
|
||||
}
|
||||
return ctrl.Result{}, nil
|
||||
}
|
||||
log.Info("Starting fullsync mode")
|
||||
var networkCRDs unifiv1.NetworkconfigurationList
|
||||
_ = r.List(ctx, &networkCRDs, client.InNamespace(defaultNs))
|
||||
|
||||
networks, err := r.UnifiClient.Client.ListNetwork(context.Background(), r.UnifiClient.SiteID)
|
||||
if err != nil {
|
||||
log.Error(err, "Failed to list Unifi Networks")
|
||||
return ctrl.Result{}, err
|
||||
log.Error(err, "Could not list netwrorks")
|
||||
return ctrl.Result{RequeueAfter: 10 * time.Minute}, err
|
||||
}
|
||||
log.Info(fmt.Sprintf("Number of resources: %d Number of networks in Unifi: %d", len(networkCRDs.Items), len(networks)))
|
||||
|
||||
var firewallZoneCRDs unifiv1.FirewallZoneList
|
||||
err = r.List(ctx, &firewallZoneCRDs, client.InNamespace(defaultNs))
|
||||
if err != nil {
|
||||
log.Error(err, "Could not list firewall zones")
|
||||
return ctrl.Result{RequeueAfter: 10 * time.Minute}, err
|
||||
}
|
||||
|
||||
seenNetworks := map[string]bool{}
|
||||
networkNamesUnifi := make(map[string]struct{})
|
||||
for _, unifinetwork := range networks {
|
||||
networkNamesUnifi[unifinetwork.Name] = struct{}{}
|
||||
}
|
||||
|
||||
for _, network := range networks {
|
||||
networkID := network.ID
|
||||
seenNetworks[networkID] = true
|
||||
log.Info(fmt.Sprintf("Searching for %s\n", networkID))
|
||||
|
||||
if existing, found := k8sNetworks[networkID]; found {
|
||||
log.Info(fmt.Sprintf("Found network match: %s/%s", existing.Spec.NetworkID, networkID))
|
||||
} else {
|
||||
if network.Purpose == "corporate" {
|
||||
log.Info(fmt.Sprintf("New network: %s with ID %s", network.Name, network.ID))
|
||||
var networkObject unifiv1.Networkconfiguration
|
||||
networkObject.Name = network.Name
|
||||
networkObject.Spec.Name = network.Name
|
||||
networkObject.Spec.NetworkID = network.ID
|
||||
networkObject.Spec.IPSubnet = network.IPSubnet
|
||||
networkObject.Spec.Ipv6InterfaceType = network.IPV6InterfaceType
|
||||
networkObject.Spec.Ipv6PdAutoPrefixidEnabled = network.IPV6PDAutoPrefixidEnabled
|
||||
networkObject.Spec.Ipv6RaEnabled = network.IPV6RaEnabled
|
||||
networkObject.Spec.Ipv6SettingPreference = network.IPV6SettingPreference
|
||||
networkObject.Spec.Ipv6Subnet = network.IPV6Subnet
|
||||
networkObject.Spec.Purpose = network.Purpose
|
||||
networkObject.Spec.Networkgroup = network.NetworkGroup
|
||||
networkObject.Spec.SettingPreference = network.SettingPreference
|
||||
networkObject.Spec.VlanEnabled = network.VLANEnabled
|
||||
// Step 2: Collect zones in fwzCRDs that are NOT in firewall_zones
|
||||
for _, network := range networkCRDs.Items {
|
||||
if _, found := networkNamesUnifi[network.Spec.Name]; !found {
|
||||
err := r.Delete(ctx, &network)
|
||||
if err != nil {
|
||||
return ctrl.Result{RequeueAfter: 10 * time.Minute}, err
|
||||
}
|
||||
}
|
||||
}
|
||||
networkNamesCRDs := make(map[string]struct{})
|
||||
for _, networkCRD := range networkCRDs.Items {
|
||||
networkNamesCRDs[networkCRD.Spec.Name] = struct{}{}
|
||||
}
|
||||
for _, unifinetwork := range networks {
|
||||
if unifinetwork.Purpose == "corporate" {
|
||||
networkSpec := unifiv1.NetworkconfigurationSpec{
|
||||
Name: unifinetwork.Name,
|
||||
ID: unifinetwork.ID,
|
||||
IPSubnet: unifinetwork.IPSubnet,
|
||||
Ipv6InterfaceType: unifinetwork.IPV6InterfaceType,
|
||||
Ipv6PdAutoPrefixidEnabled: unifinetwork.IPV6PDAutoPrefixidEnabled,
|
||||
Ipv6RaEnabled: unifinetwork.IPV6RaEnabled,
|
||||
Ipv6SettingPreference: unifinetwork.IPV6SettingPreference,
|
||||
Ipv6Subnet: unifinetwork.IPV6Subnet,
|
||||
Purpose: unifinetwork.Purpose,
|
||||
Networkgroup: unifinetwork.NetworkGroup,
|
||||
SettingPreference: unifinetwork.SettingPreference,
|
||||
Vlan: int64(unifinetwork.VLAN),
|
||||
VlanEnabled: unifinetwork.VLANEnabled,
|
||||
}
|
||||
networkStatus := unifiv1.NetworkconfigurationStatus{
|
||||
FirewallZoneID: unifinetwork.FirewallZoneID,
|
||||
}
|
||||
log.Info(fmt.Sprintf("Network status %s: %+v", networkSpec.Name, networkStatus))
|
||||
if _, found := networkNamesCRDs[unifinetwork.Name]; !found {
|
||||
firewallZoneNamesCRDs := make(map[string]struct{})
|
||||
firewallZoneIdsCRDs := make(map[string]struct{})
|
||||
for _, firewallZoneCRD := range firewallZoneCRDs.Items {
|
||||
firewallZoneNamesCRDs[firewallZoneCRD.Spec.Name] = struct{}{}
|
||||
firewallZoneIdsCRDs[firewallZoneCRD.Spec.ID] = struct{}{}
|
||||
}
|
||||
networkCRD := &unifiv1.Networkconfiguration{
|
||||
ObjectMeta: ctrl.ObjectMeta{
|
||||
Name: toKubeName(unifinetwork.Name),
|
||||
Namespace: defaultNs,
|
||||
},
|
||||
Spec: networkSpec,
|
||||
Status: networkStatus,
|
||||
}
|
||||
err = r.Create(ctx, networkCRD)
|
||||
if err != nil {
|
||||
return ctrl.Result{RequeueAfter: 10 * time.Minute}, err
|
||||
}
|
||||
err = r.Get(ctx, types.NamespacedName{Name: networkCRD.Name, Namespace: networkCRD.Namespace}, networkCRD)
|
||||
networkCRD.Status = networkStatus
|
||||
if err = r.Status().Update(ctx, networkCRD); err != nil {
|
||||
return ctrl.Result{RequeueAfter: 10 * time.Minute}, err
|
||||
}
|
||||
} else {
|
||||
for _, networkCRD := range networkCRDs.Items {
|
||||
if networkCRD.Spec.Name == unifinetwork.Name {
|
||||
networkCRD.Spec = networkSpec
|
||||
}
|
||||
err := r.Update(ctx, &networkCRD)
|
||||
if err != nil {
|
||||
return ctrl.Result{RequeueAfter: 10 * time.Minute}, err
|
||||
}
|
||||
if err = r.Status().Update(ctx, &networkCRD); err != nil {
|
||||
return ctrl.Result{RequeueAfter: 10 * time.Minute}, err
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return ctrl.Result{}, nil
|
||||
return ctrl.Result{RequeueAfter: 10 * time.Minute}, nil
|
||||
}
|
||||
|
||||
// SetupWithManager sets up the controller with the Manager.
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
/* https://github.com/clbx/kube-port-forward-controller */
|
||||
|
||||
package unifi_network_operator_utils
|
||||
|
||||
import (
|
||||
"regexp"
|
||||
"strings"
|
||||
)
|
||||
|
||||
func isIPv6(ip string) bool {
|
||||
return strings.Contains(ip, ":")
|
||||
}
|
||||
|
||||
func toKubeName(input string) string {
|
||||
// Lowercase the input
|
||||
name := strings.ToLower(input)
|
||||
|
||||
// Replace any non-alphanumeric characters with dashes
|
||||
re := regexp.MustCompile(`[^a-z0-9\-\.]+`)
|
||||
name = re.ReplaceAllString(name, "-")
|
||||
|
||||
// Trim leading and trailing non-alphanumerics
|
||||
name = strings.Trim(name, "-.")
|
||||
|
||||
// Ensure it's not empty and doesn't exceed 253 characters
|
||||
if len(name) == 0 {
|
||||
name = "default"
|
||||
} else if len(name) > 253 {
|
||||
name = name[:253]
|
||||
}
|
||||
|
||||
return name
|
||||
}
|
||||
Reference in New Issue
Block a user