Skip to content

Commit 2e08cf6

Browse files
AlexFenlonAlexFenlon
committed
Merge remote-tracking branch 'origin/main' into feat/zone-sync-configmap
2 parents b315177 + 4dbfc2e commit 2e08cf6

35 files changed

+678
-438
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ jobs:
227227
if: ${{ needs.checks.outputs.binary_cache_hit != 'true' }}
228228

229229
- name: Upload coverage to Codecov
230-
uses: codecov/codecov-action@0da7aa657d958d32c117fc47e1f977e7524753c7 # v5.3.0
230+
uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v5.3.1
231231
with:
232232
files: ./coverage.txt
233233
token: ${{ secrets.CODECOV_TOKEN }} # required

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070

7171
# Initializes the CodeQL tools for scanning.
7272
- name: Initialize CodeQL
73-
uses: github/codeql-action/init@ee117c905ab18f32fa0f66c2fe40ecc8013f3e04 # v3.28.4
73+
uses: github/codeql-action/init@f6091c0113d1dcf9b98e269ee48e8a7e51b7bdd4 # v3.28.5
7474
with:
7575
languages: ${{ matrix.language }}
7676
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -89,7 +89,7 @@ jobs:
8989
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
9090
# If this step fails, then you should remove it and run the build manually (see below)
9191
- name: Autobuild
92-
uses: github/codeql-action/autobuild@ee117c905ab18f32fa0f66c2fe40ecc8013f3e04 # v3.28.4
92+
uses: github/codeql-action/autobuild@f6091c0113d1dcf9b98e269ee48e8a7e51b7bdd4 # v3.28.5
9393

9494
# ℹ️ Command-line programs to run using the OS shell.
9595
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -102,6 +102,6 @@ jobs:
102102
# ./location_of_script_within_repo/buildscript.sh
103103

104104
- name: Perform CodeQL Analysis
105-
uses: github/codeql-action/analyze@ee117c905ab18f32fa0f66c2fe40ecc8013f3e04 # v3.28.4
105+
uses: github/codeql-action/analyze@f6091c0113d1dcf9b98e269ee48e8a7e51b7bdd4 # v3.28.5
106106
with:
107107
category: "/language:${{matrix.language}}"

‎.github/workflows/dependabot-auto-merge.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
steps:
1515
- name: Dependabot metadata
1616
id: dependabot-metadata
17-
uses: dependabot/fetch-metadata@dbb049abf0d677abbd7f7eee0375145b417fdd34 # v2.2.0
17+
uses: dependabot/fetch-metadata@d7267f607e9d3fb96fc2fbe83e0af444713e90b7 # v2.3.0
1818

1919
- name: Enable auto-merge for Dependabot PRs
2020
run: gh pr merge --auto --squash "$PR_URL"

‎.github/workflows/dependabot-hugo.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
steps:
2424
- name: Fetch Dependabot metadata
2525
id: dependabot-metadata
26-
uses: dependabot/fetch-metadata@dbb049abf0d677abbd7f7eee0375145b417fdd34 # v2.2.0
26+
uses: dependabot/fetch-metadata@d7267f607e9d3fb96fc2fbe83e0af444713e90b7 # v2.3.0
2727

2828
- name: Checkout Repository
2929
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

‎.github/workflows/image-promotion.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ jobs:
143143
fi
144144
145145
- name: Upload SARIF file
146-
uses: github/codeql-action/upload-sarif@ee117c905ab18f32fa0f66c2fe40ecc8013f3e04 # v3.28.4
146+
uses: github/codeql-action/upload-sarif@f6091c0113d1dcf9b98e269ee48e8a7e51b7bdd4 # v3.28.5
147147
if: steps.check-sarif.outputs.sarif_has_results == 'true'
148148
with:
149149
sarif_file: govulncheck.sarif
@@ -468,7 +468,7 @@ jobs:
468468
overwrite: true
469469

