github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #51936 from CaoShuFeng/audit_doc_string

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 51833, 51936)

fix docstring of advanced audit policy

I found this when I write doc for advanced audit beta version.

**Release note**:
```
NONE
```
This commit is contained in:
Kubernetes Submit Queue
2017-09-05 02:14:58 -07:00
committed by GitHub
parent c31eb54cca 22f4c1ad4d
commit 3a5622db73
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
staging/src/k8s.io/apiserver/pkg/apis/audit/types.go
View File

@@ -220,9 +220,9 @@ type GroupResources struct {
// +optional // +optional
Group string Group string
// Resources is a list of resources within the API group. Subresources are // Resources is a list of resources within the API group. Subresources are
// matched using a "/" to indicate the subresource. For example, "pods/logs" // matched using a "/" to indicate the subresource. For example, "pods/log"
// would match request to the logs subresource of pods. The top level resource // would match request to the log subresource of pods. The top level resource
// does not match subresources, "pods" doesn't match "pods/logs". // does not match subresources, "pods" doesn't match "pods/log".
// +optional // +optional
Resources []string Resources []string
// ResourceNames is a list of resource instance names that the policy matches. // ResourceNames is a list of resource instance names that the policy matches.

6
staging/src/k8s.io/apiserver/pkg/apis/audit/v1beta1/generated.proto
View File

@@ -108,9 +108,9 @@ message GroupResources {
optional string group = 1; optional string group = 1;
// Resources is a list of resources within the API group. Subresources are // Resources is a list of resources within the API group. Subresources are
// matched using a "/" to indicate the subresource. For example, "pods/logs" // matched using a "/" to indicate the subresource. For example, "pods/log"
// would match request to the logs subresource of pods. The top level resource // would match request to the log subresource of pods. The top level resource
// does not match subresources, "pods" doesn't match "pods/logs". // does not match subresources, "pods" doesn't match "pods/log".
// +optional // +optional
repeated string resources = 2; repeated string resources = 2;

6
staging/src/k8s.io/apiserver/pkg/apis/audit/v1beta1/types.go
View File

@@ -214,9 +214,9 @@ type GroupResources struct {
// +optional // +optional
Group string `json:"group,omitempty" protobuf:"bytes,1,opt,name=group"` Group string `json:"group,omitempty" protobuf:"bytes,1,opt,name=group"`
// Resources is a list of resources within the API group. Subresources are // Resources is a list of resources within the API group. Subresources are
// matched using a "/" to indicate the subresource. For example, "pods/logs" // matched using a "/" to indicate the subresource. For example, "pods/log"
// would match request to the logs subresource of pods. The top level resource // would match request to the log subresource of pods. The top level resource
// does not match subresources, "pods" doesn't match "pods/logs". // does not match subresources, "pods" doesn't match "pods/log".
// +optional // +optional
Resources []string `json:"resources,omitempty" protobuf:"bytes,2,rep,name=resources"` Resources []string `json:"resources,omitempty" protobuf:"bytes,2,rep,name=resources"`
// ResourceNames is a list of resource instance names that the policy matches. // ResourceNames is a list of resource instance names that the policy matches.