diff --git a/addons/velero/1.11.0/Manifest b/addons/velero/1.11.0/Manifest index e92f75f760..1bc4b48bd9 100644 --- a/addons/velero/1.11.0/Manifest +++ b/addons/velero/1.11.0/Manifest @@ -4,7 +4,7 @@ image velero-restore-helper-gcr gcr.io/velero-gcp/velero-restore-helper:v1.11.0 image velero-aws velero/velero-plugin-for-aws:v1.7.0 image velero-gcp velero/velero-plugin-for-gcp:v1.7.0 image velero-azure velero/velero-plugin-for-microsoft-azure:v1.7.0 -image local-volume-provider replicated/local-volume-provider:v0.5.3 +image local-volume-provider replicated/local-volume-provider:v0.5.4 image s3cmd kurlsh/s3cmd:20230406-9a6d89f asset velero.tar.gz https://github.com/vmware-tanzu/velero/releases/download/v1.11.0/velero-v1.11.0-linux-amd64.tar.gz diff --git a/addons/velero/1.11.0/install.sh b/addons/velero/1.11.0/install.sh index d711ef0355..31d34c5c30 100644 --- a/addons/velero/1.11.0/install.sh +++ b/addons/velero/1.11.0/install.sh @@ -157,7 +157,7 @@ function velero_install() { $bslArgs \ $secretArgs \ --namespace $VELERO_NAMESPACE \ - --plugins velero/velero-plugin-for-aws:v1.7.0,velero/velero-plugin-for-gcp:v1.7.0,velero/velero-plugin-for-microsoft-azure:v1.7.0,replicated/local-volume-provider:v0.5.3,"$KURL_UTIL_IMAGE" \ + --plugins velero/velero-plugin-for-aws:v1.7.0,velero/velero-plugin-for-gcp:v1.7.0,velero/velero-plugin-for-microsoft-azure:v1.7.0,replicated/local-volume-provider:v0.5.4,"$KURL_UTIL_IMAGE" \ --use-volume-snapshots=false \ --dry-run -o yaml > "$dst/velero.yaml" diff --git a/addons/velero/template/testgrid/k8s-docker.yaml b/addons/velero/template/testgrid/k8s-docker.yaml index 96c39933dc..a3e558e93e 100644 --- a/addons/velero/template/testgrid/k8s-docker.yaml +++ b/addons/velero/template/testgrid/k8s-docker.yaml @@ -8,9 +8,16 @@ version: "latest" containerd: version: "latest" + kotsadm: + version: latest velero: version: "__testver__" s3Override: "__testdist__" + postInstallScript: | + source /opt/kurl-testgrid/testhelpers.sh + install_and_customize_kurl_integration_test_application + kubectl kots backup + kubectl kots backup ls - name: "Velero Minimal Airgap" airgap: true installerSpec: @@ -22,12 +29,21 @@ version: "latest" containerd: version: "latest" + kotsadm: + version: latest + registry: + version: latest velero: version: "__testver__" s3Override: "__testdist__" preInstallScript: | source /opt/kurl-testgrid/testhelpers.sh rhel_9_install_host_packages lvm2 conntrack-tools socat container-selinux git + postInstallScript: | + source /opt/kurl-testgrid/testhelpers.sh + install_and_customize_kurl_integration_test_application + kubectl kots backup + kubectl kots backup ls - name: "Velero DisableS3 - Rook" installerSpec: kubernetes: @@ -44,6 +60,11 @@ velero: version: "__testver__" s3Override: "__testdist__" + postInstallScript: | + source /opt/kurl-testgrid/testhelpers.sh + install_and_customize_kurl_integration_test_application + kubectl kots backup + kubectl kots backup ls - name: "Velero OpenEBS only" installerSpec: kubernetes: @@ -102,3 +123,12 @@ version: "latest" unsupportedOSIDs: - centos-74 # Rook 1.8+ not supported on 3.10.0-693.el7.x86_64 kernel + postInstallScript: | + source /opt/kurl-testgrid/testhelpers.sh + install_and_customize_kurl_integration_test_application + kubectl kots backup + kubectl kots backup ls + postUpgradeScript: | + source /opt/kurl-testgrid/testhelpers.sh + kubectl kots backup + kubectl kots backup ls