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

v1beta1 fields updated to v1 in docs and examples #7873

Merged
merged 2 commits into from
May 16, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions docs/pipeline-api.md
Original file line number Diff line number Diff line change
Expand Up @@ -12193,7 +12193,7 @@ string
</tr>
<tr>
<td>
<code>taskServiceAccountName</code><br/>
<code>serviceAccountName</code><br/>
Copy link
Member

Choose a reason for hiding this comment

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

This document is generated, it cannot be edited manually - this change is what's causing the CI failutr

Copy link
Contributor Author

Choose a reason for hiding this comment

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

reverted

<em>
string
</em>
Expand All @@ -12203,7 +12203,7 @@ string
</tr>
<tr>
<td>
<code>taskPodTemplate</code><br/>
<code>podTemplate</code><br/>
<em>
<a href="#tekton.dev/unversioned.Template">
Template
Expand Down
10 changes: 5 additions & 5 deletions docs/windows.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@ In order to ensure that Tasks are scheduled to a node with the correct host OS,

### Node Selectors

Node selectors are the simplest way to schedule pods to a Windows or Linux node. By default, Kubernetes nodes include a label `kubernetes.io/os` to identify the host OS. The Kubelet populates this with `runtime.GOOS` as defined by Go. Use `spec.podTemplate.nodeSelector` (or `spec.taskRunSpecs[i].taskPodTemplate.nodeSelector` in a PipelineRun) to schedule Tasks to a node with a specific label and value.
Node selectors are the simplest way to schedule pods to a Windows or Linux node. By default, Kubernetes nodes include a label `kubernetes.io/os` to identify the host OS. The Kubelet populates this with `runtime.GOOS` as defined by Go. Use `spec.podTemplate.nodeSelector` (or `spec.taskRunSpecs[i].podTemplate.nodeSelector` in a PipelineRun) to schedule Tasks to a node with a specific label and value.

For example:

``` yaml
apiVersion: tekton.dev/v1beta1
apiVersion: tekton.dev/v1
kind: TaskRun
metadata:
name: windows-taskrun
Expand All @@ -52,7 +52,7 @@ spec:
nodeSelector:
kubernetes.io/os: windows
---
apiVersion: tekton.dev/v1beta1
apiVersion: tekton.dev/v1
kind: TaskRun
metadata:
name: linux-taskrun
Expand All @@ -71,7 +71,7 @@ Node affinity can be used as an alternative method of defining the OS requiremen
For example:

```yaml
apiVersion: tekton.dev/v1beta1
apiVersion: tekton.dev/v1
kind: TaskRun
metadata:
name: windows-taskrun
Expand All @@ -89,7 +89,7 @@ spec:
values:
- windows
---
apiVersion: tekton.dev/v1beta1
apiVersion: tekton.dev/v1
kind: TaskRun
metadata:
name: linux-taskrun
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ spec:
- pipelineTaskName: first-add-taskspec
serviceAccountName: 'default'
- pipelineTaskName: second-add-taskspec
taskPodTemplate:
podTemplate:
nodeSelector:
disktype: ssd
params:
Expand Down
2 changes: 1 addition & 1 deletion examples/v1/pipelineruns/no-ci/windows-node-affinity.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ spec:
name: windows-pipeline-na
taskRunSpecs:
- pipelineTaskName: windows-task-na
taskPodTemplate:
podTemplate:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
Expand Down
2 changes: 1 addition & 1 deletion examples/v1/pipelineruns/no-ci/windows-node-selectors.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@ spec:
name: windows-pipeline-ns
taskRunSpecs:
- pipelineTaskName: windows-task-ns
taskPodTemplate:
podTemplate:
nodeSelector:
kubernetes.io/os: windows