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

Flyte core webhook pod settings should be separate #5490

Merged
merged 1 commit into from
Jun 25, 2024
+19 −7
Merged

Flyte core webhook pod settings should be separate #5490

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
4 changes: 4 additions & 0 deletions charts/flyte-core/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,10 @@ helm install gateway bitnami/contour -n flyte
| storage.s3.secretKey | string | `""` | AWS IAM user secret access key to use for S3 bucket auth, only used if authType is set to accesskey |
| storage.type | string | `"sandbox"` | Sets the storage type. Supported values are sandbox, s3, gcs and custom. |
| webhook.enabled | bool | `true` | enable or disable secrets webhook |
| webhook.nodeSelector | object | `{}` | nodeSelector for webhook deployment |
| webhook.podAnnotations | object | `{}` | Annotations for webhook pods |
| webhook.podEnv | object | `{}` | Additional webhook container environment variables |
| webhook.podLabels | object | `{}` | Labels for webhook pods |
| webhook.priorityClassName | string | `""` | Sets priorityClassName for webhook pod |
| webhook.resources.requests.cpu | string | `"200m"` | |
| webhook.resources.requests.ephemeral-storage | string | `"500Mi"` | |
Expand Down
14 changes: 7 additions & 7 deletions charts/flyte-core/templates/propeller/webhook.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ spec:
app: {{ template "flyte-pod-webhook.name" . }}
app.kubernetes.io/name: {{ template "flyte-pod-webhook.name" . }}
app.kubernetes.io/version: {{ .Values.flytepropeller.image.tag }}
{{- with .Values.flytepropeller.podLabels }}
{{- with .Values.webhook.podLabels }}
{{- toYaml . | nindent 8 }}
{{- end }}
annotations:
configChecksum: {{ include (print .Template.BasePath "/propeller/configmap.yaml") . | sha256sum | trunc 63 | quote }}
{{- with .Values.flytepropeller.podAnnotations }}
{{- with .Values.webhook.podAnnotations }}
{{- toYaml . | nindent 8 }}
{{- end }}
spec:
Expand Down Expand Up @@ -63,8 +63,8 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
{{- if .Values.flytepropeller.podEnv -}}
{{- with .Values.flytepropeller.podEnv -}}
{{- if .Values.webhook.podEnv -}}
{{- with .Values.webhook.podEnv -}}
{{- toYaml . | nindent 10 }}
{{- end }}
{{- end }}
Expand Down Expand Up @@ -95,8 +95,8 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
{{- if .Values.flytepropeller.podEnv -}}
{{- with .Values.flytepropeller.podEnv -}}
{{- if .Values.webhook.podEnv -}}
{{- with .Values.webhook.podEnv -}}
{{- toYaml . | nindent 12 }}
{{- end }}
{{- end }}
Expand All @@ -123,7 +123,7 @@ spec:
- name: webhook-certs
secret:
secretName: flyte-pod-webhook
{{- with .Values.flytepropeller.nodeSelector }}
{{- with .Values.webhook.nodeSelector }}
nodeSelector: {{ tpl (toYaml .) $ | nindent 8 }}
{{- end }}
---
Expand Down
8 changes: 8 additions & 0 deletions charts/flyte-core/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,6 +477,14 @@ webhook:
annotations:
projectcontour.io/upstream-protocol.h2c: grpc
type: ClusterIP
# -- Annotations for webhook pods
podAnnotations: {}
# -- Additional webhook container environment variables
podEnv: {}
pingsutw marked this conversation as resolved.
Show resolved Hide resolved
# -- Labels for webhook pods
podLabels: {}
# -- nodeSelector for webhook deployment
nodeSelector: {}
# -- Sets securityContext for webhook pod(s).
securityContext:
fsGroup: 65534
Expand Down
Loading