Wait for port to be available

openshift · Apr 15, 2019 · 2a5caa9 · 2a5caa9
1 parent 8fb6d93
commit 2a5caa9
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 2 deletions.
diff --git a/bindata/v3.11.0/kube-scheduler/pod.yaml b/bindata/v3.11.0/kube-scheduler/pod.yaml
@@ -8,6 +8,19 @@ metadata:
     scheduler: "true"
     revision: "REVISION"
 spec:
+  initContainers:
+  - name: wait-for-host-port
+    image: ${IMAGE}
+    imagePullPolicy: IfNotPresent
+    terminationMessagePolicy: FallbackToLogsOnError
+    command: ['/usr/bin/timeout', '30', '/bin/bash', '-c']
+    args:
+    - |
+      echo -n "Waiting for port :10251 to be released."
+      while [ -n "$(lsof -ni :10251)" ]; do
+        echo -n "."
+        sleep 1
+      done
   containers:
   - name: scheduler
     image: ${IMAGE}
@@ -23,9 +36,25 @@ spec:
     resources:
       requests:
         memory: 50Mi
+    ports:
+    - containerPort: 10259
     volumeMounts:
     - mountPath: /etc/kubernetes/static-pod-resources
       name: resource-dir
+    livenessProbe:
+      httpGet:
+        scheme: HTTP
+         port: 10251
+         path: healthz
+      initialDelaySeconds: 45
+      timeOutSeconds: 10
+    readinessProbe:
+      httpGet:
+        scheme: HTTP
+        port: 10251
+        path: healthz
+      initialDelaySeconds: 45
+      timeOutSeconds: 10
   hostNetwork: true
   priorityClassName: system-node-critical
   tolerations:

diff --git a/manifests/0000_90_kube-scheduler-operator_03_servicemonitor.yaml b/manifests/0000_90_kube-scheduler-operator_03_servicemonitor.yaml
@@ -15,8 +15,7 @@ spec:
     port: https
     scheme: https
     tlsConfig:
-      # TODO where do you mount the service-ca.crt?
-      insecureSkipVerify: true
+      caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
       serverName: metrics.openshift-kube-scheduler-operator.svc
   jobLabel: component
   namespaceSelector:

diff --git a/pkg/operator/v311_00_assets/bindata.go b/pkg/operator/v311_00_assets/bindata.go