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
f50e0e7c
Commit
f50e0e7c
authored
Sep 25, 2017
by
zhengchuan hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix incorrect link in api
parent
0b1da1fb
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
11 deletions
+11
-11
types.go
pkg/apis/extensions/types.go
+1
-1
types.go
staging/src/k8s.io/api/batch/v1/types.go
+1
-1
types.go
staging/src/k8s.io/api/core/v1/types.go
+7
-7
types.go
staging/src/k8s.io/api/extensions/v1beta1/types.go
+1
-1
patch.go
.../src/k8s.io/apimachinery/pkg/util/strategicpatch/patch.go
+1
-1
No files found.
pkg/apis/extensions/types.go
View file @
f50e0e7c
...
...
@@ -1010,7 +1010,7 @@ type SELinuxStrategyOptions struct {
// Rule is the strategy that will dictate the allowable labels that may be set.
Rule
SELinuxStrategy
// seLinuxOptions required to run as; required for MustRunAs
// More info: https://
git.k8s.io/community/contributors/design-proposals/security_context.md
// More info: https://
kubernetes.io/docs/concepts/policy/pod-security-policy/#selinux
// +optional
SELinuxOptions
*
api
.
SELinuxOptions
}
...
...
staging/src/k8s.io/api/batch/v1/types.go
View file @
f50e0e7c
...
...
@@ -107,7 +107,7 @@ type JobSpec struct {
// and other jobs to not function correctly. However, You may see
// `manualSelector=true` in jobs that were created with the old `extensions/v1beta1`
// API.
// More info: https://
git.k8s.io/community/contributors/design-proposals/selector-generation.md
// More info: https://
kubernetes.io/docs/concepts/workloads/controllers/jobs-run-to-completion/#specifying-your-own-pod-selector
// +optional
ManualSelector
*
bool
`json:"manualSelector,omitempty" protobuf:"varint,5,opt,name=manualSelector"`
...
...
staging/src/k8s.io/api/core/v1/types.go
View file @
f50e0e7c
...
...
@@ -1996,7 +1996,7 @@ type Container struct {
ImagePullPolicy
PullPolicy
`json:"imagePullPolicy,omitempty" protobuf:"bytes,14,opt,name=imagePullPolicy,casttype=PullPolicy"`
// Security options the pod should run with.
// More info: https://kubernetes.io/docs/concepts/policy/security-context/
// More info: https://
git.k8s.io/community/contributors/design-proposals/security_context.md
// More info: https://
kubernetes.io/docs/tasks/configure-pod-container/security-context/
// +optional
SecurityContext
*
SecurityContext
`json:"securityContext,omitempty" protobuf:"bytes,15,opt,name=securityContext"`
...
...
@@ -3825,7 +3825,7 @@ const (
// NamespaceSpec describes the attributes on a Namespace.
type
NamespaceSpec
struct
{
// Finalizers is an opaque list of values that must be empty to permanently remove object from storage.
// More info: https://
git.k8s.io/community/contributors/design-proposals/namespaces.md#finalizers
// More info: https://
kubernetes.io/docs/tasks/administer-cluster/namespaces/
// +optional
Finalizers
[]
FinalizerName
`json:"finalizers,omitempty" protobuf:"bytes,1,rep,name=finalizers,casttype=FinalizerName"`
}
...
...
@@ -3833,7 +3833,7 @@ type NamespaceSpec struct {
// NamespaceStatus is information about the current status of a Namespace.
type
NamespaceStatus
struct
{
// Phase is the current lifecycle phase of the namespace.
// More info: https://
git.k8s.io/community/contributors/design-proposals/namespaces.md#phases
// More info: https://
kubernetes.io/docs/tasks/administer-cluster/namespaces/
// +optional
Phase
NamespacePhase
`json:"phase,omitempty" protobuf:"bytes,1,opt,name=phase,casttype=NamespacePhase"`
}
...
...
@@ -4376,7 +4376,7 @@ type LimitRangeList struct {
metav1
.
ListMeta
`json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
// Items is a list of LimitRange objects.
// More info: https://
git.k8s.io/community/contributors/design-proposals/admission_control_limit_range.md
// More info: https://
kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/
Items
[]
LimitRange
`json:"items" protobuf:"bytes,2,rep,name=items"`
}
...
...
@@ -4433,7 +4433,7 @@ const (
// ResourceQuotaSpec defines the desired hard limits to enforce for Quota.
type
ResourceQuotaSpec
struct
{
// Hard is the set of desired hard limits for each named resource.
// More info: https://
git.k8s.io/community/contributors/design-proposals/admission_control_resource_quota.md
// More info: https://
kubernetes.io/docs/concepts/policy/resource-quotas/
// +optional
Hard
ResourceList
`json:"hard,omitempty" protobuf:"bytes,1,rep,name=hard,casttype=ResourceList,castkey=ResourceName"`
// A collection of filters that must match each object tracked by a quota.
...
...
@@ -4445,7 +4445,7 @@ type ResourceQuotaSpec struct {
// ResourceQuotaStatus defines the enforced hard limits and observed use.
type
ResourceQuotaStatus
struct
{
// Hard is the set of enforced hard limits for each named resource.
// More info: https://
git.k8s.io/community/contributors/design-proposals/admission_control_resource_quota.md
// More info: https://
kubernetes.io/docs/concepts/policy/resource-quotas/
// +optional
Hard
ResourceList
`json:"hard,omitempty" protobuf:"bytes,1,rep,name=hard,casttype=ResourceList,castkey=ResourceName"`
// Used is the current observed total usage of the resource in the namespace.
...
...
@@ -4486,7 +4486,7 @@ type ResourceQuotaList struct {
metav1
.
ListMeta
`json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
// Items is a list of ResourceQuota objects.
// More info: https://
git.k8s.io/community/contributors/design-proposals/admission_control_resource_quota.md
// More info: https://
kubernetes.io/docs/concepts/policy/resource-quotas/
Items
[]
ResourceQuota
`json:"items" protobuf:"bytes,2,rep,name=items"`
}
...
...
staging/src/k8s.io/api/extensions/v1beta1/types.go
View file @
f50e0e7c
...
...
@@ -1038,7 +1038,7 @@ type SELinuxStrategyOptions struct {
// type is the strategy that will dictate the allowable labels that may be set.
Rule
SELinuxStrategy
`json:"rule" protobuf:"bytes,1,opt,name=rule,casttype=SELinuxStrategy"`
// seLinuxOptions required to run as; required for MustRunAs
// More info: https://
git.k8s.io/community/contributors/design-proposals/security_context.md
// More info: https://
kubernetes.io/docs/tasks/configure-pod-container/security-context/
// +optional
SELinuxOptions
*
v1
.
SELinuxOptions
`json:"seLinuxOptions,omitempty" protobuf:"bytes,2,opt,name=seLinuxOptions"`
}
...
...
staging/src/k8s.io/apimachinery/pkg/util/strategicpatch/patch.go
View file @
f50e0e7c
...
...
@@ -1054,7 +1054,7 @@ func applyRetainKeysDirective(original, patch map[string]interface{}, options Me
// Then, sort them by the relative order in setElementOrder, patch list and live list.
// The precedence is $setElementOrder > order in patch list > order in live list.
// This function will delete the item after merging it to prevent process it again in the future.
// Ref: https://git.k8s.io/community/contributors/design-proposals/preserve-order-in-strategic-merge-patch.md
// Ref: https://git.k8s.io/community/contributors/design-proposals/
cli/
preserve-order-in-strategic-merge-patch.md
func
mergePatchIntoOriginal
(
original
,
patch
map
[
string
]
interface
{},
t
reflect
.
Type
,
mergeOptions
MergeOptions
)
error
{
for
key
,
patchV
:=
range
patch
{
// Do nothing if there is no ordering directive
...
...
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