Skip to content

Commit

Permalink
Support Kubernetes 1.31: Update azure and digital ocean (#3365)
Browse files Browse the repository at this point in the history 
* update azure and digital ocean

* update azure ccm

* update azure ccm
  • Loading branch information
@mohamed-rafraf
mohamed-rafraf authored Aug 30, 2024
1 parent db49dbf commit e50a6b1
Show file tree
Hide file tree
Showing 3 changed files with 98 additions and 29 deletions.
36 changes: 36 additions & 0 deletions addons/csi-azuredisk/csi-azuredisk.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ rules:
- list
- watch
- create
- patch
- delete
- apiGroups:
- ""
Expand Down Expand Up @@ -500,6 +501,10 @@ spec:
requests:
cpu: 10m
memory: 20Mi
securityContext:
capabilities:
drop:
- ALL
volumeMounts:
- mountPath: /csi
name: socket-dir
Expand All @@ -523,6 +528,10 @@ spec:
requests:
cpu: 10m
memory: 20Mi
securityContext:
capabilities:
drop:
- ALL
volumeMounts:
- mountPath: /csi
name: socket-dir
Expand All @@ -543,6 +552,10 @@ spec:
requests:
cpu: 10m
memory: 20Mi
securityContext:
capabilities:
drop:
- ALL
volumeMounts:
- mountPath: /csi
name: socket-dir
Expand All @@ -565,6 +578,10 @@ spec:
requests:
cpu: 10m
memory: 20Mi
securityContext:
capabilities:
drop:
- ALL
volumeMounts:
- mountPath: /csi
name: socket-dir
Expand All @@ -581,6 +598,10 @@ spec:
requests:
cpu: 10m
memory: 20Mi
securityContext:
capabilities:
drop:
- ALL
volumeMounts:
- mountPath: /csi
name: socket-dir
Expand Down Expand Up @@ -633,6 +654,10 @@ spec:
requests:
cpu: 10m
memory: 20Mi
securityContext:
capabilities:
drop:
- ALL
volumeMounts:
- mountPath: /csi
name: socket-dir
Expand Down Expand Up @@ -713,6 +738,10 @@ spec:
requests:
cpu: 10m
memory: 20Mi
securityContext:
capabilities:
drop:
- ALL
volumeMounts:
- mountPath: /csi
name: socket-dir
Expand Down Expand Up @@ -741,6 +770,10 @@ spec:
requests:
cpu: 10m
memory: 20Mi
securityContext:
capabilities:
drop:
- ALL
volumeMounts:
- mountPath: /csi
name: socket-dir
Expand Down Expand Up @@ -796,6 +829,9 @@ spec:
cpu: 10m
memory: 20Mi
securityContext:
capabilities:
drop:
- ALL
privileged: true
volumeMounts:
- mountPath: /csi
Expand Down
45 changes: 38 additions & 7 deletions addons/csi-azurefile/ccm-azurefile.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ metadata:
rules:
- apiGroups: [""]
resources: ["persistentvolumes"]
verbs: ["get", "list", "watch", "create", "delete"]
verbs: ["get", "list", "watch", "create", "patch", "delete"]
- apiGroups: [""]
resources: ["persistentvolumeclaims"]
verbs: ["get", "list", "watch", "update"]
Expand Down Expand Up @@ -410,6 +410,10 @@ spec:
requests:
cpu: 10m
memory: 20Mi
securityContext:
capabilities:
drop:
- ALL
- name: node-driver-registrar
image: {{ .InternalImages.Get "AzureFileCSINodeDriverRegistar" }}
args:
Expand Down Expand Up @@ -441,6 +445,10 @@ spec:
requests:
cpu: 10m
memory: 20Mi
securityContext:
capabilities:
drop:
- ALL
- name: azurefile
image: {{ .InternalImages.Get "AzureFileCSI" }}
args:
Expand Down Expand Up @@ -487,6 +495,9 @@ spec:
imagePullPolicy: IfNotPresent
securityContext:
privileged: true
capabilities:
drop:
- ALL
volumeMounts:
- mountPath: /csi
name: socket-dir
Expand Down Expand Up @@ -579,7 +590,7 @@ spec:
operator: Exists
containers:
- name: csi-provisioner
image: "{{ .InternalImages.Get "AzureFileCSIProvisioner" }}"
image: {{ .InternalImages.Get "AzureFileCSIProvisioner" }}
args:
- "-v=2"
- "--csi-address=$(ADDRESS)"
Expand All @@ -604,8 +615,12 @@ spec:
requests:
cpu: 10m
memory: 20Mi
securityContext:
capabilities:
drop:
- ALL
- name: csi-snapshotter
image: "{{ .InternalImages.Get "AzureFileCSISnapshotter" }}"
image: {{ .InternalImages.Get "AzureFileCSISnapshotter" }}
args:
- "-csi-address=$(ADDRESS)"
- "-leader-election"
Expand All @@ -624,8 +639,12 @@ spec:
requests:
cpu: 10m
memory: 20Mi
securityContext:
capabilities:
drop:
- ALL
- name: csi-resizer
image: "{{ .InternalImages.Get "AzureFileCSIResizer" }}"
image: {{ .InternalImages.Get "AzureFileCSIResizer" }}
args:
- "-csi-address=$(ADDRESS)"
- "-v=2"
Expand All @@ -648,8 +667,12 @@ spec:
requests:
cpu: 10m
memory: 20Mi
securityContext:
capabilities:
drop:
- ALL
- name: liveness-probe
image: "{{ .InternalImages.Get "AzureFileCSILivenessProbe" }}"
image: {{ .InternalImages.Get "AzureFileCSILivenessProbe" }}
args:
- --csi-address=/csi/csi.sock
- --probe-timeout=3s
Expand All @@ -666,8 +689,12 @@ spec:
requests:
cpu: 10m
memory: 20Mi
securityContext:
capabilities:
drop:
- ALL
- name: azurefile
image: "{{ .InternalImages.Get "AzureFileCSI" }}"
image: {{ .InternalImages.Get "AzureFileCSI" }}
args:
- "--v=5"
- "--endpoint=$(CSI_ENDPOINT)"
Expand Down Expand Up @@ -718,6 +745,10 @@ spec:
requests:
cpu: 10m
memory: 20Mi
securityContext:
capabilities:
drop:
- ALL
volumes:
- name: socket-dir
emptyDir: {}
Expand All @@ -743,7 +774,7 @@ metadata:
helm.sh/chart: azurefile-csi-driver-v1.30.2
annotations:
csiDriver: "v1.30.2"
snapshot: "v7.0.2"
snapshot: "v8.0.1"
spec:
attachRequired: false
podInfoOnMount: true
Expand Down
46 changes: 24 additions & 22 deletions pkg/templates/images/images.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -242,45 +242,47 @@ func optionalResources() map[Resource]map[string]string {

// Azure CCM
AzureCCM: {
"1.27.x": "mcr.microsoft.com/oss/kubernetes/azure-cloud-controller-manager:v1.27.16",
"1.28.x": "mcr.microsoft.com/oss/kubernetes/azure-cloud-controller-manager:v1.28.8",
"1.29.x": "mcr.microsoft.com/oss/kubernetes/azure-cloud-controller-manager:v1.29.3",
">= 1.30.0": "mcr.microsoft.com/oss/kubernetes/azure-cloud-controller-manager:v1.30.3",
"1.27.x": "mcr.microsoft.com/oss/kubernetes/azure-cloud-controller-manager:v1.27.20",
"1.28.x": "mcr.microsoft.com/oss/kubernetes/azure-cloud-controller-manager:v1.28.12",
"1.29.x": "mcr.microsoft.com/oss/kubernetes/azure-cloud-controller-manager:v1.29.10",
"1.30.x": "mcr.microsoft.com/oss/kubernetes/azure-cloud-controller-manager:v1.30.6",
">= 1.31.0": "mcr.microsoft.com/oss/kubernetes/azure-cloud-controller-manager:v1.31.0",
},
AzureCNM: {
"1.27.x": "mcr.microsoft.com/oss/kubernetes/azure-cloud-node-manager:v1.27.16",
"1.28.x": "mcr.microsoft.com/oss/kubernetes/azure-cloud-node-manager:v1.28.8",
"1.29.x": "mcr.microsoft.com/oss/kubernetes/azure-cloud-node-manager:v1.29.3",
">= 1.30.0": "mcr.microsoft.com/oss/kubernetes/azure-cloud-node-manager:v1.30.3",
"1.27.x": "mcr.microsoft.com/oss/kubernetes/azure-cloud-node-manager:v1.27.20",
"1.28.x": "mcr.microsoft.com/oss/kubernetes/azure-cloud-node-manager:v1.28.12",
"1.29.x": "mcr.microsoft.com/oss/kubernetes/azure-cloud-node-manager:v1.29.10",
"1.30.x": "mcr.microsoft.com/oss/kubernetes/azure-cloud-node-manager:v1.30.6",
">= 1.31.0": "mcr.microsoft.com/oss/kubernetes/azure-cloud-node-manager:v1.31.0",
},

// AzureFile CSI driver
AzureFileCSI: {"*": "mcr.microsoft.com/oss/kubernetes-csi/azurefile-csi:v1.30.2"},
AzureFileCSILivenessProbe: {"*": "mcr.microsoft.com/oss/kubernetes-csi/livenessprobe:v2.12.0"},
AzureFileCSINodeDriverRegistar: {"*": "mcr.microsoft.com/oss/kubernetes-csi/csi-node-driver-registrar:v2.10.1"},
AzureFileCSIProvisioner: {"*": "mcr.microsoft.com/oss/kubernetes-csi/csi-provisioner:v4.0.1"},
AzureFileCSI: {"*": "mcr.microsoft.com/oss/kubernetes-csi/azurefile-csi:v1.30.5"},
AzureFileCSILivenessProbe: {"*": "mcr.microsoft.com/oss/kubernetes-csi/livenessprobe:v2.13.1"},
AzureFileCSINodeDriverRegistar: {"*": "mcr.microsoft.com/oss/kubernetes-csi/csi-node-driver-registrar:v2.12.0"},
AzureFileCSIProvisioner: {"*": "mcr.microsoft.com/oss/kubernetes-csi/csi-provisioner:v5.1.0"},
AzureFileCSIResizer: {"*": "mcr.microsoft.com/oss/kubernetes-csi/csi-resizer:v1.10.1"},
AzureFileCSISnapshotter: {"*": "registry.k8s.io/sig-storage/csi-snapshotter:v8.0.1"}, // use non-MCR image until 8.x is mirrored in MCR

// AzureDisk CSI driver
AzureDiskCSI: {"*": "mcr.microsoft.com/oss/kubernetes-csi/azuredisk-csi:v1.30.1"},
AzureDiskCSIAttacher: {"*": "mcr.microsoft.com/oss/kubernetes-csi/csi-attacher:v4.5.1"},
AzureDiskCSILivenessProbe: {"*": "mcr.microsoft.com/oss/kubernetes-csi/livenessprobe:v2.12.0"},
AzureDiskCSINodeDriverRegistar: {"*": "mcr.microsoft.com/oss/kubernetes-csi/csi-node-driver-registrar:v2.10.1"},
AzureDiskCSIProvisioner: {"*": "mcr.microsoft.com/oss/kubernetes-csi/csi-provisioner:v4.0.1"},
AzureDiskCSIAttacher: {"*": "mcr.microsoft.com/oss/kubernetes-csi/csi-attacher:v4.6.1"},
AzureDiskCSILivenessProbe: {"*": "mcr.microsoft.com/oss/kubernetes-csi/livenessprobe:v2.13.1"},
AzureDiskCSINodeDriverRegistar: {"*": "mcr.microsoft.com/oss/kubernetes-csi/csi-node-driver-registrar:v2.12.0"},
AzureDiskCSIProvisioner: {"*": "mcr.microsoft.com/oss/kubernetes-csi/csi-provisioner:v5.1.0"},
AzureDiskCSIResizer: {"*": "mcr.microsoft.com/oss/kubernetes-csi/csi-resizer:v1.10.1"},
AzureDiskCSISnapshotter: {"*": "registry.k8s.io/sig-storage/csi-snapshotter:v8.0.1"}, // use non-MCR image until 8.x is mirrored in MCR

// DigitalOcean CCM
DigitaloceanCCM: {"*": "docker.io/digitalocean/digitalocean-cloud-controller-manager:v0.1.53"},
DigitaloceanCCM: {"*": "docker.io/digitalocean/digitalocean-cloud-controller-manager:v0.1.56"},

// DigitalOcean CSI
DigitalOceanCSI: {"*": "digitalocean/do-csi-plugin:v4.10.0"},
DigitalOceanCSI: {"*": "digitalocean/do-csi-plugin:v4.12.0"},
DigitalOceanCSIAlpine: {"*": "docker.io/alpine:3"},
DigitalOceanCSIAttacher: {"*": "registry.k8s.io/sig-storage/csi-attacher:v4.5.1"},
DigitalOceanCSINodeDriverRegistar: {"*": "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1"},
DigitalOceanCSIProvisioner: {"*": "registry.k8s.io/sig-storage/csi-provisioner:v4.0.1"},
DigitalOceanCSIResizer: {"*": "registry.k8s.io/sig-storage/csi-resizer:v1.10.1"},
DigitalOceanCSIAttacher: {"*": "registry.k8s.io/sig-storage/csi-attacher:v4.7.0"},
DigitalOceanCSINodeDriverRegistar: {"*": "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.12.0"},
DigitalOceanCSIProvisioner: {"*": "registry.k8s.io/sig-storage/csi-provisioner:v5.1.0"},
DigitalOceanCSIResizer: {"*": "registry.k8s.io/sig-storage/csi-resizer:v1.12.0"},
DigitalOceanCSISnapshotter: {"*": "registry.k8s.io/sig-storage/csi-snapshotter:v8.0.1"},

// Hetzner CCM
Expand Down

0 comments on commit e50a6b1

Please sign in to comment.