Skip to content

Commit

Permalink
delete kuberay-logging and kuberay-operator module
Browse files Browse the repository at this point in the history
Change-Id: I2b8eda653bcf4b1d1cd402111e7bd79d18eaf1ac
  • Loading branch information
Gen Lu committed Aug 29, 2024
1 parent d15b816 commit 11dfd75
Show file tree
Hide file tree
Showing 13 changed files with 43 additions and 487 deletions.
34 changes: 17 additions & 17 deletions applications/rag/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -64,25 +64,25 @@ module "infra" {
source = "../../infrastructure"
count = var.create_cluster ? 1 : 0

project_id = var.project_id
cluster_name = local.cluster_name
cluster_location = var.cluster_location
region = local.cluster_location_region
autopilot_cluster = var.autopilot_cluster
private_cluster = var.private_cluster
create_network = var.create_network
network_name = local.network_name
subnetwork_name = local.network_name
subnetwork_cidr = var.subnetwork_cidr
subnetwork_region = local.cluster_location_region
cpu_pools = var.cpu_pools
enable_gpu = true
gpu_pools = var.gpu_pools
ray_addon_enabled = true
project_id = var.project_id
cluster_name = local.cluster_name
cluster_location = var.cluster_location
region = local.cluster_location_region
autopilot_cluster = var.autopilot_cluster
private_cluster = var.private_cluster
create_network = var.create_network
network_name = local.network_name
subnetwork_name = local.network_name
subnetwork_cidr = var.subnetwork_cidr
subnetwork_region = local.cluster_location_region
cpu_pools = var.cpu_pools
enable_gpu = true
gpu_pools = var.gpu_pools
ray_addon_enabled = true
# TODO(genlu): remove channel and k8s_version after ray addon is in REGULAR channel
release_channel = "RAPID"
release_channel = "RAPID"
kubernetes_version = "1.30.3-gke.1969000"
depends_on = [module.project-services]
depends_on = [module.project-services]
}

data "google_container_cluster" "default" {
Expand Down
26 changes: 26 additions & 0 deletions cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,33 @@ steps:
-auto-approve -no-color
echo "pass" > /workspace/user_result.txt
wait_for_pod_with_timeout() {
local NAMESPACE=$1
local TIMEOUT=$2
local START_TIME=$(date +%s)
while true; do
POD_COUNT=$(kubectl get pods -n "$NAMESPACE" --no-headers 2>/dev/null | wc -l)
if [[ "$POD_COUNT" -gt 0 ]]; then
return 0
fi
CURRENT_TIME=$(date +%s)
ELAPSED_TIME=$((CURRENT_TIME - START_TIME))
if [[ "$ELAPSED_TIME" -ge "$TIMEOUT" ]]; then
echo "Timeout reached after ${TIMEOUT} seconds. No pods found in the namespace '$NAMESPACE'."
return 1
fi
echo "No pods found yet in the namespace '$NAMESPACE'. Checking again in 5 seconds..."
sleep 5
done
}
# Make sure pods are running
wait_for_pod_with_timeout "ml-$SHORT_SHA-$_BUILD_ID-ray" "60"
kubectl wait --all pods -n ml-$SHORT_SHA-$_BUILD_ID-ray --for=condition=Ready --timeout=1200s
# Wait for pods to be stable
sleep 5s
Expand Down
18 changes: 0 additions & 18 deletions modules/kuberay-logging/config/fluent-bit.conf

This file was deleted.

4 changes: 0 additions & 4 deletions modules/kuberay-logging/config/parsers.conf

This file was deleted.

Empty file.
26 changes: 0 additions & 26 deletions modules/kuberay-logging/main.tf

This file was deleted.

19 changes: 0 additions & 19 deletions modules/kuberay-logging/variables.tf

This file was deleted.

33 changes: 0 additions & 33 deletions modules/kuberay-logging/versions.tf

This file was deleted.

121 changes: 0 additions & 121 deletions modules/kuberay-operator/kuberay-operator-autopilot-values.yaml

This file was deleted.

Loading

0 comments on commit 11dfd75

Please sign in to comment.