Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: upgrade azuredisk csi driver to v1.28.3 #190

Merged
merged 16 commits into from
Oct 5, 2023
Merged

chore: upgrade azuredisk csi driver to v1.28.3 #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
0cb70ec
upgrade azuredisk-csi-driver to v1.28.3
christinalau0 Sep 29, 2023
10d6615
update v1.28.3 csi driver template: csi-azuredisk-node-windows.yaml
christinalau0 Sep 29, 2023
fe06af5
update v1.28.3 csi driver template: csi-azuredisk-node.yaml
christinalau0 Sep 29, 2023
780c932
update v1.28.3 csi driver template: csi-azuredisk-controller.yaml
christinalau0 Sep 30, 2023
413790a
update v1.28.3 csi driver template: csi-snapshot-controller.yaml
christinalau0 Sep 30, 2023
cee0ed5
update v1.28.3 csi driver template: crd-csi-snapshot.yaml
christinalau0 Sep 30, 2023
56f6fc8
Update generated template
christinalau0 Sep 30, 2023
9b25bae
Fix syntax
christinalau0 Sep 30, 2023
7315a92
Fix k8s_versions_test
christinalau0 Oct 3, 2023
4c5f2e5
Change addon template based on version
christinalau0 Oct 3, 2023
459206a
Fix lint
christinalau0 Oct 4, 2023
45da9eb
Fix GCR for unit tests
christinalau0 Oct 4, 2023
11b8696
Update documentation for Windows HostProcess containers
christinalau0 Oct 4, 2023
db74df8
Test PVC by default
christinalau0 Oct 4, 2023
3c44032
Add IsAzureDiskCSIDriverVersionGe
christinalau0 Oct 4, 2023
35ae088
Revert "Add IsAzureDiskCSIDriverVersionGe"
christinalau0 Oct 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .pipelines/e2e-job-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ parameters:
stabilityIterations: 0
windowsVHDBuild: ""
linuxVHDBuild: ""
testPVC: true

jobs:
- job: ${{ parameters.name }}
Expand Down Expand Up @@ -55,6 +56,7 @@ jobs:
LINUX_NODE_IMAGE_GALLERY: AKSeGallery
LINUX_NODE_IMAGE_NAME: ubuntu-20.04
LINUX_NODE_IMAGE_VERSION: ${{ parameters.linuxVHDBuild }}
TEST_PVC: ${{ parameters.testPVC }}

steps:
- template: e2e-step-template.yaml
Expand Down
3 changes: 3 additions & 0 deletions .pipelines/pr-e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ jobs:
msiId: $(MSI_USER_ASSIGNED_ID_AKS_ENGINE_E2E)
windowsVHDBuild: $(WINDOWS_VHD_BUILD)
linuxVHDBuild: $(LINUX_VHD_BUILD)
testPVC: true

- template: e2e-job-template.yaml
parameters:
Expand All @@ -93,6 +94,7 @@ jobs:
msiId: $(MSI_USER_ASSIGNED_ID_AKS_ENGINE_E2E)
windowsVHDBuild: $(WINDOWS_VHD_BUILD)
linuxVHDBuild: $(LINUX_VHD_BUILD)
testPVC: true

- template: e2e-job-template.yaml
parameters:
Expand All @@ -112,3 +114,4 @@ jobs:
msiId: $(MSI_USER_ASSIGNED_ID_AKS_ENGINE_E2E)
windowsVHDBuild: $(WINDOWS_VHD_BUILD)
linuxVHDBuild: $(LINUX_VHD_BUILD)
testPVC: true
18 changes: 15 additions & 3 deletions docs/topics/azure-stack.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@ The [in-tree volume provisioner](https://kubernetes.io/blog/2019/12/09/kubernete
AKS Engine will **not** enable any CSI driver by default on Azure Stack Hub. For workloads that require a CSI driver, it is possible to either:

* For AKS Engine versions 0.75.3 and above: explicitly enable the `azuredisk-csi-driver` [addon](../topics/clusterdefinitions.md#addons) (Linux and/or Windows cluster)
* If you are using Windows HostProcess containers in your workloads, do not use the addon. Instead use `Helm` to [install the `azuredisk-csi-driver` chart](#1-install-azure-disk-csi-driver-manually) and set the following value: `--set windows.useHostProcessContainers=true`.
* For AKS Engine versions 0.70.0 and above: explicitly enable the `azuredisk-csi-driver` [addon](../topics/clusterdefinitions.md#addons) (Linux cluster only)
* For AKS Engine versions 0.70.0 and above: use `Helm` to [install the `azuredisk-csi-driver` chart](#1-install-azure-disk-csi-driver-manually) (Linux and/or Windows clusters).

Expand All @@ -203,7 +204,8 @@ If the data persisted in the underlying Azure disks should be preserved, then th
The following script uses `Helm` to install the Azure Disk CSI Driver:

```bash
DRIVER_VERSION=v1.26.5
DRIVER_VERSION=v1.26.5 # if using k8s v1.26
DRIVER_VERSION=v1.28.3 # if using k8s v1.27
jadarsie marked this conversation as resolved.
Show resolved Hide resolved
helm repo add azuredisk-csi-driver https://raw.githubusercontent.com/kubernetes-sigs/azuredisk-csi-driver/master/charts
helm install azuredisk-csi-driver azuredisk-csi-driver/azuredisk-csi-driver \
--namespace kube-system \
Expand All @@ -212,6 +214,7 @@ helm install azuredisk-csi-driver azuredisk-csi-driver/azuredisk-csi-driver \
--set node.supportZone=false \
--set windows.getNodeInfoFromLabels=true \
--set linux.getNodeInfoFromLabels=true \
# --set windows.useHostProcessContainers=true \ # if using Windows HostProcess containers
--version ${DRIVER_VERSION}
```

Expand Down Expand Up @@ -278,9 +281,18 @@ In this section, please follow the example commands to deploy a StatefulSet appl

```bash
# Install CSI Driver
DRIVER_VERSION=v1.26.5
DRIVER_VERSION=v1.26.5 # if using k8s v1.26
DRIVER_VERSION=v1.28.3 # if using k8s v1.27
helm repo add azuredisk-csi-driver https://raw.githubusercontent.com/kubernetes-sigs/azuredisk-csi-driver/master/charts
helm install azuredisk-csi-driver azuredisk-csi-driver/azuredisk-csi-driver --namespace kube-system --set cloud=AzureStackCloud --set controller.runOnMaster=true --set node.supportZone=false --set windows.getNodeInfoFromLabels=true --set linux.getNodeInfoFromLabels=true --version ${DRIVER_VERSION}
helm install azuredisk-csi-driver azuredisk-csi-driver/azuredisk-csi-driver \
--namespace kube-system \
--set cloud=AzureStackCloud \
--set controller.runOnMaster=true \
--set node.supportZone=false \
--set windows.getNodeInfoFromLabels=true \
--set linux.getNodeInfoFromLabels=true \
# --set windows.useHostProcessContainers=true \ # if using Windows HostProcess containers
--version ${DRIVER_VERSION}

# Deploy Storage Class
kubectl apply -f https://raw.githubusercontent.com/kubernetes-sigs/azuredisk-csi-driver/master/deploy/example/storageclass-azuredisk-csi-azurestack.yaml
Expand Down
365 changes: 315 additions & 50 deletions parts/k8s/addons/azuredisk-csi-driver-deployment.yaml
View file
Open in desktop

Large diffs are not rendered by default.

694 changes: 477 additions & 217 deletions pkg/api/k8s_versions.go
View file
Open in desktop

Large diffs are not rendered by default.

78 changes: 39 additions & 39 deletions pkg/api/k8s_versions_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,16 +68,16 @@ func TestGetK8sVersionComponents(t *testing.T) {
common.AzurePolicyAddonName: azurePolicyImageReference,
common.GatekeeperContainerName: gatekeeperImageReference,
common.NodeProblemDetectorAddonName: nodeProblemDetectorImageReference,
common.CSIProvisionerContainerName: csiProvisionerImageReference,
common.CSIAttacherContainerName: csiAttacherImageReference,
common.CSILivenessProbeContainerName: csiLivenessProbeImageReference,
common.CSILivenessProbeWindowsContainerName: csiLivenessProbeWindowsImageReference,
common.CSINodeDriverRegistrarContainerName: csiNodeDriverRegistrarImageReference,
common.CSINodeDriverRegistrarWindowsContainerName: csiNodeDriverRegistrarWindowsImageReference,
common.CSISnapshotterContainerName: csiSnapshotterImageReference,
common.CSISnapshotControllerContainerName: csiSnapshotControllerImageReference,
common.CSIResizerContainerName: csiResizerImageReference,
common.CSIAzureDiskContainerName: csiAzureDiskImageReference,
common.CSIProvisionerContainerName: "oss/kubernetes-csi/csi-provisioner:v3.0.0",
common.CSIAttacherContainerName: "oss/kubernetes-csi/csi-attacher:v3.3.0",
common.CSILivenessProbeContainerName: "oss/kubernetes-csi/livenessprobe:v2.5.0",
common.CSILivenessProbeWindowsContainerName: "oss/kubernetes-csi/livenessprobe:v2.5.0",
common.CSINodeDriverRegistrarContainerName: "oss/kubernetes-csi/csi-node-driver-registrar:v2.4.0",
common.CSINodeDriverRegistrarWindowsContainerName: "oss/kubernetes-csi/csi-node-driver-registrar:v2.4.0",
common.CSISnapshotterContainerName: "oss/kubernetes-csi/csi-snapshotter:v4.2.1",
common.CSISnapshotControllerContainerName: "oss/kubernetes-csi/snapshot-controller:v4.2.1",
common.CSIResizerContainerName: "oss/kubernetes-csi/csi-resizer:v1.3.0",
common.CSIAzureDiskContainerName: "oss/kubernetes-csi/azuredisk-csi:v1.10.0",
common.CSIAzureFileContainerName: csiAzureFileImageReference,
common.KubeFlannelContainerName: kubeFlannelImageReference,
"flannel" + common.FlannelInstallCNIContainerName: flannelInstallCNIImageReference,
Expand Down Expand Up @@ -157,14 +157,14 @@ func TestGetK8sVersionComponents(t *testing.T) {
common.AzurePolicyAddonName: azurePolicyImageReference,
common.GatekeeperContainerName: gatekeeperImageReference,
common.NodeProblemDetectorAddonName: nodeProblemDetectorImageReference,
common.CSIProvisionerContainerName: csiProvisionerImageReference,
common.CSIAttacherContainerName: csiAttacherImageReference,
common.CSILivenessProbeContainerName: csiLivenessProbeImageReference,
common.CSINodeDriverRegistrarContainerName: csiNodeDriverRegistrarImageReference,
common.CSISnapshotterContainerName: csiSnapshotterImageReference,
common.CSISnapshotControllerContainerName: csiSnapshotControllerImageReference,
common.CSIResizerContainerName: csiResizerImageReference,
common.CSIAzureDiskContainerName: csiAzureDiskImageReference,
common.CSIProvisionerContainerName: "oss/kubernetes-csi/csi-provisioner:v3.0.0",
common.CSIAttacherContainerName: "oss/kubernetes-csi/csi-attacher:v3.3.0",
common.CSILivenessProbeContainerName: "oss/kubernetes-csi/livenessprobe:v2.5.0",
common.CSINodeDriverRegistrarContainerName: "oss/kubernetes-csi/csi-node-driver-registrar:v2.4.0",
common.CSISnapshotterContainerName: "oss/kubernetes-csi/csi-snapshotter:v4.2.1",
common.CSISnapshotControllerContainerName: "oss/kubernetes-csi/snapshot-controller:v4.2.1",
common.CSIResizerContainerName: "oss/kubernetes-csi/csi-resizer:v1.3.0",
common.CSIAzureDiskContainerName: "oss/kubernetes-csi/azuredisk-csi:v1.10.0",
common.CSIAzureFileContainerName: csiAzureFileImageReference,
common.KubeFlannelContainerName: kubeFlannelImageReference,
"flannel" + common.FlannelInstallCNIContainerName: flannelInstallCNIImageReference,
Expand Down Expand Up @@ -224,12 +224,12 @@ func TestGetK8sVersionComponents(t *testing.T) {
common.SMBFlexVolumeAddonName: smbFlexVolumeImageReference,
common.IPMASQAgentAddonName: getDefaultImage(common.IPMASQAgentAddonName, kubernetesImageBaseType),
common.AzureNetworkPolicyAddonName: azureNPMContainerImageReference,
common.CSIProvisionerContainerName: csiProvisionerImageReference,
common.CSIAttacherContainerName: csiAttacherImageReference,
common.CSILivenessProbeContainerName: csiLivenessProbeImageReference,
common.CSINodeDriverRegistrarContainerName: csiNodeDriverRegistrarImageReference,
common.CSIResizerContainerName: csiResizerImageReference,
common.CSIAzureDiskContainerName: csiAzureDiskImageReference,
common.CSIProvisionerContainerName: "oss/kubernetes-csi/csi-provisioner:v3.0.0",
common.CSIAttacherContainerName: "oss/kubernetes-csi/csi-attacher:v3.3.0",
common.CSILivenessProbeContainerName: "oss/kubernetes-csi/livenessprobe:v2.5.0",
common.CSINodeDriverRegistrarContainerName: "oss/kubernetes-csi/csi-node-driver-registrar:v2.4.0",
common.CSIResizerContainerName: "oss/kubernetes-csi/csi-resizer:v1.3.0",
common.CSIAzureDiskContainerName: "oss/kubernetes-csi/azuredisk-csi:v1.10.0",
common.CSIAzureFileContainerName: csiAzureFileImageReference,
common.CalicoTyphaComponentName: calicoTyphaImageReference,
common.CalicoCNIComponentName: calicoCNIImageReference,
Expand Down Expand Up @@ -307,11 +307,11 @@ func TestGetK8sVersionComponents(t *testing.T) {
common.SMBFlexVolumeAddonName: smbFlexVolumeImageReference,
common.IPMASQAgentAddonName: getDefaultImage(common.IPMASQAgentAddonName, kubernetesImageBaseType),
common.AzureNetworkPolicyAddonName: azureNPMContainerImageReference,
common.CSIProvisionerContainerName: csiProvisionerImageReference,
common.CSIAttacherContainerName: csiAttacherImageReference,
common.CSILivenessProbeContainerName: csiLivenessProbeImageReference,
common.CSINodeDriverRegistrarContainerName: csiNodeDriverRegistrarImageReference,
common.CSIAzureDiskContainerName: csiAzureDiskImageReference,
common.CSIProvisionerContainerName: "oss/kubernetes-csi/csi-provisioner:v3.0.0",
common.CSIAttacherContainerName: "oss/kubernetes-csi/csi-attacher:v3.3.0",
common.CSILivenessProbeContainerName: "oss/kubernetes-csi/livenessprobe:v2.5.0",
common.CSINodeDriverRegistrarContainerName: "oss/kubernetes-csi/csi-node-driver-registrar:v2.4.0",
common.CSIAzureDiskContainerName: "oss/kubernetes-csi/azuredisk-csi:v1.10.0",
common.CSIAzureFileContainerName: csiAzureFileImageReference,
common.CalicoTyphaComponentName: calicoTyphaImageReference,
common.CalicoCNIComponentName: calicoCNIImageReference,
Expand Down Expand Up @@ -385,11 +385,11 @@ func TestGetK8sVersionComponents(t *testing.T) {
common.SMBFlexVolumeAddonName: smbFlexVolumeImageReference,
common.IPMASQAgentAddonName: getDefaultImage(common.IPMASQAgentAddonName, kubernetesImageBaseType),
common.AzureNetworkPolicyAddonName: azureNPMContainerImageReference,
common.CSIProvisionerContainerName: csiProvisionerImageReference,
common.CSIAttacherContainerName: csiAttacherImageReference,
common.CSILivenessProbeContainerName: csiLivenessProbeImageReference,
common.CSINodeDriverRegistrarContainerName: csiNodeDriverRegistrarImageReference,
common.CSIAzureDiskContainerName: csiAzureDiskImageReference,
common.CSIProvisionerContainerName: "oss/kubernetes-csi/csi-provisioner:v3.0.0",
common.CSIAttacherContainerName: "oss/kubernetes-csi/csi-attacher:v3.3.0",
common.CSILivenessProbeContainerName: "oss/kubernetes-csi/livenessprobe:v2.5.0",
common.CSINodeDriverRegistrarContainerName: "oss/kubernetes-csi/csi-node-driver-registrar:v2.4.0",
common.CSIAzureDiskContainerName: "oss/kubernetes-csi/azuredisk-csi:v1.10.0",
common.CSIAzureFileContainerName: csiAzureFileImageReference,
common.CalicoTyphaComponentName: calicoTyphaImageReference,
common.CalicoCNIComponentName: calicoCNIImageReference,
Expand Down Expand Up @@ -462,11 +462,11 @@ func TestGetK8sVersionComponents(t *testing.T) {
common.SMBFlexVolumeAddonName: smbFlexVolumeImageReference,
common.IPMASQAgentAddonName: getDefaultImage(common.IPMASQAgentAddonName, kubernetesImageBaseType),
common.AzureNetworkPolicyAddonName: azureNPMContainerImageReference,
common.CSIProvisionerContainerName: csiProvisionerImageReference,
common.CSIAttacherContainerName: csiAttacherImageReference,
common.CSILivenessProbeContainerName: csiLivenessProbeImageReference,
common.CSINodeDriverRegistrarContainerName: csiNodeDriverRegistrarImageReference,
common.CSIAzureDiskContainerName: csiAzureDiskImageReference,
common.CSIProvisionerContainerName: "oss/kubernetes-csi/csi-provisioner:v3.0.0",
common.CSIAttacherContainerName: "oss/kubernetes-csi/csi-attacher:v3.3.0",
common.CSILivenessProbeContainerName: "oss/kubernetes-csi/livenessprobe:v2.5.0",
common.CSINodeDriverRegistrarContainerName: "oss/kubernetes-csi/csi-node-driver-registrar:v2.4.0",
common.CSIAzureDiskContainerName: "oss/kubernetes-csi/azuredisk-csi:v1.10.0",
common.CSIAzureFileContainerName: csiAzureFileImageReference,
common.CalicoTyphaComponentName: calicoTyphaImageReference,
common.CalicoCNIComponentName: calicoCNIImageReference,
Expand Down
Loading