Skip to content

Commit

Permalink
chore(cleanup): To cleanup PSP related files or changes
Browse files Browse the repository at this point in the history
As PSP will be removed from k8s upstream
(kubernetes/kubernetes#90603), any psp related
changes in codebase can be cleaned up.

Closes #12468

Signed-off-by: Tam Mach <sayboras@yahoo.com>
  • Loading branch information
sayboras authored and nebril committed Jul 10, 2020
1 parent 5e9c427 commit c78b1f9
Show file tree
Hide file tree
Showing 6 changed files with 2 additions and 157 deletions.

This file was deleted.

This file was deleted.

4 changes: 0 additions & 4 deletions install/kubernetes/cilium/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -461,10 +461,6 @@ global:
# remoteNodeIdentity enables use of the remote node identity
remoteNodeIdentity: true

# psp creates and binds PodSecurityPolicies for the components that require it
psp:
enabled: false

# hubble configures Hubble.
hubble:
enabled: false
Expand Down
1 change: 0 additions & 1 deletion test/helpers/kubectl.go
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@ var (
"global.etcd.leaseTTL": "30s",
"global.ipv4.enabled": "true",
"global.ipv6.enabled": "true",
"global.psp.enabled": "true",
"global.ci.kubeCacheMutationDetector": "true",
"config.bpfMasquerade": "true",
// Disable by default, so that 4.9 CI build does not panic due to
Expand Down
5 changes: 2 additions & 3 deletions test/k8sT/Updates.go
Original file line number Diff line number Diff line change
Expand Up @@ -153,11 +153,10 @@ func InstallAndValidateCiliumUpgrades(kubectl *helpers.Kubectl, oldHelmChartVers
_ = kubectl.ExecMiddle("helm delete cilium --namespace=" + helpers.CiliumNamespace)
_ = kubectl.ExecMiddle(fmt.Sprintf("kubectl delete configmap --namespace=%s cilium-config", helpers.CiliumNamespace))
_ = kubectl.ExecMiddle(fmt.Sprintf("kubectl delete serviceaccount --namespace=%s cilium cilium-operator", helpers.CiliumNamespace))
_ = kubectl.ExecMiddle("kubectl delete clusterrole cilium cilium-operator cilium-psp cilium-operator-psp")
_ = kubectl.ExecMiddle("kubectl delete clusterrolebinding cilium cilium-operator cilium-psp cilium-operator-psp")
_ = kubectl.ExecMiddle("kubectl delete clusterrole cilium cilium-operator")
_ = kubectl.ExecMiddle("kubectl delete clusterrolebinding cilium cilium-operator")
_ = kubectl.ExecMiddle(fmt.Sprintf("kubectl delete daemonset --namespace=%s cilium", helpers.CiliumNamespace))
_ = kubectl.ExecMiddle(fmt.Sprintf("kubectl delete deployment --namespace=%s cilium-operator", helpers.CiliumNamespace))
_ = kubectl.ExecMiddle("kubectl delete podsecuritypolicy cilium-psp cilium-operator-psp")
_ = kubectl.ExecMiddle(fmt.Sprintf("kubectl delete daemonset --namespace=%s cilium-node-init", helpers.CiliumNamespace))
ExpectAllPodsTerminated(kubectl)
opts := map[string]string{
Expand Down
29 changes: 0 additions & 29 deletions test/k8sT/manifests/metallb.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,35 +5,6 @@ metadata:
app: metallb
name: metallb-system
---
apiVersion: policy/v1beta1
kind: PodSecurityPolicy
metadata:
labels:
app: metallb
name: speaker
namespace: metallb-system
spec:
allowPrivilegeEscalation: false
allowedCapabilities:
- NET_ADMIN
- NET_RAW
- SYS_ADMIN
fsGroup:
rule: RunAsAny
hostNetwork: true
hostPorts:
- max: 7472
min: 7472
privileged: true
runAsUser:
rule: RunAsAny
seLinux:
rule: RunAsAny
supplementalGroups:
rule: RunAsAny
volumes:
- '*'
---
apiVersion: v1
kind: ServiceAccount
metadata:
Expand Down

0 comments on commit c78b1f9

Please sign in to comment.