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

feat(757): Add screwdriver.cd/disk annotation; deprecate beta.screwdriver.cd #233

Merged
merged 3 commits into from
Sep 24, 2018

Conversation

Filbird
Copy link
Member

@Filbird Filbird commented Sep 10, 2018

Context

High disk support will soon be available for k8s-vm. This is configurable via the screwdriver.cd/disk annotation.

Additionally we plan to deprecate beta.screwdriver.cd in favor of screwdriver.cd

Objective

Document the screwdriver.cd/disk annotation.

Document the deprecation of beta.screwdriver.cd.

References

screwdriver-cd/screwdriver#757
screwdriver-cd/executor-k8s-vm#39
screwdriver-cd/executor-base#48

@@ -35,6 +35,7 @@ Some Annotations are used to modify the properties of the build environment. The
| beta.screwdriver.cd/executor | Ask your cluster admin | This will determine what compute system is used to run the build. For example, set the build to run in a VM, a kubernetes pod, a docker container, or a Jenkins agent. |
| beta.screwdriver.cd/cpu | `MICRO` / `LOW` / `HIGH` | When using a `k8s` executor, this will allow the user to choose between 0.5 (`MICRO`), 2 (`LOW`) and 6 (`HIGH`) CPU resources. Default is `LOW`.<br> When using a `k8s-vm` executor, this will allow the user to choose between 1 (`MICRO`), 2 (`LOW`) and 6 (`HIGH`) CPU resources. Default is `LOW`. |
| beta.screwdriver.cd/ram | `MICRO` / `LOW` / `HIGH` | When using a `k8s` executor, this will allow the user to choose between 1 GB (`MICRO`), 2 GB (`LOW`) and 12 GB (`HIGH`) RAM. Default is `LOW`.<br> When using a `k8s-vm` executor, this will allow the user to choose between 1 GB (`MICRO`), 2 GB (`LOW`) and 12 GB (`HIGH`) RAM. Default is `LOW`. |
| beta.screwdriver.cd/disk | `LOW` / `HIGH` | When using a `k8s-vm` executor, this will allow the user to choose between 20 GB (`LOW`) and 50 GB (`HIGH`) disk space. Default is `LOW`. |
Copy link
Member

Choose a reason for hiding this comment

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

Not sure if this makes more or less sense, but should this be alphabetically positioned in relation to the other resource annotations? (beta.screwdriver.cd/cpu, beta.screwdriver.cd/disk, beta.screwdriver.cd/ram)

Copy link
Member Author

Choose a reason for hiding this comment

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

sounds reasonable!

Copy link
Member

@minzcmu minzcmu left a comment

Choose a reason for hiding this comment

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

Let's change everything to screwdriver.cd/ and document that beta.screwdriver.cd also works but deprecated?

screwdriver.cd/buildPeriodically: H H(4-7) * * * # Run the job every day sometime between 4am and 7am UTC.
```

## Supported Annotations
Some Annotations are used to modify the properties of the build environment. The following annotations are supported by plugins maintained by Screwdriver.cd. Ask your cluster admin which annotations are supported in your Screwdriver cluster.

Please note that `beta.screwdriver.cd` is deprecated in favor of `screwdriver.cd`. However, annotations that are prefixed with `beta.screwdriver.cd` will continue to work.
Copy link
Member

Choose a reason for hiding this comment

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

for now*?

might want to use > to highlight it

Example:

Please note that beta.screwdriver.cd is deprecated in favor of screwdriver.cd. However, annotations that are prefixed with beta.screwdriver.cd will continue to work for now.

Copy link
Member

@minzcmu minzcmu left a comment

Choose a reason for hiding this comment

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

LGTM but let's merge it after we pull in the parse annotations change internally. So that ppl won't be confused by this when it's not actually available

@Filbird Filbird changed the title feat(757): Add beta.screwdriver.cd/disk annotation feat(757): Add screwdriver.cd/disk annotation; deprecate beta.screwdriver.cd Sep 11, 2018
@tkyi tkyi merged commit 34814b8 into master Sep 24, 2018
@tkyi tkyi deleted the disk branch September 24, 2018 21:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants