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

Update kubectl patch doc to use apps/v1beta2 APIs #5422

Merged
merged 1 commit into from
Sep 19, 2017
Merged

Update kubectl patch doc to use apps/v1beta2 APIs #5422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion cn/docs/tasks/run-application/deployment-patch-demo.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
apiVersion: apps/v1beta1
apiVersion: apps/v1beta2
Copy link
Contributor

Choose a reason for hiding this comment

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

@chenopis @steveperry-53, do we typically edit the cn/docs/... YAMLs directly?

Copy link
Contributor

Choose a reason for hiding this comment

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

@markthink, @zhangxiaoyu-zidif, Can you answer this question about editing the cn files directly?

Copy link
Contributor

@zhangxiaoyu-zidif zhangxiaoyu-zidif Sep 19, 2017 •
edited
Loading

Choose a reason for hiding this comment

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

I contacted with @markthink, he said it's fine to modify any .yaml files in cn/.
I think so.
@steveperry-53 @foxish

kind: Deployment
metadata:
name: patch-demo
spec:
replicas: 2
selector:
matchLabels:
app: nginx
template:
metadata:
labels:
Expand Down
5 changes: 4 additions & 1 deletion docs/tasks/run-application/deployment-patch-demo.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
apiVersion: apps/v1beta1
apiVersion: apps/v1beta2
kind: Deployment
metadata:
name: patch-demo
spec:
replicas: 2
selector:
matchLabels:
app: nginx
template:
metadata:
labels:
Expand Down
12 changes: 6 additions & 6 deletions docs/tasks/run-application/update-api-object-kubectl-patch.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,14 +81,14 @@ The output shows that the PodSpec in the Deployment has two Containers:

```shell
containers:
- image: nginx
imagePullPolicy: Always
name: patch-demo-ctr
...
- image: redis
imagePullPolicy: Always
name: patch-demo-ctr-2
...
- image: nginx
imagePullPolicy: Always
name: patch-demo-ctr
...
```

View the Pods associated with your patched Deployment:
Expand Down Expand Up @@ -118,10 +118,10 @@ The output shows that the Pod has two Containers: one running nginx and one runn

```
containers:
- image: nginx
...
- image: redis
...
- image: nginx
...
```

### Notes on the strategic merge patch
Expand Down