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.

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

update deploy yamls about jobflows by make generate-yaml & make update-development-yaml #2882

Closed
wants to merge 2 commits into from
Closed
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
6 changes: 6 additions & 0 deletions hack/generate-yaml.sh
Original file line number Diff line number Diff line change
Expand Up @@ -88,12 +88,16 @@ tail -n +3 ${VK_ROOT}/config/crd/bases/bus.volcano.sh_commands.yaml > ${HELM_CRD
tail -n +3 ${VK_ROOT}/config/crd/bases/scheduling.volcano.sh_podgroups.yaml > ${HELM_CRD_DIR}/bases/scheduling.volcano.sh_podgroups.yaml
tail -n +3 ${VK_ROOT}/config/crd/bases/scheduling.volcano.sh_queues.yaml > ${HELM_CRD_DIR}/bases/scheduling.volcano.sh_queues.yaml
tail -n +3 ${VK_ROOT}/config/crd/bases/nodeinfo.volcano.sh_numatopologies.yaml > ${HELM_CRD_DIR}/bases/nodeinfo.volcano.sh_numatopologies.yaml
tail -n +3 ${VK_ROOT}/config/crd/bases/flow.volcano.sh_jobflows.yaml > ${HELM_CRD_DIR}/bases/flow.volcano.sh_jobflows.yaml
tail -n +3 ${VK_ROOT}/config/crd/bases/flow.volcano.sh_jobtemplates.yaml > ${HELM_CRD_DIR}/bases/flow.volcano.sh_jobtemplates.yaml
# sync v1beta1
tail -n +3 ${VK_ROOT}/config/crd/v1beta1/batch.volcano.sh_jobs.yaml > ${HELM_CRD_DIR}/v1beta1/batch.volcano.sh_jobs.yaml
tail -n +3 ${VK_ROOT}/config/crd/v1beta1/bus.volcano.sh_commands.yaml > ${HELM_CRD_DIR}/v1beta1/bus.volcano.sh_commands.yaml
tail -n +3 ${VK_ROOT}/config/crd/v1beta1/scheduling.volcano.sh_podgroups.yaml > ${HELM_CRD_DIR}/v1beta1/scheduling.volcano.sh_podgroups.yaml
tail -n +3 ${VK_ROOT}/config/crd/v1beta1/scheduling.volcano.sh_queues.yaml > ${HELM_CRD_DIR}/v1beta1/scheduling.volcano.sh_queues.yaml
tail -n +3 ${VK_ROOT}/config/crd/v1beta1/nodeinfo.volcano.sh_numatopologies.yaml > ${HELM_CRD_DIR}/v1beta1/nodeinfo.volcano.sh_numatopologies.yaml
tail -n +3 ${VK_ROOT}/config/crd/v1beta1/flow.volcano.sh_jobflows.yaml > ${HELM_CRD_DIR}/v1beta1/flow.volcano.sh_jobflows.yaml
tail -n +3 ${VK_ROOT}/config/crd/v1beta1/flow.volcano.sh_jobtemplates.yaml > ${HELM_CRD_DIR}/v1beta1/flow.volcano.sh_jobtemplates.yaml

# Step3. generate yaml in folder
if [[ ! -d ${RELEASE_FOLDER} ]];then
Expand Down Expand Up @@ -124,6 +128,8 @@ ${HELM_BIN_DIR}/helm template ${VK_ROOT}/installer/helm/chart/volcano --namespac
-s templates/scheduling_v1beta1_queue.yaml \
-s templates/nodeinfo_v1alpha1_numatopologies.yaml \
-s templates/webhooks.yaml \
-s templates/flow_v1alpha1_jobflows.yaml \
-s templates/flow_v1alpha1_jobtemplates.yaml \
>> ${DEPLOYMENT_FILE}

${HELM_BIN_DIR}/helm template ${VK_ROOT}/installer/helm/chart/volcano --namespace volcano-monitoring \
Expand Down
8 changes: 6 additions & 2 deletions installer/helm/chart/volcano/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
apiVersion: v1
description: A Helm chart for Volcano
name: volcano
version: 1.5
appVersion: 0.1
version: "1.5"
appVersion: "0.1"
icon: https://raw.githubusercontent.com/volcano-sh/charts/master/docs/images/volcano-logo.png
home: https://volcano.sh
sources:
- https://github.com/volcano-sh/volcano
dependencies:
- name: jobflow
version: "1.0.0"
repository: "file://../charts/jobflow"
maintainers:
- name: k82cn
email: klaus1982.cn@gmail.com
Expand Down
23 changes: 23 additions & 0 deletions installer/helm/chart/volcano/charts/jobflow/.helmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Patterns to ignore when building packages.
# This supports shell glob matching, relative path matching, and
# negation (prefixed with !). Only one pattern per line.
.DS_Store
# Common VCS dirs
.git/
.gitignore
.bzr/
.bzrignore
.hg/
.hgignore
.svn/
# Common backup files
*.swp
*.bak
*.tmp
*.orig
*~
# Various IDEs
.project
.idea/
*.tmproj
.vscode/
5 changes: 5 additions & 0 deletions installer/helm/chart/volcano/charts/jobflow/Chart.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
apiVersion: v1
description: A Helm chart for Volcano-Job-flow
name: jobflow
version: "1.0.0"
appVersion: "0.1"
Original file line number Diff line number Diff line change
@@ -0,0 +1,218 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.0
creationTimestamp: null
name: jobflows.flow.volcano.sh
spec:
group: flow.volcano.sh
names:
kind: JobFlow
listKind: JobFlowList
plural: jobflows
shortNames:
- jf
singular: jobflow
scope: Namespaced
versions:
- additionalPrinterColumns:
- jsonPath: .status.state.phase
name: Status
type: string
- jsonPath: .metadata.creationTimestamp
name: Age
type: date
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:
probe:
properties:
httpGetList:
items:
properties:
httpHeader:
description: HTTPHeader describes a custom header
to be used in HTTP probes
properties:
name:
description: The header field name
type: string
value:
description: The header field value
type: string
required:
- name
- value
type: object
path:
type: string
port:
type: integer
taskName:
type: string
type: object
type: array
taskStatusList:
items:
properties:
phase:
type: string
taskName:
type: string
type: object
type: array
tcpSocketList:
items:
properties:
port:
type: integer
taskName:
type: string
required:
- port
type: object
type: array
type: object
targets:
items:
type: string
type: array
type: object
name:
type: string
required:
- name
type: object
type: array
jobRetainPolicy:
type: string
type: object
status:
description: JobFlowStatus defines the observed state of JobFlow
properties:
completedJobs:
items:
type: string
type: array
conditions:
additionalProperties:
properties:
createTime:
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
type: object
type: object
failedJobs:
items:
type: string
type: array
jobStatusList:
items:
properties:
endTimestamp:
format: date-time
type: string
name:
type: string
restartCount:
format: int32
type: integer
runningHistories:
items:
properties:
endTimestamp:
format: date-time
type: string
startTimestamp:
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
pendingJobs:
items:
type: string
type: array
runningJobs:
items:
type: string
type: array
state:
properties:
phase:
type: string
type: object
terminatedJobs:
items:
type: string
type: array
unKnowJobs:
items:
type: string
type: array
type: object
type: object
served: true
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
Loading