Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
22670de5
Commit
22670de5
authored
Mar 30, 2015
by
Victor Marmol
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #6092 from derekwaynecarr/limit_range_default
Eliminate trailing commas
parents
a4daa88f
84667ac0
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
25 additions
and
24 deletions
+25
-24
namespace-dev.json
examples/kubernetes-namespaces/namespace-dev.json
+1
-1
namespace-prod.json
examples/kubernetes-namespaces/namespace-prod.json
+1
-1
namespace-dev.json
examples/kubernetes-namespaces/v1beta3/namespace-dev.json
+2
-2
namespace-prod.json
examples/kubernetes-namespaces/v1beta3/namespace-prod.json
+2
-2
invalid-pod.json
examples/limitrange/invalid-pod.json
+3
-2
limit-range.json
examples/limitrange/limit-range.json
+4
-4
invalid-pod.json
examples/limitrange/v1beta3/invalid-pod.json
+2
-2
limit-range.json
examples/limitrange/v1beta3/limit-range.json
+5
-5
valid-pod.json
examples/limitrange/v1beta3/valid-pod.json
+5
-5
No files found.
examples/kubernetes-namespaces/namespace-dev.json
View file @
22670de5
...
@@ -6,5 +6,5 @@
...
@@ -6,5 +6,5 @@
"status"
:
{},
"status"
:
{},
"labels"
:
{
"labels"
:
{
"name"
:
"development"
"name"
:
"development"
}
,
}
}
}
examples/kubernetes-namespaces/namespace-prod.json
View file @
22670de5
...
@@ -6,5 +6,5 @@
...
@@ -6,5 +6,5 @@
"status"
:
{},
"status"
:
{},
"labels"
:
{
"labels"
:
{
"name"
:
"production"
"name"
:
"production"
}
,
}
}
}
examples/kubernetes-namespaces/v1beta3/namespace-dev.json
View file @
22670de5
...
@@ -2,10 +2,10 @@
...
@@ -2,10 +2,10 @@
"apiVersion"
:
"v1beta3"
,
"apiVersion"
:
"v1beta3"
,
"kind"
:
"Namespace"
,
"kind"
:
"Namespace"
,
"metadata"
:
{
"metadata"
:
{
"name"
:
"development"
,
"name"
:
"development"
},
},
"spec"
:
{},
"spec"
:
{},
"labels"
:
{
"labels"
:
{
"name"
:
"development"
"name"
:
"development"
}
,
}
}
}
examples/kubernetes-namespaces/v1beta3/namespace-prod.json
View file @
22670de5
...
@@ -2,10 +2,10 @@
...
@@ -2,10 +2,10 @@
"apiVersion"
:
"v1beta3"
,
"apiVersion"
:
"v1beta3"
,
"kind"
:
"Namespace"
,
"kind"
:
"Namespace"
,
"metadata"
:
{
"metadata"
:
{
"name"
:
"production"
,
"name"
:
"production"
},
},
"spec"
:
{},
"spec"
:
{},
"labels"
:
{
"labels"
:
{
"name"
:
"production"
"name"
:
"production"
}
,
}
}
}
examples/limitrange/invalid-pod.json
View file @
22670de5
...
@@ -11,8 +11,8 @@
...
@@ -11,8 +11,8 @@
"id"
:
"invalid-pod"
,
"id"
:
"invalid-pod"
,
"containers"
:
[{
"containers"
:
[{
"name"
:
"kubernetes-serve-hostname"
,
"name"
:
"kubernetes-serve-hostname"
,
"image"
:
"kubernetes/serve_hostname"
,
"image"
:
"kubernetes/serve_hostname"
}]
}]
}
}
}
,
}
}
}
\ No newline at end of file
examples/limitrange/limit-range.json
View file @
22670de5
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
"type"
:
"Pod"
,
"type"
:
"Pod"
,
"max"
:
{
"max"
:
{
"memory"
:
"1073741824"
,
"memory"
:
"1073741824"
,
"cpu"
:
"2"
,
"cpu"
:
"2"
},
},
"min"
:
{
"min"
:
{
"memory"
:
"1048576"
,
"memory"
:
"1048576"
,
...
@@ -19,13 +19,13 @@
...
@@ -19,13 +19,13 @@
"type"
:
"Container"
,
"type"
:
"Container"
,
"max"
:
{
"max"
:
{
"memory"
:
"1073741824"
,
"memory"
:
"1073741824"
,
"cpu"
:
"2"
,
"cpu"
:
"2"
},
},
"min"
:
{
"min"
:
{
"memory"
:
"1048576"
,
"memory"
:
"1048576"
,
"cpu"
:
"0.25"
"cpu"
:
"0.25"
}
}
}
,
}
]
,
]
}
}
}
}
examples/limitrange/v1beta3/invalid-pod.json
View file @
22670de5
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
"apiVersion"
:
"v1beta3"
,
"apiVersion"
:
"v1beta3"
,
"kind"
:
"Pod"
,
"kind"
:
"Pod"
,
"metadata"
:
{
"metadata"
:
{
"name"
:
"invalid-pod"
,
"name"
:
"invalid-pod"
},
},
"labels"
:
{
"labels"
:
{
"name"
:
"invalid-pod"
"name"
:
"invalid-pod"
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
"spec"
:
{
"spec"
:
{
"containers"
:
[{
"containers"
:
[{
"name"
:
"kubernetes-serve-hostname"
,
"name"
:
"kubernetes-serve-hostname"
,
"image"
:
"kubernetes/serve_hostname"
,
"image"
:
"kubernetes/serve_hostname"
}]
}]
}
}
}
}
examples/limitrange/v1beta3/limit-range.json
View file @
22670de5
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
"apiVersion"
:
"v1beta3"
,
"apiVersion"
:
"v1beta3"
,
"kind"
:
"LimitRange"
,
"kind"
:
"LimitRange"
,
"metadata"
:
{
"metadata"
:
{
"name"
:
"limits"
,
"name"
:
"limits"
},
},
"spec"
:
{
"spec"
:
{
"limits"
:
[
"limits"
:
[
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
"type"
:
"Pod"
,
"type"
:
"Pod"
,
"max"
:
{
"max"
:
{
"memory"
:
"1Gi"
,
"memory"
:
"1Gi"
,
"cpu"
:
"2"
,
"cpu"
:
"2"
},
},
"min"
:
{
"min"
:
{
"memory"
:
"1Mi"
,
"memory"
:
"1Mi"
,
...
@@ -21,13 +21,13 @@
...
@@ -21,13 +21,13 @@
"type"
:
"Container"
,
"type"
:
"Container"
,
"max"
:
{
"max"
:
{
"memory"
:
"1Gi"
,
"memory"
:
"1Gi"
,
"cpu"
:
"2"
,
"cpu"
:
"2"
},
},
"min"
:
{
"min"
:
{
"memory"
:
"1Mi"
,
"memory"
:
"1Mi"
,
"cpu"
:
"250m"
"cpu"
:
"250m"
}
}
}
,
}
]
,
]
}
}
}
}
examples/limitrange/v1beta3/valid-pod.json
View file @
22670de5
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
"apiVersion"
:
"v1beta3"
,
"apiVersion"
:
"v1beta3"
,
"kind"
:
"Pod"
,
"kind"
:
"Pod"
,
"metadata"
:
{
"metadata"
:
{
"name"
:
"valid-pod"
,
"name"
:
"valid-pod"
},
},
"labels"
:
{
"labels"
:
{
"name"
:
"valid-pod"
"name"
:
"valid-pod"
...
@@ -14,9 +14,9 @@
...
@@ -14,9 +14,9 @@
"resources"
:
{
"resources"
:
{
"limits"
:
{
"limits"
:
{
"cpu"
:
"1"
,
"cpu"
:
"1"
,
"memory"
:
"1Mi"
,
"memory"
:
"1Mi"
}
,
}
}
,
}
}]
}]
}
,
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment