Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Gardener v1.92 #424

Merged
merged 4 commits into from
Sep 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion charts/gardener-extension-admission-metal/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ global:
ciliumDevices:
ciliumHubbleEnabled:
ciliumKubeProxyEnabled:
ciliumPSPEnabled:
ciliumTunnel:
ciliumIPv4NativeRoutingCIDREnabled:
ciliumLoadBalancingMode:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@ spec:
- -admin-token=/duros/admin-token
- -admin-key=/duros/admin-key
- -shoot-kubeconfig=/var/run/secrets/gardener.cloud/shoot/generic-kubeconfig/kubeconfig
- -psp-disabled={{ .Values.pspDisabled }}
- -api-endpoint={{ .Values.duros.controller.apiEndpoint }}
{{- if .Values.duros.controller.apiCA }}
- -api-ca=/duros/api-ca
Expand Down
102 changes: 0 additions & 102 deletions charts/internal/shoot-control-plane/templates/metallb.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,88 +4,6 @@ metadata:
labels:
app: metallb
name: metallb-system
{{- if not .Values.pspDisabled }}
---
apiVersion: policy/v1beta1
kind: PodSecurityPolicy
metadata:
labels:
app: metallb
name: controller
namespace: metallb-system
spec:
allowPrivilegeEscalation: false
allowedCapabilities: []
allowedHostPaths: []
defaultAddCapabilities: []
defaultAllowPrivilegeEscalation: false
fsGroup:
ranges:
- max: 65535
min: 1
rule: MustRunAs
hostIPC: false
hostNetwork: false
hostPID: false
privileged: false
requiredDropCapabilities:
- ALL
runAsUser:
ranges:
- max: 65535
min: 1
rule: MustRunAs
seLinux:
rule: RunAsAny
supplementalGroups:
ranges:
- max: 65535
min: 1
rule: MustRunAs
volumes:
- configMap
- secret
- emptyDir
---
apiVersion: policy/v1beta1
kind: PodSecurityPolicy
metadata:
labels:
app: metallb
name: speaker
namespace: metallb-system
spec:
allowPrivilegeEscalation: false
allowedCapabilities:
- NET_RAW
allowedHostPaths: []
defaultAddCapabilities: []
defaultAllowPrivilegeEscalation: false
fsGroup:
rule: RunAsAny
hostIPC: false
hostNetwork: true
hostPID: false
hostPorts:
- max: 7472
min: 7472
- max: 7946
min: 7946
privileged: true
readOnlyRootFilesystem: true
requiredDropCapabilities:
- ALL
runAsUser:
rule: RunAsAny
seLinux:
rule: RunAsAny
supplementalGroups:
rule: RunAsAny
volumes:
- configMap
- secret
- emptyDir
{{- end }}
---
apiVersion: v1
kind: ServiceAccount
Expand Down Expand Up @@ -198,16 +116,6 @@ rules:
verbs:
- list
- watch
{{- if not .Values.pspDisabled }}
- apiGroups:
- policy
resourceNames:
- controller
resources:
- podsecuritypolicies
verbs:
- use
{{- end }}
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
Expand Down Expand Up @@ -242,16 +150,6 @@ rules:
verbs:
- create
- patch
{{- if not .Values.pspDisabled }}
- apiGroups:
- policy
resourceNames:
- speaker
resources:
- podsecuritypolicies
verbs:
- use
{{- end }}
---
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
Expand Down
31 changes: 0 additions & 31 deletions charts/internal/shoot-control-plane/templates/node-init.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,6 @@ kind: ServiceAccount
metadata:
name: node-init
namespace: kube-system
{{- if not .Values.pspDisabled }}
---
apiVersion: policy/v1beta1
kind: PodSecurityPolicy
metadata:
name: node-init
spec:
allowedCapabilities:
- NET_ADMIN
fsGroup:
rule: RunAsAny
runAsUser:
rule: RunAsAny
seLinux:
rule: RunAsAny
supplementalGroups:
rule: RunAsAny
volumes:
- secret
hostNetwork: true
{{- end }}
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
Expand All @@ -39,16 +18,6 @@ rules:
- watch
- list
- get
{{- if not .Values.pspDisabled }}
- apiGroups:
- extensions
resources:
- podsecuritypolicies
resourceNames:
- node-init
verbs:
- use
{{- end }}
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
Expand Down
15 changes: 0 additions & 15 deletions charts/internal/shoot-control-plane/templates/rbac-duros.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,21 +49,6 @@ rules:
- patch
- update
- watch
{{- if not .Values.pspDisabled }}
- apiGroups:
- "policy"
resources:
- podsecuritypolicies
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- use
{{- end }}
- apiGroups:
- "rbac.authorization.k8s.io"
resources:
Expand Down
1 change: 0 additions & 1 deletion charts/internal/shoot-control-plane/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
kubernetesVersion: "1.16.0"
apiserverIPs: []
nodeCIDR:
pspDisabled: false

images:
droptailer: image-repository:image-tag
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -140,43 +140,6 @@ kind: ServiceAccount
metadata:
name: csi-lvm-reviver
namespace: csi-lvm
{{- if not .Values.pspDisabled }}
---
apiVersion: policy/v1beta1
kind: PodSecurityPolicy
metadata:
name: csi-lvm-reviver-psp
namespace: csi-lvm
spec:
allowPrivilegeEscalation: true
privileged: true
fsGroup:
rule: RunAsAny
privileged: true
runAsUser:
rule: RunAsAny
seLinux:
rule: RunAsAny
supplementalGroups:
rule: RunAsAny
volumes:
- '*'
---
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
name: csi-lvm-reviver-psp
namespace: csi-lvm
rules:
- apiGroups:
- extensions
resources:
- podsecuritypolicies
resourceNames:
- csi-lvm-reviver-psp
verbs:
- use
{{- end }}
---
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
Expand All @@ -200,21 +163,6 @@ rules:
---
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: csi-lvm-reviver-psp
namespace: csi-lvm
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
name: csi-lvm-reviver-psp
subjects:
- apiGroup: ""
kind: ServiceAccount
name: csi-lvm-reviver
namespace: csi-lvm
---
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: csi-lvm-reviver
namespace: csi-lvm
Expand Down
1 change: 0 additions & 1 deletion charts/internal/shoot-storageclasses/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@ images:
csi-lvm-provisioner: image-repository:image-tag

isDefaultStorageClass: true
pspDisabled: false
2 changes: 1 addition & 1 deletion example/10-fake-shoot-controlplane.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ spec:
- command:
- /hyperkube
- apiserver
- --enable-admission-plugins=Priority,NamespaceLifecycle,LimitRanger,PodSecurityPolicy,ServiceAccount,NodeRestriction,DefaultStorageClass,Initializers,DefaultTolerationSeconds,ResourceQuota,StorageObjectInUseProtection,MutatingAdmissionWebhook,ValidatingAdmissionWebhook
- --enable-admission-plugins=Priority,NamespaceLifecycle,LimitRanger,ServiceAccount,NodeRestriction,DefaultStorageClass,Initializers,DefaultTolerationSeconds,ResourceQuota,StorageObjectInUseProtection,MutatingAdmissionWebhook,ValidatingAdmissionWebhook
- --disable-admission-plugins=PersistentVolumeLabel
- --allow-privileged=true
- --anonymous-auth=false
Expand Down
Loading