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

Add option to install CRD as a part of chart install in flyte-binary #5967

Merged
merged 3 commits into from
Nov 18, 2024
Merged

Add option to install CRD as a part of chart install in flyte-binary #5967

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
66f839c
Add option to install CRD as a part of chart install in flyte-binary
marrrcin Nov 6, 2024
892c96e
Add option to install CRD as a part of chart install in flyte-binary …
marrrcin Nov 6, 2024
7102cfa
Add option to install CRD as a part of chart install in flyte-binary …
marrrcin Nov 12, 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/flyte-binary/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ Chart for basic single Flyte executable deployment
| configuration.logging.plugins.kubernetes.templateUri | string | `""` | |
| configuration.logging.plugins.stackdriver.enabled | bool | `false` | |
| configuration.logging.plugins.stackdriver.templateUri | string | `""` | |
| configuration.propeller.createCRDs | bool | `true` | |
| configuration.storage.metadataContainer | string | `"my-organization-flyte-container"` | |
| configuration.storage.provider | string | `"s3"` | |
| configuration.storage.providerConfig.azure.account | string | `"storage-account-name"` | |
Expand Down
2 changes: 1 addition & 1 deletion charts/flyte-binary/templates/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ data:
show-source: true
level: {{ default 1 .Values.configuration.logging.level }}
propeller:
create-flyteworkflow-crd: true
create-flyteworkflow-crd: {{ .Values.configuration.propeller.createCRDs }}
webhook:
certDir: /var/run/flyte/certs
localCert: true
Expand Down
32 changes: 32 additions & 0 deletions charts/flyte-binary/templates/crds/flyteworkflow.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{{- if not .Values.configuration.propeller.createCRDs }}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
{{- if not .Values.configuration.propeller.createCRDs }}
{{- if .Values.configuration.propeller.createCRDs }}

I think this should be the logic?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, the logic is correct. If propeller is set to create CRDs at runtime, then we don't want to install them as a part of helm chart installation.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right. Thanks for your patience, this helped me understand better how the CRD install operation works.

{{- if $.Capabilities.APIVersions.Has "apiextensions.k8s.io/v1/CustomResourceDefinition" }}
apiVersion: apiextensions.k8s.io/v1
{{- else }}
apiVersion: apiextensions.k8s.io/v1beta1
{{- end }}
kind: CustomResourceDefinition
metadata:
name: flyteworkflows.flyte.lyft.com
spec:
group: flyte.lyft.com
names:
kind: FlyteWorkflow
plural: flyteworkflows
shortNames:
- fly
singular: flyteworkflow
scope: Namespaced
{{- if $.Capabilities.APIVersions.Has "apiextensions.k8s.io/v1/CustomResourceDefinition" }}
versions:
- name: v1alpha1
served: true
storage: true
schema:
openAPIV3Schema:
type: object
x-kubernetes-preserve-unknown-fields: true
properties:
{{- else }}
version: v1alpha1
{{- end }}
{{- end }}
4 changes: 4 additions & 0 deletions charts/flyte-binary/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,10 @@ configuration:
timeouts:
GetTask: 10s
defaultTimeout: 10s
# propeller Specify configuration for Flyte Propeller
propeller:
# createCRDs If true, Propeller will install CRDs at runtime, if false, CRDs will be installed during helm install
createCRDs: true
# externalConfigMap Specify an existing, external ConfigMap to use as configuration for Flyte
# If set, no Flyte configuration will be generated by this chart
externalConfigMap: ""
Expand Down
4 changes: 2 additions & 2 deletions docker/sandbox-bundled/manifests/complete-agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -819,7 +819,7 @@ type: Opaque
---
apiVersion: v1
data:
haSharedSecret: SlI1TDFkTXBMaThuc0hlSQ==
haSharedSecret: c2Z6ZUdxTjJ1bEc1QlVaeQ==
proxyPassword: ""
proxyUsername: ""
kind: Secret
Expand Down Expand Up @@ -1416,7 +1416,7 @@ spec:
metadata:
annotations:
checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81
checksum/secret: ffc8aa05a602edd8f9b1d7ef35aa1cc5e383bceb9b91307eef99e86f53e13d4e
checksum/secret: ad072a5177dfbeacda100d536f1c7d611808b1c7f79dc6d02d9dbf24b8294e3b
labels:
app: docker-registry
release: flyte-sandbox
Expand Down
4 changes: 2 additions & 2 deletions docker/sandbox-bundled/manifests/complete.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -801,7 +801,7 @@ type: Opaque
---
apiVersion: v1
data:
haSharedSecret: YjdMdE9yejJzZ2xXSDFBRQ==
haSharedSecret: TUpUek9Ib3BpWTlEbFRvSw==
proxyPassword: ""
proxyUsername: ""
kind: Secret
Expand Down Expand Up @@ -1365,7 +1365,7 @@ spec:
metadata:
annotations:
checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81
checksum/secret: 956ac1b58c049a630c94605eedaba7ba9de3fc01233701ef403ab4bf24fe2a7a
checksum/secret: 09204971564694f6090d55069cf0853843456945f781aa7842f33021d09f4f25
labels:
app: docker-registry
release: flyte-sandbox
Expand Down
4 changes: 2 additions & 2 deletions docker/sandbox-bundled/manifests/dev.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@ metadata:
---
apiVersion: v1
data:
haSharedSecret: YUpzb25xNTM1eml3Rmpueg==
haSharedSecret: d2VkcjRnRHkyTmZrOU52cw==
proxyPassword: ""
proxyUsername: ""
kind: Secret
Expand Down Expand Up @@ -934,7 +934,7 @@ spec:
metadata:
annotations:
checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81
checksum/secret: 2720f13bd64051a7acb512e59e426b9f6c5f6c3c7d1d9a3a423e2df4cf9bab46
checksum/secret: 3b1376c2c63f4fff6745ad085844b7a1d7c8ad2cce13cae4e1e9c3ea495cebaa
labels:
app: docker-registry
release: flyte-sandbox
Expand Down
Loading