Fixed deployment.yaml merge conflict

hyperledger-labs · Mar 21, 2024 · d5ca2c0 · d5ca2c0
1 parent 39eeaf4
commit d5ca2c0
Showing 1 changed file with 49 additions and 1 deletion.
diff --git a/definitions/peer/deployment.yaml b/definitions/peer/deployment.yaml
@@ -30,6 +30,47 @@ spec:
                 topologyKey: kubernetes.io/hostname
               weight: 100
       containers:
+        - env:
+            - name: LICENSE
+              value: accept
+          image: ""
+          imagePullPolicy: Always
+          livenessProbe:
+            failureThreshold: 6
+            initialDelaySeconds: 30
+            tcpSocket:
+              port: 2375
+            timeoutSeconds: 5
+          name: dind
+          ports:
+            - containerPort: 2375
+          readinessProbe:
+            exec:
+              command:
+                - readiness.sh
+            initialDelaySeconds: 30
+            periodSeconds: 5
+            timeoutSeconds: 5
+          resources:
+            limits:
+              cpu: 500m
+              memory: 1000M
+            requests:
+              cpu: 500m
+              memory: 1000M
+          securityContext:
+            seccompProfile:
+              type: RuntimeDefault
+            allowPrivilegeEscalation: true
+            capabilities:
+              add:
+                - NET_BIND_SERVICE
+              drop:
+                - ALL
+            privileged: true
+            readOnlyRootFilesystem: false
+            runAsNonRoot: false
+            runAsUser: 0
         - env:
             - name: LICENSE
               value: accept
@@ -97,6 +138,8 @@ spec:
               cpu: 200m
               memory: 400M
           securityContext:
+            seccompProfile:
+              type: RuntimeDefault
             allowPrivilegeEscalation: false
             capabilities:
               add:
@@ -105,6 +148,7 @@ spec:
                 - ALL
             privileged: false
             readOnlyRootFilesystem: false
+            runAsGroup: 7051
             runAsNonRoot: true
             runAsUser: 7051
           volumeMounts:
@@ -178,6 +222,8 @@ spec:
               cpu: 100m
               memory: 200M
           securityContext:
+            seccompProfile:
+              type: RuntimeDefault
             allowPrivilegeEscalation: false
             capabilities:
               add:
@@ -186,6 +232,7 @@ spec:
                 - ALL
             privileged: false
             readOnlyRootFilesystem: false
+            runAsGroup: 1000
             runAsNonRoot: true
             runAsUser: 1000
           volumeMounts:
@@ -230,5 +277,6 @@ spec:
               subPath: data
       securityContext:
         fsGroup: 2000
+        runAsGroup: 1000
         runAsNonRoot: true
-        runAsUser: 1000
+        runAsUser: 1000