Skip to content

Commit 2f35fdf

Browse files
committed
Merge branch 'renovate/registry.k8s.io-ingress-nginx-kube-webhook-certgen-1.x' of github.com:projectcapsule/capsule-proxy into renovate/registry.k8s.io-ingress-nginx-kube-webhook-certgen-1.x
2 parents 1232211 + 838d162 commit 2f35fdf

45 files changed

Lines changed: 175 additions & 1644 deletions

Some content is hidden

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

.github/actions/setup-caches/action.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ inputs:
99
runs:
1010
using: composite
1111
steps:
12-
- uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
12+
- uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
1313
with:
1414
path: ~/go/pkg/mod
1515
key: ${{ runner.os }}-go-pkg-mod-${{ hashFiles('**/go.sum') }}-${{ hashFiles('Makefile') }}
16-
- uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
16+
- uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
1717
if: ${{ inputs.build-cache-key }}
1818
with:
1919
path: ~/.cache/go-build

.github/workflows/check-actions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Checkout
1818
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1919
- name: Ensure SHA pinned actions
20-
uses: zgosalvez/github-actions-ensure-sha-pinned-actions@cc9ffdc62fadb9f83b46dd0979d9ad50408cc6a6 # v5.0.2
20+
uses: zgosalvez/github-actions-ensure-sha-pinned-actions@ca46236c6ce584ae24bc6283ba8dcf4b3ec8a066 # v5.0.4
2121
with:
2222
# slsa-github-generator requires using a semver tag for reusable workflows.
2323
# See: https://github.com/slsa-framework/slsa-github-generator#referencing-slsa-builders-and-generators

.github/workflows/coverage.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ jobs:
2727
value: ${{ secrets.FOSSA_API_KEY }}
2828
- name: "Run FOSSA Scan"
2929
if: steps.checksecret.outputs.result == 'true'
30-
uses: fossas/fossa-action@c414b9ad82eaad041e47a7cf62a4f02411f427a0 # v1.8.0
30+
uses: fossas/fossa-action@ff70fe9fe17cbd2040648f1c45e8ec4e4884dcf3 # v1.9.0
3131
with:
3232
api-key: ${{ secrets.FOSSA_API_KEY }}
3333
- name: "Run FOSSA Test"
3434
if: steps.checksecret.outputs.result == 'true'
35-
uses: fossas/fossa-action@c414b9ad82eaad041e47a7cf62a4f02411f427a0 # v1.8.0
35+
uses: fossas/fossa-action@ff70fe9fe17cbd2040648f1c45e8ec4e4884dcf3 # v1.9.0
3636
with:
3737
api-key: ${{ secrets.FOSSA_API_KEY }}
3838
run-tests: true
@@ -48,15 +48,15 @@ jobs:
4848
steps:
4949
- name: Checkout Source
5050
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
51-
- uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
51+
- uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
5252
with:
5353
go-version-file: 'go.mod'
5454
- name: Run Gosec Security Scanner
55-
uses: securego/gosec@bb17e422fc34bf4c0a2e5cab9d07dc45a68c040c # v2.24.7
55+
uses: securego/gosec@223e19b8856e00f02cc67804499a83f77e208f3c # v2.25.0
5656
with:
5757
args: '-no-fail -fmt sarif -out gosec.sarif ./...'
5858
- name: Upload SARIF file
59-
uses: github/codeql-action/upload-sarif@1a97b0f94ec9297d6f58aefe5a6b5441c045bed4
59+
uses: github/codeql-action/upload-sarif@34950e1b113b30df4edee1a6d3a605242df0c40b
6060
with:
6161
sarif_file: gosec.sarif
6262
unit_tests:
@@ -65,7 +65,7 @@ jobs:
6565
steps:
6666
- name: Checkout
6767
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
68-
- uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
68+
- uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
6969
with:
7070
go-version-file: 'go.mod'
7171
- name: Unit Test
@@ -77,7 +77,7 @@ jobs:
7777
value: ${{ secrets.CODECOV_TOKEN }}
7878
- name: Upload Report to Codecov
7979
if: ${{ steps.checksecret.outputs.result == 'true' }}
80-
uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
80+
uses: codecov/codecov-action@75cd11691c0faa626561e295848008c8a7dddffe # v5.5.4
8181
with:
8282
token: ${{ secrets.CODECOV_TOKEN }}
8383
slug: projectcapsule/capsule-proxy

.github/workflows/docker-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,6 @@ jobs:
4040
# See: https://github.com/aquasecurity/trivy-action/issues/389#issuecomment-2385416577
4141
TRIVY_DB_REPOSITORY: 'public.ecr.aws/aquasecurity/trivy-db:2'
4242
- name: Upload Trivy scan results to GitHub Security tab
43-
uses: github/codeql-action/upload-sarif@1a97b0f94ec9297d6f58aefe5a6b5441c045bed4
43+
uses: github/codeql-action/upload-sarif@34950e1b113b30df4edee1a6d3a605242df0c40b
4444
with:
4545
sarif_file: 'trivy-results.sarif'

.github/workflows/e2e.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2929
with:
3030
fetch-depth: 0
31-
- uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
31+
- uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
3232
with:
3333
go-version-file: 'go.mod'
3434
- uses: azure/setup-helm@1a275c3b69536ee54be43f2070a358922e12c8d4 # v4

.github/workflows/lint.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1919
with:
2020
fetch-depth: 0
21-
- uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
21+
- uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
2222
with:
2323
go-version-file: 'go.mod'
2424
- name: Generate manifests
@@ -45,7 +45,7 @@ jobs:
4545
runs-on: ubuntu-24.04
4646
steps:
4747
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
48-
- uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
48+
- uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
4949
with:
5050
go-version-file: 'go.mod'
5151
- name: Run golangci-lint

.github/workflows/releaser.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
timeout-minutes: 5
2727
continue-on-error: true
2828
- uses: creekorful/goreportcard-action@1f35ced8cdac2cba28c9a2f2288a16aacfd507f9 # v1.0
29-
- uses: anchore/sbom-action/download-syft@57aae528053a48a3f6235f2d9461b05fbcb7366d
29+
- uses: anchore/sbom-action/download-syft@f0d33c151c04af6fcbf4363834e838fcc7c87783
3030
- name: Install Cosign
3131
uses: sigstore/cosign-installer@fb28c2b6339dcd94da6e4cbcbc5e888961f6f8c3 # DO NOT UPDATE v3.9.0
3232
- name: Run GoReleaser

.github/workflows/scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@ jobs:
3737
path: results.sarif
3838
retention-days: 5
3939
- name: Upload to code-scanning
40-
uses: github/codeql-action/upload-sarif@b1bff81932f5cdfc8695c7752dcee935dcd061c8 # v4.33.0
40+
uses: github/codeql-action/upload-sarif@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
4141
with:
4242
sarif_file: results.sarif

.github/workflows/stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
pull-requests: write
1616
steps:
1717
- name: Close stale pull requests
18-
uses: actions/stale@b5d41d4e1d5dceea10e7104786b73624c18a190f
18+
uses: actions/stale@db5d06a4c82d5e94513c09c406638111df61f63e
1919
with:
2020
stale-issue-message: 'This pull request has been automatically closed because it has been inactive for more than 60 days. Please reopen if you still intend to submit this pull request.'
2121
days-before-stale: 60

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ ifeq ($(CAPSULE_PROXY_MODE),http)
190190
--set "serviceMonitor.enabled=false" \
191191
--set "options.generateCertificates=false" \
192192
--set "certManager.generateCertificates=false" \
193-
--set "options.extraArgs={--feature-gates=ProxyClusterScoped=true,--feature-gates=ProxyAllNamespaced=true}"
193+
--set "options.extraArgs={--feature-gates=ProxyAllNamespaced=true}"
194194
else
195195
@echo "Running in HTTPS mode"
196196
@echo "Installing Capsule-Proxy using HELM..."
@@ -206,7 +206,7 @@ else
206206
--set "serviceMonitor.enabled=false" \
207207
--set "options.generateCertificates=false" \
208208
--set "certManager.certificate.ipAddresses={127.0.0.1}" \
209-
--set "options.extraArgs={--feature-gates=ProxyClusterScoped=true,--feature-gates=ProxyAllNamespaced=true}"
209+
--set "options.extraArgs={--feature-gates=ProxyAllNamespaced=true}"
210210
endif
211211
@kubectl rollout restart ds capsule-proxy -n capsule-system || true
212212
$(MAKE) generate-kubeconfigs

0 commit comments

Comments
 (0)