kubernetes · k8s-ci-robot · Oct 12, 2018 · Aug 3, 2018
diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json
diff --git a/api/swagger-spec/extensions_v1beta1.json b/api/swagger-spec/extensions_v1beta1.json
diff --git a/api/swagger-spec/policy_v1beta1.json b/api/swagger-spec/policy_v1beta1.json
diff --git a/docs/api-reference/extensions/v1beta1/definitions.html b/docs/api-reference/extensions/v1beta1/definitions.html
diff --git a/docs/api-reference/policy/v1beta1/definitions.html b/docs/api-reference/policy/v1beta1/definitions.html
diff --git a/pkg/api/podsecuritypolicy/util.go b/pkg/api/podsecuritypolicy/util.go
@@ -28,4 +28,7 @@ func DropDisabledAlphaFields(pspSpec *policy.PodSecurityPolicySpec) {
 	if !utilfeature.DefaultFeatureGate.Enabled(features.ProcMountType) {
 		pspSpec.AllowedProcMountTypes = nil
 	}
+	if !utilfeature.DefaultFeatureGate.Enabled(features.RunAsGroup) {
+		pspSpec.RunAsGroup = nil
+	}
 }
diff --git a/pkg/apis/extensions/v1beta1/zz_generated.conversion.go b/pkg/apis/extensions/v1beta1/zz_generated.conversion.go
diff --git a/pkg/apis/policy/fuzzer/fuzzer.go b/pkg/apis/policy/fuzzer/fuzzer.go
@@ -40,6 +40,13 @@ var Funcs = func(codecs runtimeserializer.CodecFactory) []interface{} {
 			}
 			psp.RunAsUser.Rule = runAsUserRules[c.Rand.Intn(len(runAsUserRules))]
 
+			runAsGroupRules := []policy.RunAsGroupStrategy{
+				policy.RunAsGroupStrategyMustRunAs,
+				policy.RunAsGroupStrategyRunAsAny,
+				policy.RunAsGroupStrategyMayRunAs,
+			}
+			psp.RunAsGroup = &policy.RunAsGroupStrategyOptions{}
+			psp.RunAsGroup.Rule = runAsGroupRules[c.Rand.Intn(len(runAsGroupRules))]
 			seLinuxRules := []policy.SELinuxStrategy{
 				policy.SELinuxStrategyMustRunAs,
 				policy.SELinuxStrategyRunAsAny,