github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 19:31:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #67176 from charrywanganthony/auditv1beta1Tov1_utils

Browse Source 
Automatic merge from submit-queue. 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>.

use v1 version of advanced audit policy in kubeadm

audit api version has been updated to v1 #65891 

**Release note**:
```release-note
kubeadm uses audit policy v1 instead of v1beta1
```
This commit is contained in:
Kubernetes Submit Queue 2018-08-10 08:57:11 -07:00 committed by GitHub
commit 5de3896d0d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/kubeadm/app/util/audit/BUILD
View File

@ -11,7 +11,7 @@ go_library(
"//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/apis/audit/install:go_default_library", "//staging/src/k8s.io/apiserver/pkg/apis/audit/install:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/apis/audit/v1beta1:go_default_library", "//staging/src/k8s.io/apiserver/pkg/apis/audit/v1:go_default_library",
], ],
) )
@ -23,7 +23,7 @@ go_test(
"//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/apis/audit/install:go_default_library", "//staging/src/k8s.io/apiserver/pkg/apis/audit/install:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/apis/audit/v1beta1:go_default_library", "//staging/src/k8s.io/apiserver/pkg/apis/audit/v1:go_default_library",
], ],
) )

14
cmd/kubeadm/app/util/audit/utils.go
View File

@ -26,27 +26,27 @@ import (
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/apimachinery/pkg/runtime/serializer"
"k8s.io/apiserver/pkg/apis/audit/install" "k8s.io/apiserver/pkg/apis/audit/install"
auditv1beta1 "k8s.io/apiserver/pkg/apis/audit/v1beta1" auditv1 "k8s.io/apiserver/pkg/apis/audit/v1"
"k8s.io/kubernetes/cmd/kubeadm/app/util" "k8s.io/kubernetes/cmd/kubeadm/app/util"
) )
// CreateDefaultAuditLogPolicy writes the default audit log policy to disk. // CreateDefaultAuditLogPolicy writes the default audit log policy to disk.
func CreateDefaultAuditLogPolicy(policyFile string) error { func CreateDefaultAuditLogPolicy(policyFile string) error {
policy := auditv1beta1.Policy{ policy := auditv1.Policy{
TypeMeta: metav1.TypeMeta{ TypeMeta: metav1.TypeMeta{
APIVersion: auditv1beta1.SchemeGroupVersion.String(), APIVersion: auditv1.SchemeGroupVersion.String(),
Kind: "Policy", Kind: "Policy",
}, },
Rules: []auditv1beta1.PolicyRule{ Rules: []auditv1.PolicyRule{
{ {
Level: auditv1beta1.LevelMetadata, Level: auditv1.LevelMetadata,
}, },
}, },
} }
return writePolicyToDisk(policyFile, &policy) return writePolicyToDisk(policyFile, &policy)
} }
func writePolicyToDisk(policyFile string, policy *auditv1beta1.Policy) error { func writePolicyToDisk(policyFile string, policy *auditv1.Policy) error {
// creates target folder if not already exists // creates target folder if not already exists
if err := os.MkdirAll(filepath.Dir(policyFile), 0700); err != nil { if err := os.MkdirAll(filepath.Dir(policyFile), 0700); err != nil {
return fmt.Errorf("failed to create directory %q: %v", filepath.Dir(policyFile), err) return fmt.Errorf("failed to create directory %q: %v", filepath.Dir(policyFile), err)
@ -59,7 +59,7 @@ func writePolicyToDisk(policyFile string, policy *auditv1beta1.Policy) error {
codecs := serializer.NewCodecFactory(scheme) codecs := serializer.NewCodecFactory(scheme)
// writes the policy to disk // writes the policy to disk
serialized, err := util.MarshalToYamlForCodecs(policy, auditv1beta1.SchemeGroupVersion, codecs) serialized, err := util.MarshalToYamlForCodecs(policy, auditv1.SchemeGroupVersion, codecs)
if err != nil { if err != nil {
return fmt.Errorf("failed to marshal audit policy to YAML: %v", err) return fmt.Errorf("failed to marshal audit policy to YAML: %v", err)

4
cmd/kubeadm/app/util/audit/utils_test.go
View File

@ -25,7 +25,7 @@ import (
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/apimachinery/pkg/runtime/serializer"
"k8s.io/apiserver/pkg/apis/audit/install" "k8s.io/apiserver/pkg/apis/audit/install"
auditv1beta1 "k8s.io/apiserver/pkg/apis/audit/v1beta1" auditv1 "k8s.io/apiserver/pkg/apis/audit/v1"
) )
func cleanup(t *testing.T, path string) { func cleanup(t *testing.T, path string) {
@ -54,7 +54,7 @@ func TestCreateDefaultAuditLogPolicy(t *testing.T) {
scheme := runtime.NewScheme() scheme := runtime.NewScheme()
install.Install(scheme) install.Install(scheme)
codecs := serializer.NewCodecFactory(scheme) codecs := serializer.NewCodecFactory(scheme)
policy := auditv1beta1.Policy{} policy := auditv1.Policy{}
err = runtime.DecodeInto(codecs.UniversalDecoder(), policyBytes, &policy) err = runtime.DecodeInto(codecs.UniversalDecoder(), policyBytes, &policy)
if err != nil { if err != nil {
t.Fatalf("failed to decode written policy: %v", err) t.Fatalf("failed to decode written policy: %v", err)