diff --git a/Makefile b/Makefile index f6bf1294..b942deb8 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ # To re-generate a bundle for another specific version without changing the standard setup, you can: # - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2) # - use environment variables to overwrite this value (e.g export VERSION=0.0.2) -VERSION ?= 0.0.24 +VERSION ?= 0.0.25 # CHANNELS define the bundle channels used in the bundle. # Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable") diff --git a/chart/Chart.yaml b/chart/Chart.yaml index 19f982c0..154ed781 100644 --- a/chart/Chart.yaml +++ b/chart/Chart.yaml @@ -10,7 +10,7 @@ version: 0.1.3 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "v0.0.24" +appVersion: "v0.0.25" dependencies: - name: common repository: https://charts.bitnami.com/bitnami diff --git a/controllers/uffizzicluster_controller.go b/controllers/uffizzicluster_controller.go index fa9ae078..7ed05e73 100644 --- a/controllers/uffizzicluster_controller.go +++ b/controllers/uffizzicluster_controller.go @@ -374,6 +374,9 @@ func (r *UffizziClusterReconciler) createVClusterHelmRelease(ctx context.Context PersistentVolumes: VClusterSyncPersistentVolumes{ Enabled: true, }, + PersistentVolumeClaims: VClusterSyncPersistentVolumeClaims{ + Enabled: true, + }, }, } @@ -383,6 +386,7 @@ func (r *UffizziClusterReconciler) createVClusterHelmRelease(ctx context.Context if uCluster.Spec.Storage.SyncFromManifests != nil { uClusterHelmValues.Sync.PersistentVolumes.Enabled = *uCluster.Spec.Storage.SyncFromManifests + uClusterHelmValues.Sync.PersistentVolumeClaims.Enabled = *uCluster.Spec.Storage.SyncFromManifests uClusterHelmValues.Sync.StorageClasses.Enabled = *uCluster.Spec.Storage.SyncFromManifests } diff --git a/controllers/vcluster.go b/controllers/vcluster.go index bfea1ed1..5a2ccda2 100644 --- a/controllers/vcluster.go +++ b/controllers/vcluster.go @@ -29,9 +29,10 @@ type VClusterSyncer struct { } type VClusterSync struct { - Ingresses VClusterSyncIngresses `json:"ingresses,omitempty"` - PersistentVolumes VClusterSyncPersistentVolumes `json:"persistentvolumes,omitempty"` - StorageClasses VClusterSyncStorageClasses `json:"storageclasses,omitempty"` + Ingresses VClusterSyncIngresses `json:"ingresses,omitempty"` + PersistentVolumes VClusterSyncPersistentVolumes `json:"persistentvolumes,omitempty"` + PersistentVolumeClaims VClusterSyncPersistentVolumeClaims `json:"persistentvolumeclaims,omitempty"` + StorageClasses VClusterSyncStorageClasses `json:"storageclasses,omitempty"` } type VClusterSyncIngresses struct { @@ -42,6 +43,10 @@ type VClusterSyncPersistentVolumes struct { Enabled bool `json:"enabled"` } +type VClusterSyncPersistentVolumeClaims struct { + Enabled bool `json:"enabled"` +} + type VClusterSyncStorageClasses struct { Enabled bool `json:"enabled"` }