From 8399557acd40bd155c5cdb2260d04be14223515d Mon Sep 17 00:00:00 2001 From: Maciej Szulik Date: Fri, 2 Mar 2018 16:44:04 +0100 Subject: [PATCH] Register audit/v1beta1 for master config --- pkg/cmd/server/apis/config/install/install.go | 2 ++ pkg/cmd/server/apis/config/validation/master.go | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/cmd/server/apis/config/install/install.go b/pkg/cmd/server/apis/config/install/install.go index ef44960a9a4f..4da6a3e1256e 100644 --- a/pkg/cmd/server/apis/config/install/install.go +++ b/pkg/cmd/server/apis/config/install/install.go @@ -10,6 +10,7 @@ import ( apiserverv1alpha1 "k8s.io/apiserver/pkg/apis/apiserver/v1alpha1" "k8s.io/apiserver/pkg/apis/audit" auditv1alpha1 "k8s.io/apiserver/pkg/apis/audit/v1alpha1" + auditv1beta1 "k8s.io/apiserver/pkg/apis/audit/v1beta1" configapi "github.com/openshift/origin/pkg/cmd/server/apis/config" configapiv1 "github.com/openshift/origin/pkg/cmd/server/apis/config/v1" @@ -40,6 +41,7 @@ func AddToScheme(scheme *runtime.Scheme) { // policy file inside master-config.yaml audit.AddToScheme(scheme) auditv1alpha1.AddToScheme(scheme) + auditv1beta1.AddToScheme(scheme) apiserver.AddToScheme(scheme) apiserverv1alpha1.AddToScheme(scheme) } diff --git a/pkg/cmd/server/apis/config/validation/master.go b/pkg/cmd/server/apis/config/validation/master.go index 6a2b45ff054d..e881287637dd 100644 --- a/pkg/cmd/server/apis/config/validation/master.go +++ b/pkg/cmd/server/apis/config/validation/master.go @@ -242,7 +242,7 @@ func ValidateAuditConfig(config configapi.AuditConfig, fldPath *field.Path) Vali } else { policyConfiguration, ok := config.PolicyConfiguration.(*auditinternal.Policy) if !ok { - validationResults.AddErrors(field.Invalid(fldPath.Child("policyConfiguration"), config.PolicyConfiguration, "must be of type audit/v1alpha1.Policy")) + validationResults.AddErrors(field.Invalid(fldPath.Child("policyConfiguration"), config.PolicyConfiguration, "must be of type audit/v1beta1.Policy")) } else { if err := auditvalidation.ValidatePolicy(policyConfiguration); err != nil { validationResults.AddErrors(field.Invalid(fldPath.Child("policyConfiguration"), config.PolicyConfiguration, err.ToAggregate().Error()))