diff --git a/_data/concepts.yml b/_data/concepts.yml index 0a0fc14143..5b7e106621 100644 --- a/_data/concepts.yml +++ b/_data/concepts.yml @@ -7,6 +7,7 @@ toc: section: - docs/concepts/overview/what-is-kubernetes.md - docs/concepts/overview/components.md + - docs/concepts/overview/kubernetes-api.md - title: Working with Kubernetes Objects section: - docs/concepts/overview/working-with-objects/kubernetes-objects.md @@ -14,7 +15,12 @@ toc: - docs/concepts/overview/working-with-objects/namespaces.md - docs/concepts/overview/working-with-objects/labels.md - docs/concepts/overview/working-with-objects/annotations.md - - docs/concepts/overview/kubernetes-api.md + - title: Object Management Using kubectl + section: + - docs/concepts/overview/object-management-kubectl/overview.md + - docs/concepts/overview/object-management-kubectl/imperative-command.md + - docs/concepts/overview/object-management-kubectl/imperative-config.md + - docs/concepts/overview/object-management-kubectl/declarative-config.md - title: Kubernetes Architecture section: diff --git a/_data/tutorials.yml b/_data/tutorials.yml index eaf44f93e8..32e2b565ed 100644 --- a/_data/tutorials.yml +++ b/_data/tutorials.yml @@ -41,12 +41,6 @@ toc: - title: Configuration section: - docs/tutorials/configuration/configure-redis-using-configmap.md -- title: Object Management Using kubectl - section: - - docs/tutorials/object-management-kubectl/object-management.md - - docs/tutorials/object-management-kubectl/imperative-object-management-command.md - - docs/tutorials/object-management-kubectl/imperative-object-management-configuration.md - - docs/tutorials/object-management-kubectl/declarative-object-management-configuration.md - title: Stateless Applications section: - docs/tasks/run-application/run-stateless-application-deployment.md diff --git a/_redirects b/_redirects index fbd6069238..8339eff09b 100644 --- a/_redirects +++ b/_redirects @@ -114,11 +114,11 @@ /docs/concepts/services-networking/networkpolicies/ /docs/concepts/services-networking/network-policies/ 301 /docs/concepts/storage/etcd-store-api-object/ /docs/tasks/administer-cluster/configure-upgrade-etcd/ 301 /docs/concepts/storage/volumes/emptyDirapiVersion/ /docs/concepts/storage/volumes/#emptydir/ 301 -/docs/concepts/tools/kubectl/object-management-overview/ /docs/tutorials/object-management-kubectl/object-management/ 301 -/docs/concepts/tools/kubectl/object-management-using-commands/ /docs/tutorials/object-management-kubectl/imperative-object-management-command/ 301 -/docs/concepts/tools/kubectl/object-management-using-declarative-config/ /docs/tutorials/object-management-kubectl/declarative-object-management-configuration/ 301 -/docs/concepts/tools/kubectl/object-management-using-imperative-commands/ /docs/tutorials/object-management-kubectl/imperative-object-management-command/ 301 -/docs/concepts/tools/kubectl/object-management-using-imperative-config/ /docs/tutorials/object-management-kubectl/imperative-object-management-configuration/ 301 +/docs/concepts/tools/kubectl/object-management-overview/ /docs/concepts/overview/object-management-kubectl/overview/ 301 +/docs/concepts/tools/kubectl/object-management-using-commands/ /docs/concepts/overview/object-management-kubectl/imperative-command/ 301 +/docs/concepts/tools/kubectl/object-management-using-declarative-config/ /docs/concepts/overview/object-management-kubectl/declarative-config/ 301 +/docs/concepts/tools/kubectl/object-management-using-imperative-commands/ /docs/concepts/overview/object-management-kubectl/imperative-command/ 301 +/docs/concepts/tools/kubectl/object-management-using-imperative-config/ /docs/concepts/overview/object-management-kubectl/imperative-config/ 301 /docs/concepts/workloads/controllers/cron-jobs/deployment/ /docs/concepts/workloads/controllers/cron-jobs/ 301 /docs/concepts/workloads/controllers/daemonset/docs/concepts/workloads/pods/pod/ /docs/concepts/workloads/pods/pod/ 301 /docs/concepts/workloads/controllers/deployment/docs/concepts/workloads/pods/pod/ /docs/concepts/workloads/pods/pod/ 301 @@ -272,6 +272,10 @@ /docs/tutorials/getting-started/scale-intro/ /docs/tutorials/kubernetes-basics/scale-intro/ 301 /docs/tutorials/getting-started/update-interactive/ /docs/tutorials/kubernetes-basics/update-interactive/ 301 /docs/tutorials/getting-started/update-intro/ /docs/tutorials/kubernetes-basics/ 301 +/docs/tutorials/object-management-kubectl/declarative-object-management-configuration/ /docs/concepts/overview/object-management-kubectl/declarative-config/ 301 +/docs/tutorials/object-management-kubectl/imperative-object-management-command/ /docs/concepts/overview/object-management-kubectl/imperative-command/ 301 +/docs/tutorials/object-management-kubectl/imperative-object-management-configuration/ /docs/concepts/overview/object-management-kubectl/imperative-config/ 301 +/docs/tutorials/object-management-kubectl/object-management/ /docs/concepts/overview/object-management-kubectl/overview/ 301 /docs/tutorials/stateful-application/run-replicated-stateful-application/ /docs/tasks/run-application/run-replicated-stateful-application/ 301 /docs/tutorials/stateful-application/run-stateful-application/ /docs/tasks/run-application/run-single-instance-stateful-application/ 301 /docs/tutorials/stateless-application/expose-external-ip-address-service/ /docs/tasks/access-application-cluster/service-access-application-cluster/ 301 @@ -390,7 +394,7 @@ /docs/user-guide/secrets/walkthrough/ /docs/tasks/inject-data-application/distribute-credentials-secure/ 301 /docs/user-guide/security-context/ /docs/tasks/configure-pod-container/security-context/ 301 /docs/user-guide/service-accounts/ /docs/tasks/configure-pod-container/configure-service-account/ 301 -/docs/user-guide/service-accounts/working-with-resources/ /docs/tutorials/object-management-kubectl/object-management/ 301 +/docs/user-guide/service-accounts/working-with-resources/ /docs/concepts/overview/object-management-kubectl/overview/ 301 /docs/user-guide/services/ /docs/concepts/services-networking/service/ 301 /docs/user-guide/services-firewalls/ /docs/tasks/access-application-cluster/configure-cloud-provider-firewall/ 301 /docs/user-guide/services/operations/ /docs/tasks/access-application-cluster/connecting-frontend-backend/ 301 @@ -404,7 +408,7 @@ /docs/user-guide/update-demo/ /docs/tasks/run-application/rolling-update-replication-controller/ 301 /docs/user-guide/volumes/ /docs/concepts/storage/volumes/ 301 -/docs/user-guide/working-with-resources/ /docs/tutorials/object-management-kubectl/object-management/ 301 +/docs/user-guide/working-with-resources/ /docs/concepts/overview/object-management-kubectl/overview/ 301 /docs/whatisk8s/ /docs/concepts/overview/what-is-kubernetes/ 301 /events/ /docs/community 301 diff --git a/docs/tutorials/object-management-kubectl/declarative-object-management-configuration.md b/docs/concepts/overview/object-management-kubectl/declarative-config.md similarity index 94% rename from docs/tutorials/object-management-kubectl/declarative-object-management-configuration.md rename to docs/concepts/overview/object-management-kubectl/declarative-config.md index 6d337c9848..7bf37d22b5 100644 --- a/docs/tutorials/object-management-kubectl/declarative-object-management-configuration.md +++ b/docs/concepts/overview/object-management-kubectl/declarative-config.md @@ -20,7 +20,7 @@ The `kubectl` tool supports three kinds of object management: * Imperative object configuration * Declarative object configuration -See [Kubernetes Object Management](/docs/tutorials/object-management-kubectl/object-management/) +See [Kubernetes Object Management](/docs/concepts/overview/object-management-kubectl/overview/) for a discussion of the advantages and disadvantage of each kind of object management. ## Before you begin @@ -29,8 +29,8 @@ Declarative object configuration requires a firm understanding of the Kubernetes object definitions and configuration. Read and complete the following documents if you have not already: -- [Managing Kubernetes Objects Using Imperative Commands](/docs/tutorials/object-management-kubectl/imperative-object-management-command/) -- [Imperative Management of Kubernetes Objects Using Configuration Files](/docs/tutorials/object-management-kubectl/imperative-object-management-configuration/) +- [Managing Kubernetes Objects Using Imperative Commands](/docs/concepts/overview/object-management-kubectl/imperative-command/) +- [Imperative Management of Kubernetes Objects Using Configuration Files](/docs/concepts/overview/object-management-kubectl/imperative-config/) Following are definitions for terms used in this document: @@ -61,18 +61,18 @@ configuration file that was used to create the object. Here's an example of an object configuration file: -{% include code.html language="yaml" file="simple_deployment.yaml" ghlink="/docs/tutorials/object-management-kubectl/simple_deployment.yaml" %} +{% include code.html language="yaml" file="simple_deployment.yaml" ghlink="/docs/concepts/overview/object-management-kubectl/simple_deployment.yaml" %} Create the object using `kubectl apply`: ```shell -kubectl apply -f https://k8s.io/docs/tutorials/object-management-kubectl/simple_deployment.yaml +kubectl apply -f https://k8s.io/docs/concepts/overview/object-management-kubectl/simple_deployment.yaml ``` Print the live configuration using `kubectl get`: ```shell -kubectl get -f https://k8s.io/docs/tutorials/object-management-kubectl/simple_deployment.yaml -o yaml +kubectl get -f https://k8s.io/docs/concepts/overview/object-management-kubectl/simple_deployment.yaml -o yaml ``` The output shows that the `kubectl.kubernetes.io/last-applied-configuration` annotation @@ -129,12 +129,12 @@ kubectl apply -f / Here's an example configuration file: -{% include code.html language="yaml" file="simple_deployment.yaml" ghlink="/docs/tutorials/object-management-kubectl/simple_deployment.yaml" %} +{% include code.html language="yaml" file="simple_deployment.yaml" ghlink="/docs/concepts/overview/object-management-kubectl/simple_deployment.yaml" %} Create the object using `kubectl apply`: ```shell -kubectl apply -f https://k8s.io/docs/tutorials/object-management-kubectl/simple_deployment.yaml +kubectl apply -f https://k8s.io/docs/concepts/overview/object-management-kubectl/simple_deployment.yaml ``` **Note:** For purposes of illustration, the preceding command refers to a single @@ -143,7 +143,7 @@ configuration file instead of a directory. Print the live configuration using `kubectl get`: ```shell -kubectl get -f https://k8s.io/docs/tutorials/object-management-kubectl/simple_deployment.yaml -o yaml +kubectl get -f https://k8s.io/docs/concepts/overview/object-management-kubectl/simple_deployment.yaml -o yaml ``` The output shows that the `kubectl.kubernetes.io/last-applied-configuration` annotation @@ -194,7 +194,7 @@ kubectl scale deployment/nginx-deployment --replicas=2 Print the live configuration using `kubectl get`: ```shell -kubectl get -f https://k8s.io/docs/tutorials/object-management-kubectl/simple_deployment.yaml -o yaml +kubectl get -f https://k8s.io/docs/concepts/overview/object-management-kubectl/simple_deployment.yaml -o yaml ``` The output shows that the `replicas` field has been set to 2, and the `last-applied-configuration` @@ -237,18 +237,18 @@ spec: Update the `simple_deployment.yaml` configuration file to change the image from `nginx:1.7.9` to `nginx:1.11.9`, and delete the `minReadySeconds` field: -{% include code.html language="yaml" file="update_deployment.yaml" ghlink="/docs/tutorials/object-management-kubectl/update_deployment.yaml" %} +{% include code.html language="yaml" file="update_deployment.yaml" ghlink="/docs/concepts/overview/object-management-kubectl/update_deployment.yaml" %} Apply the changes made to the configuration file: ```shell -kubectl apply -f https://k8s.io/docs/tutorials/object-management-kubectl/update_deployment.yaml +kubectl apply -f https://k8s.io/docs/concepts/overview/object-management-kubectl/update_deployment.yaml ``` Print the live configuration using `kubectl get`: ``` -kubectl get -f https://k8s.io/docs/tutorials/object-management-kubectl/simple_deployment.yaml -o yaml +kubectl get -f https://k8s.io/docs/concepts/overview/object-management-kubectl/simple_deployment.yaml -o yaml ``` The output shows the following changes to the live configuration: @@ -383,7 +383,7 @@ to calculate which fields should be deleted or set: Here's an example. Suppose this is the configuration file for a Deployment object: -{% include code.html language="yaml" file="update_deployment.yaml" ghlink="/docs/tutorials/object-management-kubectl/update_deployment.yaml" %} +{% include code.html language="yaml" file="update_deployment.yaml" ghlink="/docs/concepts/overview/object-management-kubectl/update_deployment.yaml" %} Also, suppose this is the live configuration for the same Deployment object: @@ -668,18 +668,18 @@ not specified when the object is created. Here's a configuration file for a Deployment. The file does not specify `strategy` or `selector`: -{% include code.html language="yaml" file="simple_deployment.yaml" ghlink="/docs/tutorials/object-management-kubectl/simple_deployment.yaml" %} +{% include code.html language="yaml" file="simple_deployment.yaml" ghlink="/docs/concepts/overview/object-management-kubectl/simple_deployment.yaml" %} Create the object using `kubectl apply`: ```shell -kubectl apply -f https://k8s.io/docs/tutorials/object-management-kubectl/simple_deployment.yaml +kubectl apply -f https://k8s.io/docs/concepts/overview/object-management-kubectl/simple_deployment.yaml ``` Print the live configuration using `kubectl get`: ```shell -kubectl get -f https://k8s.io/docs/tutorials/object-management-kubectl/simple_deployment.yaml -o yaml +kubectl get -f https://k8s.io/docs/concepts/overview/object-management-kubectl/simple_deployment.yaml -o yaml ``` The output shows that the API server set several fields to default values in the live @@ -942,12 +942,12 @@ template: * Prior to Kubernetes 1.6, `kubectl apply` did not support operating on objects stored in a [custom resource](/docs/concepts/api-extension/custom-resources/). - For these cluster versions, you should instead use [imperative object configuration](/docs/tutorials/object-management-kubectl/imperative-object-management-configuration/). + For these cluster versions, you should instead use [imperative object configuration](/docs/concepts/overview/object-management-kubectl/imperative-config/). {% endcapture %} {% capture whatsnext %} -- [Managing Kubernetes Objects Using Imperative Commands](/docs/tutorials/object-management-kubectl/imperative-object-management-command/) -- [Imperative Management of Kubernetes Objects Using Configuration Files](/docs/tutorials/object-management-kubectl/imperative-object-management-configuration/) +- [Managing Kubernetes Objects Using Imperative Commands](/docs/concepts/overview/object-management-kubectl/imperative-command/) +- [Imperative Management of Kubernetes Objects Using Configuration Files](/docs/concepts/overview/object-management-kubectl/imperative-config/) - [Kubectl Command Reference](/docs/user-guide/kubectl/{{page.version}}/) - [Kubernetes API Reference](/docs/api-reference/{{page.version}}/) {% endcapture %} diff --git a/docs/tutorials/object-management-kubectl/imperative-object-management-command.md b/docs/concepts/overview/object-management-kubectl/imperative-command.md similarity index 95% rename from docs/tutorials/object-management-kubectl/imperative-object-management-command.md rename to docs/concepts/overview/object-management-kubectl/imperative-command.md index 243be33aec..a4d62c90a6 100644 --- a/docs/tutorials/object-management-kubectl/imperative-object-management-command.md +++ b/docs/concepts/overview/object-management-kubectl/imperative-command.md @@ -18,7 +18,7 @@ The `kubectl` tool supports three kinds of object management: * Imperative object configuration * Declarative object configuration -See [Kubernetes Object Management](/docs/concepts/tools/kubectl/object-management-overview/) +See [Kubernetes Object Management](/docs/concepts/overview/object-management-kubectl/overview/) for a discussion of the advantages and disadvantage of each kind of object management. ## How to create objects @@ -150,8 +150,8 @@ kubectl create --edit -f /tmp/srv.yaml {% endcapture %} {% capture whatsnext %} -- [Managing Kubernetes Objects Using Object Configuration (Imperative)](/docs/tutorials/object-management-kubectl/imperative-object-management-configuration/) -- [Managing Kubernetes Objects Using Object Configuration (Declarative)](/docs/tutorials/object-management-kubectl/declarative-object-management-configuration/) +- [Managing Kubernetes Objects Using Object Configuration (Imperative)](/docs/concepts/overview/object-management-kubectl/imperative-config/) +- [Managing Kubernetes Objects Using Object Configuration (Declarative)](/docs/concepts/overview/object-management-kubectl/declarative-config/) - [Kubectl Command Reference](/docs/user-guide/kubectl/{{page.version}}/) - [Kubernetes API Reference](/docs/api-reference/{{page.version}}/) {% endcapture %} diff --git a/docs/tutorials/object-management-kubectl/imperative-object-management-configuration.md b/docs/concepts/overview/object-management-kubectl/imperative-config.md similarity index 94% rename from docs/tutorials/object-management-kubectl/imperative-object-management-configuration.md rename to docs/concepts/overview/object-management-kubectl/imperative-config.md index f0705217c8..51fff13e43 100644 --- a/docs/tutorials/object-management-kubectl/imperative-object-management-configuration.md +++ b/docs/concepts/overview/object-management-kubectl/imperative-config.md @@ -18,7 +18,7 @@ The `kubectl` tool supports three kinds of object management: * Imperative object configuration * Declarative object configuration -See [Kubernetes Object Management](/docs/tutorials/object-management-kubectl/object-management/) +See [Kubernetes Object Management](/docs/concepts/overview/object-management-kubectl/overview/) for a discussion of the advantages and disadvantage of each kind of object management. ## How to create objects @@ -128,8 +128,8 @@ template: {% endcapture %} {% capture whatsnext %} -- [Managing Kubernetes Objects Using Imperative Commands](/docs/tutorials/object-management-kubectl/imperative-object-management-command/) -- [Managing Kubernetes Objects Using Object Configuration (Declarative)](/docs/tutorials/object-management-kubectl/declarative-object-management-configuration/) +- [Managing Kubernetes Objects Using Imperative Commands](/docs/concepts/overview/object-management-kubectl/imperative-command/) +- [Managing Kubernetes Objects Using Object Configuration (Declarative)](/docs/concepts/overview/object-management-kubectl/declarative-config/) - [Kubectl Command Reference](/docs/user-guide/kubectl/{{page.version}}/) - [Kubernetes API Reference](/docs/api-reference/{{page.version}}/) {% endcapture %} diff --git a/docs/tutorials/object-management-kubectl/object-management.md b/docs/concepts/overview/object-management-kubectl/overview.md similarity index 95% rename from docs/tutorials/object-management-kubectl/object-management.md rename to docs/concepts/overview/object-management-kubectl/overview.md index c4045804ca..6a3ea8f073 100644 --- a/docs/tutorials/object-management-kubectl/object-management.md +++ b/docs/concepts/overview/object-management-kubectl/overview.md @@ -164,9 +164,9 @@ Disadvantages compared to imperative object configuration: {% endcapture %} {% capture whatsnext %} -- [Managing Kubernetes Objects Using Imperative Commands](/docs/tutorials/object-management-kubectl/imperative-object-management-command/) -- [Managing Kubernetes Objects Using Object Configuration (Imperative)](/docs/tutorials/object-management-kubectl/imperative-object-management-configuration/) -- [Managing Kubernetes Objects Using Object Configuration (Declarative)](/docs/tutorials/object-management-kubectl/declarative-object-management-configuration/) +- [Managing Kubernetes Objects Using Imperative Commands](/docs/concepts/overview/object-management-kubectl/imperative-command/) +- [Managing Kubernetes Objects Using Object Configuration (Imperative)](/docs/concepts/overview/object-management-kubectl/imperative-config/) +- [Managing Kubernetes Objects Using Object Configuration (Declarative)](/docs/concepts/overview/object-management-kubectl/declarative-config/) - [Kubectl Command Reference](/docs/user-guide/kubectl/{{page.version}}/) - [Kubernetes API Reference](/docs/api-reference/{{page.version}}/) diff --git a/docs/tutorials/object-management-kubectl/simple_deployment.yaml b/docs/concepts/overview/object-management-kubectl/simple_deployment.yaml similarity index 100% rename from docs/tutorials/object-management-kubectl/simple_deployment.yaml rename to docs/concepts/overview/object-management-kubectl/simple_deployment.yaml diff --git a/docs/tutorials/object-management-kubectl/update_deployment.yaml b/docs/concepts/overview/object-management-kubectl/update_deployment.yaml similarity index 100% rename from docs/tutorials/object-management-kubectl/update_deployment.yaml rename to docs/concepts/overview/object-management-kubectl/update_deployment.yaml diff --git a/docs/concepts/services-networking/network-policies.md b/docs/concepts/services-networking/network-policies.md index 8b96771b64..a3840c24f2 100644 --- a/docs/concepts/services-networking/network-policies.md +++ b/docs/concepts/services-networking/network-policies.md @@ -68,7 +68,11 @@ spec: *POSTing this to the API server will have no effect unless your chosen networking solution supports network policy.* -__Mandatory Fields__: As with all other Kubernetes config, a `NetworkPolicy` needs `apiVersion`, `kind`, and `metadata` fields. For general information about working with config files, see [Configure Containers Using a ConfigMap](/docs/tasks/configure-pod-container/configure-pod-configmap/), and [Object Management](https://kubernetes.io/docs/tutorials/object-management-kubectl/object-management/). +__Mandatory Fields__: As with all other Kubernetes config, a `NetworkPolicy` +needs `apiVersion`, `kind`, and `metadata` fields. For general information +about working with config files, see +[Configure Containers Using a ConfigMap](/docs/tasks/configure-pod-container/configure-pod-configmap/), +and [Object Management](/docs/concepts/overview/object-management-kubectl/overview/). __spec__: `NetworkPolicy` [spec](https://git.k8s.io/community/contributors/devel/api-conventions.md#spec-and-status) has all the information needed to define a particular network policy in the given namespace. diff --git a/docs/concepts/workloads/controllers/daemonset.md b/docs/concepts/workloads/controllers/daemonset.md index 4ffa9144da..ff9f37f934 100644 --- a/docs/concepts/workloads/controllers/daemonset.md +++ b/docs/concepts/workloads/controllers/daemonset.md @@ -45,7 +45,7 @@ kubectl create -f daemonset.yaml As with all other Kubernetes config, a DaemonSet needs `apiVersion`, `kind`, and `metadata` fields. For general information about working with config files, see [deploying applications](/docs/user-guide/deploying-applications/), -[configuring containers](/docs/tasks/), and [working with resources](/docs/concepts/tools/kubectl/object-management-overview/) documents. +[configuring containers](/docs/tasks/), and [object management using kubectl](/docs/concepts/overview/object-management-kubectl/overview/) documents. A DaemonSet also needs a [`.spec`](https://git.k8s.io/community/contributors/devel/api-conventions.md#spec-and-status) section. diff --git a/docs/concepts/workloads/controllers/deployment.md b/docs/concepts/workloads/controllers/deployment.md index 360a979bcf..52d3601710 100644 --- a/docs/concepts/workloads/controllers/deployment.md +++ b/docs/concepts/workloads/controllers/deployment.md @@ -834,7 +834,7 @@ can create multiple Deployments, one for each release, following the canary patt As with all other Kubernetes configs, a Deployment needs `apiVersion`, `kind`, and `metadata` fields. For general information about working with config files, see [deploying applications](/docs/tutorials/stateless-application/run-stateless-application-deployment/), -configuring containers, and [using kubectl to manage resources](/docs/tutorials/object-management-kubectl/object-management/) documents. +configuring containers, and [using kubectl to manage resources](/docs/concepts/overview/object-management-kubectl/overview/) documents. A Deployment also needs a [`.spec` section](https://git.k8s.io/community/contributors/devel/api-conventions.md#spec-and-status). diff --git a/docs/concepts/workloads/controllers/replicaset.md b/docs/concepts/workloads/controllers/replicaset.md index fdaec4fe5e..8bbc6e08d4 100644 --- a/docs/concepts/workloads/controllers/replicaset.md +++ b/docs/concepts/workloads/controllers/replicaset.md @@ -96,7 +96,7 @@ frontend-qhloh 1/1 Running 0 1m ## Writing a ReplicaSet Spec As with all other Kubernetes API objects, a ReplicaSet needs the `apiVersion`, `kind`, and `metadata` fields. For -general information about working with manifests, see [Object Management](/docs/concepts/tools/kubectl/object-management-overview/). +general information about working with manifests, see [object management using kubectl](/docs/concepts/overview/object-management-kubectl/overview/). A ReplicaSet also needs a [`.spec` section](https://git.k8s.io/community/contributors/devel/api-conventions.md#spec-and-status). diff --git a/docs/concepts/workloads/controllers/replicationcontroller.md b/docs/concepts/workloads/controllers/replicationcontroller.md index 7a4eb08a47..e4f1951d64 100644 --- a/docs/concepts/workloads/controllers/replicationcontroller.md +++ b/docs/concepts/workloads/controllers/replicationcontroller.md @@ -100,7 +100,7 @@ specifies an expression that just gets the name from each pod in the returned li ## Writing a ReplicationController Spec As with all other Kubernetes config, a ReplicationController needs `apiVersion`, `kind`, and `metadata` fields. -For general information about working with config files, see [Object Management](/docs/concepts/tools/kubectl/object-management-overview/). +For general information about working with config files, see [object management ](/docs/concepts/overview/object-management-kubectl/overview/). A ReplicationController also needs a [`.spec` section](https://git.k8s.io/community/contributors/devel/api-conventions.md#spec-and-status). diff --git a/docs/tasks/manage-daemon/update-daemon-set.md b/docs/tasks/manage-daemon/update-daemon-set.md index 4b0e367490..b5cea61f1f 100644 --- a/docs/tasks/manage-daemon/update-daemon-set.md +++ b/docs/tasks/manage-daemon/update-daemon-set.md @@ -104,7 +104,7 @@ update. This can be done with several different `kubectl` commands. #### Declarative commands If you update DaemonSets using -[configuration files](/docs/tutorials/object-management-kubectl/declarative-object-management-configuration/), +[configuration files](/docs/concepts/overview/object-management-kubectl/declarative-config/), use `kubectl apply`: ```shell @@ -114,7 +114,7 @@ kubectl apply -f ds-v2.yaml #### Imperative commands If you update DaemonSets using -[imperative commands](/docs/tutorials/object-management-kubectl/imperative-object-management-command/), +[imperative commands](/docs/concepts/overview/object-management-kubectl/imperative-command/), use `kubectl edit` or `kubectl patch`: ```shell diff --git a/docs/tasks/run-application/update-api-object-kubectl-patch.md b/docs/tasks/run-application/update-api-object-kubectl-patch.md index a4ab2056c4..ddb528880c 100644 --- a/docs/tasks/run-application/update-api-object-kubectl-patch.md +++ b/docs/tasks/run-application/update-api-object-kubectl-patch.md @@ -261,10 +261,10 @@ and {% capture whatsnext %} -* [Kubernetes Object Management](/docs/tutorials/object-management-kubectl/object-management/) -* [Managing Kubernetes Objects Using Imperative Commands](/docs/tutorials/object-management-kubectl/imperative-object-management-command/) -* [Imperative Management of Kubernetes Objects Using Configuration Files](/docs/tutorials/object-management-kubectl/imperative-object-management-configuration/) -* [Declarative Management of Kubernetes Objects Using Configuration Files](/docs/tutorials/object-management-kubectl/declarative-object-management-configuration/) +* [Kubernetes Object Management](/docs/concepts/overview/object-management-kubectl/overview/) +* [Managing Kubernetes Objects Using Imperative Commands](/docs/concepts/overview/object-management-kubectl/imperative-command/) +* [Imperative Management of Kubernetes Objects Using Configuration Files](/docs/concepts/overview/object-management-kubectl/imperative-config/) +* [Declarative Management of Kubernetes Objects Using Configuration Files](/docs/concepts/overview/object-management-kubectl/declarative-config/) {% endcapture %} diff --git a/test/examples_test.go b/test/examples_test.go index 088d48387c..2b237749f3 100644 --- a/test/examples_test.go +++ b/test/examples_test.go @@ -473,7 +473,7 @@ func TestExampleObjectSchemas(t *testing.T) { "hello-apparmor-pod": {&api.Pod{}}, "my-scheduler": {&extensions.Deployment{}}, }, - "../docs/tutorials/object-management-kubectl": { + "../docs/concepts/overview/object-management-kubectl": { "simple_deployment": {&extensions.Deployment{}}, "update_deployment": {&extensions.Deployment{}}, },