Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
K
Kubespray
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Mirror
Kubespray
Commits
da86457c
Unverified
Commit
da86457c
authored
5 years ago
by
Adrien Gooris
Committed by
GitHub
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
remove unused var 'kube_apiserver_admission_control' (#5648) (#5651)
parent
eb006933
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
roles/kubernetes/master/defaults/main/main.yml
+0
-11
0 additions, 11 deletions
roles/kubernetes/master/defaults/main/main.yml
roles/kubernetes/master/tasks/main.yml
+0
-1
0 additions, 1 deletion
roles/kubernetes/master/tasks/main.yml
with
0 additions
and
12 deletions
roles/kubernetes/master/defaults/main/main.yml
+
0
−
11
View file @
da86457c
...
...
@@ -95,17 +95,6 @@ kube_apiserver_memory_requests: 256M
kube_apiserver_cpu_requests
:
100m
kube_apiserver_request_timeout
:
"
1m0s"
# 1.9 and below Admission control plug-ins
kube_apiserver_admission_control
:
-
NamespaceLifecycle
-
LimitRanger
-
ServiceAccount
-
DefaultStorageClass
-
PersistentVolumeClaimResize
-
MutatingAdmissionWebhook
-
ValidatingAdmissionWebhook
-
ResourceQuota
# 1.10+ admission plugins
kube_apiserver_enable_admission_plugins
:
[]
...
...
This diff is collapsed.
Click to expand it.
roles/kubernetes/master/tasks/main.yml
+
0
−
1
View file @
da86457c
...
...
@@ -61,7 +61,6 @@
-
name
:
Disable SecurityContextDeny admission-controller and enable PodSecurityPolicy
set_fact
:
kube_apiserver_admission_control
:
"
{{
kube_apiserver_admission_control
|
default([])
|
difference(['SecurityContextDeny'])
|
union(['PodSecurityPolicy'])
|
unique
}}"
kube_apiserver_enable_admission_plugins
:
"
{{
kube_apiserver_enable_admission_plugins
|
difference(['SecurityContextDeny'])
|
union(['PodSecurityPolicy'])
|
unique
}}"
when
:
podsecuritypolicy_enabled
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment