✨ update scripts for using released chart for kueue-ks

.github/workflows/goreleaser.yml

@@ -89,3 +89,15 @@ jobs:
         ${{ env.CHARTS_PATH }}/suspend-webhook/values.yaml
         helm package ${{ env.CHARTS_PATH }}/suspend-webhook --destination . --version ${chartVersion} --app-version ${chartVersion}
         helm push ./suspend-webhook-chart-${chartVersion}.tgz oci://${{ env.REGISTRY }}/${{ env.REPO }}
+
+
+    - name: Package and push kueue-ks chart
+      run: |
+        chartVersion=$(echo ${{ github.ref_name }} | cut -c 2-)
+        sed -i.bk -e "s|image_placeholder|${{ env.REGISTRY }}/${{ env.REPO }}/kueue-ks|g" \
+        -e "s|tag_placeholder|${{github.ref_name}}|g" \
+        -e "s|cm_placeholder|${{ env.REGISTRY }}/${{ env.REPO }}/cluster-metrics|g" \
+        ${{ env.CHARTS_PATH }}/kueue-ks/values.yaml
+        helm package ${{ env.CHARTS_PATH }}/kueue-ks --destination . --version ${chartVersion} --app-version ${chartVersion}
+        helm push ./kueue-ks-chart-${chartVersion}.tgz oci://${{ env.REGISTRY }}/${{ env.REPO }}
+

charts/kueue-ks/templates/operator.yaml

@@ -613,7 +613,7 @@ spec:
         - --deleteOnCompletion={{.Values.deleteOnCompletion}}
         - --clusterMetricsImage={{.Values.clusterMetricsImage}}
         - --clusterMetricsImageTag={{.Values.clusterMetricsImageTag}}
-        image: {{.Values.image}}
+        image: {{.Values.image}}:{{.Values.imageTag}}
         livenessProbe:
           httpGet:
             path: /healthz

charts/kueue-ks/values.yaml

@@ -1,6 +1,8 @@
 deleteOnCompletion: false
-clusterMetricsImage: ghcr.io/cwiklik/clustermetrics
-clusterMetricsImageTag: v1
+image: image_placeholder
+imageTag: tag_placeholder
+clusterMetricsImage: cm_placeholder
+clusterMetricsImageTag: tag_placeholder
 service:
   type: ClusterIP
   port: 80

kueue-ks/Makefile

@@ -4,15 +4,13 @@ KO_DOCKER_REPO ?= ko.local
 IMAGE_TAG ?= $(shell git rev-parse --short HEAD)
 #IMAGE_TAG ?= 0.0.1
 CMD_NAME ?= kueue-ks
-IMG ?= ${KO_DOCKER_REPO}/${CMD_NAME}:${IMAGE_TAG}
-HELM_IMG := --set image=${IMG}
+IMG ?= ${KO_DOCKER_REPO}/${CMD_NAME}
+HELM_IMG := --set image=${IMG} --set imageTag=${IMAGE_TAG}
 #CLUSTER_METRICS_IMAGE ?= --set clusterMetricsImage=ghcr.io/cwiklik/clustermetrics
 #CLUSTER_METRICS_IMAGE_TAG ?= --set clusterMetricsImageTag=v1
 HELM_OPTS ?= ${HELM_IMG}
 #${CLUSTER_METRICS_IMAGE} ${CLUSTER_METRICS_IMAGE_TAG}
-echo ${HELM_OPTS}
-
-#FOO ?= " --set image=${IMG}"
+#echo ${HELM_OPTS}
 
 # Image URL to use all building/pushing image targets
 #IMG ?= controller:latest
@@ -144,7 +142,7 @@ ko-local-build:
 
 .PHONY: k3d-load-image
 k3d-load-image:
-	k3d image import ${IMG} -c ${CLUSTER}
+	k3d image import ${IMG}:${IMAGE_TAG} -c ${CLUSTER}
 
 .PHONY: k3d-install-local-chart
 k3d-install-local-chart: k3d-load-image

scripts/common/config.sh

@@ -21,10 +21,11 @@ clusters=(cluster1 cluster2);
 core=kind-kubeflex
 
 # charts versions
-CLUSTER_METRICS_CHART_VERSION=0.0.1-alpha.7
-MC_SCHEDULING_CHART_VERSION=0.0.1-alpha.7
-SHADOW_PODS_VERSION=0.0.1-alpha.7
-SUSPEND_WEBHOOK_VERSION=0.0.1-alpha.7
+CLUSTER_METRICS_CHART_VERSION=0.0.1-alpha.8
+MC_SCHEDULING_CHART_VERSION=0.0.1-alpha.8
+SHADOW_PODS_VERSION=0.0.1-alpha.8
+SUSPEND_WEBHOOK_VERSION=0.0.1-alpha.8
+KUEUE_KS_VERSION=0.0.1-alpha.8
 
 # Kubeflow Pipeline Version
 PIPELINE_VERSION=2.2.0

scripts/kueue/install-kueue-ks.sh

@@ -214,8 +214,11 @@ for context in "${contexts[@]}"; do
   wait-for-cmd '(($(wrap-cmd kubectl --context ${context} get deployments -n kueue-system -o jsonpath='{.status.readyReplicas}' kueue-controller-manager 2>/dev/null || echo 0) >= 1))'
 done
 
-cd ${SCRIPT_DIR}/../../kueue-ks
 
-make ko-local-build
+: install kueue-ks
+
+helm --kube-context k3d-kubeflex upgrade --install kueue-ks \
+      ${SCRIPT_DIR}/../../charts/kueue-ks \
+      --create-namespace --namespace kueue-ks-system 
+
 
-CONTEXT=k3d-kubeflex CLUSTER=kubeflex make k3d-install-local-chart