whentimeslows/website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bump up deployment version in concepts/overview/object-management-kubectl folder (#7327)

Browse Source
This commit is contained in:
Xiaodong Zhang
2018-02-28 01:51:46 +08:00
committed by k8s-ci-robot
parent 46d4998e3e
commit 5401750219
3 changed files with 52 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/concepts/overview/object-management-kubectl/declarative-config.md
+44 -17
View File
@@ -86,15 +86,19 @@ metadata:
# This is the json representation of simple_deployment.yaml # This is the json representation of simple_deployment.yaml
# It was written by kubectl apply when the object was created # It was written by kubectl apply when the object was created
kubectl.kubernetes.io/last-applied-configuration: | kubectl.kubernetes.io/last-applied-configuration: |
{"apiVersion":"apps/v1beta1","kind":"Deployment", {"apiVersion":"apps/v1","kind":"Deployment",
"metadata":{"annotations":{},"name":"nginx-deployment","namespace":"default"}, "metadata":{"annotations":{},"name":"nginx-deployment","namespace":"default"},
"spec":{"minReadySeconds":5,"template":{"metadata":{"labels":{"app":"nginx"}}, "spec":{"minReadySeconds":5,"selector":{"matchLabels":{"app":nginx}},"template":{"metadata":{"labels":{"app":"nginx"}},
"spec":{"containers":[{"image":"nginx:1.7.9","name":"nginx", "spec":{"containers":[{"image":"nginx:1.7.9","name":"nginx",
"ports":[{"containerPort":80}]}]}}}} "ports":[{"containerPort":80}]}]}}}}
# ... # ...
spec: spec:
# ... # ...
minReadySeconds: 5 minReadySeconds: 5
selector:
matchLabels:
# ...
app: nginx
template: template:
metadata: metadata:
# ... # ...
@@ -157,15 +161,19 @@ metadata:
# This is the json representation of simple_deployment.yaml # This is the json representation of simple_deployment.yaml
# It was written by kubectl apply when the object was created # It was written by kubectl apply when the object was created
kubectl.kubernetes.io/last-applied-configuration: | kubectl.kubernetes.io/last-applied-configuration: |
{"apiVersion":"apps/v1beta1","kind":"Deployment", {"apiVersion":"apps/v1","kind":"Deployment",
"metadata":{"annotations":{},"name":"nginx-deployment","namespace":"default"}, "metadata":{"annotations":{},"name":"nginx-deployment","namespace":"default"},
"spec":{"minReadySeconds":5,"template":{"metadata":{"labels":{"app":"nginx"}}, "spec":{"minReadySeconds":5,"selector":{"matchLabels":{"app":nginx}},"template":{"metadata":{"labels":{"app":"nginx"}},
"spec":{"containers":[{"image":"nginx:1.7.9","name":"nginx", "spec":{"containers":[{"image":"nginx:1.7.9","name":"nginx",
"ports":[{"containerPort":80}]}]}}}} "ports":[{"containerPort":80}]}]}}}}
# ... # ...
spec: spec:
# ... # ...
minReadySeconds: 5 minReadySeconds: 5
selector:
matchLabels:
# ...
app: nginx
template: template:
metadata: metadata:
# ... # ...
@@ -201,7 +209,7 @@ The output shows that the `replicas` field has been set to 2, and the `last-appl
annotation does not contain a `replicas` field: annotation does not contain a `replicas` field:
``` ```
apiVersion: apps/v1beta1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
annotations: annotations:
@@ -209,9 +217,9 @@ metadata:
# note that the annotation does not contain replicas # note that the annotation does not contain replicas
# because it was not updated through apply # because it was not updated through apply
kubectl.kubernetes.io/last-applied-configuration: | kubectl.kubernetes.io/last-applied-configuration: |
{"apiVersion":"apps/v1beta1","kind":"Deployment", {"apiVersion":"apps/v1","kind":"Deployment",
"metadata":{"annotations":{},"name":"nginx-deployment","namespace":"default"}, "metadata":{"annotations":{},"name":"nginx-deployment","namespace":"default"},
"spec":{"minReadySeconds":5,"template":{"metadata":{"labels":{"app":"nginx"}}, "spec":{"minReadySeconds":5,"selector":{"matchLabels":{"app":nginx}},"template":{"metadata":{"labels":{"app":"nginx"}},
"spec":{"containers":[{"image":"nginx:1.7.9","name":"nginx", "spec":{"containers":[{"image":"nginx:1.7.9","name":"nginx",
"ports":[{"containerPort":80}]}]}}}} "ports":[{"containerPort":80}]}]}}}}
# ... # ...
@@ -219,6 +227,10 @@ spec:
replicas: 2 # written by scale replicas: 2 # written by scale
# ... # ...
minReadySeconds: 5 minReadySeconds: 5
selector:
matchLabels:
# ...
app: nginx
template: template:
metadata: metadata:
# ... # ...
@@ -261,7 +273,7 @@ The output shows the following changes to the live configuration:
- The `last-applied-configuration` annotation no longer contains the `minReadySeconds` field. - The `last-applied-configuration` annotation no longer contains the `minReadySeconds` field.
```shell ```shell
apiVersion: apps/v1beta1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
annotations: annotations:
@@ -269,9 +281,9 @@ metadata:
# The annotation contains the updated image to nginx 1.11.9, # The annotation contains the updated image to nginx 1.11.9,
# but does not contain the updated replicas to 2 # but does not contain the updated replicas to 2
kubectl.kubernetes.io/last-applied-configuration: | kubectl.kubernetes.io/last-applied-configuration: |
{"apiVersion":"apps/v1beta1","kind":"Deployment", {"apiVersion":"apps/v1","kind":"Deployment",
"metadata":{"annotations":{},"name":"nginx-deployment","namespace":"default"}, "metadata":{"annotations":{},"name":"nginx-deployment","namespace":"default"},
"spec":{"template":{"metadata":{"labels":{"app":"nginx"}}, "spec":{"selector":{"matchLabels":{"app":nginx}},"template":{"metadata":{"labels":{"app":"nginx"}},
"spec":{"containers":[{"image":"nginx:1.11.9","name":"nginx", "spec":{"containers":[{"image":"nginx:1.11.9","name":"nginx",
"ports":[{"containerPort":80}]}]}}}} "ports":[{"containerPort":80}]}]}}}}
# ... # ...
@@ -279,6 +291,10 @@ spec:
replicas: 2 # Set by `kubectl scale`. Ignored by `kubectl apply`. replicas: 2 # Set by `kubectl scale`. Ignored by `kubectl apply`.
# minReadySeconds cleared by `kubectl apply` # minReadySeconds cleared by `kubectl apply`
# ... # ...
selector:
matchLabels:
# ...
app: nginx
template: template:
metadata: metadata:
# ... # ...
@@ -388,7 +404,7 @@ Here's an example. Suppose this is the configuration file for a Deployment objec
Also, suppose this is the live configuration for the same Deployment object: Also, suppose this is the live configuration for the same Deployment object:
```shell ```shell
apiVersion: apps/v1beta1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
annotations: annotations:
@@ -396,9 +412,9 @@ metadata:
# note that the annotation does not contain replicas # note that the annotation does not contain replicas
# because it was not updated through apply # because it was not updated through apply
kubectl.kubernetes.io/last-applied-configuration: | kubectl.kubernetes.io/last-applied-configuration: |
{"apiVersion":"apps/v1beta1","kind":"Deployment", {"apiVersion":"apps/v1","kind":"Deployment",
"metadata":{"annotations":{},"name":"nginx-deployment","namespace":"default"}, "metadata":{"annotations":{},"name":"nginx-deployment","namespace":"default"},
"spec":{"minReadySeconds":5,"template":{"metadata":{"labels":{"app":"nginx"}}, "spec":{"minReadySeconds":5,"selector":{"matchLabels":{"app":nginx}},"template":{"metadata":{"labels":{"app":"nginx"}},
"spec":{"containers":[{"image":"nginx:1.7.9","name":"nginx", "spec":{"containers":[{"image":"nginx:1.7.9","name":"nginx",
"ports":[{"containerPort":80}]}]}}}} "ports":[{"containerPort":80}]}]}}}}
# ... # ...
@@ -406,6 +422,10 @@ spec:
replicas: 2 # written by scale replicas: 2 # written by scale
# ... # ...
minReadySeconds: 5 minReadySeconds: 5
selector:
matchLabels:
# ...
app: nginx
template: template:
metadata: metadata:
# ... # ...
@@ -439,7 +459,7 @@ Here are the merge calculations that would be performed by `kubectl apply`:
Here is the live configuration that is the result of the merge: Here is the live configuration that is the result of the merge:
```shell ```shell
apiVersion: apps/v1beta1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
annotations: annotations:
@@ -447,13 +467,17 @@ metadata:
# The annotation contains the updated image to nginx 1.11.9, # The annotation contains the updated image to nginx 1.11.9,
# but does not contain the updated replicas to 2 # but does not contain the updated replicas to 2
kubectl.kubernetes.io/last-applied-configuration: | kubectl.kubernetes.io/last-applied-configuration: |
{"apiVersion":"apps/v1beta1","kind":"Deployment", {"apiVersion":"apps/v1","kind":"Deployment",
"metadata":{"annotations":{},"name":"nginx-deployment","namespace":"default"}, "metadata":{"annotations":{},"name":"nginx-deployment","namespace":"default"},
"spec":{"template":{"metadata":{"labels":{"app":"nginx"}}, "spec":{"selector":{"matchLabels":{"app":nginx}},"template":{"metadata":{"labels":{"app":"nginx"}},
"spec":{"containers":[{"image":"nginx:1.11.9","name":"nginx", "spec":{"containers":[{"image":"nginx:1.11.9","name":"nginx",
"ports":[{"containerPort":80}]}]}}}} "ports":[{"containerPort":80}]}]}}}}
# ... # ...
spec: spec:
selector:
matchLabels:
# ...
app: nginx
replicas: 2 # Set by `kubectl scale`. Ignored by `kubectl apply`. replicas: 2 # Set by `kubectl scale`. Ignored by `kubectl apply`.
# minReadySeconds cleared by `kubectl apply` # minReadySeconds cleared by `kubectl apply`
# ... # ...
@@ -686,10 +710,13 @@ The output shows that the API server set several fields to default values in the
configuration. These fields were not specified in the configuration file. configuration. These fields were not specified in the configuration file.
```shell ```shell
apiVersion: apps/v1beta1 apiVersion: apps/v1
kind: Deployment kind: Deployment
# ... # ...
spec: spec:
selector:
matchLabels:
app: nginx
minReadySeconds: 5 minReadySeconds: 5
replicas: 1 # defaulted by apiserver replicas: 1 # defaulted by apiserver
selector: selector:
docs/concepts/overview/object-management-kubectl/simple_deployment.yaml
+4 -1
View File
@@ -1,8 +1,11 @@
apiVersion: apps/v1beta1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
name: nginx-deployment name: nginx-deployment
spec: spec:
selector:
matchLabels:
app: nginx
minReadySeconds: 5 minReadySeconds: 5
template: template:
metadata: metadata:
docs/concepts/overview/object-management-kubectl/update_deployment.yaml
+4 -1
View File
@@ -1,8 +1,11 @@
apiVersion: apps/v1beta1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
name: nginx-deployment name: nginx-deployment
spec: spec:
selector:
matchLabels:
app: nginx
template: template:
metadata: metadata:
labels: labels: