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.

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

Fix jaeger operator wait logic #2114

Merged
merged 3 commits into from
Jul 10, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion Makefile.d/k8s.mk
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#

JAEGER_OPERATOR_WAIT_DURATION := 0

.PHONY: k8s/manifest/clean
## clean k8s manifests
k8s/manifest/clean:
Expand Down Expand Up @@ -227,7 +230,8 @@ k8s/metrics/jaeger/deploy:
helm repo add jaegertracing https://jaegertracing.github.io/helm-charts
helm install jaeger jaegertracing/jaeger-operator --version $(JAEGER_OPERATOR_VERSION)
kubectl wait --for=condition=ready pod -l app.kubernetes.io/name=jaeger-operator --timeout=60s
until kubectl run busybox --restart=Never --image=busybox --rm -it -- wget -q -S --spider "https://jaeger-operator-webhook-service.default.svc:443/mutate-jaegertracing-io-v1-jaeger"; do sleep 1; done
kubectl wait --for=condition=available deployment/jaeger-jaeger-operator --timeout=60s
sleep $(JAEGER_OPERATOR_WAIT_DURATION)
kubectl apply -f k8s/metrics/jaeger/jaeger.yaml

.PHONY: k8s/metrics/jaeger/delete
Expand Down