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

[cherry-pick for release-1.9]fix jobflow CRD metadata.annotations: Too long error #3356

Merged
merged 2 commits into from
Apr 2, 2024
+20 −16,152
Merged

[cherry-pick for release-1.9]fix jobflow CRD metadata.annotations: Too long error #3356

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
8855142
fix jobflow CRD metadata.annotations: Too long error
Mar 13, 2024
403667f
update volcano api version
Mar 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
2 changes: 2 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,8 @@ manifests: controller-gen
$(CONTROLLER_GEN) "crd:maxDescLen=0,crdVersions=v1beta1" paths="./vendor/volcano.sh/apis/pkg/apis/batch/v1alpha1" output:crd:artifacts:config=config/crd/volcano/v1beta1
# jobflow crd base
$(CONTROLLER_GEN) $(CRD_OPTIONS) paths="./vendor/volcano.sh/apis/pkg/apis/flow/v1alpha1" output:crd:artifacts:config=config/crd/jobflow/bases
# generate volcano jobflow crd yaml without description to avoid yaml size limit when using `kubectl apply`
$(CONTROLLER_GEN) $(CRD_OPTIONS_EXCLUDE_DESCRIPTION) paths="./vendor/volcano.sh/apis/pkg/apis/flow/v1alpha1" output:crd:artifacts:config=config/crd/jobflow/bases

unit-test:
go clean -testcache
Expand Down
24 changes: 0 additions & 24 deletions config/crd/jobflow/bases/flow.volcano.sh_jobflows.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,28 +28,17 @@ spec:
name: v1alpha1
schema:
openAPIV3Schema:
description: JobFlow is the Schema for the jobflows API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: JobFlowSpec defines the desired state of JobFlow
properties:
flows:
description: Foo is an example field of JobFlow. Edit jobflow_types.go
to remove/update
items:
description: Flow defines the dependent of jobs
properties:
dependsOn:
properties:
Expand All @@ -59,16 +48,10 @@ spec:
items:
properties:
httpHeader:
description: HTTPHeader describes a custom header
to be used in HTTP probes
properties:
name:
description: The header field name. This will
be canonicalized upon output, so case-variant
names will be understood as the same header.
type: string
value:
description: The header field value
type: string
required:
- name
Expand Down Expand Up @@ -118,7 +101,6 @@ spec:
type: string
type: object
status:
description: JobFlowStatus defines the observed state of JobFlow
properties:
completedJobs:
items:
Expand All @@ -131,20 +113,16 @@ spec:
format: date-time
type: string
phase:
description: JobPhase defines the phase of the job.
type: string
runningDuration:
type: string
taskStatusCount:
additionalProperties:
description: TaskState contains details for the current state
of the task.
properties:
phase:
additionalProperties:
format: int32
type: integer
description: The phase of Task.
type: object
type: object
type: object
Expand Down Expand Up @@ -175,15 +153,13 @@ spec:
format: date-time
type: string
state:
description: JobPhase defines the phase of the job.
type: string
type: object
type: array
startTimestamp:
format: date-time
type: string
state:
description: JobPhase defines the phase of the job.
type: string
type: object
type: array
Expand Down
Loading
Loading