fix: remove vcluster json marshalling for storage

UffizziCloud · Jul 14, 2023 · 2ee127f · 2ee127f
1 parent ba5b0a1
commit 2ee127f
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 28 deletions.
diff --git 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.35
+VERSION ?= 0.0.36
 
 # 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/api/v1alpha1/uffizzicluster_types.go b/api/v1alpha1/uffizzicluster_types.go
@@ -68,12 +68,6 @@ type UffizziClusterIngress struct {
 	Services          []ExposedVClusterService `json:"services,omitempty"`
 }
 
-type UffizziClusterStorageSync struct {
-	PersistentVolumes      bool `json:"persistentVolumes,omitempty"`
-	StorageClasses         bool `json:"storageClasses,omitempty"`
-	PersistentVolumeClaims bool `json:"persistentVolumeClaims,omitempty"`
-}
-
 // UffizziClusterSpec defines the desired state of UffizziCluster
 type UffizziClusterSpec struct {
 	Ingress   UffizziClusterIngress `json:"ingress,omitempty"`

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/chart/Chart.yaml b/chart/Chart.yaml
@@ -10,7 +10,7 @@ version: 0.1.4
 # 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.35"
+appVersion: "v0.0.36"
 dependencies:
   - name: common
     repository: https://charts.bitnami.com/bitnami

diff --git a/chart/values.yaml b/chart/values.yaml
@@ -4,7 +4,7 @@
 
 image:
   repository: docker.io/uffizzi/uffizzi-cluster-operator
-  tag: latest
+  tag: v0.0.36
 
 # `flux` dependency values
 flux:

diff --git a/controllers/vcluster.go b/controllers/vcluster.go
@@ -29,10 +29,7 @@ type VClusterSyncer struct {
 }
 
 type VClusterSync struct {
-	Ingresses              EnabledBool `json:"ingresses,omitempty"`
-	PersistentVolumes      EnabledBool `json:"persistentvolumes,omitempty"`
-	PersistentVolumeClaims EnabledBool `json:"persistentvolumeclaims,omitempty"`
-	StorageClasses         EnabledBool `json:"storageclasses,omitempty"`
+	Ingresses EnabledBool `json:"ingresses,omitempty"`
 }
 
 type EnabledBool struct {