mirror of
https://github.com/kubernetes/sample-controller.git
synced 2026-04-12 00:00:26 +08:00
Merge pull request #54600 from marun/enable-federation-vendoring
Automatic merge from submit-queue (batch tested with PRs 54081, 54271, 51783, 54600, 54594). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Update to latest kube-openapi and kazel - update vendored kube-openapi to include https://github.com/kubernetes/kube-openapi/pull/14 - update hash of repo infra used for bazel generation so kazel includes https://github.com/kubernetes/repo-infra/pull/48 This is the final step in enabling federation to generate openapi code for itself and vendored kube (#54335). /sig multicluster testing Kubernetes-commit: 3f5f9c3df96618f6fc447fc98d9fc7ba97b0e333
This commit is contained in:
+1
-1
@@ -1016,7 +1016,7 @@ message SELinuxStrategyOptions {
|
||||
optional string rule = 1;
|
||||
|
||||
// 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
|
||||
optional k8s.io.api.core.v1.SELinuxOptions seLinuxOptions = 2;
|
||||
}
|
||||
|
||||
+1
-1
@@ -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"`
|
||||
}
|
||||
|
||||
+1
-1
@@ -575,7 +575,7 @@ func (RunAsUserStrategyOptions) SwaggerDoc() map[string]string {
|
||||
var map_SELinuxStrategyOptions = map[string]string{
|
||||
"": "SELinux Strategy Options defines the strategy type and any options used to create the strategy.",
|
||||
"rule": "type is the strategy that will dictate the allowable labels that may be set.",
|
||||
"seLinuxOptions": "seLinuxOptions required to run as; required for MustRunAs More info: https://git.k8s.io/community/contributors/design-proposals/security_context.md",
|
||||
"seLinuxOptions": "seLinuxOptions required to run as; required for MustRunAs More info: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/",
|
||||
}
|
||||
|
||||
func (SELinuxStrategyOptions) SwaggerDoc() map[string]string {
|
||||
|
||||
Reference in New Issue
Block a user