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

K8s - Jaeger Operator - Add annotations #2849

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

K8s - Jaeger Operator - Add annotations #2849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f998b99
K8s - Jaeger Operator - Add annotations
armandomiani Jan 13, 2025
37f5b9a
Merge branch 'master' into miani-k8s-jaeger-20250113
armandomiani Jan 17, 2025
e31fca4
fix: replace netcat
armandomiani Jan 17, 2025
1b6720a
fix: add ca-certificates
armandomiani Jan 17, 2025
00fb66c
Merge branch 'master' into miani-k8s-jaeger-20250113
armandomiani Jan 20, 2025
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
1 change: 1 addition & 0 deletions k8s/jaeger-operator/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ APP_ID ?= $(CHART_NAME)
SOURCE_REGISTRY ?= marketplace.gcr.io/google

TRACK ?= 1.45
SERVICE_NAME := services/434ff7ab-fb9b-46c5-b76c-1d6088d5dc8b.cloudpartnerservices.goog

IMAGE_MAIN ?= $(SOURCE_REGISTRY)/jaeger-operator1:$(TRACK)

Expand Down
6 changes: 3 additions & 3 deletions k8s/jaeger-operator/apptest/tester/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM gcr.io/cloud-marketplace-tools/testrunner:0.1.5
FROM gcr.io/cloud-marketplace-tools/testrunner:0.1.8

RUN apt-get update && apt-get install -y --no-install-recommends \
curl wget dnsutils netcat jq \
ca-certificates curl dnsutils netcat-traditional jq \
&& rm -rf /var/lib/apt/lists/*

RUN mkdir -p /opt/kubectl/1.26 \
&& wget -q -O /opt/kubectl/1.26/kubectl \
&& curl -L -o /opt/kubectl/1.26/kubectl \
https://storage.googleapis.com/kubernetes-release/release/v1.26.1/bin/linux/amd64/kubectl \
&& chmod 755 /opt/kubectl/1.26/kubectl \
&& ln -s /opt/kubectl/1.26/kubectl /usr/bin/kubectl
Expand Down
Loading