Merge pull request #45460 from nilebox/nilebox-pod-preset-renaming

Automatic merge from submit-queue (batch tested with PRs 45623, 45241, 45460, 41162)

Replacing “Pod Injection Policy” with “Pod Preset” in the code documentation

**What this PR does / why we need it**:
Replacing the leftovers of the old term "Pod Injection Policy" with "Pod Preset" in the code documentation.
pull/6/head
Kubernetes Submit Queue 2017-05-12 15:00:43 -07:00 committed by GitHub
commit dbcfa96c60
12 changed files with 16 additions and 16 deletions

View File

@ -49674,7 +49674,7 @@
] ]
}, },
"io.k8s.kubernetes.pkg.apis.settings.v1alpha1.PodPresetSpec": { "io.k8s.kubernetes.pkg.apis.settings.v1alpha1.PodPresetSpec": {
"description": "PodPresetSpec is a description of a pod injection policy.", "description": "PodPresetSpec is a description of a pod preset.",
"properties": { "properties": {
"env": { "env": {
"description": "Env defines the collection of EnvVar to inject into containers.", "description": "Env defines the collection of EnvVar to inject into containers.",

View File

@ -1020,7 +1020,7 @@
}, },
"v1alpha1.PodPresetSpec": { "v1alpha1.PodPresetSpec": {
"id": "v1alpha1.PodPresetSpec", "id": "v1alpha1.PodPresetSpec",
"description": "PodPresetSpec is a description of a pod injection policy.", "description": "PodPresetSpec is a description of a pod preset.",
"properties": { "properties": {
"selector": { "selector": {
"$ref": "v1.LabelSelector", "$ref": "v1.LabelSelector",

View File

@ -2473,7 +2473,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
<div class="sect2"> <div class="sect2">
<h3 id="_v1alpha1_podpresetspec">v1alpha1.PodPresetSpec</h3> <h3 id="_v1alpha1_podpresetspec">v1alpha1.PodPresetSpec</h3>
<div class="paragraph"> <div class="paragraph">
<p>PodPresetSpec is a description of a pod injection policy.</p> <p>PodPresetSpec is a description of a pod preset.</p>
</div> </div>
<table class="tableblock frame-all grid-all" style="width:100%; "> <table class="tableblock frame-all grid-all" style="width:100%; ">
<colgroup> <colgroup>

View File

@ -34,7 +34,7 @@ type PodPreset struct {
Spec PodPresetSpec Spec PodPresetSpec
} }
// PodPresetSpec is a description of a pod injection policy. // PodPresetSpec is a description of a pod preset.
type PodPresetSpec struct { type PodPresetSpec struct {
// Selector is a label query over a set of resources, in this case pods. // Selector is a label query over a set of resources, in this case pods.
// Required. // Required.

View File

@ -51,7 +51,7 @@ message PodPresetList {
repeated PodPreset items = 2; repeated PodPreset items = 2;
} }
// PodPresetSpec is a description of a pod injection policy. // PodPresetSpec is a description of a pod preset.
message PodPresetSpec { message PodPresetSpec {
// Selector is a label query over a set of resources, in this case pods. // Selector is a label query over a set of resources, in this case pods.
// Required. // Required.

View File

@ -34,7 +34,7 @@ type PodPreset struct {
Spec PodPresetSpec `json:"spec,omitempty" protobuf:"bytes,2,opt,name=spec"` Spec PodPresetSpec `json:"spec,omitempty" protobuf:"bytes,2,opt,name=spec"`
} }
// PodPresetSpec is a description of a pod injection policy. // PodPresetSpec is a description of a pod preset.
type PodPresetSpec struct { type PodPresetSpec struct {
// Selector is a label query over a set of resources, in this case pods. // Selector is a label query over a set of resources, in this case pods.
// Required. // Required.

View File

@ -46,7 +46,7 @@ func (PodPresetList) SwaggerDoc() map[string]string {
} }
var map_PodPresetSpec = map[string]string{ var map_PodPresetSpec = map[string]string{
"": "PodPresetSpec is a description of a pod injection policy.", "": "PodPresetSpec is a description of a pod preset.",
"selector": "Selector is a label query over a set of resources, in this case pods. Required.", "selector": "Selector is a label query over a set of resources, in this case pods. Required.",
"env": "Env defines the collection of EnvVar to inject into containers.", "env": "Env defines the collection of EnvVar to inject into containers.",
"envFrom": "EnvFrom defines the collection of EnvFromSource to inject into containers.", "envFrom": "EnvFrom defines the collection of EnvFromSource to inject into containers.",

View File

@ -32,21 +32,21 @@ import (
"k8s.io/kubernetes/pkg/apis/settings/validation" "k8s.io/kubernetes/pkg/apis/settings/validation"
) )
// podPresetStrategy implements verification logic for Pod Injection Policies. // podPresetStrategy implements verification logic for Pod Presets.
type podPresetStrategy struct { type podPresetStrategy struct {
runtime.ObjectTyper runtime.ObjectTyper
names.NameGenerator names.NameGenerator
} }
// Strategy is the default logic that applies when creating and updating Pod Injection Policy objects. // Strategy is the default logic that applies when creating and updating Pod Preset objects.
var Strategy = podPresetStrategy{api.Scheme, names.SimpleNameGenerator} var Strategy = podPresetStrategy{api.Scheme, names.SimpleNameGenerator}
// NamespaceScoped returns true because all Pod Injection Policies need to be within a namespace. // NamespaceScoped returns true because all Pod Presets need to be within a namespace.
func (podPresetStrategy) NamespaceScoped() bool { func (podPresetStrategy) NamespaceScoped() bool {
return true return true
} }
// PrepareForCreate clears the status of a Pod Injection Policy before creation. // PrepareForCreate clears the status of a Pod Preset before creation.
func (podPresetStrategy) PrepareForCreate(ctx genericapirequest.Context, obj runtime.Object) { func (podPresetStrategy) PrepareForCreate(ctx genericapirequest.Context, obj runtime.Object) {
pip := obj.(*settings.PodPreset) pip := obj.(*settings.PodPreset)
pip.Generation = 1 pip.Generation = 1
@ -82,7 +82,7 @@ func (podPresetStrategy) ValidateUpdate(ctx genericapirequest.Context, obj, old
return append(validationErrorList, updateErrorList...) return append(validationErrorList, updateErrorList...)
} }
// AllowUnconditionalUpdate is the default update policy for Pod Injection Policy objects. // AllowUnconditionalUpdate is the default update policy for Pod Preset objects.
func (podPresetStrategy) AllowUnconditionalUpdate() bool { func (podPresetStrategy) AllowUnconditionalUpdate() bool {
return true return true
} }

View File

@ -34,7 +34,7 @@ type PodPreset struct {
Spec PodPresetSpec Spec PodPresetSpec
} }
// PodPresetSpec is a description of a pod injection policy. // PodPresetSpec is a description of a pod preset.
type PodPresetSpec struct { type PodPresetSpec struct {
// Selector is a label query over a set of resources, in this case pods. // Selector is a label query over a set of resources, in this case pods.
// Required. // Required.

View File

@ -51,7 +51,7 @@ message PodPresetList {
repeated PodPreset items = 2; repeated PodPreset items = 2;
} }
// PodPresetSpec is a description of a pod injection policy. // PodPresetSpec is a description of a pod preset.
message PodPresetSpec { message PodPresetSpec {
// Selector is a label query over a set of resources, in this case pods. // Selector is a label query over a set of resources, in this case pods.
// Required. // Required.

View File

@ -34,7 +34,7 @@ type PodPreset struct {
Spec PodPresetSpec `json:"spec,omitempty" protobuf:"bytes,2,opt,name=spec"` Spec PodPresetSpec `json:"spec,omitempty" protobuf:"bytes,2,opt,name=spec"`
} }
// PodPresetSpec is a description of a pod injection policy. // PodPresetSpec is a description of a pod preset.
type PodPresetSpec struct { type PodPresetSpec struct {
// Selector is a label query over a set of resources, in this case pods. // Selector is a label query over a set of resources, in this case pods.
// Required. // Required.

View File

@ -46,7 +46,7 @@ func (PodPresetList) SwaggerDoc() map[string]string {
} }
var map_PodPresetSpec = map[string]string{ var map_PodPresetSpec = map[string]string{
"": "PodPresetSpec is a description of a pod injection policy.", "": "PodPresetSpec is a description of a pod preset.",
"selector": "Selector is a label query over a set of resources, in this case pods. Required.", "selector": "Selector is a label query over a set of resources, in this case pods. Required.",
"env": "Env defines the collection of EnvVar to inject into containers.", "env": "Env defines the collection of EnvVar to inject into containers.",
"envFrom": "EnvFrom defines the collection of EnvFromSource to inject into containers.", "envFrom": "EnvFrom defines the collection of EnvFromSource to inject into containers.",