XComp commented on code in PR #23528:
URL: https://github.com/apache/flink/pull/23528#discussion_r1375870619
##########
flink-end-to-end-tests/test-scripts/common_kubernetes.sh:
##########
@@ -50,32 +53,36 @@ function setup_kubernetes_for_linux {
if ! [ -x "$(command -v minikube)" ]; then
echo "Installing minikube $MINIKUBE_VERSION ..."
- curl -Lo minikube
https://storage.googleapis.com/minikube/releases/$MINIKUBE_VERSION/minikube-linux-$arch
&& \
- chmod +x minikube && sudo mv minikube /usr/bin/minikube
+
download_minikube_url="https://storage.googleapis.com/minikube/releases/$MINIKUBE_VERSION/minikube-linux-$arch";
+ retry_download "${download_minikube_url}"
+ chmod +x "minikube-linux-$arch" && sudo mv "minikube-linux-$arch"
/usr/bin/minikube
fi
# conntrack is required for minikube 1.9 and later
sudo apt-get install conntrack
# crictl is required for cri-dockerd
- local crictl_version crictl_archive
- crictl_version="v1.24.2"
- crictl_archive="crictl-$crictl_version-linux-${arch}.tar.gz"
- wget -nv
"https://github.com/kubernetes-sigs/cri-tools/releases/download/${crictl_version}/${crictl_archive}";
+ local crictl_archive
+ crictl_archive="crictl-$CRICTL_VERSION-linux-${arch}.tar.gz"
+
download_circtl_url="https://github.com/kubernetes-sigs/cri-tools/releases/download/${CRICTL_VERSION}/${crictl_archive}";
+ retry_download "${download_circtl_url}"
Review Comment:
```suggestion
download_crictl_url="https://github.com/kubernetes-sigs/cri-tools/releases/download/${CRICTL_VERSION}/${crictl_archive}";
retry_download "${download_crictl_url}"
```
##########
flink-end-to-end-tests/test-scripts/common_kubernetes.sh:
##########
@@ -50,32 +53,36 @@ function setup_kubernetes_for_linux {
if ! [ -x "$(command -v minikube)" ]; then
echo "Installing minikube $MINIKUBE_VERSION ..."
- curl -Lo minikube
https://storage.googleapis.com/minikube/releases/$MINIKUBE_VERSION/minikube-linux-$arch
&& \
- chmod +x minikube && sudo mv minikube /usr/bin/minikube
+
download_minikube_url="https://storage.googleapis.com/minikube/releases/$MINIKUBE_VERSION/minikube-linux-$arch";
+ retry_download "${download_minikube_url}"
+ chmod +x "minikube-linux-$arch" && sudo mv "minikube-linux-$arch"
/usr/bin/minikube
fi
# conntrack is required for minikube 1.9 and later
sudo apt-get install conntrack
# crictl is required for cri-dockerd
- local crictl_version crictl_archive
- crictl_version="v1.24.2"
- crictl_archive="crictl-$crictl_version-linux-${arch}.tar.gz"
- wget -nv
"https://github.com/kubernetes-sigs/cri-tools/releases/download/${crictl_version}/${crictl_archive}";
+ local crictl_archive
+ crictl_archive="crictl-$CRICTL_VERSION-linux-${arch}.tar.gz"
+
download_circtl_url="https://github.com/kubernetes-sigs/cri-tools/releases/download/${CRICTL_VERSION}/${crictl_archive}";
+ retry_download "${download_circtl_url}"
+
sudo tar zxvf ${crictl_archive} -C /usr/local/bin
rm -f ${crictl_archive}
# cri-dockerd is required to use Kubernetes 1.24+ and the none driver
- local cri_dockerd_version cri_dockerd_archive cri_dockerd_binary
- cri_dockerd_version="0.2.3"
- cri_dockerd_archive="cri-dockerd-${cri_dockerd_version}.${arch}.tgz"
+ local cri_dockerd_archive cri_dockerd_binary
+ cri_dockerd_archive="cri-dockerd-${CRI_DOCKERD_VERSION}.${arch}.tgz"
cri_dockerd_binary="cri-dockerd"
- wget -nv
"https://github.com/Mirantis/cri-dockerd/releases/download/v${cri_dockerd_version}/${cri_dockerd_archive}";
+
download_cri_dockerd_archive_url="https://github.com/Mirantis/cri-dockerd/releases/download/v${CRI_DOCKERD_VERSION}/${cri_dockerd_archive}";
+ retry_download "${download_cri_dockerd_archive_url}"
tar xzvf $cri_dockerd_archive "cri-dockerd/${cri_dockerd_binary}"
--strip-components=1
sudo install -o root -g root -m 0755 "${cri_dockerd_binary}"
"/usr/local/bin/${cri_dockerd_binary}"
rm ${cri_dockerd_binary}
- wget -nv
https://raw.githubusercontent.com/Mirantis/cri-dockerd/v${cri_dockerd_version}/packaging/systemd/cri-docker.service
- wget -nv
https://raw.githubusercontent.com/Mirantis/cri-dockerd/v${cri_dockerd_version}/packaging/systemd/cri-docker.socket
+
download_cri_docker_service_url="https://raw.githubusercontent.com/Mirantis/cri-dockerd/v${CRI_DOCKERD_VERSION}/packaging/systemd/cri-docker.service";
+ retry_download "${download_cri_docker_service_url}"
+
download_cri_docker_socket_url="https://raw.githubusercontent.com/Mirantis/cri-dockerd/v${CRI_DOCKERD_VERSION}/packaging/systemd/cri-docker.socket";
+ retry_download "${download_cri_docker_socket_url}"
Review Comment:
```suggestion
retry_download
"https://raw.githubusercontent.com/Mirantis/cri-dockerd/v${CRI_DOCKERD_VERSION}/packaging/systemd/cri-docker.service";
retry_download
"https://raw.githubusercontent.com/Mirantis/cri-dockerd/v${CRI_DOCKERD_VERSION}/packaging/systemd/cri-docker.socket";
```
nit: just to make the diff smaller. There's no need for a new variable here,
I guess.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscr...@flink.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