470470
- name: Upload Scan results to GitHub Security tab
471-
uses: github/codeql-action/upload-sarif@ee117c905ab18f32fa0f66c2fe40ecc8013f3e04 # v3.28.4
471+
uses: github/codeql-action/upload-sarif@f6091c0113d1dcf9b98e269ee48e8a7e51b7bdd4 # v3.28.5
472472
with:
473473
sarif_file: "${{ steps.directory.outputs.directory }}/"
474474

@@ -557,7 +557,7 @@ jobs:
557557
overwrite: true
558558

559559
- name: Upload Scan results to GitHub Security tab
560-
uses: github/codeql-action/upload-sarif@ee117c905ab18f32fa0f66c2fe40ecc8013f3e04 # v3.28.4
560+
uses: github/codeql-action/upload-sarif@f6091c0113d1dcf9b98e269ee48e8a7e51b7bdd4 # v3.28.5
561561
with:
562562
sarif_file: "${{ steps.directory.outputs.directory }}/"
563563

@@ -653,7 +653,7 @@ jobs:
653653
overwrite: true
654654

655655
- name: Upload Scan results to GitHub Security tab
656-
uses: github/codeql-action/upload-sarif@ee117c905ab18f32fa0f66c2fe40ecc8013f3e04 # v3.28.4
656+
uses: github/codeql-action/upload-sarif@f6091c0113d1dcf9b98e269ee48e8a7e51b7bdd4 # v3.28.5
657657
with:
658658
sarif_file: "${{ steps.directory.outputs.directory }}/"
659659
continue-on-error: true

‎.github/workflows/regression.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ jobs:
9999
run: make cover
100100

101101
- name: Upload coverage to Codecov
102-
uses: codecov/codecov-action@0da7aa657d958d32c117fc47e1f977e7524753c7 # v5.3.0
102+
uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v5.3.1
103103
with:
104104
files: ./coverage.txt
105105
token: ${{ secrets.CODECOV_TOKEN }} # required

‎.github/workflows/scorecards.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,6 @@ jobs:
5757

5858
# Upload the results to GitHub's code scanning dashboard.
5959
- name: "Upload to code-scanning"
60-
uses: github/codeql-action/upload-sarif@ee117c905ab18f32fa0f66c2fe40ecc8013f3e04 # v3.28.4
60+
uses: github/codeql-action/upload-sarif@f6091c0113d1dcf9b98e269ee48e8a7e51b7bdd4 # v3.28.5
6161
with:
6262
sarif_file: results.sarif

‎cmd/nginx-ingress/main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1068,7 +1068,7 @@ func updateSelfWithVersionInfo(ctx context.Context, eventLog record.EventRecorde
10681068
for key, value := range labels {
10691069
fmt.Fprintf(labelsString, "%s=\"%s\", ", key, value)
10701070
}
1071-
eventLog.Eventf(newPod, api_v1.EventTypeNormal, "UpdatePodLabel", "Successfully added version labels, %s", strings.TrimRight(labelsString.String(), ", "))
1071+
eventLog.Eventf(newPod, api_v1.EventTypeNormal, nl.EventReasonUpdatePodLabel, "Successfully added version labels, %s", strings.TrimRight(labelsString.String(), ", "))
10721072
nl.Infof(l, "Pod label updated: %s", pod.ObjectMeta.Name)
10731073
podUpdated = true
10741074
}

‎internal/certmanager/sync.go‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,6 @@ import (
4040
vsapi "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1"
4141
)
4242

43-
const (
44-
reasonBadConfig = "BadConfig"
45-
reasonCreateCertificate = "CreateCertificate"
46-
reasonUpdateCertificate = "UpdateCertificate"
47-
reasonDeleteCertificate = "DeleteCertificate"
48-
)
49-
5043
var vsGVK = vsapi.SchemeGroupVersion.WithKind("VirtualServer")
5144

