Merge pull request ceph#34 from red-hat-storage/sync_us--main

Syncing latest changes from upstream main for ceph-csi-operator
Madhu-1 · Sep 27, 2024 · 776e748 · 776e748
2 parents 029fc62 + 9ad05e2
commit 776e748
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/test_operator.yaml b/.github/workflows/test_operator.yaml
@@ -42,7 +42,6 @@ jobs:
 
       - name: print k8s cluster status
         run: |
-            minikube status
             kubectl get nodes
 
       - name: use local disk

diff --git a/internal/utils/csi.go b/internal/utils/csi.go
@@ -128,6 +128,7 @@ var EtcSelinuxVolume = corev1.Volume{
 
 func KmsConfigVolume(configRef *corev1.LocalObjectReference) corev1.Volume {
 	return corev1.Volume{
+		Name: kmsConfigVolumeName,
 		VolumeSource: corev1.VolumeSource{
 			ConfigMap: &corev1.ConfigMapVolumeSource{
 				LocalObjectReference: *configRef,

diff --git a/test/scripts/github-action-helper.sh b/test/scripts/github-action-helper.sh
@@ -37,7 +37,7 @@ use_local_disk() {
 }
 
 deploy_rook() {
-  rook_version="v1.14.8"
+  rook_version="v1.15.1"
   kubectl create -f https://raw.githubusercontent.com/rook/rook/$rook_version/deploy/examples/common.yaml
   kubectl create -f https://raw.githubusercontent.com/rook/rook/$rook_version/deploy/examples/crds.yaml
   curl https://raw.githubusercontent.com/rook/rook/$rook_version/deploy/examples/operator.yaml -o operator.yaml
@@ -92,26 +92,26 @@ timeout_command_exit_code() {
 }
 
 install_minikube_with_none_driver() {
-  CRICTL_VERSION="v1.30.0"
-  MINIKUBE_VERSION="v1.33.1"
-  kubernetes_version="v1.30.2"
+  CRICTL_VERSION="v1.31.1"
+  MINIKUBE_VERSION="v1.34.0"
+  kubernetes_version="v1.31.1"
 
   sudo apt update
   sudo apt install -y conntrack socat
   curl -LO https://storage.googleapis.com/minikube/releases/$MINIKUBE_VERSION/minikube_latest_amd64.deb
   sudo dpkg -i minikube_latest_amd64.deb
   rm -f minikube_latest_amd64.deb
 
-  curl -LO https://github.com/Mirantis/cri-dockerd/releases/download/v0.3.4/cri-dockerd_0.3.4.3-0.ubuntu-focal_amd64.deb
-  sudo dpkg -i cri-dockerd_0.3.4.3-0.ubuntu-focal_amd64.deb
-  rm -f cri-dockerd_0.3.4.3-0.ubuntu-focal_amd64.deb
+  curl -LO https://github.com/Mirantis/cri-dockerd/releases/download/v0.3.15/cri-dockerd_0.3.15.3-0.ubuntu-focal_amd64.deb
+  sudo dpkg -i cri-dockerd_0.3.15.3-0.ubuntu-focal_amd64.deb
+  rm -f cri-dockerd_0.3.15.3-0.ubuntu-focal_amd64.deb
 
   wget https://github.com/kubernetes-sigs/cri-tools/releases/download/$CRICTL_VERSION/crictl-$CRICTL_VERSION-linux-amd64.tar.gz
   sudo tar zxvf crictl-$CRICTL_VERSION-linux-amd64.tar.gz -C /usr/local/bin
   rm -f crictl-$CRICTL_VERSION-linux-amd64.tar.gz
   sudo sysctl fs.protected_regular=0
 
-  CNI_PLUGIN_VERSION="v1.3.0"
+  CNI_PLUGIN_VERSION="v1.5.1"
   CNI_PLUGIN_TAR="cni-plugins-linux-amd64-$CNI_PLUGIN_VERSION.tgz" # change arch if not on amd64
   CNI_PLUGIN_INSTALL_DIR="/opt/cni/bin"
 
@@ -121,7 +121,7 @@ install_minikube_with_none_driver() {
   rm "$CNI_PLUGIN_TAR"
 
   export MINIKUBE_HOME=$HOME CHANGE_MINIKUBE_NONE_USER=true KUBECONFIG=$HOME/.kube/config
-  sudo -E minikube start --kubernetes-version="$kubernetes_version" --driver=none --memory 6g --cpus=2 --addons ingress --cni=calico
+  minikube start --kubernetes-version="$kubernetes_version" --driver=none --memory 6g --cpus=2 --addons ingress --cni=calico
 }
 
 ########