Skip to content
Open
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
1 change: 0 additions & 1 deletion basic/cookiecutter.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"component_name": "bar",
"__component_slug": "{{cookiecutter.component_name.lower().replace(' ', '-')}}",
"__repo_slug": "{{cookiecutter.__project_slug}}-{{cookiecutter.__component_slug}}",
"task_suffix": "-v0-7-0",
"_copy_without_render": [
"chart/templates/*"
]
Expand Down
26 changes: 13 additions & 13 deletions basic/{{cookiecutter.__repo_slug}}/ods.yaml
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
branchToEnvironmentMapping:
- branch: '*'
environment: dev

environments:
- name: dev
namespace: {{ cookiecutter.__project_slug }}-dev
stage: dev

pipeline:
tasks:
- name: package
taskRef:
kind: Task
name: ods-package-image{{ cookiecutter.task_suffix }}
resolver: git
params:
- { name: url, value: https://github.com/opendevstack/ods-pipeline-image.git }
- { name: revision, value: v0.3.0 }
- { name: pathInRepo, value: tasks/package.yaml }
workspaces:
- name: source
workspace: shared-workspace
- name: deploy
taskRef:
kind: Task
name: ods-deploy-helm{{ cookiecutter.task_suffix }}
resolver: git
params:
- { name: url, value: https://github.com/opendevstack/ods-pipeline-helm.git }
- { name: revision, value: v0.4.1 }
- { name: pathInRepo, value: tasks/deploy.yaml }
runAfter:
- package
params:
- name: namespace
value: {{ cookiecutter.__project_slug }}-dev
workspaces:
- name: source
workspace: shared-workspace
1 change: 0 additions & 1 deletion jupyter-lab/cookiecutter.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"component_name": "bar",
"__component_slug": "{{cookiecutter.component_name.lower().replace(' ', '-')}}",
"__repo_slug": "{{cookiecutter.__project_slug}}-{{cookiecutter.__component_slug}}",
"task_suffix": "-v0-7-0",
"_copy_without_render": [
"chart/templates/*"
]
Expand Down
26 changes: 13 additions & 13 deletions jupyter-lab/{{cookiecutter.__repo_slug}}/ods.yaml
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
branchToEnvironmentMapping:
- branch: '*'
environment: dev

environments:
- name: dev
namespace: {{cookiecutter.__project_slug}}-dev
stage: dev

pipeline:
Copy link

Choose a reason for hiding this comment

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

Should this be pipelines?

Copy link

Choose a reason for hiding this comment

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

Same goes for the others

Copy link
Contributor Author

Choose a reason for hiding this comment

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

If there is just one target namespace, it is not needed. If there are different targets based on different branches, then pipeline triggers would be used, as explained in https://github.com/opendevstack/ods-pipeline/blob/main/docs/ods-configuration.adoc#configuring-pipeline-triggers. Would you add that as an example here? I thought to keep it super simple initially.

tasks:
- name: package
taskRef:
kind: Task
name: ods-package-image{{cookiecutter.task_suffix}}
resolver: git
params:
- { name: url, value: https://github.com/opendevstack/ods-pipeline-image.git }
- { name: revision, value: v0.3.0 }
- { name: pathInRepo, value: tasks/package.yaml }
workspaces:
- name: source
workspace: shared-workspace
- name: deploy
taskRef:
kind: Task
name: ods-deploy-helm{{cookiecutter.task_suffix}}
resolver: git
params:
- { name: url, value: https://github.com/opendevstack/ods-pipeline-helm.git }
- { name: revision, value: v0.4.1 }
- { name: pathInRepo, value: tasks/deploy.yaml }
runAfter:
- package
params:
- name: namespace
value: {{ cookiecutter.__project_slug }}-dev
workspaces:
- name: source
workspace: shared-workspace
1 change: 0 additions & 1 deletion postgres-operator/cookiecutter.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"component_name": "bar",
"__component_slug": "{{cookiecutter.component_name.lower().replace(' ', '-')}}",
"__repo_slug": "{{cookiecutter.__project_slug}}-{{cookiecutter.__component_slug}}",
"task_suffix": "-v0-7-0",
"_copy_without_render": [
"chart/templates/*"
]
Expand Down
19 changes: 8 additions & 11 deletions postgres-operator/{{cookiecutter.__repo_slug}}/ods.yaml
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
branchToEnvironmentMapping:
- branch: '*'
environment: dev

environments:
- name: dev
namespace: {{cookiecutter.__project_slug}}-dev
stage: dev

pipeline:
tasks:
- name: deploy
taskRef:
kind: Task
name: ods-deploy-helm{{cookiecutter.task_suffix}}
resolver: git
params:
- { name: url, value: https://github.com/opendevstack/ods-pipeline-helm.git }
- { name: revision, value: v0.4.1 }
- { name: pathInRepo, value: tasks/deploy.yaml }
params:
- name: namespace
value: {{ cookiecutter.__project_slug }}-dev
workspaces:
- name: source
workspace: shared-workspace