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.

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

Update Azure CCM, AzureDisk CSI driver to v1.21.0, and AzureFile CSI driver to v1.20.0 #2172

Merged
merged 4 commits into from
Jul 25, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion addons/csi-azuredisk/csi-azuredisk-driver.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ kind: CSIDriver
metadata:
name: disk.csi.azure.com
annotations:
csiDriver: v1.18.0
csiDriver: v1.20.0
snapshot: v5.0.1
spec:
attachRequired: true
Expand Down
2 changes: 1 addition & 1 deletion addons/csi-azuredisk/rbac-csi-azuredisk-node.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@ subjects:
namespace: kube-system
roleRef:
kind: ClusterRole
name: csi-azuredisk-node-secret-role
name: csi-azuredisk-node-secret-role # IMMUTABLE - do not change, requires migration
apiGroup: rbac.authorization.k8s.io
2 changes: 1 addition & 1 deletion addons/csi-azurefile/csi-azurefile-driver.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ kind: CSIDriver
metadata:
name: file.csi.azure.com
annotations:
csiDriver: v1.18.0
csiDriver: v1.20.0
snapshot: v5.0.1
spec:
attachRequired: false
Expand Down
2 changes: 1 addition & 1 deletion addons/csi-azurefile/csi-azurefile-node.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ spec:
name: device-dir
resources:
limits:
memory: 300Mi
memory: 400Mi
requests:
cpu: 10m
memory: 20Mi
Expand Down
40 changes: 20 additions & 20 deletions pkg/templates/images/images.go
Original file line number Diff line number Diff line change
Expand Up @@ -243,17 +243,17 @@ func optionalResources() map[Resource]map[string]string {
// Azure CCM
AzureCCM: {
"1.20.x": "mcr.microsoft.com/oss/kubernetes/azure-cloud-controller-manager:v0.7.21",
"1.21.x": "mcr.microsoft.com/oss/kubernetes/azure-cloud-controller-manager:v1.0.18",
"1.22.x": "mcr.microsoft.com/oss/kubernetes/azure-cloud-controller-manager:v1.1.14",
"1.23.x": "mcr.microsoft.com/oss/kubernetes/azure-cloud-controller-manager:v1.23.11",
">= 1.24.0": "mcr.microsoft.com/oss/kubernetes/azure-cloud-controller-manager:v1.24.0",
"1.21.x": "mcr.microsoft.com/oss/kubernetes/azure-cloud-controller-manager:v1.0.22",
"1.22.x": "mcr.microsoft.com/oss/kubernetes/azure-cloud-controller-manager:v1.1.18",
"1.23.x": "mcr.microsoft.com/oss/kubernetes/azure-cloud-controller-manager:v1.23.15",
">= 1.24.0": "mcr.microsoft.com/oss/kubernetes/azure-cloud-controller-manager:v1.24.3",
},
AzureCNM: {
"1.20.x": "mcr.microsoft.com/oss/kubernetes/azure-cloud-node-manager:v0.7.21",
"1.21.x": "mcr.microsoft.com/oss/kubernetes/azure-cloud-node-manager:v1.0.18",
"1.22.x": "mcr.microsoft.com/oss/kubernetes/azure-cloud-node-manager:v1.1.14",
"1.23.x": "mcr.microsoft.com/oss/kubernetes/azure-cloud-node-manager:v1.23.11",
">= 1.24.0": "mcr.microsoft.com/oss/kubernetes/azure-cloud-node-manager:v1.24.0",
"1.21.x": "mcr.microsoft.com/oss/kubernetes/azure-cloud-node-manager:v1.0.22",
"1.22.x": "mcr.microsoft.com/oss/kubernetes/azure-cloud-node-manager:v1.1.18",
"1.23.x": "mcr.microsoft.com/oss/kubernetes/azure-cloud-node-manager:v1.23.15",
">= 1.24.0": "mcr.microsoft.com/oss/kubernetes/azure-cloud-node-manager:v1.24.3",
},

// AWS EBS CSI driver
Expand All @@ -267,22 +267,22 @@ func optionalResources() map[Resource]map[string]string {
AwsEbsCSISnapshotController: {"*": "k8s.gcr.io/sig-storage/snapshot-controller:v6.0.1"},

// AzureFile CSI driver
AzureFileCSI: {"*": "mcr.microsoft.com/k8s/csi/azurefile-csi:v1.18.0"},
AzureFileCSIAttacher: {"*": "mcr.microsoft.com/oss/kubernetes-csi/csi-attacher:v3.4.0"},
AzureFileCSILivenessProbe: {"*": "mcr.microsoft.com/oss/kubernetes-csi/livenessprobe:v2.6.0"},
AzureFileCSINodeDriverRegistar: {"*": "mcr.microsoft.com/oss/kubernetes-csi/csi-node-driver-registrar:v2.5.0"},
AzureFileCSIProvisioner: {"*": "mcr.microsoft.com/oss/kubernetes-csi/csi-provisioner:v3.1.0"},
AzureFileCSIResizer: {"*": "mcr.microsoft.com/oss/kubernetes-csi/csi-resizer:v1.4.0"},
AzureFileCSI: {"*": "mcr.microsoft.com/oss/kubernetes-csi/azurefile-csi:v1.20.0"},
AzureFileCSIAttacher: {"*": "mcr.microsoft.com/oss/kubernetes-csi/csi-attacher:v3.5.0"},
AzureFileCSILivenessProbe: {"*": "mcr.microsoft.com/oss/kubernetes-csi/livenessprobe:v2.7.0"},
AzureFileCSINodeDriverRegistar: {"*": "mcr.microsoft.com/oss/kubernetes-csi/csi-node-driver-registrar:v2.5.1"},
AzureFileCSIProvisioner: {"*": "mcr.microsoft.com/oss/kubernetes-csi/csi-provisioner:v3.2.0"},
AzureFileCSIResizer: {"*": "mcr.microsoft.com/oss/kubernetes-csi/csi-resizer:v1.5.0"},
AzureFileCSISnapshotter: {"*": "mcr.microsoft.com/oss/kubernetes-csi/csi-snapshotter:v5.0.1"},
AzureFileCSISnapshotterController: {"*": "mcr.microsoft.com/oss/kubernetes-csi/snapshot-controller:v5.0.1"},

// AzureDisk CSI driver
AzureDiskCSI: {"*": "mcr.microsoft.com/k8s/csi/azuredisk-csi:v1.18.0"},
AzureDiskCSIAttacher: {"*": "mcr.microsoft.com/oss/kubernetes-csi/csi-attacher:v3.4.0"},
AzureDiskCSILivenessProbe: {"*": "mcr.microsoft.com/oss/kubernetes-csi/livenessprobe:v2.6.0"},
AzureDiskCSINodeDriverRegistar: {"*": "mcr.microsoft.com/oss/kubernetes-csi/csi-node-driver-registrar:v2.5.0"},
AzureDiskCSIProvisioner: {"*": "mcr.microsoft.com/oss/kubernetes-csi/csi-provisioner:v3.1.0"},
AzureDiskCSIResizer: {"*": "mcr.microsoft.com/oss/kubernetes-csi/csi-resizer:v1.4.0"},
AzureDiskCSI: {"*": "mcr.microsoft.com/oss/kubernetes-csi/azuredisk-csi:v1.21.0"},
AzureDiskCSIAttacher: {"*": "mcr.microsoft.com/oss/kubernetes-csi/csi-attacher:v3.5.0"},
AzureDiskCSILivenessProbe: {"*": "mcr.microsoft.com/oss/kubernetes-csi/livenessprobe:v2.7.0"},
AzureDiskCSINodeDriverRegistar: {"*": "mcr.microsoft.com/oss/kubernetes-csi/csi-node-driver-registrar:v2.5.1"},
AzureDiskCSIProvisioner: {"*": "mcr.microsoft.com/oss/kubernetes-csi/csi-provisioner:v3.2.0"},
AzureDiskCSIResizer: {"*": "mcr.microsoft.com/oss/kubernetes-csi/csi-resizer:v1.5.0"},
AzureDiskCSISnapshotter: {"*": "mcr.microsoft.com/oss/kubernetes-csi/csi-snapshotter:v5.0.1"},
AzureDiskCSISnapshotterController: {"*": "mcr.microsoft.com/oss/kubernetes-csi/snapshot-controller:v5.0.1"},

Expand Down