Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bug 1891023: Fix ovn rbac proxy init script secret name #841

Merged
merged 1 commit into from
Oct 23, 2020
Merged

Bug 1891023: Fix ovn rbac proxy init script secret name #841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions bindata/network/ovn-kubernetes/ovnkube-master.yaml
View file
Open in desktop
Expand Up @@ -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
Expand All @@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why are we changing the retries from 20 to 100? In sdn we use 20. Anyways let's see, now that the namespace part is fixed we should not be hitting this that often.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because we retry 100 times:
while [[ "${retries}" -lt 100 ]]; do

This should have never been 20.

echo $(date -Iseconds) FATAL: Unable to get ovnkube-master service from API.
exit 1
fi
Expand Down
4 changes: 2 additions & 2 deletions bindata/network/ovn-kubernetes/ovnkube-node.yaml
View file
Open in desktop
Expand Up @@ -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
Expand All @@ -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
Expand Down