From 2cd97bd44e8df71a81d1755149e3b5bee25bd60d Mon Sep 17 00:00:00 2001 From: srinivas-avesha Date: Tue, 26 Nov 2024 16:00:08 +0530 Subject: [PATCH 1/2] adding charts to release branch --- charts/kubeslice-controller-egs/Chart.yaml | 4 ++-- charts/kubeslice-controller-egs/values.yaml | 2 +- charts/kubeslice-ui-egs/Chart.yaml | 4 ++-- charts/kubeslice-ui-egs/values.yaml | 4 ++-- charts/kubeslice-worker-egs/Chart.yaml | 4 ++-- charts/kubeslice-worker-egs/values.yaml | 2 +- egs-installer-config.yaml | 18 +++++++++--------- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/charts/kubeslice-controller-egs/Chart.yaml b/charts/kubeslice-controller-egs/Chart.yaml index f75ec9a..a4d6bdd 100644 --- a/charts/kubeslice-controller-egs/Chart.yaml +++ b/charts/kubeslice-controller-egs/Chart.yaml @@ -38,5 +38,5 @@ dependencies: repository: file://./charts/prometheus version: 25.*.* condition: kubeslice.prometheus.enabled -version: 0.8.2 -appVersion: 0.8.2 +version: 0.9.0 +appVersion: 0.9.0 diff --git a/charts/kubeslice-controller-egs/values.yaml b/charts/kubeslice-controller-egs/values.yaml index 006b9ab..69e14be 100644 --- a/charts/kubeslice-controller-egs/values.yaml +++ b/charts/kubeslice-controller-egs/values.yaml @@ -133,7 +133,7 @@ egs: # Image name for inventory-manager image: inventory-manager # Image tag for inventory-manager - tag: 0.8.0 + tag: 0.9.0 imagePullPolicy: IfNotPresent logLevel: INFO service: diff --git a/charts/kubeslice-ui-egs/Chart.yaml b/charts/kubeslice-ui-egs/Chart.yaml index 051d164..4eb5027 100644 --- a/charts/kubeslice-ui-egs/Chart.yaml +++ b/charts/kubeslice-ui-egs/Chart.yaml @@ -28,5 +28,5 @@ keywords: - application kubeVersion: '>= 1.19.0-0' home: https://avesha.io/products/product-slice -version: 0.8.2 -appVersion: 0.8.2 +version: 0.9.0 +appVersion: 0.9.0 diff --git a/charts/kubeslice-ui-egs/values.yaml b/charts/kubeslice-ui-egs/values.yaml index 1135b1d..1011204 100644 --- a/charts/kubeslice-ui-egs/values.yaml +++ b/charts/kubeslice-ui-egs/values.yaml @@ -15,7 +15,7 @@ kubeslice: pullPolicy: IfNotPresent uiv2: image: kubeslice-ui-v2-ent-egs - tag: 0.8.0 + tag: 0.9.0 pullPolicy: IfNotPresent dashboard: enabled: false @@ -35,7 +35,7 @@ kubeslice: # nodePort: apigw: image: kubeslice-api-gw-ent-egs - tag: 0.8.0 + tag: 0.9.0 pullPolicy: IfNotPresent egsCoreApis: diff --git a/charts/kubeslice-worker-egs/Chart.yaml b/charts/kubeslice-worker-egs/Chart.yaml index ad5a9a5..27efdef 100644 --- a/charts/kubeslice-worker-egs/Chart.yaml +++ b/charts/kubeslice-worker-egs/Chart.yaml @@ -37,5 +37,5 @@ dependencies: repository: file://./charts/netop version: 0.2.0 condition: kubesliceNetworking.enabled -version: 0.8.2 -appVersion: 0.8.2 +version: 0.9.0 +appVersion: 0.9.0 diff --git a/charts/kubeslice-worker-egs/values.yaml b/charts/kubeslice-worker-egs/values.yaml index 638eda5..d36aeeb 100644 --- a/charts/kubeslice-worker-egs/values.yaml +++ b/charts/kubeslice-worker-egs/values.yaml @@ -18,7 +18,7 @@ cluster: aiops: image: kube-aiops-operator - tag: 0.8.0 + tag: 0.9.0 pullPolicy: IfNotPresent logLevel: INFO diff --git a/egs-installer-config.yaml b/egs-installer-config.yaml index 585b9b0..a4fcbbd 100644 --- a/egs-installer-config.yaml +++ b/egs-installer-config.yaml @@ -53,7 +53,7 @@ kubeslice_controller_egs: kubeconfig: "" # Path to the kubeconfig file specific to the controller kubecontext: "" # Kubecontext specific to the controller; if empty, uses the global context namespace: "kubeslice-controller" # Kubernetes namespace where the controller will be installed - release: "kubeslice-controller-release" # Helm release name for the controller + release: "egs-controller" # Helm release name for the controller chart: "kubeslice-controller-egs" # Helm chart name for the controller inline_values: # Inline Helm values for the controller chart global: @@ -80,7 +80,7 @@ kubeslice_ui_egs: skip_installation: false # Do not skip the installation of the UI use_global_kubeconfig: true # Use global kubeconfig for the UI installation namespace: "kubeslice-controller" # Kubernetes namespace where the UI will be installed - release: "kubeslice-ui" # Helm release name for the UI + release: "egs-ui" # Helm release name for the UI chart: "kubeslice-ui-egs" # Helm chart name for the UI inline_values: # Inline Helm values for the UI chart global: @@ -104,7 +104,7 @@ kubeslice_worker_egs: skip_installation: false # Do not skip the installation of the worker specific_use_local_charts: true # Override to use local charts for this worker namespace: "kubeslice-system" # Kubernetes namespace for this worker - release: "kubeslice-worker1-release" # Helm release name for the worker + release: "egs-worker" # Helm release name for the worker chart: "kubeslice-worker-egs" # Helm chart name for the worker inline_values: # Inline Helm values for the worker chart global: @@ -150,8 +150,8 @@ additional_apps: - name: "gpu-operator" skip_installation: false # Do not skip the installation of the GPU operator use_global_kubeconfig: true # Use global kubeconfig for this application - namespace: "gpu-operator" # Namespace where the GPU operator will be installed - release: "gpu-operator-release" # Helm release name for the GPU operator + namespace: "egs-gpu-operator" # Namespace where the GPU operator will be installed + release: "gpu-operator" # Helm release name for the GPU operator chart: "gpu-operator" # Helm chart name for the GPU operator repo_url: "https://helm.ngc.nvidia.com/nvidia" # Helm repository URL for the GPU operator version: "v24.6.0" # Version of the GPU operator to install @@ -174,7 +174,7 @@ additional_apps: - name: "prometheus" skip_installation: false # Do not skip the installation of Prometheus use_global_kubeconfig: true # Use global kubeconfig for Prometheus - namespace: "monitoring" # Namespace where Prometheus will be installed + namespace: "egs-monitoring" # Namespace where Prometheus will be installed release: "prometheus" # Helm release name for Prometheus chart: "kube-prometheus-stack" # Helm chart name for Prometheus repo_url: "https://prometheus-community.github.io/helm-charts" # Helm repository URL for Prometheus @@ -205,7 +205,7 @@ additional_apps: - role: endpoints namespaces: names: - - gpu-operator + - egs-gpu-operator relabel_configs: - source_labels: [__meta_kubernetes_endpoints_name] action: drop @@ -260,7 +260,7 @@ manifests: verify_install: true # Verify the installation of this application verify_install_timeout: 30 # Timeout for verification (in seconds) skip_on_verify_fail: false # Do not skip if verification fails - namespace: gpu-operator # Namespace for this application + namespace: egs-gpu-operator # Namespace for this application kubeconfig: "" # Path to the kubeconfig file specific to this application kubecontext: "" # Kubecontext specific to this application; uses global context if empty @@ -287,6 +287,6 @@ commands: skip_on_verify_fail: true # Skip if command verification fails namespace: kube-system # Namespace context for these commands command_stream: | # Commands to execute - kubectl create namespace gpu-operator --dry-run=client -o yaml | kubectl apply -f - + kubectl create namespace egs-gpu-operator --dry-run=client -o yaml | kubectl apply -f - get nodes get nodes -o json | jq -r '.items[] | select(.status.capacity["nvidia.com/gpu"] != null) | .metadata.name' | xargs -I {} kubectl label nodes {} gke-no-default-nvidia-gpu-device-plugin=true --overwrite From df87667af5af43bbf67b3e082672cf96041739c2 Mon Sep 17 00:00:00 2001 From: srinivas-avesha Date: Tue, 26 Nov 2024 17:48:07 +0530 Subject: [PATCH 2/2] updating the installer script --- egs-installer.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/egs-installer.sh b/egs-installer.sh index 00e8903..2e93361 100755 --- a/egs-installer.sh +++ b/egs-installer.sh @@ -2473,7 +2473,7 @@ prepare_worker_values_file() { echo "Waiting for Grafana service to get an IP or port for worker..." external_ip="" while [ -z "${external_ip}" ] ; do - external_ip="$(get_lb_external_ip "${kubeconfigname}" "${kubecontextname}" "monitoring" prometheus-grafana)" + external_ip="$(get_lb_external_ip "${kubeconfigname}" "${kubecontextname}" "egs-monitoring" prometheus-grafana)" sleep 10 done