Merge pull request #30 from jsafrane/allocated-port-for-liveness-probe

Bug 1879406: Use port 10300-10301 for liveness probes
bennyz · Sep 24, 2020 · c4cddfb · c4cddfb
2 parents 67bbdc8 + 625f260
commit c4cddfb
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 4 deletions.
diff --git a/assets/controller.yaml b/assets/controller.yaml
@@ -92,7 +92,8 @@ spec:
               value: /tmp/config/ovirt-config.yaml
           ports:
             - name: healthz
-              containerPort: 19808
+              # Due to hostNetwork, this port is open on a node!
+              containerPort: 10301
               protocol: TCP
           volumeMounts:
             - name: socket-dir
@@ -130,6 +131,19 @@ spec:
             requests:
               memory: 50Mi
               cpu: 10m
+        - name: csi-liveness-probe
+          image: ${LIVENESS_PROBE_IMAGE}
+          args:
+            - --csi-address=/csi/csi.sock
+            - --probe-timeout=3s
+            - --health-port=10301
+          volumeMounts:
+            - name: socket-dir
+              mountPath: /csi
+          resources:
+            requests:
+              memory: 50Mi
+              cpu: 10m
       volumes:
         - name: socket-dir
           emptyDir: {}

diff --git a/assets/node.yaml b/assets/node.yaml
@@ -103,7 +103,8 @@ spec:
 
           ports:
             - name: healthz
-              containerPort: 9808
+              # Due to hostNetwork, this port is open on a node!
+              containerPort: 10300
               protocol: TCP
           livenessProbe:
             httpGet:
@@ -148,6 +149,7 @@ spec:
           args:
             - --csi-address=/csi/csi.sock
             - --probe-timeout=3s
+            - --health-port=10300
           volumeMounts:
             - name: plugin-dir
               mountPath: /csi

diff --git a/pkg/generated/bindata.go b/pkg/generated/bindata.go