epostnikof/kubespray
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-02-28 09:39:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

remove unused code (#4981)

Browse Source
This commit is contained in:
刘旭
2019-07-16 16:39:24 +08:00
committed by Kubernetes Prow Robot
parent 99c5f7e013
commit de9443a694
36 changed files with 6 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
roles/kubernetes-apps/cluster_roles/tasks/main.yml
View File

@@ -140,9 +140,7 @@
- name: PriorityClass | Copy k8s-cluster-critical-pc.yml file
copy: src=k8s-cluster-critical-pc.yml dest={{ kube_config_dir }}/k8s-cluster-critical-pc.yml
when:
- kube_version is version('v1.11.1', '>=')
- inventory_hostname == groups['kube-master']|last
when: inventory_hostname == groups['kube-master']|last
- name: PriorityClass | Create k8s-cluster-critical
kube:
@@ -151,6 +149,4 @@
resource: "PriorityClass"
filename: "{{ kube_config_dir }}/k8s-cluster-critical-pc.yml"
state: latest
when:
- kube_version is version('v1.11.1', '>=')
- inventory_hostname == groups['kube-master']|last
when: inventory_hostname == groups['kube-master']|last

4
roles/kubernetes-apps/cluster_roles/templates/psp.yml.j2
View File

@@ -43,10 +43,8 @@ spec:
- min: 1
max: 65535
readOnlyRootFilesystem: false
{% if kube_version is version('v1.12.1', '>=') %}
forbiddenSysctls:
- '*'
{% endif %}
---
apiVersion: policy/v1beta1
kind: PodSecurityPolicy
@@ -79,8 +77,6 @@ spec:
fsGroup:
rule: 'RunAsAny'
readOnlyRootFilesystem: false
{% if kube_version is version('v1.12.1', '>=') %}
# This will fail if allowed-unsafe-sysctls is not set accordingly in kubelet flags
allowedUnsafeSysctls:
- '*'
{% endif %}