resolved merge conflicts

oracle · Feb 16, 2023 · b44c593 · b44c593
1 parent 95f4d46
commit b44c593
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/deploy/provider.daemonset.yaml b/deploy/provider.daemonset.yaml
@@ -45,23 +45,16 @@ spec:
               memory: 100Mi
           # Container should run as root to mount the hostPath volume and create Unix Domain Socket in that volume.
           securityContext:
-<<<<<<< HEAD
             seccompProfile:
               type: RuntimeDefault
-=======
->>>>>>> f4d5b84ba419ef09bb02f117901ac96285f2ffb5
             allowPrivilegeEscalation: false
             readOnlyRootFilesystem: true
             runAsUser: 0
             capabilities:
               drop:
                 - ALL
           volumeMounts:
-<<<<<<< HEAD
             - mountPath: "/opt/provider/sockets"
-=======
-            - mountPath: "/tmp"
->>>>>>> f4d5b84ba419ef09bb02f117901ac96285f2ffb5
               name: socket-volume
       volumes:
         - name: socket-volume