Skip to content

Commit 7a28e59

Browse files
checkpoint: Enhance service gateway existence check and configuration validation
1 parent a6e4f0f commit 7a28e59

File tree

102 files changed

+2376
-924
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+2376
-924
lines changed

pkg/provider/azure_loadbalancer_repo.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ func (az *Cloud) ListManagedLBs(ctx context.Context, service *v1.Service, nodes
148148
// CreateOrUpdateLB invokes az.NetworkClientFactory.GetLoadBalancerClient().CreateOrUpdate with exponential backoff retry
149149
func (az *Cloud) CreateOrUpdateLB(ctx context.Context, service *v1.Service, lb armnetwork.LoadBalancer) error {
150150
klog.Infof("EDWARD: CreateOrUpdateLB: creating default load balancer for Service Gateway: ")
151-
logObject(lb)
151+
// logObject(lb)
152152
lb = cleanupSubnetInFrontendIPConfigurations(&lb)
153153

154154
rgName := az.getLoadBalancerResourceGroup()

pkg/provider/azure_servicegateway_difftracker_init.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ func (az *Cloud) initializeDiffTracker() error {
9898
}
9999
}
100100
klog.Infof("initializeDiffTracker: nodeNameToIPMap: ")
101-
logObject(nodeNameToIPMap)
101+
//logObject(nodeNameToIPMap)
102102

103103
// 1. Fetch all services and update difftracker.K8sResources.Services
104104
services, err := az.KubeClient.CoreV1().Services(v1.NamespaceAll).List(ctx, metav1.ListOptions{})
@@ -249,7 +249,7 @@ func (az *Cloud) initializeDiffTracker() error {
249249

250250
locationsDTO, err := az.GetAddressLocations(ctx, az.ServiceGatewayResourceName)
251251
klog.Infof("initializeDiffTracker: fetched %d locations from ServiceGateway API", len(locationsDTO))
252-
logObject(locationsDTO)
252+
//logObject(locationsDTO)
253253
if err != nil {
254254
return fmt.Errorf("initializeDiffTracker: failed to get locations from ServiceGateway API: %w", err)
255255
}
@@ -294,10 +294,10 @@ func (az *Cloud) initializeDiffTracker() error {
294294
az.diffTracker = difftracker.InitializeDiffTracker(k8s, nrp)
295295
az.diffTracker.LocalServiceNameToNRPServiceMap = syncMapFromMap(localServiceNameToNRPServiceMap)
296296
klog.Infof("initializeDiffTracker: initialized diff tracker localServiceNameToNRPServiceMap with %d entries", localServiceNameToNRPServiceMap)
297-
logObject(localServiceNameToNRPServiceMap)
297+
//logObject(localServiceNameToNRPServiceMap)
298298
logSyncStringIntMap("initializeDiffTracker: LocalServiceNameToNRPServiceMap", &az.diffTracker.LocalServiceNameToNRPServiceMap)
299299
klog.Infof("initializeDiffTracker: initialized diff tracker")
300-
logObject(az.diffTracker)
300+
//logObject(az.diffTracker)
301301
// 6. Fetch LoadBalancers from NRP
302302
lbclient := az.NetworkClientFactory.GetLoadBalancerClient()
303303
lbs, err := lbclient.List(ctx, az.ResourceGroup)

pkg/provider/azure_servicegateway_location_service_updater.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,18 +49,18 @@ func (az *Cloud) TriggerLocationAndNRPServiceBatchUpdate() {
4949
func (updater *locationAndNRPServiceBatchUpdater) process(ctx context.Context) {
5050
klog.Infof("CLB-ENECHITOAIA-locationAndNRPServiceBatchUpdater.process BEGIN: processing batch update\n")
5151
klog.Infof("CLB-ENECHITOAIA-locationAndNRPServiceBatchUpdater.process BEGIN: difftracker:\n")
52-
logDiffTracker(updater.az.diffTracker)
52+
// logDiffTracker(updater.az.diffTracker)
5353
// klog.Infof("CLB-ENECHITOAIA-locationAndNRPServiceBatchUpdater.process BEGIN: subscription ID: %s\n", updater.az.SubscriptionID)
5454
// klog.Infof("CLB-ENECHITOAIA-locationAndNRPServiceBatchUpdater.process BEGIN: resource group: %s\n", updater.az.ResourceGroup)
5555
// klog.Infof("CLB-ENECHITOAIA-locationAndNRPServiceBatchUpdater.process BEGIN: location and NRP service batch updater started\n")
5656

5757
serviceLoadBalancerList := updater.az.diffTracker.GetSyncLoadBalancerServices()
5858
serviceNATGatewayList := updater.az.diffTracker.GetSyncNRPNATGateways()
5959

60-
klog.Infof("CLB-ENECHITOAIA-locationAndNRPServiceBatchUpdater.process: serviceLoadBalancerList:\n")
61-
logObject(serviceLoadBalancerList)
62-
klog.Infof("CLB-ENECHITOAIA-locationAndNRPServiceBatchUpdater.process: serviceNATGatewayList:\n")
63-
logObject(serviceNATGatewayList)
60+
// klog.Infof("CLB-ENECHITOAIA-locationAndNRPServiceBatchUpdater.process: serviceLoadBalancerList:\n")
61+
//logObject(serviceLoadBalancerList)
62+
// klog.Infof("CLB-ENECHITOAIA-locationAndNRPServiceBatchUpdater.process: serviceNATGatewayList:\n")
63+
//logObject(serviceNATGatewayList)
6464
// Add services
6565
if serviceLoadBalancerList.Additions.Len() > 0 || serviceNATGatewayList.Additions.Len() > 0 {
6666
createServicesRequestDTO := difftracker.MapLoadBalancerAndNATGatewayUpdatesToServicesDataDTO(
@@ -74,8 +74,8 @@ func (updater *locationAndNRPServiceBatchUpdater) process(ctx context.Context) {
7474
},
7575
updater.az.SubscriptionID,
7676
updater.az.ResourceGroup)
77-
klog.Infof("CLB-ENECHITOAIA-locationAndNRPServiceBatchUpdater.process: createServicesRequestDTO:\n")
78-
logObject(createServicesRequestDTO)
77+
// klog.Infof("CLB-ENECHITOAIA-locationAndNRPServiceBatchUpdater.process: createServicesRequestDTO:\n")
78+
//logObject(createServicesRequestDTO)
7979
// createServicesResponseDTO := NRPAPIClientUpdateNRPServices(ctx, createServicesRequestDTO, updater.az.SubscriptionID, updater.az.ResourceGroup)
8080
// klog.Infof("CLB-ENECHITOAIA-locationAndNRPServiceBatchUpdater.process: createServicesResponseDTO:\n")
8181
err := updater.az.UpdateNRPSGWServices(ctx, updater.az.ServiceGatewayResourceName, createServicesRequestDTO)
@@ -151,8 +151,8 @@ func (updater *locationAndNRPServiceBatchUpdater) process(ctx context.Context) {
151151

152152
// Update all locations and addresses
153153
locationData := updater.az.diffTracker.GetSyncLocationsAddresses()
154-
klog.Infof("CLB-ENECHITOAIA-locationAndNRPServiceBatchUpdater.process: locationData:\n")
155-
logObject(locationData)
154+
// klog.Infof("CLB-ENECHITOAIA-locationAndNRPServiceBatchUpdater.process: locationData:\n")
155+
// logObject(locationData)
156156
if len(locationData.Locations) > 0 {
157157
locationDataRequestDTO := difftracker.MapLocationDataToDTO(locationData)
158158
// klog.Infof("CLB-ENECHITOAIA-locationAndNRPServiceBatchUpdater.process: locationDataRequestDTO:\n")
@@ -211,7 +211,7 @@ func (updater *locationAndNRPServiceBatchUpdater) process(ctx context.Context) {
211211

212212
// klog.Infof("CLB-ENECHITOAIA-locationAndNRPServiceBatchUpdater.process END: processing batch update")
213213
klog.Infof("CLB-ENECHITOAIA-locationAndNRPServiceBatchUpdater.process END: difftracker:")
214-
logDiffTracker(updater.az.diffTracker)
214+
// logDiffTracker(updater.az.diffTracker)
215215
}
216216

217217
func logDiffTracker(dt interface{}) {

0 commit comments

Comments
 (0)