5245
// SyncFn is the reconciliation function passed to cert manager VS controller.
@@ -71,7 +64,7 @@ func SyncFnFor(
7164
issuerName, issuerKind, issuerGroup, err := issuerForVirtualServer(vs)
7265
if err != nil {
7366
nl.Errorf(l, "Failed to determine issuer to be used for VirtualServer resource: %v", err)
74-
rec.Eventf(vs, corev1.EventTypeWarning, reasonBadConfig, "Could not determine issuer for virtual server due to bad config: %s",
67+
rec.Eventf(vs, corev1.EventTypeWarning, nl.EventReasonBadConfig, "Could not determine issuer for virtual server due to bad config: %s",
7568
err)
7669
return err
7770
}
@@ -81,7 +74,7 @@ func SyncFnFor(
8174
newCrts, updateCrts, err := buildCertificates(ctx, nsi.cmLister, vs, issuerName, issuerKind, issuerGroup)
8275
if err != nil {
8376
nl.Errorf(l, "Incorrect cert-manager configuration for VirtualServer resource: %v", err)
84-
rec.Eventf(vs, corev1.EventTypeWarning, reasonBadConfig, "Incorrect cert-manager configuration for VirtualServer resource: %s",
77+
rec.Eventf(vs, corev1.EventTypeWarning, nl.EventReasonBadConfig, "Incorrect cert-manager configuration for VirtualServer resource: %s",
8578
err)
8679
return err
8780
}
@@ -90,22 +83,22 @@ func SyncFnFor(
9083
_, err := cmClient.CertmanagerV1().Certificates(crt.Namespace).Create(ctx, crt, metav1.CreateOptions{})
9184
if err != nil {
9285
nl.Errorf(l, "Error issuing Certificate for VirtualServer resource: %v", err)
93-
rec.Eventf(vs, corev1.EventTypeWarning, reasonBadConfig, "Error issuing Certificate for VirtualServer resource: %s",
86+
rec.Eventf(vs, corev1.EventTypeWarning, nl.EventReasonBadConfig, "Error issuing Certificate for VirtualServer resource: %s",
9487
err)
9588
return err
9689
}
97-
rec.Eventf(vs, corev1.EventTypeNormal, reasonCreateCertificate, "Successfully created Certificate %q", crt.Name)
90+
rec.Eventf(vs, corev1.EventTypeNormal, nl.EventReasonCreateCertificate, "Successfully created Certificate %q", crt.Name)
9891
}
9992

10093
for _, crt := range updateCrts {
10194
_, err := cmClient.CertmanagerV1().Certificates(crt.Namespace).Update(ctx, crt, metav1.UpdateOptions{})
10295
if err != nil {
10396
nl.Errorf(l, "Error updating Certificate for VirtualServer resource: %v", err)
104-
rec.Eventf(vs, corev1.EventTypeWarning, reasonBadConfig, "Error updating Certificate for VirtualServer resource: %s",
97+
rec.Eventf(vs, corev1.EventTypeWarning, nl.EventReasonBadConfig, "Error updating Certificate for VirtualServer resource: %s",
10598
err)
10699
return err
107100
}
108-
rec.Eventf(vs, corev1.EventTypeNormal, reasonUpdateCertificate, "Successfully updated Certificate %q", crt.Name)
101+
rec.Eventf(vs, corev1.EventTypeNormal, nl.EventReasonUpdateCertificate, "Successfully updated Certificate %q", crt.Name)
109102
}
110103
var certs []*cmapi.Certificate
111104

@@ -121,7 +114,7 @@ func SyncFnFor(
121114
nl.Errorf(l, "Error deleting Certificate for VirtualServer resource: %v", err)
122115
return err
123116
}
124-
rec.Eventf(vs, corev1.EventTypeNormal, reasonDeleteCertificate, "Successfully deleted unrequired Certificate %q", certName)
117+
rec.Eventf(vs, corev1.EventTypeNormal, nl.EventReasonDeleteCertificate, "Successfully deleted unrequired Certificate %q", certName)
125118
}
126119

127120
return nil

0 commit comments

Comments
 (0)