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.

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

Jump to bottom

separate toleration daemonset and crd upgrade hook #1538

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

separate toleration daemonset and crd upgrade hook #1538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a7f25b6
separate toleration daemonset and crd upgrade hook
omerap12 Jun 5, 2024
a026885
Fix indentation and add conditional tolerations
omerap12 Jun 14, 2024
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
1 change: 1 addition & 0 deletions charts/secrets-store-csi-driver/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ The following table lists the configurable parameters of the csi-secrets-store-p
| `linux.crds.image.tag` | Linux crds image tag | `v1.4.3` |
| `linux.crds.resources` | The resource request/limits for the linux crds container image | `{}` |
| `linux.crds.podLabels` | Linux *Pod* labels appended to CRD helm hook job pods | `{}` |
| `linux.crds.tolerations` | Tolerations for crds-upgrade-hook | `[{"operator": "Exists"}]` |
| `linux.affinity` | Linux affinity | `key: type; operator: NotIn; values: [virtual-kubelet]` |
| `linux.driver.resources` | The resource request/limits for the linux secrets-store container image | `limits: 200m CPU, 200Mi; requests: 50m CPU, 100Mi` |
| `linux.enabled` | Install secrets store csi driver on linux nodes | true |
Expand Down
9 changes: 7 additions & 2 deletions charts/secrets-store-csi-driver/templates/crds-upgrade-hook.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ rules:
{{- if and .Values.rbac.pspEnabled (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy") }}
- apiGroups: ['policy']
resources: ['podsecuritypolicies']
verbs: ['use']
verbs: ['use']
resourceNames:
- allow-upgrade-crds
{{- end }}
Expand Down Expand Up @@ -124,8 +124,13 @@ spec:
{{- if .Values.linux.nodeSelector }}
{{- toYaml .Values.linux.nodeSelector | nindent 8 }}
{{- end }}
{{- with .Values.linux.tolerations }}
{{- if .Values.linux.crds.tolerations }}
{{- with .Values.linux.crds.tolerations }}
tolerations:
{{ toYaml . | indent 8 }}
{{- end }}
{{- else if .Values.linux.tolerations }}
tolerations:
{{ toYaml .Values.linux.tolerations | indent 8 }}
{{- end }}
{{- end }}
9 changes: 7 additions & 2 deletions charts/secrets-store-csi-driver/templates/keep-crds-upgrade-hook.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ rules:
{{- if and .Values.rbac.pspEnabled (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy") }}
- apiGroups: ['policy']
resources: ['podsecuritypolicies']
verbs: ['use']
verbs: ['use']
resourceNames:
- allow-keep-crds
{{- end }}
Expand Down Expand Up @@ -127,8 +127,13 @@ spec:
{{- if .Values.linux.nodeSelector }}
{{- toYaml .Values.linux.nodeSelector | nindent 8 }}
{{- end }}
{{- with .Values.linux.tolerations }}
{{- if .Values.linux.crds.tolerations }}
{{- with .Values.linux.crds.tolerations }}
tolerations:
{{ toYaml . | indent 8 }}
{{- end }}
{{- else if .Values.linux.tolerations }}
tolerations:
{{ toYaml .Values.linux.tolerations | indent 8 }}
{{- end }}
{{- end }}
12 changes: 8 additions & 4 deletions charts/secrets-store-csi-driver/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ linux:
tag: v1.4.3
#digest: sha256:
pullPolicy: IfNotPresent
# ref: https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/
# An empty key with operator Exists matches all keys, values and effects which means this will tolerate everything.
tolerations:
omerap12 marked this conversation as resolved.
Show resolved Hide resolved
- operator: "Exists"

crds:
enabled: true
Expand All @@ -22,6 +26,10 @@ linux:
# memory: "512Mi"
annotations: {}
podLabels: {}
# ref: https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/
# An empty key with operator Exists matches all keys, values and effects which means this will tolerate everything.
tolerations:
- operator: "Exists"

## Prevent the CSI driver from being scheduled on virtual-kubelet nodes
affinity:
Expand Down Expand Up @@ -84,10 +92,6 @@ linux:
additionalProvidersDirs:
- /etc/kubernetes/secrets-store-csi-providers
nodeSelector: {}
# ref: https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/
# An empty key with operator Exists matches all keys, values and effects which means this will tolerate everything.
tolerations:
- operator: "Exists"
metricsAddr: ":8095"
env: []
priorityClassName: ""
Expand Down
Loading