From ddf338e0102e28d0d42fe6e39cde84e4ff04b92e Mon Sep 17 00:00:00 2001 From: wanyaoqi Date: Fri, 10 Jul 2020 19:21:36 +0800 Subject: [PATCH] fix set pvc name --- pkg/manager/component/baremetal.go | 2 +- pkg/manager/component/esxi.go | 3 +-- pkg/manager/component/influxdb.go | 2 +- pkg/manager/component/meter.go | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkg/manager/component/baremetal.go b/pkg/manager/component/baremetal.go index c734ba7f..04d24a26 100644 --- a/pkg/manager/component/baremetal.go +++ b/pkg/manager/component/baremetal.go @@ -142,7 +142,7 @@ func newBaremetalVolHelper(oc *v1alpha1.OnecloudCluster, optCfgMap string, compo Name: "opt", VolumeSource: corev1.VolumeSource{ PersistentVolumeClaim: &corev1.PersistentVolumeClaimVolumeSource{ - ClaimName: controller.NewClusterComponentName(oc.GetName(), v1alpha1.BaremetalAgentComponentType), + ClaimName: m.newPvcName(oc.GetName(), oc.Spec.BaremetalAgent.StorageClassName, v1alpha1.BaremetalAgentComponentType), ReadOnly: false, }, }, diff --git a/pkg/manager/component/esxi.go b/pkg/manager/component/esxi.go index 8c56bfff..df3486c9 100644 --- a/pkg/manager/component/esxi.go +++ b/pkg/manager/component/esxi.go @@ -23,7 +23,6 @@ import ( "yunion.io/x/onecloud-operator/pkg/apis/constants" "yunion.io/x/onecloud-operator/pkg/apis/onecloud/v1alpha1" - "yunion.io/x/onecloud-operator/pkg/controller" "yunion.io/x/onecloud-operator/pkg/manager" ) @@ -86,7 +85,7 @@ func (m *esxiManager) getDeployment(oc *v1alpha1.OnecloudCluster, cfg *v1alpha1. Name: "opt", VolumeSource: corev1.VolumeSource{ PersistentVolumeClaim: &corev1.PersistentVolumeClaimVolumeSource{ - ClaimName: controller.NewClusterComponentName(oc.GetName(), v1alpha1.EsxiAgentComponentType), + ClaimName: m.newPvcName(oc.GetName(), oc.Spec.EsxiAgent.StorageClassName, v1alpha1.EsxiAgentComponentType), ReadOnly: false, }, }, diff --git a/pkg/manager/component/influxdb.go b/pkg/manager/component/influxdb.go index a3ca3531..dcb78081 100644 --- a/pkg/manager/component/influxdb.go +++ b/pkg/manager/component/influxdb.go @@ -138,7 +138,7 @@ func (m *influxdbManager) getDeployment(oc *v1alpha1.OnecloudCluster, cfg *v1alp Name: "data", VolumeSource: corev1.VolumeSource{ PersistentVolumeClaim: &corev1.PersistentVolumeClaimVolumeSource{ - ClaimName: controller.NewClusterComponentName(oc.GetName(), v1alpha1.InfluxdbComponentType), + ClaimName: m.newPvcName(oc.GetName(), oc.Spec.Influxdb.StorageClassName, v1alpha1.InfluxdbComponentType), ReadOnly: false, }, }, diff --git a/pkg/manager/component/meter.go b/pkg/manager/component/meter.go index b5a081ce..6e9f1e80 100644 --- a/pkg/manager/component/meter.go +++ b/pkg/manager/component/meter.go @@ -111,7 +111,7 @@ func (m *meterManager) getDeployment(oc *v1alpha1.OnecloudCluster, cfg *v1alpha1 Name: "data", VolumeSource: corev1.VolumeSource{ PersistentVolumeClaim: &corev1.PersistentVolumeClaimVolumeSource{ - ClaimName: controller.NewClusterComponentName(oc.GetName(), v1alpha1.MeterComponentType), + ClaimName: m.newPvcName(oc.GetName(), oc.Spec.Meter.StorageClassName, v1alpha1.MeterComponentType), ReadOnly: false, }, },