github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-17 15:13:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #15409 from caesarxuchao/extension/v1beta1

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-10-10 09:03:43 -07:00
parent dfbad569fd 3a2e001267
commit fa557f6101
139 changed files with 1859 additions and 1859 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/admin/daemon.yaml
View File

@@ -1,4 +1,4 @@
apiVersion: experimental/v1alpha1
apiVersion: extensions/v1beta1
kind: DaemonSet
metadata:
name: prometheus-node-exporter

2
docs/user-guide/job.yaml
View File

@@ -1,4 +1,4 @@
apiVersion: experimental/v1alpha1
apiVersion: extensions/v1beta1
kind: Job
metadata:
name: pi

2
docs/user-guide/jobs.md
View File

@@ -70,7 +70,7 @@ It takes around 10s to complete.
<!-- BEGIN MUNGE: EXAMPLE job.yaml -->
```yaml
apiVersion: experimental/v1alpha1
apiVersion: extensions/v1beta1
kind: Job
metadata:
name: pi