Skip to content

Commit

Permalink
Merge pull request kubernetes#1251 from zhxcai/deamonset
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue.

Update daemonset-update.md fix some typos
  • Loading branch information
Kubernetes Submit Queue authored Oct 23, 2017
2 parents e35e2a8 + 0686710 commit 5b0f576
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ Name | Code | Description
AlwaysPullImages | alwayspullimages/admission.go | Forces the Kubelet to pull images to prevent pods from accessing private images that another user with credentials has already pulled to the node.
LimitPodHardAntiAffinityTopology | antiaffinity/admission.go | Defended the cluster against abusive anti-affinity topology rules that might hang the scheduler.
DenyEscalatingExec | exec/admission.go | Prevent users from executing into pods that have higher privileges via their service account than allowed by their policy (regular users can't exec into admin pods).
DenyExecOnPrivileged | exec/admission.go | Blanket ban exec access to pods with host level security. Superceded by DenyEscalatingExec
DenyExecOnPrivileged | exec/admission.go | Blanket ban exec access to pods with host level security. Superseded by DenyEscalatingExec
OwnerReferencesPermissionEnforcement | gc/gc_admission.go | Require that a user who sets a owner reference (which could result in garbage collection) has permission to delete the object, to prevent abuse.
ImagePolicyWebhook | imagepolicy/admission.go | Invoke a remote API to determine whether an image is allowed to run on the cluster.
PodNodeSelector | podnodeselector/admission.go | Default and limit what node selectors may be used within a namespace by reading a namespace annotation and a global configuration.
Expand Down
4 changes: 2 additions & 2 deletions contributors/design-proposals/apps/daemonset-update.md
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ type DaemonSetSpec struct {

// DaemonSetStatus represents the current status of a daemon set.
type DaemonSetStatus struct {
// Note: Existing fields, including CurrentNumberScheduled, NumberMissscheduled,
// Note: Existing fields, including CurrentNumberScheduled, NumberMisscheduled,
// DesiredNumberScheduled, NumberReady, and ObservedGeneration are omitted in
// this proposal.

Expand Down Expand Up @@ -250,7 +250,7 @@ In DaemonSet strategy (pkg/registry/extensions/daemonset/strategy.go#PrepareForU
increase DaemonSet's `.spec.templateGeneration` by 1 if any changes is made to
DaemonSet's `.spec.template`.

This was originally implmeneted in 1.6, and kept in 1.7 for backward compatibility.
This was originally implemented in 1.6, and kept in 1.7 for backward compatibility.

### kubectl

Expand Down
2 changes: 1 addition & 1 deletion contributors/design-proposals/apps/stateful-apps.md
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ Requested features:
* Jobs can be used to perform a run-once initialization of the cluster
* Init containers can be used to prime PVs and config with the identity of the pod.
* Templates and how fields are overriden in the resulting object should have broad alignment
* Templates and how fields are overridden in the resulting object should have broad alignment
* DaemonSet defines the core model for how new controllers sit alongside replication controller and
how upgrades can be implemented outside of Deployment objects.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ Metadata items:
* **owning-sig** Required
* The SIG that is most closely associated with this KEP. If there is code or
other artifacts that will result from this KEP, then it is expected that
this SIG will take responsiblity for the bulk of those artificats.
this SIG will take responsiblity for the bulk of those artifacts.
* Sigs are listed as `sig-abc-def` where the name matches up with the
directory in the `kubernetes/community` repo.
* **participating-sigs** Optional
Expand Down Expand Up @@ -219,10 +219,10 @@ Metadata items:
* In the form `KEP-123`
* **replaces** Optional
* A list of KEPs that this KEP replaces. Those KEPs should list this KEP in
their `superceded-by`.
their `superseded-by`.
* In the form `KEP-123`
* **superseded-by**
* A list of KEPs that superced this KEP. Use of this should be paired with
* A list of KEPs that supersede this KEP. Use of this should be paired with
this KEP moving into the `Replaced` status.
* In the form `KEP-123`

Expand Down
2 changes: 1 addition & 1 deletion contributors/design-proposals/auth/runas-groupid.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ As a Kubernetes User, we should be able to specify both user id and group id for
inside a pod on a per Container basis, similar to how docker allows that using docker run options `-u,
--user="" Username or UID (format: <name|uid>[:<group|gid>]) format`.

PodSecurityContext allows Kubernetes users to specify RunAsUser which can be overriden by RunAsUser
PodSecurityContext allows Kubernetes users to specify RunAsUser which can be overridden by RunAsUser
in SecurityContext on a per Container basis. There is no equivalent field for specifying the primary
Group of the running container.

Expand Down

0 comments on commit 5b0f576

Please sign in to comment.