Skip to content

Commit e1449fd

Browse files
authored
Merge branch 'main' into chore/fix-cves
2 parents e8a8be1 + a2ee4c4 commit e1449fd

File tree

5 files changed

+11
-5
lines changed

5 files changed

+11
-5
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ jobs:
182182
fail-build: false
183183

184184
- name: Upload scan result to GitHub Security tab
185-
uses: github/codeql-action/upload-sarif@192325c86100d080feab897ff886c34abd4c83a3 # v3.30.3
185+
uses: github/codeql-action/upload-sarif@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # v3.30.5
186186
if: ${{ !inputs.dry_run }}
187187
continue-on-error: true
188188
with:

.github/workflows/dependency-review.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ jobs:
1515
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
1616

1717
- name: "Dependency Review"
18-
uses: actions/dependency-review-action@595b5aeba73380359d98a5e087f648dbb0edce1b # v4.7.3
18+
uses: actions/dependency-review-action@56339e523c0409420f6c2c9a2f4292bbb3c07dd3 # v4.8.0
1919
with:
2020
config-file: "nginx/k8s-common/dependency-review-config.yml@main"

.github/workflows/scorecards.yml

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

6161
# Upload the results to GitHub's code scanning dashboard.
6262
- name: "Upload to code-scanning"
63-
uses: github/codeql-action/upload-sarif@192325c86100d080feab897ff886c34abd4c83a3 # v3.30.3
63+
uses: github/codeql-action/upload-sarif@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # v3.30.5
6464
with:
6565
sarif_file: results.sarif

internal/controller/provisioner/provisioner.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,10 +224,16 @@ func (p *NginxProvisioner) provisionNginx(
224224
return nil
225225
}
226226

227+
objNames := make([]string, 0, len(objects))
228+
for _, obj := range objects {
229+
objNames = append(objNames, obj.GetName())
230+
}
231+
227232
p.cfg.Logger.Info(
228233
"Creating/Updating nginx resources",
229234
"namespace", gateway.GetNamespace(),
230-
"name", resourceName,
235+
"nginx resource name", resourceName,
236+
"resource names", objNames,
231237
)
232238

233239
var agentConfigMapUpdated, deploymentCreated bool

tests/framework/collector.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const (
1313
collectorChartReleaseName = "otel-collector"
1414
//nolint:lll
1515
// renovate: datasource=helm depName=opentelemetry-collector registryUrl=https://open-telemetry.github.io/opentelemetry-helm-charts
16-
collectorChartVersion = "0.134.1"
16+
collectorChartVersion = "0.136.1"
1717
)
1818

1919
// InstallCollector installs the otel-collector.

0 commit comments

Comments
 (0)