make csi-hostpath-snapshotclass.yaml first. Or kubernetes will return the error, because this CR is deleted befor deleting volumesnapshotclass CRD

pull/10798/head
Kent Iso 2021-03-16 01:25:32 +09:00
parent 788e910073
commit ed8885d27e
1 changed files with 7 additions and 5 deletions

View File

@ -518,6 +518,13 @@ var Addons = map[string]*Addon{
"GCPAuthWebhook": "gcr.io", "GCPAuthWebhook": "gcr.io",
}), }),
"volumesnapshots": NewAddon([]*BinAsset{ "volumesnapshots": NewAddon([]*BinAsset{
// make sure the order of apply. `csi-hostpath-snapshotclass` must be the first position, because it depends on `snapshot.storage.k8s.io_volumesnapshotclasses`
// if user disable volumesnapshots addon and delete `csi-hostpath-snapshotclass` after `snapshot.storage.k8s.io_volumesnapshotclasses`, kubernetes will return the error
MustBinAsset(
"deploy/addons/volumesnapshots/csi-hostpath-snapshotclass.yaml.tmpl",
vmpath.GuestAddonsDir,
"csi-hostpath-snapshotclass.yaml",
"0640"),
MustBinAsset( MustBinAsset(
"deploy/addons/volumesnapshots/snapshot.storage.k8s.io_volumesnapshotclasses.yaml.tmpl", "deploy/addons/volumesnapshots/snapshot.storage.k8s.io_volumesnapshotclasses.yaml.tmpl",
vmpath.GuestAddonsDir, vmpath.GuestAddonsDir,
@ -533,11 +540,6 @@ var Addons = map[string]*Addon{
vmpath.GuestAddonsDir, vmpath.GuestAddonsDir,
"snapshot.storage.k8s.io_volumesnapshots.yaml", "snapshot.storage.k8s.io_volumesnapshots.yaml",
"0640"), "0640"),
MustBinAsset(
"deploy/addons/volumesnapshots/csi-hostpath-snapshotclass.yaml.tmpl",
vmpath.GuestAddonsDir,
"csi-hostpath-snapshotclass.yaml",
"0640"),
MustBinAsset( MustBinAsset(
"deploy/addons/volumesnapshots/rbac-volume-snapshot-controller.yaml.tmpl", "deploy/addons/volumesnapshots/rbac-volume-snapshot-controller.yaml.tmpl",
vmpath.GuestAddonsDir, vmpath.GuestAddonsDir,