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

Change robusta repo #1406

Merged
merged 12 commits into from
Jun 16, 2024
Merged
Show file tree
Hide file tree
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
16 changes: 16 additions & 0 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,12 @@ jobs:
fixed-${{ github.sha }}
fixed-

- name: Login to Docker Hub
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}

- name: Build with skaffold
run: ./skaffold build --profile release --file-output=container-ids.json --tag='${{env.RELEASE_VER}}'

Expand Down Expand Up @@ -101,3 +107,13 @@ jobs:
- name: Upload helm chart
run: |
cd helm && ./upload_chart.sh

- name: Release Docker to Dockerhub
run: |-
docker buildx build \
--build-arg BUILDKIT_INLINE_CACHE=1 \
--platform linux/arm64,linux/amd64 \
--cache-from us-central1-docker.pkg.dev/genuine-flight-317411/devel/robusta:cache \
--tag robustadev/robusta-runner:${{env.RELEASE_VER}} \
--push \
.
2 changes: 1 addition & 1 deletion build_release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ docker buildx build \
--platform linux/arm64,linux/amd64 \
--cache-from us-central1-docker.pkg.dev/genuine-flight-317411/devel/robusta-runner:cache \
--tag $IMAGE \
--tag us-central1-docker.pkg.dev/genuine-flight-317411/devel/robusta-runner:cache \
--tag robustadev/robusta-runner:cache \
--push \
$BUILD_CONTEXT
4 changes: 2 additions & 2 deletions helm/robusta/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -500,12 +500,12 @@ platformPlaybooks:
disabledPlaybooks: []

image:
registry: us-central1-docker.pkg.dev/genuine-flight-317411/devel
registry: robustadev

# parameters for the robusta forwarder deployment
kubewatch:
image: ~ # image can be used to override image.registry/imageName
imageName: kubewatch:v2.6
imageName: kubewatch:v2.7.0
imagePullPolicy: IfNotPresent
pprof: True
resources:
Expand Down
1 change: 0 additions & 1 deletion playbooks/robusta_playbooks/disk_benchmark.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
Volume,
VolumeMount,
)

from robusta.api import (
FIO_IMAGE,
IMAGE_REGISTRY,
Expand Down
2 changes: 1 addition & 1 deletion playbooks/robusta_playbooks/java_pod_troubleshooting.py
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ def run_jdk_command_on_pid(

jdk_cmd = f"{cmd} {params.pid}"
try:
jdk_output = run_java_toolkit_command(jdk_cmd, pod, custom_annotations=params.custom_annotations)
jdk_output = run_java_toolkit_command(jdk_cmd, pod, params.jtk_image, custom_annotations=params.custom_annotations)
finding.add_enrichment(
[
MarkdownBlock(f"{aggregation_key} ran on process {params.pid}"),
Expand Down
3 changes: 1 addition & 2 deletions playbooks/robusta_playbooks/krr.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
from hikaru.model.rel_1_26 import Container, EnvVar, EnvVarSource, PodSpec, ResourceRequirements, SecretKeySelector
from prometrix import AWSPrometheusConfig, CoralogixPrometheusConfig, PrometheusAuthorization, PrometheusConfig
from pydantic import BaseModel, ValidationError, validator

from robusta.api import (
IMAGE_REGISTRY,
RUNNER_SERVICE_ACCOUNT,
Expand All @@ -33,7 +32,7 @@
from robusta.integrations.openshift import IS_OPENSHIFT
from robusta.integrations.prometheus.utils import generate_prometheus_config

IMAGE: str = os.getenv("KRR_IMAGE_OVERRIDE", f"{IMAGE_REGISTRY}/krr:v1.9.0")
IMAGE: str = os.getenv("KRR_IMAGE_OVERRIDE", f"{IMAGE_REGISTRY}/krr:v1.10.0")
KRR_MEMORY_LIMIT: str = os.getenv("KRR_MEMORY_LIMIT", "2Gi")
KRR_MEMORY_REQUEST: str = os.getenv("KRR_MEMORY_REQUEST", "2Gi")

Expand Down
2 changes: 1 addition & 1 deletion src/robusta/core/model/env_vars.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ def load_bool(env_var, default: bool):

MAX_ALLOWED_RULES_PER_CRD_ALERT = int(os.environ.get("MAX_ALLOWED_RULES_PER_CRD_ALERT", 600))

IMAGE_REGISTRY = os.environ.get("IMAGE_REGISTRY", "us-central1-docker.pkg.dev/genuine-flight-317411/devel")
IMAGE_REGISTRY = os.environ.get("IMAGE_REGISTRY", "robustadev")

FIO_IMAGE = os.environ.get("FIO_IMAGE", "robusta-fio-benchmark:1.0")
DISK_TOOLS_IMAGE = os.environ.get("DISK_TOOLS_IMAGE", "disk-tools:1.5")
Expand Down
2 changes: 1 addition & 1 deletion src/robusta/integrations/kubernetes/custom_models.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@

# TODO: import these from the python-tools project
PYTHON_DEBUGGER_IMAGE = f"{IMAGE_REGISTRY}/debug-toolkit:v6.0"
JAVA_DEBUGGER_IMAGE = f"{IMAGE_REGISTRY}/java-toolkit-11:jattach"
JAVA_DEBUGGER_IMAGE = f"{IMAGE_REGISTRY}/java-toolkit:v1.0.1"


class Process(BaseModel):
Expand Down
Loading