Remove minikube storage and fix ci_mac

.github/workflows/ci_mac.yaml

@@ -7,7 +7,7 @@ permissions:
   contents: read
 
 concurrency:
-  group: ${{ 'ci_tier2' }}
+  group: ${{ github.head_ref || 'ci_mac_staging' }}
   cancel-in-progress: true
 
 on:
@@ -284,6 +284,7 @@ jobs:
         uses: docker-practice/actions-setup-docker@master
       # Retag image to remove arch from tag
       - name: Load Fluvio Docker Image for K3d
+        if: ${{ false }}
         run: |
           ls -la /tmp
           docker image load --input /tmp/infinyon-fluvio-${{ matrix.k8-target }}.tar
@@ -294,18 +295,19 @@ jobs:
         if: ${{ matrix.k8 == 'kind' }}
         run: |
           brew install kind
-          kind create cluster --config k8-util/cluster/kind.yaml 
+          kind version
+          kind create cluster --config k8-util/cluster/kind.yaml
       - name: Load image to kind
         if: ${{ matrix.k8 == 'kind' }}
         run: |
-          kind load docker-image infinyon/fluvio:${{ github.sha }}
-      - name: Run smoke-test-k8-tls-root
+          kind load image-archive /tmp/infinyon-fluvio-${{ matrix.k8-target }}.tar --name fluvio
+      - name: Run smoke-test-k8
         timeout-minutes: 10
         env:
           FLV_DISPATCHER_WAIT: 300   # k3d in Github make take while to provision PVC
         run: |
             date
-            make FLUVIO_BIN=./fluvio TEST_BIN=./fluvio-test  EXTRA_ARG="--cluster-start --proxy-addr  127.0.0.1" UNINSTALL=noclean smoke-test-k8-tls
+            make FLUVIO_BIN=./fluvio TEST_BIN=./fluvio-test  EXTRA_ARG="--cluster-start --proxy-addr  127.0.0.1" UNINSTALL=noclean smoke-test-k8
       - name: Print version
         run: |
           ./fluvio version

Makefile

@@ -327,10 +327,11 @@ upgrade: build-cli build_k8_image
 	$(FLUVIO_BIN) cluster upgrade --sys
 	$(FLUVIO_BIN) cluster upgrade --rust-log $(SERVER_LOG) --develop
 
+clean_charts:
+	make -C k8-util/helm clean
 
-clean:
+clean:	clean_charts
 	cargo clean
-	make -C k8-util/helm clean
 
 
 .EXPORT_ALL_VARIABLES:

k8-util/cluster/cluster-type.sh

@@ -8,7 +8,7 @@ if echo ${nodes} | grep -q minikube;  then
     echo 'minikube'
 elif echo ${nodes} | grep -q k3d; then
     echo "k3d"
-elif echo ${nodes} | grep -q kind; then
+elif echo ${nodes} | grep -q control-plane; then
     echo "kind"
 elif echo ${nodes} | grep -q microk8s; then
     echo "microk8"

k8-util/docker/build.sh

@@ -45,7 +45,8 @@ main() {
 
   if [ "$K8" = "kind" ]; then
     echo "export image to kind cluster"
-    kind load docker-image $docker_repo:$commit_hash
+    docker image save "$docker_repo:$commit_hash" --output /tmp/infinyon-fluvio.tar
+    kind load image-archive /tmp/infinyon-fluvio.tar --name fluvio
   fi
 
   if [ "$K8" = "microk8" ]; then

k8-util/helm/fluvio-sys/Chart.yaml

@@ -2,4 +2,4 @@ apiVersion: v2
 name: fluvio-sys
 description: A Helm chart for Fluvio
 type: application
-version: 0.9.4
+version: 0.9.5