Skip to content
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -73,15 +73,31 @@ spec:
maxLength: 30
minLength: 1
type: string
cacheKey:
description: |-
CacheKey enables cache lookup/writeback for this task action when set.
This is propagated from workflow.TaskAction.cache_key.
maxLength: 256
type: string
domain:
description: Domain this action belongs to
maxLength: 63
minLength: 1
type: string
envVars:
additionalProperties:
type: string
description: EnvVars are run-scoped environment variables projected
from RunSpec for executor runtime use.
type: object
inputUri:
description: InputURI is the path to the input data for this action
minLength: 1
type: string
interruptible:
description: Interruptible is the run-scoped interruptibility override
projected from RunSpec.
type: boolean
org:
description: Org this action belongs to
maxLength: 63
Expand Down Expand Up @@ -137,6 +153,16 @@ spec:
status:
description: status defines the observed state of TaskAction
properties:
attempts:
description: Attempts is the latest observed action attempt number,
starting from 1.
format: int32
type: integer
cacheStatus:
description: CacheStatus is the latest observed cache lookup result
for this action.
format: int32
type: integer
conditions:
description: |-
conditions represent the current state of the TaskAction resource.
Expand Down Expand Up @@ -177,7 +203,7 @@ spec:
reason contains a programmatic identifier indicating the reason for the condition's last transition.
Producers of specific condition types may define expected values and meanings for this field,
and whether the values are considered a guaranteed API.
The value should be a CalmelCase string.
The value should be a CamelCase string.
This field may not be empty.
maxLength: 1024
minLength: 1
Expand Down Expand Up @@ -231,14 +257,6 @@ spec:
- phase
type: object
type: array
attempts:
description: Attempts is the latest observed action attempt number,
starting from 1.
type: integer
cacheStatus:
description: CacheStatus is the latest observed cache lookup result
for this action.
type: integer
pluginPhase:
description: PluginPhase is a human-readable representation of the
plugin's current phase.
Expand Down
6 changes: 5 additions & 1 deletion docker/sandbox-bundled/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,12 @@ console:
docker pull --platform linux/arm64 $(CONSOLE_IMAGE):$(CONSOLE_TAG)
docker save $(CONSOLE_IMAGE):$(CONSOLE_TAG) -o images/tar/arm64/flyte-client-v2.tar

.PHONY: sync-crds
sync-crds:
$(MAKE) -C ../../executor manifests

.PHONY: build
build: flyte console dep_update manifests
build: sync-crds flyte console dep_update manifests
docker buildx build --builder flyte-sandbox --allow security.insecure --load \
--tag flyte-sandbox-v2:latest .

Expand Down
2 changes: 1 addition & 1 deletion docker/sandbox-bundled/kustomize/dev/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ helmCharts:
namespace: flyte
resources:
- ../namespace.yaml
- ../../../../charts/flyte-binary/templates/crds/taskaction.yaml
- ../../../../charts/flyte-binary/templates/crds/flyte.org_taskactions.yaml
- ../dashboard-rbac.yaml
patches:
- target:
Expand Down
24 changes: 21 additions & 3 deletions docker/sandbox-bundled/manifests/complete.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -77,15 +77,31 @@ spec:
maxLength: 30
minLength: 1
type: string
cacheKey:
description: |-
CacheKey enables cache lookup/writeback for this task action when set.
This is propagated from workflow.TaskAction.cache_key.
maxLength: 256
type: string
domain:
description: Domain this action belongs to
maxLength: 63
minLength: 1
type: string
envVars:
additionalProperties:
type: string
description: EnvVars are run-scoped environment variables projected
from RunSpec for executor runtime use.
type: object
inputUri:
description: InputURI is the path to the input data for this action
minLength: 1
type: string
interruptible:
description: Interruptible is the run-scoped interruptibility override
projected from RunSpec.
type: boolean
org:
description: Org this action belongs to
maxLength: 63
Expand Down Expand Up @@ -144,10 +160,12 @@ spec:
attempts:
description: Attempts is the latest observed action attempt number,
starting from 1.
format: int32
type: integer
cacheStatus:
description: CacheStatus is the latest observed cache lookup result
for this action.
format: int32
type: integer
conditions:
description: |-
Expand Down Expand Up @@ -189,7 +207,7 @@ spec:
reason contains a programmatic identifier indicating the reason for the condition's last transition.
Producers of specific condition types may define expected values and meanings for this field,
and whether the values are considered a guaranteed API.
The value should be a CalmelCase string.
The value should be a CamelCase string.
This field may not be empty.
maxLength: 1024
minLength: 1
Expand Down Expand Up @@ -1094,7 +1112,7 @@ type: Opaque
---
apiVersion: v1
data:
haSharedSecret: ZEFIMEQzSW1OeE5HZ1Z1UQ==
haSharedSecret: Qk9IVVU4bkFTR3A4UnlMYw==
proxyPassword: ""
proxyUsername: ""
kind: Secret
Expand Down Expand Up @@ -1688,7 +1706,7 @@ spec:
metadata:
annotations:
checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81
checksum/secret: a19107aa7ee41ac729f9a35bf0e8c1dad540fce77c0ef7cd09024c0376afb3ac
checksum/secret: 95a620a15930e41d3191a31cb967f2abbc7986620582a5b00815c19b165a9296
labels:
app: docker-registry
release: flyte-sandbox
Expand Down
24 changes: 21 additions & 3 deletions docker/sandbox-bundled/manifests/dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -77,15 +77,31 @@ spec:
maxLength: 30
minLength: 1
type: string
cacheKey:
description: |-
CacheKey enables cache lookup/writeback for this task action when set.
This is propagated from workflow.TaskAction.cache_key.
maxLength: 256
type: string
domain:
description: Domain this action belongs to
maxLength: 63
minLength: 1
type: string
envVars:
additionalProperties:
type: string
description: EnvVars are run-scoped environment variables projected
from RunSpec for executor runtime use.
type: object
inputUri:
description: InputURI is the path to the input data for this action
minLength: 1
type: string
interruptible:
description: Interruptible is the run-scoped interruptibility override
projected from RunSpec.
type: boolean
org:
description: Org this action belongs to
maxLength: 63
Expand Down Expand Up @@ -144,10 +160,12 @@ spec:
attempts:
description: Attempts is the latest observed action attempt number,
starting from 1.
format: int32
type: integer
cacheStatus:
description: CacheStatus is the latest observed cache lookup result
for this action.
format: int32
type: integer
conditions:
description: |-
Expand Down Expand Up @@ -189,7 +207,7 @@ spec:
reason contains a programmatic identifier indicating the reason for the condition's last transition.
Producers of specific condition types may define expected values and meanings for this field,
and whether the values are considered a guaranteed API.
The value should be a CalmelCase string.
The value should be a CamelCase string.
This field may not be empty.
maxLength: 1024
minLength: 1
Expand Down Expand Up @@ -808,7 +826,7 @@ metadata:
---
apiVersion: v1
data:
haSharedSecret: RnFQZVlXZ0ZYS0p4WGtHUw==
haSharedSecret: cXJnVzVWY0VWdXg3M1BtRQ==
proxyPassword: ""
proxyUsername: ""
kind: Secret
Expand Down Expand Up @@ -1305,7 +1323,7 @@ spec:
metadata:
annotations:
checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81
checksum/secret: f5db463c49fd6d302903a4eb83d4f2ae3256b4f131d2e9ff92edb6da89a96e2f
checksum/secret: fa998c05a8f5d2d373e7e490e32cd0202a5ae632c2c0de4763df0c7858f5bcc4
labels:
app: docker-registry
release: flyte-sandbox
Expand Down
1 change: 1 addition & 0 deletions executor/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ help: ## Display this help.
.PHONY: manifests
manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
$(CONTROLLER_GEN) rbac:roleName=manager-role crd webhook paths="./..." output:crd:artifacts:config=config/crd/bases
cp config/crd/bases/*.yaml ../charts/flyte-binary/templates/crds/
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Copy the crd into helm chart after generation.


.PHONY: generate
generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
Expand Down
Loading