Merge pull request #841 from juanluisvaladas/fix-ovnkube-secret-test

Bug 1891023: Fix ovn rbac proxy init script secret name
openshift · Oct 23, 2020 · 6373fd4 · 6373fd4
2 parents f5bb473 + e9dda38
commit 6373fd4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/bindata/network/ovn-kubernetes/ovnkube-master.yaml b/bindata/network/ovn-kubernetes/ovnkube-master.yaml
@@ -457,7 +457,7 @@ spec:
                 -s \
                 --cacert /var/run/secrets/kubernetes.io/serviceaccount/ca.crt \
                 -H "Authorization: Bearer $(cat /var/run/secrets/kubernetes.io/serviceaccount/token)" \
-                "https://${KUBERNETES_SERVICE_HOST}:${KUBERNETES_SERVICE_PORT}/api/v1/namespaces/ovn-kubernetes/services/ovnkube-master" |
+                "https://${KUBERNETES_SERVICE_HOST}:${KUBERNETES_SERVICE_PORT}/api/v1/namespaces/openshift-ovn-kubernetes/services/ovn-kubernetes-master" |
                   python -c 'import json,sys; print(json.load(sys.stdin)["metadata"]["creationTimestamp"])' 2>/dev/null || true
             ) || :
             if [ -n "${TS}" ]; then
@@ -467,7 +467,7 @@ spec:
             echo $(date -Iseconds) INFO: Failed to get ovnkube-master service from API. Retry "${retries}"/100 1>&2
             sleep 20
           done
-          if [ "${retries}" -ge 20 ]; then
+          if [ "${retries}" -ge 100 ]; then
             echo $(date -Iseconds) FATAL: Unable to get ovnkube-master service from API.
             exit 1
           fi

diff --git a/bindata/network/ovn-kubernetes/ovnkube-node.yaml b/bindata/network/ovn-kubernetes/ovnkube-node.yaml
@@ -104,7 +104,7 @@ spec:
                 -s \
                 --cacert /var/run/secrets/kubernetes.io/serviceaccount/ca.crt \
                 -H "Authorization: Bearer $(cat /var/run/secrets/kubernetes.io/serviceaccount/token)" \
-                "https://${KUBERNETES_SERVICE_HOST}:${KUBERNETES_SERVICE_PORT}/api/v1/namespaces/ovn-kubernetes/services/ovnkube-node" |
+                "https://${KUBERNETES_SERVICE_HOST}:${KUBERNETES_SERVICE_PORT}/api/v1/namespaces/openshift-ovn-kubernetes/services/ovn-kubernetes-node" |
                   python -c 'import json,sys; print(json.load(sys.stdin)["metadata"]["creationTimestamp"])' 2>/dev/null || true
             ) || :
             if [ -n "${TS}" ]; then
@@ -114,7 +114,7 @@ spec:
             echo $(date -Iseconds) INFO: Failed to get ovnkube-node service from API. Retry "${retries}"/100 1>&2
             sleep 20
           done
-          if [ "${retries}" -ge 20 ]; then
+          if [ "${retries}" -ge 100 ]; then
             echo $(date -Iseconds) FATAL: Unable to get ovnkube-node service from API.
             exit 1
           fi