Skip to content

Commit 41cd2d9

Browse files
shearn89shearn89
authored
Merge branch 'main' into feature/support-deployment-values-for-policy-controlle-webhook
Signed-off-by: Alex Shearn <[email protected]>
2 parents 9e62a08 + 9f5d055 commit 41cd2d9

Some content is hidden

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

43 files changed

+553
-238
lines changed

‎.github/workflows/check-docs.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111

1212
steps:
1313
- name: Checkout repository
14-
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
14+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1515

1616
- name: Run Helm Docs and check the outcome
1717
run: |

‎.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818

1919
steps:
2020
- name: Checkout
21-
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
21+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2222
with:
2323
fetch-depth: 0
2424

‎.github/workflows/test.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Checkout
13-
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
13+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1414
with:
1515
fetch-depth: 0
1616

1717
- name: Set up Helm
1818
uses: azure/setup-helm@fe7b79cd5ee1e45176fcad797de68ecaf3ca4814 # v4.2.0
1919

20-
- uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
20+
- uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
2121
with:
2222
python-version: '3.x'
2323
check-latest: true

‎charts/ctlog/Chart.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ description: Certificate Log
44

55
type: application
66

7-
version: 0.2.57
8-
appVersion: 0.7.11
7+
version: 0.2.59
8+
appVersion: 0.7.15
99

1010
keywords:
1111
- security
@@ -20,10 +20,10 @@ annotations:
2020
artifacthub.io/license: Apache-2.0
2121
artifacthub.io/images: |
2222
- name: ct_server
23-
image: ghcr.io/sigstore/scaffolding/ct_server:v0.7.11@sha256:d6238aba1c35d3a2aae832469b20618e19a638da5f70d37791d945ce010f2027
23+
image: ghcr.io/sigstore/scaffolding/ct_server:v0.7.15@sha256:49bccd7bccd31f7232265410dcc075b0e2618045bff3075afcf84e630c8b77c3
2424
- name: createctconfig
25-
image: ghcr.io/sigstore/scaffolding/createctconfig:v0.7.11@sha256:bcab917a07bb27f847531b145679b4b9a57bcaa85bb91e0b441ae9473c24fb79
25+
image: ghcr.io/sigstore/scaffolding/createctconfig:v0.7.15@sha256:f0a4c3518a2b761260a47fee126db364087b9fe2d68e773d392f9cbabdccf198
2626
- name: createtree
27-
image: ghcr.io/sigstore/scaffolding/createtree:v0.7.11@sha256:4e3614df07561b096f1bfe1e1f79582b1545d6253bfad0f79235a1a1af74ef03
27+
image: ghcr.io/sigstore/scaffolding/createtree:v0.7.15@sha256:ee42272373b46a898b21a0aea21cf703e90048e03f45a4640381b4a04735ffd8
2828
- name: curlimages/curl
2929
image: docker.io/curlimages/curl:8.10.1@sha256:d9b4541e214bcd85196d6e92e2753ac6d0ea699f0af5741f8c6cccbfcf00ef4b

‎charts/ctlog/README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# ctlog
22

