Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
45d715cd
Commit
45d715cd
authored
Aug 15, 2018
by
Patrick Barker
Committed by
Patrick Barker
Mar 05, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
adds dynamic audit e2e test
parent
98fa2c7d
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
15 additions
and
1 deletion
+15
-1
config-test.sh
cluster/gce/config-test.sh
+2
-0
configure-helper.sh
cluster/gce/gci/configure-helper.sh
+5
-1
util.sh
cluster/gce/util.sh
+1
-0
BUILD
test/e2e/auth/BUILD
+3
-0
audit_dynamic.go
test/e2e/auth/audit_dynamic.go
+0
-0
util.go
test/e2e/common/util.go
+1
-0
manifest.go
test/utils/image/manifest.go
+3
-0
No files found.
cluster/gce/config-test.sh
View file @
45d715cd
...
@@ -380,6 +380,8 @@ else
...
@@ -380,6 +380,8 @@ else
ADMISSION_CONTROL
=
${
KUBE_ADMISSION_CONTROL
}
ADMISSION_CONTROL
=
${
KUBE_ADMISSION_CONTROL
}
fi
fi
ENABLE_APISERVER_DYNAMIC_AUDIT
=
"
${
ENABLE_APISERVER_DYNAMIC_AUDIT
:-
false
}
"
# Optional: if set to true kube-up will automatically check for existing resources and clean them up.
# Optional: if set to true kube-up will automatically check for existing resources and clean them up.
KUBE_UP_AUTOMATIC_CLEANUP
=
${
KUBE_UP_AUTOMATIC_CLEANUP
:-
false
}
KUBE_UP_AUTOMATIC_CLEANUP
=
${
KUBE_UP_AUTOMATIC_CLEANUP
:-
false
}
...
...
cluster/gce/gci/configure-helper.sh
View file @
45d715cd
...
@@ -1630,7 +1630,6 @@ function start-kube-apiserver {
...
@@ -1630,7 +1630,6 @@ function start-kube-apiserver {
create-master-audit-policy
"
${
audit_policy_file
}
"
"
${
ADVANCED_AUDIT_POLICY
:-}
"
create-master-audit-policy
"
${
audit_policy_file
}
"
"
${
ADVANCED_AUDIT_POLICY
:-}
"
audit_policy_config_mount
=
"{
\"
name
\"
:
\"
auditpolicyconfigmount
\"
,
\"
mountPath
\"
:
\"
${
audit_policy_file
}
\"
,
\"
readOnly
\"
: true},"
audit_policy_config_mount
=
"{
\"
name
\"
:
\"
auditpolicyconfigmount
\"
,
\"
mountPath
\"
:
\"
${
audit_policy_file
}
\"
,
\"
readOnly
\"
: true},"
audit_policy_config_volume
=
"{
\"
name
\"
:
\"
auditpolicyconfigmount
\"
,
\"
hostPath
\"
: {
\"
path
\"
:
\"
${
audit_policy_file
}
\"
,
\"
type
\"
:
\"
FileOrCreate
\"
}},"
audit_policy_config_volume
=
"{
\"
name
\"
:
\"
auditpolicyconfigmount
\"
,
\"
hostPath
\"
: {
\"
path
\"
:
\"
${
audit_policy_file
}
\"
,
\"
type
\"
:
\"
FileOrCreate
\"
}},"
if
[[
"
${
ADVANCED_AUDIT_BACKEND
:-
log
}
"
==
*
"log"
*
]]
;
then
if
[[
"
${
ADVANCED_AUDIT_BACKEND
:-
log
}
"
==
*
"log"
*
]]
;
then
# The advanced audit log backend config matches the basic audit log config.
# The advanced audit log backend config matches the basic audit log config.
params+
=
" --audit-log-path=/var/log/kube-apiserver-audit.log"
params+
=
" --audit-log-path=/var/log/kube-apiserver-audit.log"
...
@@ -1709,6 +1708,11 @@ function start-kube-apiserver {
...
@@ -1709,6 +1708,11 @@ function start-kube-apiserver {
fi
fi
fi
fi
if
[[
"
${
ENABLE_APISERVER_DYNAMIC_AUDIT
:-}
"
==
"true"
]]
;
then
params+
=
" --audit-dynamic-configuration"
RUNTIME_CONFIG
=
"
${
RUNTIME_CONFIG
}
,auditconfiguration.k8s.io/v1alpha1=true"
fi
if
[[
"
${
ENABLE_APISERVER_LOGS_HANDLER
:-}
"
==
"false"
]]
;
then
if
[[
"
${
ENABLE_APISERVER_LOGS_HANDLER
:-}
"
==
"false"
]]
;
then
params+
=
" --enable-logs-handler=false"
params+
=
" --enable-logs-handler=false"
fi
fi
...
...
cluster/gce/util.sh
View file @
45d715cd
...
@@ -1110,6 +1110,7 @@ MULTIZONE: $(yaml-quote ${MULTIZONE:-})
...
@@ -1110,6 +1110,7 @@ MULTIZONE: $(yaml-quote ${MULTIZONE:-})
NON_MASQUERADE_CIDR:
$(
yaml-quote
${
NON_MASQUERADE_CIDR
:-})
NON_MASQUERADE_CIDR:
$(
yaml-quote
${
NON_MASQUERADE_CIDR
:-})
ENABLE_DEFAULT_STORAGE_CLASS:
$(
yaml-quote
${
ENABLE_DEFAULT_STORAGE_CLASS
:-})
ENABLE_DEFAULT_STORAGE_CLASS:
$(
yaml-quote
${
ENABLE_DEFAULT_STORAGE_CLASS
:-})
ENABLE_APISERVER_ADVANCED_AUDIT:
$(
yaml-quote
${
ENABLE_APISERVER_ADVANCED_AUDIT
:-})
ENABLE_APISERVER_ADVANCED_AUDIT:
$(
yaml-quote
${
ENABLE_APISERVER_ADVANCED_AUDIT
:-})
ENABLE_APISERVER_DYNAMIC_AUDIT:
$(
yaml-quote
${
ENABLE_APISERVER_DYNAMIC_AUDIT
:-})
ENABLE_CACHE_MUTATION_DETECTOR:
$(
yaml-quote
${
ENABLE_CACHE_MUTATION_DETECTOR
:-
false
})
ENABLE_CACHE_MUTATION_DETECTOR:
$(
yaml-quote
${
ENABLE_CACHE_MUTATION_DETECTOR
:-
false
})
ENABLE_PATCH_CONVERSION_DETECTOR:
$(
yaml-quote
${
ENABLE_PATCH_CONVERSION_DETECTOR
:-
false
})
ENABLE_PATCH_CONVERSION_DETECTOR:
$(
yaml-quote
${
ENABLE_PATCH_CONVERSION_DETECTOR
:-
false
})
ADVANCED_AUDIT_POLICY:
$(
yaml-quote
${
ADVANCED_AUDIT_POLICY
:-})
ADVANCED_AUDIT_POLICY:
$(
yaml-quote
${
ADVANCED_AUDIT_POLICY
:-})
...
...
test/e2e/auth/BUILD
View file @
45d715cd
...
@@ -9,6 +9,7 @@ go_library(
...
@@ -9,6 +9,7 @@ go_library(
name = "go_default_library",
name = "go_default_library",
srcs = [
srcs = [
"audit.go",
"audit.go",
"audit_dynamic.go",
"certificates.go",
"certificates.go",
"framework.go",
"framework.go",
"metadata_concealment.go",
"metadata_concealment.go",
...
@@ -26,6 +27,7 @@ go_library(
...
@@ -26,6 +27,7 @@ go_library(
"//pkg/security/podsecuritypolicy/util:go_default_library",
"//pkg/security/podsecuritypolicy/util:go_default_library",
"//plugin/pkg/admission/serviceaccount:go_default_library",
"//plugin/pkg/admission/serviceaccount:go_default_library",
"//staging/src/k8s.io/api/apps/v1:go_default_library",
"//staging/src/k8s.io/api/apps/v1:go_default_library",
"//staging/src/k8s.io/api/auditregistration/v1alpha1:go_default_library",
"//staging/src/k8s.io/api/authentication/v1:go_default_library",
"//staging/src/k8s.io/api/authentication/v1:go_default_library",
"//staging/src/k8s.io/api/batch/v1:go_default_library",
"//staging/src/k8s.io/api/batch/v1:go_default_library",
"//staging/src/k8s.io/api/certificates/v1beta1:go_default_library",
"//staging/src/k8s.io/api/certificates/v1beta1:go_default_library",
...
@@ -39,6 +41,7 @@ go_library(
...
@@ -39,6 +41,7 @@ go_library(
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/intstr:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/uuid:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/uuid:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library",
...
...
test/e2e/auth/audit_dynamic.go
0 → 100644
View file @
45d715cd
This diff is collapsed.
Click to expand it.
test/e2e/common/util.go
View file @
45d715cd
...
@@ -48,6 +48,7 @@ var CurrentSuite Suite
...
@@ -48,6 +48,7 @@ var CurrentSuite Suite
// only used by node e2e test.
// only used by node e2e test.
// TODO(random-liu): Change the image puller pod to use similar mechanism.
// TODO(random-liu): Change the image puller pod to use similar mechanism.
var
CommonImageWhiteList
=
sets
.
NewString
(
var
CommonImageWhiteList
=
sets
.
NewString
(
imageutils
.
GetE2EImage
(
imageutils
.
AuditProxy
),
imageutils
.
GetE2EImage
(
imageutils
.
BusyBox
),
imageutils
.
GetE2EImage
(
imageutils
.
BusyBox
),
imageutils
.
GetE2EImage
(
imageutils
.
EntrypointTester
),
imageutils
.
GetE2EImage
(
imageutils
.
EntrypointTester
),
imageutils
.
GetE2EImage
(
imageutils
.
IpcUtils
),
imageutils
.
GetE2EImage
(
imageutils
.
IpcUtils
),
...
...
test/utils/image/manifest.go
View file @
45d715cd
...
@@ -105,6 +105,8 @@ const (
...
@@ -105,6 +105,8 @@ const (
APIServer
APIServer
// AppArmorLoader image
// AppArmorLoader image
AppArmorLoader
AppArmorLoader
// AuditProxy image
AuditProxy
// BusyBox image
// BusyBox image
BusyBox
BusyBox
// CheckMetadataConcealment image
// CheckMetadataConcealment image
...
@@ -196,6 +198,7 @@ func initImageConfigs() map[int]Config {
...
@@ -196,6 +198,7 @@ func initImageConfigs() map[int]Config {
configs
[
AdmissionWebhook
]
=
Config
{
e2eRegistry
,
"webhook"
,
"1.14v1"
}
configs
[
AdmissionWebhook
]
=
Config
{
e2eRegistry
,
"webhook"
,
"1.14v1"
}
configs
[
APIServer
]
=
Config
{
e2eRegistry
,
"sample-apiserver"
,
"1.10"
}
configs
[
APIServer
]
=
Config
{
e2eRegistry
,
"sample-apiserver"
,
"1.10"
}
configs
[
AppArmorLoader
]
=
Config
{
e2eRegistry
,
"apparmor-loader"
,
"1.0"
}
configs
[
AppArmorLoader
]
=
Config
{
e2eRegistry
,
"apparmor-loader"
,
"1.0"
}
configs
[
AuditProxy
]
=
Config
{
e2eRegistry
,
"audit-proxy"
,
"1.0"
}
configs
[
BusyBox
]
=
Config
{
dockerLibraryRegistry
,
"busybox"
,
"1.29"
}
configs
[
BusyBox
]
=
Config
{
dockerLibraryRegistry
,
"busybox"
,
"1.29"
}
configs
[
CheckMetadataConcealment
]
=
Config
{
e2eRegistry
,
"metadata-concealment"
,
"1.2"
}
configs
[
CheckMetadataConcealment
]
=
Config
{
e2eRegistry
,
"metadata-concealment"
,
"1.2"
}
configs
[
CudaVectorAdd
]
=
Config
{
e2eRegistry
,
"cuda-vector-add"
,
"1.0"
}
configs
[
CudaVectorAdd
]
=
Config
{
e2eRegistry
,
"cuda-vector-add"
,
"1.0"
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment