Skip to content

step-issuer: Allow customising object labels #244

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.

Sign up for GitHub

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

Open
brookelew wants to merge 1 commit into
base: master
Choose a base branch
from
Open

step-issuer: Allow customising object labels #244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion step-issuer/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,17 +50,21 @@ and their default values.
| `image.repository` | Repository of the Step Issuer image. | `cr.step.sm/smallstep/step-issuer` |
| `image.tag` | Tag of the image. If empty it will use .Chart.appVersion. | `""` |
| `image.pullPolicy` | Step Issuer image pull policy | `IfNotPresent` |
| `commonLabels` | Additional labels to be added to most deployed resources. | `{}` |
| `deployment.args.enableLeaderElection` | Enable k8s controller leader election. | `true` |
| `deployment.args.disableApprovalCheck` | To disable cert-manager approvals on old version of cert-manager. | `false` |
| `deployment.strategy` | To change the deployment strategy. | `{}` |
| `deployment.priorityClassName` | Pod priority for the Kubernetes scheduler | `""` |
| `deployment.priorityClassName` | Pod priority for the Kubernetes scheduler. | `""` |
| `deployment.labels` | Additional labels for the deployment. To add labels to the pods, see `deployment.podLabels`. | `{}` |
| `deployment.podLabels` | Additional labels for the pods. | `{}` |
| `stepIssuer.create` | If we should automatically create a StepIssuer | `false` |
| `stepIssuer.caUrl` | Step Certificates CA URL. This is usually the step certificates service FQDN. | `""` |
| `stepIssuer.caBundle` | Step Certificates root certificate in a single-line base64 string. | `""` |
| `stepIssuer.provisioner.name` | Name of the provisioner used for authorizing the sign of certificates. | `""` |
| `stepIssuer.provisioner.kid` | Key id of the provisioner used for authorizing the sign of certificates. | `""` |
| `stepIssuer.provisioner.passwordRef.name` | Name of the secret with the provisioner password. | `""` |
| `stepIssuer.provisioner.passwordRef.key` | Key name in the the secret with the provisioner password. | `""` |
| `stepIssuer.labels` | Additional labels for the issuer. | `{}` |
| `stepClusterIssuer.create` | If we should automatically create a StepClusterIssuer | `false` |
| `stepClusterIssuer.caUrl` | Step Certificates CA URL. This is usually the step certificates service FQDN. | `""` |
| `stepClusterIssuer.caBundle` | Step Certificates root certificate in a single-line base64 string. | `""` |
Expand All @@ -69,3 +73,6 @@ and their default values.
| `stepClusterIssuer.provisioner.passwordRef.name` | Name of the secret with the provisioner password. | `""` |
| `stepClusterIssuer.provisioner.passwordRef.key` | Key name in the the secret with the provisioner password. | `""` |
| `stepClusterIssuer.provisioner.passwordRef.namespace` | Namespace where the provisioner password secret resides. | `""` |
| `stepClusterIssuer.labels` | Additional labels for the cluster issuer. | `{}` |
| `service.labels` | Additional labels for the service. | `{}` |
| `serviceAccount.labels` | Additional labels for the service account. | `{}` |
3 changes: 3 additions & 0 deletions step-issuer/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ helm.sh/chart: {{ include "step-issuer.chart" . }}
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
{{- end }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- with .Values.commonLabels }}
{{ toYaml . }}
{{- end }}
{{- end -}}

{{/*
Expand Down
6 changes: 6 additions & 0 deletions step-issuer/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ metadata:
labels:
control-plane: {{ .Values.service.controlPlane }}
{{- include "step-issuer.labels" . | nindent 4 }}
{{- with .Values.deployment.labels }}
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
{{- if .Values.deployment.strategy }}
strategy: {{ toYaml .Values.deployment.strategy | nindent 4 }}
Expand All @@ -20,6 +23,9 @@ spec:
labels:
control-plane: {{ .Values.service.controlPlane }}
{{- include "step-issuer.labels" . | nindent 8 }}
{{- with .Values.deployment.podLabels }}
{{- toYaml . | nindent 8 }}
{{- end }}
spec:
{{- if $.Values.imagePullSecrets }}
imagePullSecrets:
Expand Down
5 changes: 4 additions & 1 deletion step-issuer/templates/rbac/sa.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,11 @@ metadata:
name: {{ include "step-issuer.serviceAccountName" . }}
labels:
{{- include "step-issuer.labels" . | nindent 4 }}
{{- with .Values.serviceAccount.labels }}
{{- toYaml . | nindent 4 }}
{{- end }}
{{- with .Values.serviceAccount.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}
{{- end }}
{{- end }}
3 changes: 3 additions & 0 deletions step-issuer/templates/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ metadata:
labels:
control-plane: {{ .Values.service.controlPlane }}
{{- include "step-issuer.labels" . | nindent 4 }}
{{- with .Values.service.labels }}
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
ports:
- name: {{ .Values.service.targetPorts }}
Expand Down
9 changes: 8 additions & 1 deletion step-issuer/templates/stepclusterissuer.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,13 @@ apiVersion: certmanager.step.sm/v1beta1
kind: StepClusterIssuer
metadata:
name: "{{ template "step-issuer.fullname" . }}"
labels:
{{- with .Values.commonLabels }}
{{- toYaml . | nindent 4 }}
{{- end }}
{{- with .Values.stepClusterIssuer.labels }}
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
# The CA URL.
{{- if .Values.stepClusterIssuer.caUrl }}
Expand All @@ -20,4 +27,4 @@ spec:
name: {{ .Values.stepClusterIssuer.provisioner.passwordRef.name }}
namespace: {{ .Values.stepClusterIssuer.provisioner.passwordRef.namespace }}
key: {{ .Values.stepClusterIssuer.provisioner.passwordRef.key }}
{{- end }}
{{- end }}
9 changes: 8 additions & 1 deletion step-issuer/templates/stepissuer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@ kind: StepIssuer
metadata:
name: "{{ template "step-issuer.fullname" . }}"
namespace: {{ .Release.Namespace }}
labels:
{{- with .Values.commonLabels }}
{{- toYaml . | nindent 4 }}
{{- end }}
{{- with .Values.stepIssuer.labels }}
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
# The CA URL.
{{- if .Values.stepIssuer.caUrl }}
Expand All @@ -20,4 +27,4 @@ spec:
passwordRef:
name: {{ .Values.stepIssuer.provisioner.passwordRef.name }}
key: {{ .Values.stepIssuer.provisioner.passwordRef.key }}
{{- end }}
{{- end }}
11 changes: 11 additions & 0 deletions step-issuer/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ imagePullSecrets: []
nameOverride: ""
fullnameOverride: ""

# Labels to be added to most objects deployed by this chart.
commonLabels: {}

deployment:
# Configure arguments to pass to the step issuer
args:
Expand All @@ -36,6 +39,10 @@ deployment:
# Strategy used for the deployment
strategy: {}
priorityClassName: ""
# Labels for the deployment, does not affect the deployment's pods.
labels: {}
# Labels for the pods.
podLabels: {}

resources:
limits:
Expand All @@ -52,6 +59,7 @@ service:
controlPlane: controller-manager
scrape: true
scrapePort: 8080
labels: {}

# Security Context for the pod
podSecurityContext: {}
Expand All @@ -72,6 +80,7 @@ serviceAccount:
# The name of the service account to use.
# If not set and create is true, a name is generated using the fullname template
name: ""
labels: {}

# mandatory values to generate stepIssuer resource
# please follow the https://github.com/smallstep/step-issuer#getting-started to setup step-ca and get step-issuer values
Expand All @@ -85,6 +94,7 @@ stepIssuer:
passwordRef:
name: ""
key: ""
labels: {}

# mandatory values to generate stepClusterIssuer resource
# please follow the https://github.com/smallstep/step-issuer#getting-started to setup step-ca and get step-issuer values
Expand All @@ -99,6 +109,7 @@ stepClusterIssuer:
name: ""
namespace: ""
key: ""
labels: {}

# For the cert-manager approver
certManager:
Expand Down