Skip to content

Commit e634d34

Browse files
svcAPLBotmerll
andauthored
chore(chart-deps): update cert-manager to version v1.17.1 (#1941)
Co-authored-by: Matthias Erll <[email protected]>
1 parent af1a3a0 commit e634d34

11 files changed

+106
-38
lines changed

chart/chart-index/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ dependencies:
99
version: 6.7.3
1010
repository: https://argoproj.github.io/argo-helm
1111
- name: cert-manager
12-
version: v1.16.3
12+
version: v1.17.1
1313
repository: https://charts.jetstack.io
1414
- name: cloudnative-pg
1515
version: 0.23.0

charts/cert-manager/Chart.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ annotations:
66
fingerprint: 1020CF3C033D4F35BAE1C19E1226061C665DF13E
77
url: https://cert-manager.io/public-keys/cert-manager-keyring-2021-09-20-1020CF3C033D4F35BAE1C19E1226061C665DF13E.gpg
88
apiVersion: v2
9-
appVersion: v1.16.3
9+
appVersion: v1.17.1
1010
description: A Helm chart for cert-manager
1111
home: https://cert-manager.io
1212
icon: https://raw.githubusercontent.com/cert-manager/community/4d35a69437d21b76322157e6284be4cd64e6d2b7/logo/logo-small.png
@@ -23,4 +23,4 @@ maintainers:
2323
name: cert-manager
2424
sources:
2525
- https://github.com/cert-manager/cert-manager
26-
version: v1.16.3
26+
version: v1.17.1

charts/cert-manager/README.md

+27-14
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Before installing the chart, you must first install the cert-manager CustomResou
1919
This is performed in a separate step to allow you to easily uninstall and reinstall cert-manager without deleting your installed custom resources.
2020

2121
```bash
22-
$ kubectl apply -f https://github.com/cert-manager/cert-manager/releases/download/v1.16.3/cert-manager.crds.yaml
22+
$ kubectl apply -f https://github.com/cert-manager/cert-manager/releases/download/v1.17.1/cert-manager.crds.yaml
2323
```
2424

2525
To install the chart with the release name `cert-manager`:
@@ -29,7 +29,7 @@ To install the chart with the release name `cert-manager`:
2929
$ helm repo add jetstack https://charts.jetstack.io --force-update
3030

3131
## Install the cert-manager helm chart
32-
$ helm install cert-manager --namespace cert-manager --version v1.16.3 jetstack/cert-manager
32+
$ helm install cert-manager --namespace cert-manager --version v1.17.1 jetstack/cert-manager
3333
```
3434

3535
In order to begin issuing certificates, you will need to set up a ClusterIssuer
@@ -65,7 +65,7 @@ If you want to completely uninstall cert-manager from your cluster, you will als
6565
delete the previously installed CustomResourceDefinition resources:
6666

6767
```console
68-
$ kubectl delete -f https://github.com/cert-manager/cert-manager/releases/download/v1.16.3/cert-manager.crds.yaml
68+
$ kubectl delete -f https://github.com/cert-manager/cert-manager/releases/download/v1.17.1/cert-manager.crds.yaml
6969
```
7070

7171
## Configuration
@@ -316,7 +316,13 @@ If not set and create is true, a name is generated using the fullname template.
316316
317317
#### **serviceAccount.annotations** ~ `object`
318318
319-
Optional additional annotations to add to the controller's Service Account.
319+
Optional additional annotations to add to the controller's Service Account. Templates are allowed for both keys and values.
320+
Example using templating:
321+
322+
```yaml
323+
annotations:
324+
"{{ .Chart.Name }}-helm-chart/version": "{{ .Chart.Version }}"
325+
```
320326
321327
#### **serviceAccount.labels** ~ `object`
322328
@@ -364,17 +370,24 @@ config:
364370
kubernetesAPIQPS: 9000
365371
kubernetesAPIBurst: 9000
366372
numberOfConcurrentWorkers: 200
373+
enableGatewayAPI: true
374+
# Feature gates as of v1.17.0. Listed with their default values.
375+
# See https://cert-manager.io/docs/cli/controller/
367376
featureGates:
368-
AdditionalCertificateOutputFormats: true
369-
DisallowInsecureCSRUsageDefinition: true
370-
ExperimentalCertificateSigningRequestControllers: true
371-
ExperimentalGatewayAPISupport: true
372-
LiteralCertificateSubject: true
373-
SecretsFilteredCaching: true
374-
ServerSideApply: true
375-
StableCertificateRequestName: true
376-
UseCertificateRequestBasicConstraints: true
377-
ValidateCAA: true
377+
AdditionalCertificateOutputFormats: true # BETA - default=true
378+
AllAlpha: false # ALPHA - default=false
379+
AllBeta: false # BETA - default=false
380+
ExperimentalCertificateSigningRequestControllers: false # ALPHA - default=false
381+
ExperimentalGatewayAPISupport: true # BETA - default=true
382+
LiteralCertificateSubject: true # BETA - default=true
383+
NameConstraints: true # BETA - default=true
384+
OtherNames: false # ALPHA - default=false
385+
SecretsFilteredCaching: true # BETA - default=true
386+
ServerSideApply: false # ALPHA - default=false
387+
StableCertificateRequestName: true # BETA - default=true
388+
UseCertificateRequestBasicConstraints: false # ALPHA - default=false
389+
UseDomainQualifiedFinalizer: true # BETA - default=false
390+
ValidateCAA: false # ALPHA - default=false
378391
# Configure the metrics server for TLS
379392
# See https://cert-manager.io/docs/devops-tips/prometheus-metrics/#tls
380393
metricsTLSConfig:

charts/cert-manager/templates/cainjector-deployment.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,12 @@ spec:
5353
prometheus.io/port: '9402'
5454
{{- end }}
5555
spec:
56+
{{- if not .Values.cainjector.serviceAccount.create }}
57+
{{- with .Values.global.imagePullSecrets }}
58+
imagePullSecrets:
59+
{{- toYaml . | nindent 8 }}
60+
{{- end }}
61+
{{- end }}
5662
serviceAccountName: {{ template "cainjector.serviceAccountName" . }}
5763
{{- if hasKey .Values.cainjector "automountServiceAccountToken" }}
5864
automountServiceAccountToken: {{ .Values.cainjector.automountServiceAccountToken }}

charts/cert-manager/templates/cainjector-service.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{{- if .Values.cainjector.enabled }}
12
{{- if and .Values.prometheus.enabled (not .Values.prometheus.podmonitor.enabled) }}
23
apiVersion: v1
34
kind: Service
@@ -28,3 +29,4 @@ spec:
2829
app.kubernetes.io/instance: {{ .Release.Name }}
2930
app.kubernetes.io/component: "cainjector"
3031
{{- end }}
32+
{{- end }}

charts/cert-manager/templates/crds.yaml

+30-7
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,6 @@ spec:
514514
type: object
515515
required:
516516
- create
517-
- passwordSecretRef
518517
properties:
519518
alias:
520519
description: |-
@@ -526,17 +525,25 @@ spec:
526525
Create enables JKS keystore creation for the Certificate.
527526
If true, a file named `keystore.jks` will be created in the target
528527
Secret resource, encrypted using the password stored in
529-
`passwordSecretRef`.
528+
`passwordSecretRef` or `password`.
530529
The keystore file will be updated immediately.
531530
If the issuer provided a CA certificate, a file named `truststore.jks`
532531
will also be created in the target Secret resource, encrypted using the
533532
password stored in `passwordSecretRef`
534533
containing the issuing Certificate Authority
535534
type: boolean
535+
password:
536+
description: |-
537+
Password provides a literal password used to encrypt the JKS keystore.
538+
Mutually exclusive with passwordSecretRef.
539+
One of password or passwordSecretRef must provide a password with a non-zero length.
540+
type: string
536541
passwordSecretRef:
537542
description: |-
538-
PasswordSecretRef is a reference to a key in a Secret resource
543+
PasswordSecretRef is a reference to a non-empty key in a Secret resource
539544
containing the password used to encrypt the JKS keystore.
545+
Mutually exclusive with password.
546+
One of password or passwordSecretRef must provide a password with a non-zero length.
540547
type: object
541548
required:
542549
- name
@@ -559,24 +566,31 @@ spec:
559566
type: object
560567
required:
561568
- create
562-
- passwordSecretRef
563569
properties:
564570
create:
565571
description: |-
566572
Create enables PKCS12 keystore creation for the Certificate.
567573
If true, a file named `keystore.p12` will be created in the target
568574
Secret resource, encrypted using the password stored in
569-
`passwordSecretRef`.
575+
`passwordSecretRef` or in `password`.
570576
The keystore file will be updated immediately.
571577
If the issuer provided a CA certificate, a file named `truststore.p12` will
572578
also be created in the target Secret resource, encrypted using the
573579
password stored in `passwordSecretRef` containing the issuing Certificate
574580
Authority
575581
type: boolean
582+
password:
583+
description: |-
584+
Password provides a literal password used to encrypt the PKCS#12 keystore.
585+
Mutually exclusive with passwordSecretRef.
586+
One of password or passwordSecretRef must provide a password with a non-zero length.
587+
type: string
576588
passwordSecretRef:
577589
description: |-
578-
PasswordSecretRef is a reference to a key in a Secret resource
579-
containing the password used to encrypt the PKCS12 keystore.
590+
PasswordSecretRef is a reference to a non-empty key in a Secret resource
591+
containing the password used to encrypt the PKCS#12 keystore.
592+
Mutually exclusive with password.
593+
One of password or passwordSecretRef must provide a password with a non-zero length.
580594
type: object
581595
required:
582596
- name
@@ -1376,6 +1390,9 @@ spec:
13761390
resource ID of the managed identity, can not be used at the same time as clientID
13771391
Cannot be used for Azure Managed Service Identity
13781392
type: string
1393+
tenantID:
1394+
description: tenant ID of the managed identity, can not be used at the same time as resourceID
1395+
type: string
13791396
resourceGroupName:
13801397
description: resource group the DNS zone is located in
13811398
type: string
@@ -4689,6 +4706,9 @@ spec:
46894706
resource ID of the managed identity, can not be used at the same time as clientID
46904707
Cannot be used for Azure Managed Service Identity
46914708
type: string
4709+
tenantID:
4710+
description: tenant ID of the managed identity, can not be used at the same time as resourceID
4711+
type: string
46924712
resourceGroupName:
46934713
description: resource group the DNS zone is located in
46944714
type: string
@@ -8415,6 +8435,9 @@ spec:
84158435
resource ID of the managed identity, can not be used at the same time as clientID
84168436
Cannot be used for Azure Managed Service Identity
84178437
type: string
8438+
tenantID:
8439+
description: tenant ID of the managed identity, can not be used at the same time as resourceID
8440+
type: string
84188441
resourceGroupName:
84198442
description: resource group the DNS zone is located in
84208443
type: string

charts/cert-manager/templates/deployment.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,12 @@ spec:
5252
prometheus.io/port: '9402'
5353
{{- end }}
5454
spec:
55+
{{- if not .Values.serviceAccount.create }}
56+
{{- with .Values.global.imagePullSecrets }}
57+
imagePullSecrets:
58+
{{- toYaml . | nindent 8 }}
59+
{{- end }}
60+
{{- end }}
5561
serviceAccountName: {{ template "cert-manager.serviceAccountName" . }}
5662
{{- if hasKey .Values "automountServiceAccountToken" }}
5763
automountServiceAccountToken: {{ .Values.automountServiceAccountToken }}

charts/cert-manager/templates/serviceaccount.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ metadata:
1111
namespace: {{ include "cert-manager.namespace" . }}
1212
{{- with .Values.serviceAccount.annotations }}
1313
annotations:
14-
{{- toYaml . | nindent 4 }}
14+
{{- range $k, $v := . }}
15+
{{- printf "%s: %s" (tpl $k $) (tpl $v $) | nindent 4 }}
16+
{{- end }}
1517
{{- end }}
1618
labels:
1719
app: {{ include "cert-manager.name" . }}

charts/cert-manager/templates/webhook-deployment.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,12 @@ spec:
5252
prometheus.io/port: '9402'
5353
{{- end }}
5454
spec:
55+
{{- if not .Values.webhook.serviceAccount.create }}
56+
{{- with .Values.global.imagePullSecrets }}
57+
imagePullSecrets:
58+
{{- toYaml . | nindent 8 }}
59+
{{- end }}
60+
{{- end }}
5561
serviceAccountName: {{ template "webhook.serviceAccountName" . }}
5662
{{- if hasKey .Values.webhook "automountServiceAccountToken" }}
5763
automountServiceAccountToken: {{ .Values.webhook.automountServiceAccountToken }}

charts/cert-manager/values.schema.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -579,7 +579,7 @@
579579
},
580580
"helm-values.config": {
581581
"default": {},
582-
"description": "This property is used to configure options for the controller pod. This allows setting options that would usually be provided using flags.\n\nIf `apiVersion` and `kind` are unspecified they default to the current latest version (currently `controller.config.cert-manager.io/v1alpha1`). You can pin the version by specifying the `apiVersion` yourself.\n\nFor example:\nconfig:\n apiVersion: controller.config.cert-manager.io/v1alpha1\n kind: ControllerConfiguration\n logging:\n verbosity: 2\n format: text\n leaderElectionConfig:\n namespace: kube-system\n kubernetesAPIQPS: 9000\n kubernetesAPIBurst: 9000\n numberOfConcurrentWorkers: 200\n featureGates:\n AdditionalCertificateOutputFormats: true\n DisallowInsecureCSRUsageDefinition: true\n ExperimentalCertificateSigningRequestControllers: true\n ExperimentalGatewayAPISupport: true\n LiteralCertificateSubject: true\n SecretsFilteredCaching: true\n ServerSideApply: true\n StableCertificateRequestName: true\n UseCertificateRequestBasicConstraints: true\n ValidateCAA: true\n # Configure the metrics server for TLS\n # See https://cert-manager.io/docs/devops-tips/prometheus-metrics/#tls\n metricsTLSConfig:\n dynamic:\n secretNamespace: \"cert-manager\"\n secretName: \"cert-manager-metrics-ca\"\n dnsNames:\n - cert-manager-metrics",
582+
"description": "This property is used to configure options for the controller pod. This allows setting options that would usually be provided using flags.\n\nIf `apiVersion` and `kind` are unspecified they default to the current latest version (currently `controller.config.cert-manager.io/v1alpha1`). You can pin the version by specifying the `apiVersion` yourself.\n\nFor example:\nconfig:\n apiVersion: controller.config.cert-manager.io/v1alpha1\n kind: ControllerConfiguration\n logging:\n verbosity: 2\n format: text\n leaderElectionConfig:\n namespace: kube-system\n kubernetesAPIQPS: 9000\n kubernetesAPIBurst: 9000\n numberOfConcurrentWorkers: 200\n enableGatewayAPI: true\n # Feature gates as of v1.17.0. Listed with their default values.\n # See https://cert-manager.io/docs/cli/controller/\n featureGates:\n AdditionalCertificateOutputFormats: true # BETA - default=true\n AllAlpha: false # ALPHA - default=false\n AllBeta: false # BETA - default=false\n ExperimentalCertificateSigningRequestControllers: false # ALPHA - default=false\n ExperimentalGatewayAPISupport: true # BETA - default=true\n LiteralCertificateSubject: true # BETA - default=true\n NameConstraints: true # BETA - default=true\n OtherNames: false # ALPHA - default=false\n SecretsFilteredCaching: true # BETA - default=true\n ServerSideApply: false # ALPHA - default=false\n StableCertificateRequestName: true # BETA - default=true\n UseCertificateRequestBasicConstraints: false # ALPHA - default=false\n UseDomainQualifiedFinalizer: true # BETA - default=false\n ValidateCAA: false # ALPHA - default=false\n # Configure the metrics server for TLS\n # See https://cert-manager.io/docs/devops-tips/prometheus-metrics/#tls\n metricsTLSConfig:\n dynamic:\n secretNamespace: \"cert-manager\"\n secretName: \"cert-manager-metrics-ca\"\n dnsNames:\n - cert-manager-metrics",
583583
"type": "object"
584584
},
585585
"helm-values.containerSecurityContext": {
@@ -1223,7 +1223,7 @@
12231223
"type": "object"
12241224
},
12251225
"helm-values.serviceAccount.annotations": {
1226-
"description": "Optional additional annotations to add to the controller's Service Account.",
1226+
"description": "Optional additional annotations to add to the controller's Service Account. Templates are allowed for both keys and values.\nExample using templating:\nannotations:\n \"{{ .Chart.Name }}-helm-chart/version\": \"{{ .Chart.Version }}\"",
12271227
"type": "object"
12281228
},
12291229
"helm-values.serviceAccount.automountServiceAccountToken": {

charts/cert-manager/values.yaml

+21-11
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,10 @@ serviceAccount:
190190
# +docs:property
191191
# name: ""
192192

193-
# Optional additional annotations to add to the controller's Service Account.
193+
# Optional additional annotations to add to the controller's Service Account. Templates are allowed for both keys and values.
194+
# Example using templating:
195+
# annotations:
196+
# "{{ .Chart.Name }}-helm-chart/version": "{{ .Chart.Version }}"
194197
# +docs:property
195198
# annotations: {}
196199

@@ -227,17 +230,24 @@ enableCertificateOwnerRef: false
227230
# kubernetesAPIQPS: 9000
228231
# kubernetesAPIBurst: 9000
229232
# numberOfConcurrentWorkers: 200
233+
# enableGatewayAPI: true
234+
# # Feature gates as of v1.17.0. Listed with their default values.
235+
# # See https://cert-manager.io/docs/cli/controller/
230236
# featureGates:
231-
# AdditionalCertificateOutputFormats: true
232-
# DisallowInsecureCSRUsageDefinition: true
233-
# ExperimentalCertificateSigningRequestControllers: true
234-
# ExperimentalGatewayAPISupport: true
235-
# LiteralCertificateSubject: true
236-
# SecretsFilteredCaching: true
237-
# ServerSideApply: true
238-
# StableCertificateRequestName: true
239-
# UseCertificateRequestBasicConstraints: true
240-
# ValidateCAA: true
237+
# AdditionalCertificateOutputFormats: true # BETA - default=true
238+
# AllAlpha: false # ALPHA - default=false
239+
# AllBeta: false # BETA - default=false
240+
# ExperimentalCertificateSigningRequestControllers: false # ALPHA - default=false
241+
# ExperimentalGatewayAPISupport: true # BETA - default=true
242+
# LiteralCertificateSubject: true # BETA - default=true
243+
# NameConstraints: true # BETA - default=true
244+
# OtherNames: false # ALPHA - default=false
245+
# SecretsFilteredCaching: true # BETA - default=true
246+
# ServerSideApply: false # ALPHA - default=false
247+
# StableCertificateRequestName: true # BETA - default=true
248+
# UseCertificateRequestBasicConstraints: false # ALPHA - default=false
249+
# UseDomainQualifiedFinalizer: true # BETA - default=false
250+
# ValidateCAA: false # ALPHA - default=false
241251
# # Configure the metrics server for TLS
242252
# # See https://cert-manager.io/docs/devops-tips/prometheus-metrics/#tls
243253
# metricsTLSConfig:

0 commit comments

Comments
 (0)