Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Configurable Common Labels and Add a PDB #149

Merged
merged 1 commit into from
Feb 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
28 changes: 28 additions & 0 deletions deploy/charts/trust-manager/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -420,5 +420,33 @@ The timeout for a metrics scrape.
> ```

Additional labels to add to the ServiceMonitor.
#### **podDisruptionBudget.enabled** ~ `bool`
> Default value:
> ```yaml
> false
> ```

Enable or disable the PodDisruptionBudget resource.

This prevents downtime during voluntary disruptions such as during a Node upgrade. For example, the PodDisruptionBudget will block `kubectl drain` if it is used on the Node where the only remaining cert-manager
Pod is currently running.
#### **podDisruptionBudget.minAvailable** ~ `unknown`

This configures the minimum available pods for disruptions. It can either be set to an integer (e.g. 1) or a percentage value (e.g. 25%).
It cannot be used if `maxUnavailable` is set.


#### **podDisruptionBudget.maxUnavailable** ~ `unknown`

This configures the maximum unavailable pods for disruptions. It can either be set to an integer (e.g. 1) or a percentage value (e.g. 25%). it cannot be used if `minAvailable` is set.


#### **commonLabels** ~ `object`
> Default value:
> ```yaml
> {}
> ```

Labels to apply to all resources

<!-- /AUTO-GENERATED -->
3 changes: 3 additions & 0 deletions deploy/charts/trust-manager/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
{{- end }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- if .Values.commonLabels}}
{{ toYaml .Values.commonLabels }}
{{- end }}
{{- end -}}

{{/*
Expand Down
24 changes: 24 additions & 0 deletions deploy/charts/trust-manager/templates/poddisruptionbudget.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{{- if .Values.podDisruptionBudget.enabled }}
apiVersion: policy/v1
kind: PodDisruptionBudget
metadata:
name: {{ include "trust-manager.name" . }}
namespace: {{ .Release.Namespace }}
labels:
app: {{ include "trust-manager.name" . }}
{{- include "trust-manager.labels" . | nindent 4 }}
spec:
selector:
matchLabels:
app: {{ include "trust-manager.name" . }}

{{- if not (or (hasKey .Values.podDisruptionBudget "minAvailable") (hasKey .Values.podDisruptionBudget "maxUnavailable")) }}
minAvailable: 1 # Default value because minAvailable and maxUnavailable are not set
{{- end }}
{{- if hasKey .Values.podDisruptionBudget "minAvailable" }}
minAvailable: {{ .Values.podDisruptionBudget.minAvailable }}
{{- end }}
{{- if hasKey .Values.podDisruptionBudget "maxUnavailable" }}
maxUnavailable: {{ .Values.podDisruptionBudget.maxUnavailable }}
{{- end }}
{{- end }}
37 changes: 37 additions & 0 deletions deploy/charts/trust-manager/values.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
"app": {
"$ref": "#/$defs/helm-values.app"
},
"commonLabels": {
"$ref": "#/$defs/helm-values.commonLabels"
},
"crds": {
"$ref": "#/$defs/helm-values.crds"
},
Expand All @@ -35,6 +38,9 @@
"nodeSelector": {
"$ref": "#/$defs/helm-values.nodeSelector"
},
"podDisruptionBudget": {
"$ref": "#/$defs/helm-values.podDisruptionBudget"
},
"priorityClassName": {
"$ref": "#/$defs/helm-values.priorityClassName"
},
Expand Down Expand Up @@ -348,6 +354,11 @@
"type": "boolean",
"default": false
},
"helm-values.commonLabels": {
"description": "Labels to apply to all resources",
"type": "object",
"default": {}
},
"helm-values.crds": {
"type": "object",
"properties": {
Expand Down Expand Up @@ -503,6 +514,32 @@
"kubernetes.io/os": "linux"
}
},
"helm-values.podDisruptionBudget": {
"type": "object",
"properties": {
"enabled": {
"$ref": "#/$defs/helm-values.podDisruptionBudget.enabled"
},
"maxUnavailable": {
"$ref": "#/$defs/helm-values.podDisruptionBudget.maxUnavailable"
},
"minAvailable": {
"$ref": "#/$defs/helm-values.podDisruptionBudget.minAvailable"
}
},
"additionalProperties": false
},
"helm-values.podDisruptionBudget.enabled": {
"description": "Enable or disable the PodDisruptionBudget resource.\n\nThis prevents downtime during voluntary disruptions such as during a Node upgrade. For example, the PodDisruptionBudget will block `kubectl drain` if it is used on the Node where the only remaining cert-manager\nPod is currently running.",
"type": "boolean",
"default": false
},
"helm-values.podDisruptionBudget.maxUnavailable": {
"description": "This configures the maximum unavailable pods for disruptions. It can either be set to an integer (e.g. 1) or a percentage value (e.g. 25%). it cannot be used if `minAvailable` is set."
},
"helm-values.podDisruptionBudget.minAvailable": {
"description": "This configures the minimum available pods for disruptions. It can either be set to an integer (e.g. 1) or a percentage value (e.g. 25%).\nIt cannot be used if `maxUnavailable` is set."
},
"helm-values.priorityClassName": {
"description": "Configure the priority class of the pod. For more information, see [PriorityClass](https://kubernetes.io/docs/concepts/scheduling-eviction/pod-priority-preemption/#priorityclass).",
"type": "string",
Expand Down
28 changes: 27 additions & 1 deletion deploy/charts/trust-manager/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -230,4 +230,30 @@ app:
# The timeout for a metrics scrape.
scrapeTimeout: 5s
# Additional labels to add to the ServiceMonitor.
labels: {}
labels: {}

podDisruptionBudget:
# Enable or disable the PodDisruptionBudget resource.
#
# This prevents downtime during voluntary disruptions such as during a Node upgrade.
# For example, the PodDisruptionBudget will block `kubectl drain`
# if it is used on the Node where the only remaining cert-manager
# Pod is currently running.
enabled: false

# This configures the minimum available pods for disruptions. It can either be set to
# an integer (e.g. 1) or a percentage value (e.g. 25%).
# It cannot be used if `maxUnavailable` is set.
# +docs:type=unknown
# +docs:property
# minAvailable: 1

# This configures the maximum unavailable pods for disruptions. It can either be set to
# an integer (e.g. 1) or a percentage value (e.g. 25%).
# it cannot be used if `minAvailable` is set.
# +docs:type=unknown
# +docs:property
# maxUnavailable: 1

# Labels to apply to all resources
commonLabels: {}