3-
![Version: 0.2.57](https://img.shields.io/badge/Version-0.2.57-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.7.11](https://img.shields.io/badge/AppVersion-0.7.11-informational?style=flat-square)
3+
![Version: 0.2.59](https://img.shields.io/badge/Version-0.2.59-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.7.15](https://img.shields.io/badge/AppVersion-0.7.15-informational?style=flat-square)
44

55
Certificate Log
66

@@ -24,7 +24,7 @@ Certificate Log
2424
| createctconfig.image.pullPolicy | string | `"IfNotPresent"` | |
2525
| createctconfig.image.registry | string | `"ghcr.io"` | |
2626
| createctconfig.image.repository | string | `"sigstore/scaffolding/createctconfig"` | |
27-
| createctconfig.image.version | string | `"sha256:bcab917a07bb27f847531b145679b4b9a57bcaa85bb91e0b441ae9473c24fb79"` | v0.7.11 |
27+
| createctconfig.image.version | string | `"sha256:f0a4c3518a2b761260a47fee126db364087b9fe2d68e773d392f9cbabdccf198"` | v0.7.15 |
2828
| createctconfig.initContainerImage.curl.imagePullPolicy | string | `"IfNotPresent"` | |
2929
| createctconfig.initContainerImage.curl.registry | string | `"docker.io"` | |
3030
| createctconfig.initContainerImage.curl.repository | string | `"curlimages/curl"` | |
@@ -51,7 +51,7 @@ Certificate Log
5151
| createtree.image.pullPolicy | string | `"IfNotPresent"` | |
5252
| createtree.image.registry | string | `"ghcr.io"` | |
5353
| createtree.image.repository | string | `"sigstore/scaffolding/createtree"` | |
54-
| createtree.image.version | string | `"sha256:4e3614df07561b096f1bfe1e1f79582b1545d6253bfad0f79235a1a1af74ef03"` | |
54+
| createtree.image.version | string | `"sha256:ee42272373b46a898b21a0aea21cf703e90048e03f45a4640381b4a04735ffd8"` | |
5555
| createtree.name | string | `"createtree"` | |
5656
| createtree.nodeSelector | object | `{}` | |
5757
| createtree.securityContext.runAsNonRoot | bool | `true` | |
@@ -73,7 +73,7 @@ Certificate Log
7373
| server.image.pullPolicy | string | `"IfNotPresent"` | |
7474
| server.image.registry | string | `"ghcr.io"` | |
7575
| server.image.repository | string | `"sigstore/scaffolding/ct_server"` | |
76-
| server.image.version | string | `"sha256:d6238aba1c35d3a2aae832469b20618e19a638da5f70d37791d945ce010f2027"` | |
76+
| server.image.version | string | `"sha256:49bccd7bccd31f7232265410dcc075b0e2618045bff3075afcf84e630c8b77c3"` | |
7777
| server.ingress.annotations | object | `{}` | |
7878
| server.ingress.className | string | `"nginx"` | |
7979
| server.ingress.enabled | bool | `false` | |

‎charts/ctlog/templates/_helpers.tpl

+3-9
Original file line numberDiff line numberDiff line change
@@ -110,15 +110,9 @@ Server Arguments
110110
- {{ printf "--metrics_endpoint=0.0.0.0:%d" (.Values.server.portHTTPMetrics | int) | quote }}
111111
- "--log_config=/ctfe-keys/config"
112112
- "--alsologtostderr"
113-
{{- if .Values.server.extraArgs -}}
114-
{{- range $key, $value := .Values.server.extraArgs }}
115-
{{- if $value }}
116-
- {{ printf "%v=%v" $key $value | quote }}
117-
{{- else }}
118-
- {{ printf $key | quote }}
119-
{{- end }}
120-
{{- end }}
121-
{{- end -}}
113+
{{- range .Values.server.extraArgs }}
114+
- {{ . | quote }}
115+
{{ end }}
122116
{{- end -}}
123117

124118
{{/*

‎charts/ctlog/values.yaml

+6-6
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ server:
1313
registry: ghcr.io
1414
repository: sigstore/scaffolding/ct_server
1515
pullPolicy: IfNotPresent
16-
# v0.7.11
17-
version: sha256:d6238aba1c35d3a2aae832469b20618e19a638da5f70d37791d945ce010f2027
16+
# v0.7.15
17+
version: sha256:49bccd7bccd31f7232265410dcc075b0e2618045bff3075afcf84e630c8b77c3
1818
livenessProbe:
1919
httpGet:
2020
path: /healthz
@@ -100,8 +100,8 @@ createtree:
100100
registry: ghcr.io
101101
repository: sigstore/scaffolding/createtree
102102
pullPolicy: IfNotPresent
103-
# v0.7.11
104-
version: sha256:4e3614df07561b096f1bfe1e1f79582b1545d6253bfad0f79235a1a1af74ef03
103+
# v0.7.15
104+
version: sha256:ee42272373b46a898b21a0aea21cf703e90048e03f45a4640381b4a04735ffd8
105105
ttlSecondsAfterFinished: 3600
106106
serviceAccount:
107107
create: true
@@ -132,8 +132,8 @@ createctconfig:
132132
registry: ghcr.io
133133
repository: sigstore/scaffolding/createctconfig
134134
pullPolicy: IfNotPresent
135-
# -- v0.7.11
136-
version: sha256:bcab917a07bb27f847531b145679b4b9a57bcaa85bb91e0b441ae9473c24fb79
135+
# -- v0.7.15
136+
version: sha256:f0a4c3518a2b761260a47fee126db364087b9fe2d68e773d392f9cbabdccf198
137137
fulcioURL: "http://fulcio-server.fulcio-system.svc"
138138
logPrefix: sigstorescaffolding
139139
privateKeyPasswordSecretName: ""

‎charts/fulcio/Chart.lock

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dependencies:
22
- name: ctlog
33
repository: https://sigstore.github.io/helm-charts
4-
version: 0.2.57
5-
digest: sha256:9d3b2e53af0b40157727a7928095d92c355b08a0fa625dcf46a0cc695f78f905
6-
generated: "2024-09-29T17:20:25.569061877-04:00"
4+
version: 0.2.59
5+
digest: sha256:bb907cdf05f1b8d94240217874b1497dd6456d212aa7df66d8424b3a5ca94d2b
6+
generated: "2024-10-31T15:31:00.446133788-04:00"

‎charts/fulcio/Chart.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: |
55
66
type: application
77

8-
version: 2.6.1
8+
version: 2.6.3
99
appVersion: 1.6.4
1010

1111
keywords:
@@ -19,7 +19,7 @@ maintainers:
1919

2020
dependencies:
2121
- name: ctlog
22-
version: 0.2.57
22+
version: 0.2.59
2323
repository: https://sigstore.github.io/helm-charts
2424
condition: ctlog.enabled
2525

@@ -29,4 +29,4 @@ annotations:
2929
- name: fulcio
3030
image: gcr.io/projectsigstore/fulcio:v1.6.4@sha256:4b2a0f0877095aa36898af70edd00568158f89e015f6bb7f02475660d0924f3b
3131
- name: createcerts
32-
image: ghcr.io/sigstore/scaffolding/createcerts:v0.7.11@sha256:00fdcc2018c1a377eeabf840371711162fe50c31b57646bfda5ed9c0affdea9e
32+
image: ghcr.io/sigstore/scaffolding/createcerts:v0.7.15@sha256:03a5725b8812a45570a1c6ed8e5df7dc2295904cd8603c7ed537d97af174d235

‎charts/fulcio/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<!-- This README.md is generated. Please edit README.md.gotmpl -->
44

5-
![Version: 2.6.1](https://img.shields.io/badge/Version-2.6.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.6.4](https://img.shields.io/badge/AppVersion-1.6.4-informational?style=flat-square)
5+
![Version: 2.6.3](https://img.shields.io/badge/Version-2.6.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.6.4](https://img.shields.io/badge/AppVersion-1.6.4-informational?style=flat-square)
66

77
Fulcio is a free code signing Certificate Authority, built to make short-lived certificates available to anyone.
88

@@ -71,7 +71,7 @@ helm uninstall [RELEASE_NAME]
7171
7272
| Repository | Name | Version |
7373
|------------|------|---------|
74-
| https://sigstore.github.io/helm-charts | ctlog | 0.2.57 |
74+
| https://sigstore.github.io/helm-charts | ctlog | 0.2.59 |
7575
7676
## Values
7777
@@ -85,7 +85,7 @@ helm uninstall [RELEASE_NAME]
8585
| createcerts.image.pullPolicy | string | `"IfNotPresent"` | |
8686
| createcerts.image.registry | string | `"ghcr.io"` | |
8787
| createcerts.image.repository | string | `"sigstore/scaffolding/createcerts"` | |
88-
| createcerts.image.version | string | `"sha256:00fdcc2018c1a377eeabf840371711162fe50c31b57646bfda5ed9c0affdea9e"` | |
88+
| createcerts.image.version | string | `"sha256:03a5725b8812a45570a1c6ed8e5df7dc2295904cd8603c7ed537d97af174d235"` | |
8989
| createcerts.name | string | `"createcerts"` | |
9090
| createcerts.nodeSelector | object | `{}` | |
9191
| createcerts.replicaCount | int | `1` | |

‎charts/fulcio/values.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,8 @@ createcerts:
123123
registry: ghcr.io
124124
repository: sigstore/scaffolding/createcerts
125125
pullPolicy: IfNotPresent
126-
# v0.7.11
127-
version: sha256:00fdcc2018c1a377eeabf840371711162fe50c31b57646bfda5ed9c0affdea9e
126+
# v0.7.15
127+
version: sha256:03a5725b8812a45570a1c6ed8e5df7dc2295904cd8603c7ed537d97af174d235
128128
ttlSecondsAfterFinished: 3600
129129
serviceAccount:
130130
create: true

‎charts/policy-controller/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<!-- This README.md is generated. Please edit README.md.gotmpl -->
44

5-
![Version: 0.7.0](https://img.shields.io/badge/Version-0.7.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.8.2](https://img.shields.io/badge/AppVersion-0.8.2-informational?style=flat-square)
5+
![Version: 0.7.2](https://img.shields.io/badge/Version-0.7.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.8.2](https://img.shields.io/badge/AppVersion-0.8.2-informational?style=flat-square)
66

77
The Helm chart for Policy Controller
88

‎charts/policy-controller/templates/webhook/deployment_webhook.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ spec:
7575
value: "{{ $value }}"
7676
{{- end }}
7777
{{- end }}
78+
{{- if or (semverCompare ">= 1.8-0" .Chart.AppVersion) .Values.webhook.extraArgs }}
7879
args:
7980
{{- if semverCompare ">= 1.8-0" .Chart.AppVersion }}
8081
- -webhook-name={{ required "A valid cosign.webhookName is required" .Values.cosign.webhookName }}
@@ -84,6 +85,7 @@ spec:
8485
{{- range $key, $value := .Values.webhook.extraArgs }}
8586
- -{{ $key }}={{ $value }}
8687
{{- end }}
88+
{{- end }}
8789
ports:
8890
- containerPort: 8443
8991
name: https

‎charts/policy-controller/templates/webhook/poddisruptionbudget.yaml

+6-4
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,17 @@ metadata:
1111
{{- toYaml . | nindent 4 }}
1212
{{- end }}
1313
{{- end }}
14+
{{- with .Values.annotations }}
1415
annotations:
15-
{{- if .Values.annotations }}
16-
{{- with .Values.annotations }}
1716
{{- toYaml . | nindent 4 }}
18-
{{- end }}
19-
{{- end }}
17+
{{- end }}
2018
spec:
19+
{{- if .Values.webhook.podDisruptionBudget.minAvailable }}
2120
minAvailable: {{ .Values.webhook.podDisruptionBudget.minAvailable }}
21+
{{- end }}
22+
{{- if .Values.webhook.podDisruptionBudget.maxUnavailable }}
2223
maxUnavailable: {{ .Values.webhook.podDisruptionBudget.maxUnavailable }}
24+
{{- end }}
2325
selector:
2426
matchLabels:
2527
{{- include "policy-controller.selectorLabels" . | nindent 6 }}

‎charts/policy-controller/templates/webhook/secret_certs_webhook.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
apiVersion: v1
22
kind: Secret
33
metadata:
4+
{{- if or .Values.webhook.service.annotations .Values.commonAnnotations }}
45
annotations:
56
{{- if .Values.webhook.service.annotations }}
67
{{ toYaml .Values.webhook.service.annotations | nindent 4 }}
78
{{- end }}
89
{{- if .Values.commonAnnotations }}
910
{{- toYaml .Values.commonAnnotations | nindent 4 }}
1011
{{- end }}
12+
{{- end }}
1113
labels:
1214
{{- include "policy-controller.labels" . | nindent 4 }}
1315
control-plane: {{ template "policy-controller.fullname" . }}-webhook
1416
name: webhook-certs
1517
namespace: {{ .Release.Namespace }}
16-
# The data is populated at install time.
18+
# The data is populated at install time.

‎charts/policy-controller/templates/webhook/service_webhook.yaml

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
apiVersion: v1
22
kind: Service
33
metadata:
4+
{{- with .Values.webhook.service.annotations }}
45
annotations:
5-
{{- if .Values.webhook.service.annotations }}
6-
{{ toYaml .Values.webhook.service.annotations | nindent 4 }}
7-
{{- end }}
6+
{{- toYaml . | nindent 4 }}
7+
{{- end }}
88
labels:
99
{{- include "policy-controller.labels" . | nindent 4 }}
1010
control-plane: {{ template "policy-controller.fullname" . }}-webhook
@@ -27,10 +27,10 @@ spec:
2727
apiVersion: v1
2828
kind: Service
2929
metadata:
30+
{{- with .Values.webhook.service.annotations }}
3031
annotations:
31-
{{- if .Values.webhook.service.annotations }}
32-
{{ toYaml .Values.webhook.service.annotations | nindent 4 }}
33-
{{- end }}
32+
{{- toYaml . | nindent 4 }}
33+
{{- end }}
3434
labels:
3535
{{- include "policy-controller.labels" . | nindent 4 }}
3636
control-plane: {{ template "policy-controller.fullname" . }}-webhook

‎charts/rekor/Chart.yaml

+6-6
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Part of the sigstore project, Rekor is a timestamping server and tr
44

55
type: application
66

7-
version: 1.5.1
7+
version: 1.5.2
88
appVersion: 1.3.6
99

1010
keywords:
@@ -19,24 +19,24 @@ maintainers:
1919

2020
dependencies:
2121
- name: trillian
22-
version: 0.2.28
22+
version: 0.2.29
2323
repository: https://sigstore.github.io/helm-charts
2424
condition: trillian.enabled
2525

2626
annotations:
2727
artifacthub.io/license: Apache-2.0
2828
artifacthub.io/images: |
2929
- name: createtree
30-
image: ghcr.io/sigstore/scaffolding/createtree:v0.7.11@sha256:4e3614df07561b096f1bfe1e1f79582b1545d6253bfad0f79235a1a1af74ef03
30+
image: ghcr.io/sigstore/scaffolding/createtree:v0.7.15@sha256:ee42272373b46a898b21a0aea21cf703e90048e03f45a4640381b4a04735ffd8
3131
- name: curlimages/curl
3232
image: docker.io/curlimages/curl:8.10.1@sha256:d9b4541e214bcd85196d6e92e2753ac6d0ea699f0af5741f8c6cccbfcf00ef4b
3333
- name: rekor-server
3434
image: gcr.io/projectsigstore/rekor-server:v1.3.6@sha256:1237f29e2105d7f5451bbe15a3aca8677ddd1bb80620ca2fd06f74262437cf51
3535
- name: redis
36-
image: docker.io/redis:6.2.14-alpine3.20@sha256:e3b17ba9479deec4b7d1eeec1548a253acc5374d68d3b27937fcfe4df8d18c7e
36+
image: docker.io/redis:6.2.16-alpine3.20@sha256:2ba50e1ac3a0ea17b736ce9db2b0a9f6f8b85d4c27d5f5accc6a416d8f42c6d5
3737
- name: backfill-redis
3838
image: ghcr.io/sigstore/rekor/backfill-redis:v1.3.6@sha256:a13cd8b2a554d6116888fd1f383cf6e91fc1716df5eda392b82e6bfc66995ec3
3939
- name: scaffold_cloud_proxy
40-
image: ghcr.io/sigstore/scaffolding/cloudsqlproxy:v0.7.11@sha256:16364cc06de704959576b23da26798850141ecae0f70510654764467cd9f47be
40+
image: ghcr.io/sigstore/scaffolding/cloudsqlproxy:v0.7.15@sha256:862598dc2457fd246dc5363e0bd21462343c89e714dbd4159e49f119e8ff5ca5
4141
- name: cloud_proxy
42-
image: gcr.io/cloud-sql-connectors/cloud-sql-proxy:2.13.0-alpine@sha256:74680d0e49d44af5b6f994a6a29712866cb95d8851b1416676313d0cf567946b
42+
image: gcr.io/cloud-sql-connectors/cloud-sql-proxy:2.14.0-alpine@sha256:6dc1d9ea84ff43eaeaebe51bb52de9e24dce8d8affd2fda0dc0d218897456c12

0 commit comments

Comments
 (0)