Merge pull request #126 from weaveworks/make-v2beta1-unserved

Ahmed El-Sayed · web-flow · commit a30a6c3344e6 · 2022-11-09T13:51:57.000+02:00
support backward compatibility for policy version v2beta1
diff --git a/api/v2beta1/policy_types.go b/api/v2beta1/policy_types.go
@@ -122,7 +122,6 @@ type PolicySetSpec struct {
 	Filters PolicySetFilters `json:"filters"`
 }
 
-//+kubebuilder:unservedversion
 //+kubebuilder:object:root=true
 //+kubebuilder:resource:scope=Cluster
 
@@ -156,7 +155,6 @@ type PolicySet struct {
 	Spec PolicySetSpec `json:"spec,omitempty"`
 }
 
-//+kubebuilder:unservedversion
 //+kubebuilder:object:root=true
 //+kubebuilder:resource:scope=Cluster
 
diff --git a/helm/crds/pac.weave.works_policies.yaml b/helm/crds/pac.weave.works_policies.yaml
@@ -291,7 +291,7 @@ spec:
             - severity
             type: object
         type: object
-    served: false
+    served: true
     storage: false
   - additionalPrinterColumns:
     - jsonPath: .spec.severity

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,6 @@ type PolicySetSpec struct {`
`122`	`122`	Filters PolicySetFilters `json:"filters"`
`123`	`123`	`}`
`124`	`124`
`125`		`-//+kubebuilder:unservedversion`
`126`	`125`	`//+kubebuilder:object:root=true`
`127`	`126`	`//+kubebuilder:resource:scope=Cluster`
`128`	`127`
`@@ -156,7 +155,6 @@ type PolicySet struct {`
`156`	`155`	Spec PolicySetSpec `json:"spec,omitempty"`
`157`	`156`	`}`
`158`	`157`
`159`		`-//+kubebuilder:unservedversion`
`160`	`158`	`//+kubebuilder:object:root=true`
`161`	`159`	`//+kubebuilder:resource:scope=Cluster`
`162`	`160`