From bf499f39c22fc7fbad66402a3a008bdfda729e38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niccol=C3=B2=20Fei?= Date: Fri, 8 Mar 2024 16:54:29 +0100 Subject: [PATCH] chore: add external-snapshotter and rook to Renovate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Niccolò Fei --- .github/renovate.json5 | 75 ++++++++++++++++++++++++++++++++++++++++++ hack/setup-cluster.sh | 14 ++++---- 2 files changed, 82 insertions(+), 7 deletions(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 06cd4b9295..8c6ffa0223 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -47,6 +47,81 @@ "versioningTemplate": "loose", "depNameTemplate": "github.com/goreleaser/goreleaser", }, { + // We want a PR to bump the external-snapshotter version + "fileMatch": [ + "^.github/workflows/continuous-delivery.yml", + "^hack/setup-cluster\.sh$", + ], + "matchStrings": [ + "EXTERNAL_SNAPSHOTTER_VERSION: \"(?.*?)\"", + "EXTERNAL_SNAPSHOTTER_VERSION=(?.*?)\\n", + ], + "datasourceTemplate": "github-releases", + "versioningTemplate": "loose", + "depNameTemplate": "kubernetes-csi/external-snapshotter", + "extractVersionTemplate": "^(?v\\d+\\.\\d+\\.\\d+)" + }, { + // We want a PR to bump the external-provisioner version + "fileMatch": [ + "^hack/setup-cluster\.sh$", + ], + "matchStrings": [ + "EXTERNAL_PROVISIONER_VERSION=(?.*?)\\n", + ], + "datasourceTemplate": "github-releases", + "versioningTemplate": "loose", + "depNameTemplate": "kubernetes-csi/external-provisioner", + "extractVersionTemplate": "^(?v\\d+\\.\\d+\\.\\d+)" + }, { + // We want a PR to bump the external-resizer version + "fileMatch": [ + "^hack/setup-cluster\.sh$", + ], + "matchStrings": [ + "EXTERNAL_RESIZER_VERSION=(?.*?)\\n", + ], + "datasourceTemplate": "github-releases", + "versioningTemplate": "loose", + "depNameTemplate": "kubernetes-csi/external-resizer", + "extractVersionTemplate": "^(?v\\d+\\.\\d+\\.\\d+)" + }, { + // We want a PR to bump the external-attacher version + "fileMatch": [ + "^hack/setup-cluster\.sh$", + ], + "matchStrings": [ + "EXTERNAL_ATTACHER_VERSION=(?.*?)\\n", + ], + "datasourceTemplate": "github-releases", + "versioningTemplate": "loose", + "depNameTemplate": "kubernetes-csi/external-attacher", + "extractVersionTemplate": "^(?v\\d+\\.\\d+\\.\\d+)" + }, { + // We want a PR to bump the csi-driver-host-path version + "fileMatch": [ + "^hack/setup-cluster\.sh$", + ], + "matchStrings": [ + "CSI_DRIVER_HOST_PATH_DEFAULT_VERSION=(?.*?)\\n", + ], + "datasourceTemplate": "github-releases", + "versioningTemplate": "loose", + "depNameTemplate": "kubernetes-csi/csi-driver-host-path", + "extractVersionTemplate": "^(?v\\d+\\.\\d+\\.\\d+)" + }, { + // We want a PR to bump the rook version + "fileMatch": [ + "^.github/workflows/continuous-delivery.yml", + ], + "matchStrings": [ + "ROOK_VERSION: \"(?.*?)\"", + ], + "datasourceTemplate": "github-releases", + "versioningTemplate": "loose", + "depNameTemplate": "rook/rook", + "extractVersionTemplate": "^(?v\\d+\\.\\d+\\.\\d+)" + }, { + // We want a PR to bump kind version "fileMatch": [ "^.github/workflows/continuous-delivery.yml" ], diff --git a/hack/setup-cluster.sh b/hack/setup-cluster.sh index b8cd5a592f..d4243141b5 100755 --- a/hack/setup-cluster.sh +++ b/hack/setup-cluster.sh @@ -27,6 +27,10 @@ fi KIND_NODE_DEFAULT_VERSION=v1.29.2 K3D_NODE_DEFAULT_VERSION=v1.29.1 CSI_DRIVER_HOST_PATH_DEFAULT_VERSION=v1.11.0 +EXTERNAL_SNAPSHOTTER_VERSION=v6.3.1 +EXTERNAL_PROVISIONER_VERSION=v3.6.1 +EXTERNAL_RESIZER_VERSION=v1.9.1 +EXTERNAL_ATTACHER_VERSION=v4.4.1 K8S_VERSION=${K8S_VERSION-} KUBECTL_VERSION=${KUBECTL_VERSION-} CSI_DRIVER_HOST_PATH_VERSION=${CSI_DRIVER_HOST_PATH_VERSION:-$CSI_DRIVER_HOST_PATH_DEFAULT_VERSION} @@ -354,10 +358,6 @@ deploy_fluentd() { deploy_csi_host_path() { echo "${bright}Starting deployment of CSI driver plugin... ${reset}" CSI_BASE_URL=https://raw.githubusercontent.com/kubernetes-csi - EXTERNAL_SNAPSHOTTER_VERSION="v6.3.1" - EXTERNAL_PROVISIONER_VERSION="v3.6.1" - EXTERNAL_RESIZER_VERSION="v1.9.1" - EXTERNAL_ATTACHER_VERSION="v4.4.1" ## Install external snapshotter CRD kubectl apply -f "${CSI_BASE_URL}"/external-snapshotter/"${EXTERNAL_SNAPSHOTTER_VERSION}"/client/config/crd/snapshot.storage.k8s.io_volumesnapshotclasses.yaml @@ -377,11 +377,11 @@ deploy_csi_host_path() { kubectl apply -f "${CSI_BASE_URL}"/external-resizer/"${EXTERNAL_RESIZER_VERSION}"/deploy/kubernetes/rbac.yaml ## Install driver and plugin - kubectl apply -f "${CSI_BASE_URL}"/csi-driver-host-path/"${CSI_DRIVER_HOST_PATH_VERSION}"/deploy/kubernetes-1.24/hostpath/csi-hostpath-driverinfo.yaml - kubectl apply -f "${CSI_BASE_URL}"/csi-driver-host-path/"${CSI_DRIVER_HOST_PATH_VERSION}"/deploy/kubernetes-1.24/hostpath/csi-hostpath-plugin.yaml + kubectl apply -f "${CSI_BASE_URL}"/csi-driver-host-path/"${CSI_DRIVER_HOST_PATH_VERSION}"/deploy/kubernetes-latest/hostpath/csi-hostpath-driverinfo.yaml + kubectl apply -f "${CSI_BASE_URL}"/csi-driver-host-path/"${CSI_DRIVER_HOST_PATH_VERSION}"/deploy/kubernetes-latest/hostpath/csi-hostpath-plugin.yaml ## create volumesnapshotclass - kubectl apply -f "${CSI_BASE_URL}"/csi-driver-host-path/"${CSI_DRIVER_HOST_PATH_VERSION}"/deploy/kubernetes-1.24/hostpath/csi-hostpath-snapshotclass.yaml + kubectl apply -f "${CSI_BASE_URL}"/csi-driver-host-path/"${CSI_DRIVER_HOST_PATH_VERSION}"/deploy/kubernetes-latest/hostpath/csi-hostpath-snapshotclass.yaml ## create storage class kubectl apply -f "${CSI_BASE_URL}"/csi-driver-host-path/"${CSI_DRIVER_HOST_PATH_VERSION}"/examples/csi-storageclass.yaml