11// Copyright 2018 Microsoft. All rights reserved.
22// MIT License
3- package npm
3+ package controller
44
55import (
66 "encoding/json"
99 npmconfig "github.com/Azure/azure-container-networking/npm/config"
1010 controllersv2 "github.com/Azure/azure-container-networking/npm/pkg/controlplane/controllers/v2"
1111 "github.com/Azure/azure-container-networking/npm/pkg/dataplane"
12+ "github.com/Azure/azure-container-networking/npm/pkg/models"
1213 "github.com/Azure/azure-container-networking/npm/pkg/transport"
1314 "github.com/pkg/errors"
1415 "k8s.io/apimachinery/pkg/version"
@@ -17,6 +18,8 @@ import (
1718 "k8s.io/klog"
1819)
1920
21+ var aiMetadata string //nolint // aiMetadata is set in Makefile
22+
2023type NetworkPolicyServer struct {
2124 config npmconfig.Config
2225
@@ -25,20 +28,20 @@ type NetworkPolicyServer struct {
2528
2629 // Informers are the Kubernetes Informer
2730 // https://pkg.go.dev/k8s.io/client-go/informers
28- Informers
31+ models. Informers
2932
3033 // Controllers for handling Kubernetes resource watcher events
31- K8SControllersV2
34+ models. K8SControllersV2
3235
3336 // Azure-specific variables
34- AzureConfig
37+ models. AzureConfig
3538}
3639
3740var (
38- ErrInformerFactoryNil = errors .New ("informer factory is nil" )
39- ErrTransportManagerNil = errors .New ("transport manager is nil" )
40- ErrK8SServerVersionNil = errors .New ("k8s server version is nil" )
41- ErrInformerSyncFailure = errors .New ("informer sync failure " )
41+ ErrInformerFactoryNil = errors .New ("informer factory is nil" )
42+ ErrTransportManagerNil = errors .New ("transport manager is nil" )
43+ ErrK8SServerVersionNil = errors .New ("k8s server version is nil" )
44+ ErrDataplaneNotInitialized = errors .New ("dataplane is not initialized " )
4245)
4346
4447func NewNetworkPolicyServer (
@@ -70,87 +73,87 @@ func NewNetworkPolicyServer(
7073 n := & NetworkPolicyServer {
7174 config : config ,
7275 tm : mgr ,
73- Informers : Informers {
74- informerFactory : informerFactory ,
75- podInformer : informerFactory .Core ().V1 ().Pods (),
76- nsInformer : informerFactory .Core ().V1 ().Namespaces (),
77- npInformer : informerFactory .Networking ().V1 ().NetworkPolicies (),
76+ Informers : models. Informers {
77+ InformerFactory : informerFactory ,
78+ PodInformer : informerFactory .Core ().V1 ().Pods (),
79+ NsInformer : informerFactory .Core ().V1 ().Namespaces (),
80+ NpInformer : informerFactory .Networking ().V1 ().NetworkPolicies (),
7881 },
79- AzureConfig : AzureConfig {
80- k8sServerVersion : k8sServerVersion ,
81- NodeName : GetNodeName (),
82- version : npmVersion ,
82+ AzureConfig : models. AzureConfig {
83+ K8sServerVersion : k8sServerVersion ,
84+ NodeName : models . GetNodeName (),
85+ Version : npmVersion ,
8386 TelemetryEnabled : true ,
8487 },
8588 }
8689
87- n .npmNamespaceCacheV2 = & controllersv2.NpmNamespaceCache {NsMap : make (map [string ]* controllersv2.Namespace )}
88- n .podControllerV2 = controllersv2 .NewPodController (n .podInformer , dp , n .npmNamespaceCacheV2 )
89- n .namespaceControllerV2 = controllersv2 .NewNamespaceController (n .nsInformer , dp , n .npmNamespaceCacheV2 )
90- n .netPolControllerV2 = controllersv2 .NewNetworkPolicyController (n .npInformer , dp )
90+ n .NpmNamespaceCacheV2 = & controllersv2.NpmNamespaceCache {NsMap : make (map [string ]* controllersv2.Namespace )}
91+ n .PodControllerV2 = controllersv2 .NewPodController (n .PodInformer , dp , n .NpmNamespaceCacheV2 )
92+ n .NamespaceControllerV2 = controllersv2 .NewNamespaceController (n .NsInformer , dp , n .NpmNamespaceCacheV2 )
93+ n .NetPolControllerV2 = controllersv2 .NewNetworkPolicyController (n .NpInformer , dp )
9194
9295 return n , nil
9396}
9497
9598func (n * NetworkPolicyServer ) MarshalJSON () ([]byte , error ) {
96- m := map [CacheKey ]json.RawMessage {}
99+ m := map [models. CacheKey ]json.RawMessage {}
97100
98101 var npmNamespaceCacheRaw []byte
99102 var err error
100- npmNamespaceCacheRaw , err = json .Marshal (n .npmNamespaceCacheV2 )
103+ npmNamespaceCacheRaw , err = json .Marshal (n .NpmNamespaceCacheV2 )
101104
102105 if err != nil {
103- return nil , errors .Errorf ("%s: %v" , errMarshalNPMCache , err )
106+ return nil , errors .Errorf ("%s: %v" , models . ErrMarshalNPMCache , err )
104107 }
105- m [NsMap ] = npmNamespaceCacheRaw
108+ m [models . NsMap ] = npmNamespaceCacheRaw
106109
107110 var podControllerRaw []byte
108- podControllerRaw , err = json .Marshal (n .podControllerV2 )
111+ podControllerRaw , err = json .Marshal (n .PodControllerV2 )
109112
110113 if err != nil {
111- return nil , errors .Errorf ("%s: %v" , errMarshalNPMCache , err )
114+ return nil , errors .Errorf ("%s: %v" , models . ErrMarshalNPMCache , err )
112115 }
113- m [PodMap ] = podControllerRaw
116+ m [models . PodMap ] = podControllerRaw
114117
115118 nodeNameRaw , err := json .Marshal (n .NodeName )
116119 if err != nil {
117- return nil , errors .Errorf ("%s: %v" , errMarshalNPMCache , err )
120+ return nil , errors .Errorf ("%s: %v" , models . ErrMarshalNPMCache , err )
118121 }
119- m [NodeName ] = nodeNameRaw
122+ m [models . NodeName ] = nodeNameRaw
120123
121124 npmCacheRaw , err := json .Marshal (m )
122125 if err != nil {
123- return nil , errors .Errorf ("%s: %v" , errMarshalNPMCache , err )
126+ return nil , errors .Errorf ("%s: %v" , models . ErrMarshalNPMCache , err )
124127 }
125128
126129 return npmCacheRaw , nil
127130}
128131
129132func (n * NetworkPolicyServer ) GetAppVersion () string {
130- return n .version
133+ return n .Version
131134}
132135
133136func (n * NetworkPolicyServer ) Start (config npmconfig.Config , stopCh <- chan struct {}) error {
134- // Starts all informers manufactured by n's informerFactory .
135- n .informerFactory .Start (stopCh )
137+ // Starts all informers manufactured by n's InformerFactory .
138+ n .InformerFactory .Start (stopCh )
136139
137140 // Wait for the initial sync of local cache.
138- if ! cache .WaitForCacheSync (stopCh , n .podInformer .Informer ().HasSynced ) {
139- return fmt .Errorf ("Pod informer error: %w" , ErrInformerSyncFailure )
141+ if ! cache .WaitForCacheSync (stopCh , n .PodInformer .Informer ().HasSynced ) {
142+ return fmt .Errorf ("Pod informer error: %w" , models . ErrInformerSyncFailure )
140143 }
141144
142- if ! cache .WaitForCacheSync (stopCh , n .nsInformer .Informer ().HasSynced ) {
143- return fmt .Errorf ("Namespace informer error: %w" , ErrInformerSyncFailure )
145+ if ! cache .WaitForCacheSync (stopCh , n .NsInformer .Informer ().HasSynced ) {
146+ return fmt .Errorf ("Namespace informer error: %w" , models . ErrInformerSyncFailure )
144147 }
145148
146- if ! cache .WaitForCacheSync (stopCh , n .npInformer .Informer ().HasSynced ) {
147- return fmt .Errorf ("NetworkPolicy informer error: %w" , ErrInformerSyncFailure )
149+ if ! cache .WaitForCacheSync (stopCh , n .NpInformer .Informer ().HasSynced ) {
150+ return fmt .Errorf ("NetworkPolicy informer error: %w" , models . ErrInformerSyncFailure )
148151 }
149152
150153 // start v2 NPM controllers after synced
151- go n .podControllerV2 .Run (stopCh )
152- go n .namespaceControllerV2 .Run (stopCh )
153- go n .netPolControllerV2 .Run (stopCh )
154+ go n .PodControllerV2 .Run (stopCh )
155+ go n .NamespaceControllerV2 .Run (stopCh )
156+ go n .NetPolControllerV2 .Run (stopCh )
154157
155158 // start the transport layer (gRPC) server
156159 // We block the main thread here until the server is stopped.
0 commit comments