Merge branch 'openshift:master' into use-new-default-leader-election-…

…values-to-handle-api-server-rollout-on-sno
openshift · Aug 12, 2021 · 1c095ca · 1c095ca
2 parents 048145f + 1fb2149
commit 1c095ca
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/bindata/network/kuryr/alert-rules.yaml b/bindata/network/kuryr/alert-rules.yaml
@@ -43,7 +43,7 @@ spec:
       annotations:
         message: SDN pod {{"{{"}} $labels.pod {{"}}"}} on node {{"{{"}} $labels.node {{"}}"}} is not ready.
       expr: |
-        kube_pod_status_ready{namespace='openshift-kuryr', condition='true'} == 0
+        sum by(pod, namespace) (kube_pod_status_ready{condition="true",namespace="openshift-kuryr"}) * on(pod, namespace) group_right() kube_pod_info == 0
       for: 10m
       labels:
         severity: warning

diff --git a/bindata/network/ovn-kubernetes/ovnkube-master.yaml b/bindata/network/ovn-kubernetes/ovnkube-master.yaml
@@ -374,7 +374,9 @@ spec:
                 - /var/run/ovn/ovnnb_db.ctl
                 - exit
         readinessProbe:
+{{ if not .IsSNO }}
           initialDelaySeconds: 90
+{{ end }}
           timeoutSeconds: 5
           exec:
             command:
@@ -711,7 +713,9 @@ spec:
                 - /var/run/ovn/ovnsb_db.ctl
                 - exit
         readinessProbe:
+{{ if not .IsSNO }}
           initialDelaySeconds: 90
+{{ end }}
           timeoutSeconds: 5
           exec:
             command: