Fix velero startup issue by defining debian-v11 explicitly in version…

… number Signed-off-by: marcel <[email protected]>
IndustryFusion · Mar 11, 2024 · 2b0aa6b · 2b0aa6b
1 parent 737de66
commit 2b0aa6b
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 14 deletions.
diff --git a/.github/workflows/k8s-tests.yaml b/.github/workflows/k8s-tests.yaml
@@ -30,7 +30,7 @@ jobs:
         shellcheck *.sh *.bats test-*/*.bats
     - name: Prepare airgap deployment
       run: |
-        cd helm/airgap-deployment && bash prepare-airgap.bash
+        cd helm/airgap-deployment && REGISTRY=k3d-iff.localhost:12345 bash prepare-airgap.bash
     - name: Build Platform locally
       run: |
         cd test && bash build-local-platform.sh

diff --git a/helm/airgap-deployment/prepare-airgap.bash b/helm/airgap-deployment/prepare-airgap.bash
@@ -28,7 +28,7 @@ IMAGES=(
     docker.io/redis:7.2
     ghcr.io/zalando/spilo-15:2.1-p9
     docker.io/minio/console:v0.22.5
-    docker.io/velero/velero:v1.10.0
+    docker.io/velero/velero:${VELERO_VERSION}
     docker.io/alerta/alerta-web:8.1.0
     docker.io/busybox:1.28
     docker.io/postgrest/postgrest:v12.0.0
@@ -39,8 +39,8 @@ IMAGES=(
     quay.io/jetstack/cert-manager-cainjector:v1.9.1
     docker.io/emqx:5.1
     quay.io/keycloak/keycloak-operator:21.1.2
-    docker.io/bitnami/kubectl:1.28
-    docker.io/velero/velero-plugin-for-aws:v1.5.0
+    docker.io/bitnami/kubectl:${KUBECTL_VERSION}
+    docker.io/velero/velero-plugin-for-aws:${VELERO_PLUGIN_VERSION}
     docker.io/rancher/mirrored-pause:3.6
     docker.io/rancher/mirrored-coredns-coredns:1.10.1
     docker.io/rancher/klipper-helm:v0.8.2-build20230815
@@ -49,12 +49,12 @@ IMAGES=(
     docker.io/rancher/klipper-lb:v0.4.4
     docker.io/rancher/mirrored-library-traefik:2.10.5
     docker.io/rancher/mirrored-library-busybox:1.36.1
-    docker.io/ibn40/scorpio-all-in-one-runner:${DOCKER_TAG}
-    docker.io/ibn40/flink-services-operator:${DOCKER_TAG}
-    docker.io/ibn40/kafka-bridge:${DOCKER_TAG}
-    docker.io/ibn40/keycloak:${DOCKER_TAG}
-    docker.io/ibn40/flink-sql-gateway:${DOCKER_TAG}
-    docker.io/ibn40/debezium-postgresql-connector:${DOCKER_TAG}
+    ${REGISTRY}/ibn40/scorpio-all-in-one-runner:${DOCKER_TAG}
+    ${REGISTRY}/ibn40/flink-services-operator:${DOCKER_TAG}
+    ${REGISTRY}/ibn40/kafka-bridge:${DOCKER_TAG}
+    ${REGISTRY}/ibn40/keycloak:${DOCKER_TAG}
+    ${REGISTRY}/ibn40/flink-sql-gateway:${DOCKER_TAG}
+    ${REGISTRY}/ibn40/debezium-postgresql-connector:${DOCKER_TAG}
 )
 
 for image in ${IMAGES[@]}; do 

diff --git a/helm/env.sh b/helm/env.sh
@@ -6,7 +6,7 @@ export EMQX_OPERATOR_NAMESPACE=emqx-operator-system
 export EMQX_OPERATOR_VERSION="2.2.3"
 export POSTGRES_OPERATOR_VERSION="v1.9.0"
 export VELERO_HELM_VERSION=velero-3.2.0
-export VELERO_PLUGIN_VERSION="1.5.0"
+export VELERO_PLUGIN_VERSION="v1.5.0"
 export VELERO_VERSION="v1.10.0"
 export MINIO_OPERATOR_VERSION="4.5.8"
 export CERT_MANAGER_VERSION="1.9.1"
@@ -24,4 +24,4 @@ export EXT_REGISTRY=${EXT_REGISTRY:-${COMMON_EXTERNAL_REGISTRY}}
 export EXT_REGISTRY2=${EXT_REGISTRY2:-${COMMON_EXTERNAL_REGISTRY2}}
 export EXT_REGISTRY3=${EXT_REGISTRY3:-${COMMON_EXTERNAL_REGISTRY3}}
 export EXT_REGISTRY4=${EXT_REGISTRY4:-${COMMON_EXTERNAL_REGISTRY4}}
-export KUBECTL_VERSION=1.28
+export KUBECTL_VERSION=1.28-debian-11
diff --git a/test/install-platform.sh b/test/install-platform.sh
@@ -143,10 +143,14 @@ install_velero(){
         --set "velero.image.repository=$LOCAL_REGISTRY/velero/velero" \
         --set "velero.kubectl.image.repository=$LOCAL_REGISTRY/bitnami/kubectl" \
         --set "velero.kubectl.image.tag=${KUBECTL_VERSION}" \
-        --set "velero.initContainers[0].image=$LOCAL_REGISTRY/velero/velero-plugin-for-aws:v${VELERO_PLUGIN_VERSION}" -l app=velero $command
+        --set "velero.initContainers[0].image=$LOCAL_REGISTRY/velero/velero-plugin-for-aws:${VELERO_PLUGIN_VERSION}" -l app=velero $command
         )
     else
-      ( cd ../helm && ./helmfile $(set_helm_params) -l app=velero $command )
+        echo Install velero from remote registry
+        ( cd ../helm && ./helmfile $(set_helm_params) \
+        --set "velero.kubectl.image.tag=${KUBECTL_VERSION}" \
+        -l app=velero $command
+        )
     fi
 }