Skip to content

Commit 66dda36

Browse files
akshaysnguptamalpaniHMC
andauthored
cp: logging and build pipeline change (#1630)
* fix: adjust logging verbosity and event logs (#1629) * 5 -> 3 * add processing log for event * fix test * fix worker * gh pipeline (#1625) * Update merge-build.yml (#1626) * Remove azdevops yamls (#1627) * remove the azdevops yamls * add release to trigger --------- Co-authored-by: malpaniHMC <[email protected]>
1 parent ba37199 commit 66dda36

34 files changed

+161
-274
lines changed

.github/workflows/merge-build.yml

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
name: "Merge Build"
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
- release/*
8+
pull_request:
9+
branches:
10+
- master
11+
- release/*
12+
permissions:
13+
actions: read
14+
contents: read
15+
deployments: read
16+
17+
jobs:
18+
build_and_test:
19+
runs-on: ubuntu-latest
20+
timeout-minutes: 30
21+
steps:
22+
- name: Checkout repository
23+
uses: actions/checkout@v4
24+
- name: Set up Go workspace
25+
run: |
26+
shopt -s extglob
27+
shopt -s dotglob
28+
shell: bash
29+
- name: Install Helm
30+
uses: azure/[email protected]
31+
with:
32+
version: v3.11.0
33+
- name: Set up Go
34+
uses: actions/[email protected]
35+
with:
36+
go-version: '1.19.2'
37+
- name: Go and Helm lint check
38+
run: make lint-all
39+
- name: Go vet
40+
run: make vet-all
41+
- name: Get dependencies and build
42+
run: make build
43+
- name: Run unit tests with code coverage
44+
run: make unittest
45+
- name: Publish test results
46+
if: always()
47+
uses: actions/[email protected]
48+
with:
49+
name: test-results
50+
path: ${{ github.workspace }}/**/report.xml
51+
- name: Publish code coverage results
52+
if: always()
53+
uses: actions/[email protected]
54+
with:
55+
name: code-coverage
56+
path: coverage.xml

.pipelines/build.yml

Lines changed: 0 additions & 65 deletions
This file was deleted.

.pipelines/merge-build.yml

Lines changed: 0 additions & 19 deletions
This file was deleted.

.pipelines/nightly-build.yml

Lines changed: 0 additions & 57 deletions
This file was deleted.

.pipelines/release-build.yml

Lines changed: 0 additions & 52 deletions
This file was deleted.

cmd/appgw-ingress/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ func main() {
206206

207207
err = azClient.ApplyRouteTable(subnetID, routeTableID)
208208
if err != nil {
209-
klog.V(5).Infof("Unable to associate Application Gateway subnet '%s' with route table '%s' due to error (this is relevant for AKS clusters using 'Kubenet' network plugin): [%+v]",
209+
klog.V(3).Infof("Unable to associate Application Gateway subnet '%s' with route table '%s' due to error (this is relevant for AKS clusters using 'Kubenet' network plugin): [%+v]",
210210
subnetID,
211211
routeTableID,
212212
err)

cmd/appgw-ingress/utils.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ func getKubeClientConfig() *rest.Config {
8787

8888
func getEventRecorder(kubeClient kubernetes.Interface, ingressClassControllerName string) record.EventRecorder {
8989
eventBroadcaster := record.NewBroadcaster()
90-
eventBroadcaster.StartLogging(klog.V(5).Infof)
9190
sink := &typedcorev1.EventSinkImpl{Interface: kubeClient.CoreV1().Events("")}
9291
eventBroadcaster.StartRecordingToSink(sink)
9392
hostname, err := os.Hostname()

pkg/appgw/backendaddresspools.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ func (c appGwConfigBuilder) getPools(cbCtx *ConfigBuilderContext) []n.Applicatio
3333
}
3434

3535
defaultPool := defaultBackendAddressPool(c.appGwIdentifier)
36-
klog.V(5).Infof("Created default backend pool %s", *defaultPool.Name)
36+
klog.V(3).Infof("Created default backend pool %s", *defaultPool.Name)
3737
managedPoolsByName := map[string]*n.ApplicationGatewayBackendAddressPool{
3838
*defaultPool.Name: &defaultPool,
3939
}
@@ -44,7 +44,7 @@ func (c appGwConfigBuilder) getPools(cbCtx *ConfigBuilderContext) []n.Applicatio
4444
for backendID, serviceBackendPair := range serviceBackendPairMap {
4545
if pool := c.getBackendAddressPool(backendID, serviceBackendPair, managedPoolsByName); pool != nil {
4646
managedPoolsByName[*pool.Name] = pool
47-
klog.V(5).Infof("Created backend pool %s for service %s", *pool.Name, backendID.serviceKey())
47+
klog.V(3).Infof("Created backend pool %s for service %s", *pool.Name, backendID.serviceKey())
4848
}
4949
}
5050

@@ -53,7 +53,7 @@ func (c appGwConfigBuilder) getPools(cbCtx *ConfigBuilderContext) []n.Applicatio
5353
for destinationID, serviceBackendPair := range istioServiceBackendPairMap {
5454
if pool := c.getIstioBackendAddressPool(destinationID, serviceBackendPair, managedPoolsByName); pool != nil {
5555
managedPoolsByName[*pool.Name] = pool
56-
klog.V(5).Infof("Created backend pool %s for service %s", *pool.Name, destinationID.serviceKey())
56+
klog.V(3).Infof("Created backend pool %s for service %s", *pool.Name, destinationID.serviceKey())
5757
}
5858
}
5959
}

pkg/appgw/backendhttpsettings.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ func (c *appGwConfigBuilder) resolveBackendPort(backendID backendIdentifier) (Po
171171

172172
// if target port is port name, then resolve the port number for the port name
173173
// k8s matches service port name against endpoints port name retrieved by passing backendID service key to endpoint api.
174-
klog.V(5).Infof("resolving port name '%s' for service '%s' and service port '%s' for Ingress '%s'", servicePort.Name, backendID.serviceKey(), serviceBackendPortToStr(backendID.Backend.Service.Port), backendID.Ingress.Name)
174+
klog.V(3).Infof("resolving port name '%s' for service '%s' and service port '%s' for Ingress '%s'", servicePort.Name, backendID.serviceKey(), serviceBackendPortToStr(backendID.Backend.Service.Port), backendID.Ingress.Name)
175175
targetPortsResolved := c.resolvePortName(servicePort.Name, &backendID)
176176
for targetPort := range targetPortsResolved {
177177
pair := serviceBackendPortPair{
@@ -315,7 +315,7 @@ func (c *appGwConfigBuilder) generateHTTPSettings(backendID backendIdentifier, p
315315
certs = append(certs, *resourceRef(trustCertID))
316316
}
317317
httpSettings.TrustedRootCertificates = &certs
318-
klog.V(5).Infof("Found trusted root certificate(s): %s from ingress: %s/%s", certificateNames, backendID.Ingress.Namespace, backendID.Ingress.Name)
318+
klog.V(3).Infof("Found trusted root certificate(s): %s from ingress: %s/%s", certificateNames, backendID.Ingress.Namespace, backendID.Ingress.Name)
319319

320320
} else if err != nil && !controllererrors.IsErrorCode(err, controllererrors.ErrorMissingAnnotation) {
321321
c.recorder.Event(backendID.Ingress, v1.EventTypeWarning, events.ReasonInvalidAnnotation, err.Error())

pkg/appgw/configbuilder.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -233,9 +233,9 @@ func generateListenerID(ingress *networking.Ingress, rule *networking.IngressRul
233233
if overridePort != nil {
234234
if *overridePort > 0 && *overridePort < 65000 {
235235
frontendPort = *overridePort
236-
klog.V(5).Infof("Using custom port specified in the override annotation: %d", *overridePort)
236+
klog.V(3).Infof("Using custom port specified in the override annotation: %d", *overridePort)
237237
} else {
238-
klog.V(5).Infof("Derived listener port from ingress: %d", frontendPort)
238+
klog.V(3).Infof("Derived listener port from ingress: %d", frontendPort)
239239
}
240240

241241
}
@@ -257,7 +257,7 @@ func generateListenerID(ingress *networking.Ingress, rule *networking.IngressRul
257257

258258
extendedHostNames, err := annotations.GetHostNameExtensions(ingress)
259259
if err != nil && !controllererrors.IsErrorCode(err, controllererrors.ErrorMissingAnnotation) {
260-
klog.V(5).Infof("Error while parsing host name extensions: %s", err)
260+
klog.V(3).Infof("Error while parsing host name extensions: %s", err)
261261
} else {
262262
if extendedHostNames != nil {
263263
hostNames = append(hostNames, extendedHostNames...)
@@ -279,7 +279,7 @@ func (c *appGwConfigBuilder) addTags() {
279279
if aksResourceID, err := azure.ConvertToClusterResourceGroup(c.k8sContext.GetInfrastructureResourceGroupID()); err == nil {
280280
c.appGw.Tags[tags.IngressForAKSClusterID] = to.StringPtr(aksResourceID)
281281
} else {
282-
klog.V(5).Infof("Error while parsing cluster resource ID for tagging: %s", err)
282+
klog.V(3).Infof("Error while parsing cluster resource ID for tagging: %s", err)
283283
}
284284
}
285285

0 commit comments

Comments
 (0)