fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! Pass CPU and Memory config to minikube to ensure better stability

Signed-off-by: Jakub Stejskal <[email protected]>

Author: Frawless

.azure/scripts/setup-kubernetes.sh

@@ -61,14 +61,15 @@ if [ "$TEST_CLUSTER" = "minikube" ]; then
     mkdir $HOME/.kube || true
     touch $HOME/.kube/config
 
-    docker run -d -p 127.0.0.1:5000:5000 ${MINIKUBE_REGISTRY_IMAGE}
+    # TODO - It seems this is no needed at all :O
+#    docker run -d -p 127.0.0.1:5000:5000 ${MINIKUBE_REGISTRY_IMAGE}
 
     export KUBECONFIG=$HOME/.kube/config
     # We can turn on network polices support by adding the following options --network-plugin=cni --cni=calico
     # We have to allow trafic for ITS when NPs are turned on
     # We can allow NP after Strimzi#4092 which should fix some issues on STs side
     minikube start --vm-driver=docker --kubernetes-version=${KUBE_VERSION} \
-      --insecure-registry=127.0.0.1:5000 --extra-config=apiserver.authorization-mode=Node,RBAC \
+      --insecure-registry=$(minikube ip):5000 --extra-config=apiserver.authorization-mode=Node,RBAC \
       --cpus=${MINIKUBE_CPU} --memory=${MINIKUBE_MEMORY} --force
 
     if [ $? -ne 0 ]

.github/actions/containers-build/action.yml

@@ -39,8 +39,8 @@ runs:
         # User docker buildx
         DOCKER_BUILDX: buildx
         # Add option to load image into running Docker daemon and push into local registry to make it available between buildx executions
-        DOCKER_BUILD_ARGS: "--load --push --build-arg=BUILD_REGISTRY=127.0.0.1:5000/"
-        BUILD_REGISTRY: "127.0.0.1:5000/"
+        DOCKER_BUILD_ARGS: "--load --push --build-arg=BUILD_REGISTRY=$(minikube ip):5000/"
+        BUILD_REGISTRY: "$(minikube ip):5000/"
         # TODO - check if these are needed
         DOCKER_BUILDKIT: 1
         DOCKER_CLI_EXPERIMENTAL: enabled

.github/actions/containers-load/action.yml

@@ -26,6 +26,7 @@ runs:
       shell: bash
       #         eval $(minikube docker-env)
       run: |
+        eval $(minikube docker-env)
         make docker_load docker_tag docker_push docker_e2e docker_delete_archive
         
         docker images -a

.github/actions/set-defaults/action.yml

@@ -28,7 +28,7 @@ runs:
           # Not main, not tag/release => treat as PR
           echo "PULL_REQUEST=true" >> $GITHUB_ENV
           echo "DOCKER_ORG=strimzi" >> $GITHUB_ENV
-          echo "DOCKER_REGISTRY=127.0.0.1:5000" >> $GITHUB_ENV
+          echo "DOCKER_REGISTRY=$(minikube ip):5000" >> $GITHUB_ENV
           echo "COMMIT=${{ github.sha }}" >> $GITHUB_ENV
           echo "TAG=pr" >> $GITHUB_ENV
         fi

.github/workflows/run-system-tests.yml

@@ -177,7 +177,7 @@ jobs:
 
       - name: DEBUG - registry
         run: |
-          curl -s 127.0.0.1:5000/v2/_catalog
+          curl -s $(minikube ip):5000/v2/_catalog
           cat /etc/resolv.conf
 
       # Build Strimzi and its images => used when running STs against PR or main branch where container images should be built
@@ -199,7 +199,7 @@ jobs:
 
       - name: DEBUG - registry v2
         run: |
-          curl -s 127.0.0.1:5000/v2/_catalog
+          curl -s $(minikube ip):5000/v2/_catalog
 
       - name: Cache local Maven repository
         uses: actions/cache@v4
@@ -247,7 +247,7 @@ jobs:
       # Default value for PRs is localhost:5000 because we need to push built images into minikube registry and make them available for pods
       ############################################################################
       - name: "Set docker_registry to local registry in minikube"
-        if: ${{ contains(env.DOCKER_REGISTRY, '127.0.0.1:5000') }}
+        if: ${{ contains(env.DOCKER_REGISTRY, ':5000') }}
         run: |
           echo "DOCKER_REGISTRY=$(kubectl get service registry -n kube-system -o=jsonpath='{.spec.clusterIP}'):80" >> $GITHUB_ENV