From bbfe10a0720b94d0e6ecb922b922ced7df7d6b60 Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Thu, 24 Aug 2023 10:48:29 +0200 Subject: [PATCH 1/3] ci: enable debug logs in kubelet enable debug logs in kubelet for better debugging. Signed-off-by: Madhu Rajanna --- scripts/minikube.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/minikube.sh b/scripts/minikube.sh index b2e26f147c7..f4a332209cc 100755 --- a/scripts/minikube.sh +++ b/scripts/minikube.sh @@ -268,7 +268,11 @@ up) fi # shellcheck disable=SC2086 ${minikube} start --force --memory="${MEMORY}" --cpus="${CPUS}" -b kubeadm --kubernetes-version="${KUBE_VERSION}" --driver="${VM_DRIVER}" --feature-gates="${K8S_FEATURE_GATES}" --cni="${CNI}" ${EXTRA_CONFIG} --wait-timeout="${MINIKUBE_WAIT_TIMEOUT}" --wait="${MINIKUBE_WAIT}" --delete-on-failure ${DISK_CONFIG} - + # shellcheck disable=SC2086 + ${minikube} ssh "sudo sed -i 's/\(ExecStart=\/var.*\)/\1 --v=4/' /etc/systemd/system/kubelet.service.d/10-kubeadm.conf" + ${minikube} ssh "sudo systemctl daemon-reload" + ${minikube} ssh "sudo systemctl restart kubelet" + ${minikube} ssh "ps -Af |grep kubelet" # create a link so the default dataDirHostPath will work for this # environment if [[ "${VM_DRIVER}" != "none" ]] && [[ "${VM_DRIVER}" != "podman" ]]; then From 0c7e5f7e0938466e4ecb0c6bd3b3bdeb55e21952 Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Thu, 24 Aug 2023 12:16:22 +0200 Subject: [PATCH 2/3] deploy: use resizer canary image use resizer canary image to as it might contain fix for pvc resize with kubernetes 1.28 Signed-off-by: Madhu Rajanna --- charts/ceph-csi-cephfs/values.yaml | 4 ++-- charts/ceph-csi-rbd/values.yaml | 4 ++-- deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml | 2 +- deploy/nfs/kubernetes/csi-nfsplugin-provisioner.yaml | 2 +- deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/charts/ceph-csi-cephfs/values.yaml b/charts/ceph-csi-cephfs/values.yaml index b803bb50acb..e900052a6f2 100644 --- a/charts/ceph-csi-cephfs/values.yaml +++ b/charts/ceph-csi-cephfs/values.yaml @@ -198,8 +198,8 @@ provisioner: name: resizer enabled: true image: - repository: registry.k8s.io/sig-storage/csi-resizer - tag: v1.8.0 + repository: gcr.io/k8s-staging-sig-storage/csi-resizer + tag: canary pullPolicy: IfNotPresent resources: {} ## For further options, check diff --git a/charts/ceph-csi-rbd/values.yaml b/charts/ceph-csi-rbd/values.yaml index 31431012c4d..b2635fc078e 100644 --- a/charts/ceph-csi-rbd/values.yaml +++ b/charts/ceph-csi-rbd/values.yaml @@ -243,8 +243,8 @@ provisioner: name: resizer enabled: true image: - repository: registry.k8s.io/sig-storage/csi-resizer - tag: v1.8.0 + repository: gcr.io/k8s-staging-sig-storage/csi-resizer + tag: canary pullPolicy: IfNotPresent resources: {} ## For further options, check diff --git a/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml b/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml index 84dac64db91..bce960f2095 100644 --- a/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml +++ b/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml @@ -62,7 +62,7 @@ spec: - name: socket-dir mountPath: /csi - name: csi-resizer - image: registry.k8s.io/sig-storage/csi-resizer:v1.8.0 + image: gcr.io/k8s-staging-sig-storage/csi-resizer:canary args: - "--csi-address=$(ADDRESS)" - "--v=1" diff --git a/deploy/nfs/kubernetes/csi-nfsplugin-provisioner.yaml b/deploy/nfs/kubernetes/csi-nfsplugin-provisioner.yaml index d491f22eb49..ba9164422c6 100644 --- a/deploy/nfs/kubernetes/csi-nfsplugin-provisioner.yaml +++ b/deploy/nfs/kubernetes/csi-nfsplugin-provisioner.yaml @@ -57,7 +57,7 @@ spec: - name: socket-dir mountPath: /csi - name: csi-resizer - image: registry.k8s.io/sig-storage/csi-resizer:v1.8.0 + image: gcr.io/k8s-staging-sig-storage/csi-resizer:canary args: - "--csi-address=$(ADDRESS)" - "--v=1" diff --git a/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml b/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml index bb1ac410178..8f566a1fae1 100644 --- a/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml +++ b/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml @@ -99,7 +99,7 @@ spec: - name: socket-dir mountPath: /csi - name: csi-resizer - image: registry.k8s.io/sig-storage/csi-resizer:v1.8.0 + image: gcr.io/k8s-staging-sig-storage/csi-resizer:canary args: - "--csi-address=$(ADDRESS)" - "--v=1" From 9b86c13c0479ff399a7bb5cf6f7aad26b17a1d92 Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Fri, 25 Aug 2023 10:21:09 +0200 Subject: [PATCH 3/3] build: use lower version for dependencies if repositories are broken Some packages have dependencies on other repositories. On occasion these repositories seem to be out-of-sync. In that case, install updates with an older version, instead of erroring out. Signed-off-by: Niels de Vos --- deploy/cephcsi/image/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/cephcsi/image/Dockerfile b/deploy/cephcsi/image/Dockerfile index 741b6716851..57dfb239b01 100644 --- a/deploy/cephcsi/image/Dockerfile +++ b/deploy/cephcsi/image/Dockerfile @@ -9,7 +9,7 @@ FROM ${BASE_IMAGE} as updated_base RUN dnf config-manager --disable \ tcmu-runner,tcmu-runner-source,tcmu-runner-noarch,ceph-iscsi || true -RUN dnf -y update \ +RUN dnf -y update --nobest \ && dnf clean all \ && rm -rf /var/cache/yum