You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
* Refreshing installation instructions (#7495)
* Refreshing installation instructions
Added conjure-up. Updated displays and juju versions to current versions.
* Updated anchors
* Fixed image value version typo (#7768)
Was inconsistent with other values
* Update flocker reference to the github repo (#7784)
* Fix typo in federation document (#7779)
* an user -> a user (#7778)
* Events are namespaced (#7767)
* fix 'monitoring' link lose efficacy problem' (#7764)
* docs/concepts/policy/pod-security-policy.md: minor fix. (#7659)
* Update downward-api-volume-expose-pod-information.md (#7771)
* Update downward-api-volume-expose-pod-information.md
The pod spec puts the downward api files into /etc/podinfo, not directly in /etc. Updated docs to reflect this fact.
* Update downward-api-volume-expose-pod-information.md
One more spot needed fixing.
* Update downward-api-volume-expose-pod-information.md
Yet another fix, in the container example.
* Add Amadeus Case Study (#7783)
* Add Amadeus Case Study
* add Amadeus logo
* Fixed Cyrillic с in 'kube-proxy-cm' (#7787)
There was a typo (wrong character) in kube-proxy-cm.yaml - Cyrillic с (UTF-8 0x0441) was used instead of Latin c.
* install-kubectl: choose one installation method (#7705)
The previous text layout suggested that all installations had to be done, one after another.
* Update install-kubeadm.md (#7781)
Add note to kubeadm install instruction to help install in other arch i.e. aarch64, ppc64le etc.
* repair failure link (#7788)
* repair failure link
* repair failure link
* do change as required
* Update k8s201.md (#7777)
* Update k8s201.md
Change instructions to download yams files directly from the website (as used in other pages.)
Added instructions to delete labeled pod to avoid warnings in the subsequent deployment step.
* Update k8s201.md
Added example of using the exposed host from the a node running Kubernetes. (This works on AWS with Weave; not able to test it on other variations...)
* Gramatical fix to kompose introduction (#7792)
The original wording didn't through very well. As much of the original sentence has been preserved as possible, primarily to ensure the kompose web address is see both in text and as a href link.
* update amadeus.html (#7800)
* Fix a missing word in endpoint reconciler section (#7804)
* Partners page updates (#7802)
* Partners page updates
* Update to ZTE link
* Make using sysctls a task instead of a concept (#6808)
Closes: #4505
* add a note when mount a configmap to pod (#7745)
* adjust a note format (#7812)
* Update docker-cli-to-kubectl.md (#7748)
* Update docker-cli-to-kubectl.md
Edited the document for adherence to the style guide and word usage.
* Update docker-cli-to-kubectl.md
* Incorporated the changes suggested.
Copy file name to clipboardExpand all lines: _includes/partner-script.js
+93-9
Original file line number
Diff line number
Diff line change
@@ -1519,7 +1519,7 @@
1519
1519
type: 1,
1520
1520
name: 'Kloia',
1521
1521
logo: 'kloia',
1522
-
link: 'https://devops-as-a-service.kloia.com/',
1522
+
link: 'https://kloia.com/kubernetes/',
1523
1523
blurb: 'Kloia is DevOps and Microservices Consultancy company that helps its customers to migrate their environment to cloud platforms for enabling more scalable and secure environments. We use Kubernetes to provide our customers all-in-one solutions in an cloud-agnostic way.'
1524
1524
},
1525
1525
{
@@ -1550,13 +1550,6 @@
1550
1550
link: 'https://www.bloombase.com/go/kubernetes',
1551
1551
blurb: 'Bloombase provides high bandwidth, defense-in-depth data-at-rest encryption to lock down Kubernetes crown-jewels at scale.'
blurb: 'Kloia is DevOps and Microservices Consultancy company that helps its customers to migrate their environment to cloud platforms for enabling more scalable and secure environments. We use Kubernetes to provide our customers all-in-one solutions in an cloud-agnostic way.'
blurb: 'We are a Mexico based company offering training, consulting and support to migrate your workloads to Kubernetes, Cloud Native Microservices & Devops.'
1650
+
},
1651
+
{
1652
+
type: 1,
1653
+
name: 'DevOpsGuru',
1654
+
logo: 'devopsguru',
1655
+
link: 'http://devopsguru.ca/workshop',
1656
+
blurb: 'DevOpsGuru work with small business to transform from physical to virtual to containerization.'
1657
+
},
1658
+
{
1659
+
type: 1,
1660
+
name: 'EIN Intelligence Co., Ltd',
1661
+
logo: 'ein',
1662
+
link: 'https://ein.io',
1663
+
blurb: 'Startups and agile enterprises in South Korea.'
1664
+
},
1665
+
{
1666
+
type: 0,
1667
+
name: 'GuardiCore',
1668
+
logo: 'guardicore',
1669
+
link: 'https://www.guardicore.com/',
1670
+
blurb: 'GuardiCore provided process level visibility and network policy enforcement on containerized assets on the Kubernetes platform.'
blurb: 'We provide Kubernetes services (integration, operation, training) as well as development of banking microservices based on our extended experience with cloud of containers, microservices, data management and financial sector.'
1699
+
},
1700
+
{
1701
+
type: 2,
1702
+
name: 'SAP SE',
1703
+
logo: 'sap',
1704
+
link: 'https://cloudplatform.sap.com',
1705
+
blurb: 'The SAP Cloud Platform provides in-memory capabilities and unique business services for building and extending applications. With open sourced Project Gardener, SAP utilizes the power of Kubernetes to enable an open, robust, multi-cloud experience for our customers. You can use simple, modern cloud native design principles and leverage skills your organization already has to deliver agile and transformative applications, while integrating with the latest SAP Leonardo business features.'
Copy file name to clipboardExpand all lines: docs/reference/kubectl/docker-cli-to-kubectl.md
+54
Original file line number
Diff line number
Diff line change
@@ -13,7 +13,13 @@ You can use the Kubernetes command line tool kubectl to interact with the api. Y
13
13
14
14
#### docker run
15
15
16
+
<<<<<<< HEAD
16
17
To run an nginx Deployment and expose the Deployment, see [kubectl run](/docs/user-guide/kubectl/{{page.version}}/#run).
18
+
||||||| merged common ancestors
19
+
How do I run an nginx Deployment and expose it to the world? Checkout [kubectl run](/docs/user-guide/kubectl/{{page.version}}/#run).
20
+
=======
21
+
To run an nginx Deployment and expose the Deployment, see [kubectl run](/docs/reference/generated/kubectl/kubectl-commands/{{page.version}}/#run).
22
+
>>>>>>> Release 1.10 (#7818)
17
23
18
24
docker:
19
25
@@ -59,7 +65,13 @@ To destroy the Deployment and its pods you need to run `kubectl delete deploymen
59
65
60
66
#### docker ps
61
67
68
+
<<<<<<< HEAD
62
69
To list what is currently running, see [kubectl get](/docs/user-guide/kubectl/{{page.version}}/#get).
70
+
||||||| merged common ancestors
71
+
How do I list what is currently running? Checkout [kubectl get](/docs/user-guide/kubectl/{{page.version}}/#get).
72
+
=======
73
+
To list what is currently running, see [kubectl get](/docs/reference/generated/kubectl/kubectl-commands/{{page.version}}/#get).
74
+
>>>>>>> Release 1.10 (#7818)
63
75
64
76
docker:
65
77
@@ -81,7 +93,13 @@ ubuntu 0/1 Completed 0 20s
81
93
82
94
#### docker attach
83
95
96
+
<<<<<<< HEAD
84
97
To attach a process that is already running in a container, see [kubectl attach](/docs/user-guide/kubectl/{{page.version}}/#attach).
98
+
||||||| merged common ancestors
99
+
How do I attach to a process that is already running in a container? Checkout [kubectl attach](/docs/user-guide/kubectl/{{page.version}}/#attach).
100
+
=======
101
+
To attach a process that is already running in a container, see [kubectl attach](/docs/reference/generated/kubectl/kubectl-commands/{{page.version}}/#attach).
102
+
>>>>>>> Release 1.10 (#7818)
85
103
86
104
docker:
87
105
@@ -109,7 +127,13 @@ To detach from the container, you can type the escape sequence Ctrl+P followed b
109
127
110
128
#### docker exec
111
129
130
+
<<<<<<< HEAD
112
131
To execute a command in a container, see [kubectl exec](/docs/user-guide/kubectl/{{page.version}}/#exec).
132
+
||||||| merged common ancestors
133
+
How do I execute a command in a container? Checkout [kubectl exec](/docs/user-guide/kubectl/{{page.version}}/#exec).
134
+
=======
135
+
To execute a command in a container, see [kubectl exec](/docs/reference/generated/kubectl/kubectl-commands/{{page.version}}/#exec).
136
+
>>>>>>> Release 1.10 (#7818)
113
137
114
138
docker:
115
139
@@ -154,7 +178,13 @@ For more information, see [Get a Shell to a Running Container](/docs/tasks/debug
154
178
155
179
#### docker logs
156
180
181
+
<<<<<<< HEAD
157
182
To follow stdout/stderr of a process that is running, see [kubectl logs](/docs/user-guide/kubectl/{{page.version}}/#logs).
183
+
||||||| merged common ancestors
184
+
How do I follow stdout/stderr of a running process? Checkout [kubectl logs](/docs/user-guide/kubectl/{{page.version}}/#logs).
185
+
=======
186
+
To follow stdout/stderr of a process that is running, see [kubectl logs](/docs/reference/generated/kubectl/kubectl-commands/{{page.version}}/#logs).
For more information, see [Logging Architecture](/docs/concepts/cluster-administration/logging/).
216
+
||||||| merged common ancestors
217
+
See [Logging and Monitoring Cluster Activity](/docs/concepts/cluster-administration/logging/) for more information.
218
+
=======
219
+
For more information, see [Logging Architecture](docs/concepts/cluster-administration/logging/).
220
+
>>>>>>> Release 1.10 (#7818)
185
221
186
222
#### docker stop and docker rm
187
223
224
+
<<<<<<< HEAD
188
225
To stop and delete a running process, see [kubectl delete](/docs/user-guide/kubectl/{{page.version}}/#delete).
226
+
||||||| merged common ancestors
227
+
How do I stop and delete a running process? Checkout [kubectl delete](/docs/user-guide/kubectl/{{page.version}}/#delete).
228
+
=======
229
+
To stop and delete a running process, see [kubectl delete](/docs/reference/generated/kubectl/kubectl-commands/{{page.version}}/#delete).
230
+
>>>>>>> Release 1.10 (#7818)
189
231
190
232
docker:
191
233
@@ -228,7 +270,13 @@ There is no direct analog of `docker login` in kubectl. If you are interested in
228
270
229
271
#### docker version
230
272
273
+
<<<<<<< HEAD
231
274
To get the version of client and server, see [kubectl version](/docs/user-guide/kubectl/{{page.version}}/#version).
275
+
||||||| merged common ancestors
276
+
How do I get the version of my client and server? Checkout [kubectl version](/docs/user-guide/kubectl/{{page.version}}/#version).
277
+
=======
278
+
To get the version of client and server, see [kubectl version](/docs/reference/generated/kubectl/kubectl-commands{{page.version}}/#version).
279
+
>>>>>>> Release 1.10 (#7818)
232
280
233
281
docker:
234
282
@@ -256,7 +304,13 @@ Server Version: version.Info{Major:"1", Minor:"6", GitVersion:"v1.6.9+a3d1dfa6f4
256
304
257
305
#### docker info
258
306
307
+
<<<<<<< HEAD
259
308
To get miscellaneous information about the environment and configuration, see [kubectl cluster-info](/docs/user-guide/kubectl/{{page.version}}/#cluster-info).
309
+
||||||| merged common ancestors
310
+
How do I get miscellaneous info about my environment and configuration? Checkout [kubectl cluster-info](/docs/user-guide/kubectl/{{page.version}}/#cluster-info).
311
+
=======
312
+
To get miscellaneous information about the environment and configuration, see [kubectl cluster-info](/docs/reference/generated/kubectl/kubectl-commands/{{page.version}}/#cluster-info).
0 commit comments