Automated update from upstream

giantswarm · Oct 4, 2023 · a69bd34 · a69bd34
1 parent 63b6581
commit a69bd34
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/helm/linkerd-viz/templates/psp.yaml b/helm/linkerd-viz/templates/psp.yaml
@@ -1,4 +1,4 @@
-{{ if .Values.enablePSP -}}
+{{ if and .Values.enablePSP (not .Values.global.podSecurityStandards.enforced) -}}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role

diff --git a/vendir.lock.yml b/vendir.lock.yml
@@ -2,11 +2,10 @@ apiVersion: vendir.k14s.io/v1alpha1
 directories:
 - contents:
   - git:
-      commitTitle: Merge remote-tracking branch 'upstream/release/stable-2.13' into
-        stable-2.13.x
-      sha: ea513a4b04dd1515dec9e6ee0b44cafa4785fd63
+      commitTitle: add PSS flag for PSP->PSS migration (#559)...
+      sha: 81d4bbad3f3b9c4628b62134b014859c4e80ad15
       tags:
-      - stable-2.10.1-2949-gea513a4b0
+      - stable-2.10.1-2950-g81d4bbad3
     path: linkerd
   path: vendor
 - contents: