Merge pull request #287 from gianlucam76/sveltoscluster

Fix TokenRequestRenewalOption field
projectsveltos · Apr 11, 2024 · 1dd0438 · 1dd0438
2 parents 614be6c + 99a3a30
commit 1dd0438
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 12 deletions.
diff --git a/api/v1alpha1/sveltoscluster_type.go b/api/v1alpha1/sveltoscluster_type.go
@@ -26,8 +26,7 @@ const (
 
 type TokenRequestRenewalOption struct {
 	// RenewTokenRequestInterval is the interval at which to renew the TokenRequest
-	// +optional
-	RenewTokenRequestInterval *metav1.Duration `json:"renewTokenRequestInterval,omitempty"`
+	RenewTokenRequestInterval metav1.Duration `json:"renewTokenRequestInterval"`
 }
 
 // SveltosClusterSpec defines the desired state of SveltosCluster
@@ -46,7 +45,7 @@ type SveltosClusterSpec struct {
 
 	// TokenRequestRenewalOption contains options describing how to renew TokenRequest
 	// +optional
-	TokenRequestRenewalOption *metav1.Duration `json:"tokenRequestRenewalOption,omitempty"`
+	TokenRequestRenewalOption *TokenRequestRenewalOption `json:"tokenRequestRenewalOption,omitempty"`
 }
 
 // SveltosClusterStatus defines the status of SveltosCluster

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/lib.projectsveltos.io_sveltosclusters.yaml b/config/crd/bases/lib.projectsveltos.io_sveltosclusters.yaml
@@ -65,7 +65,14 @@ spec:
               tokenRequestRenewalOption:
                 description: TokenRequestRenewalOption contains options describing
                   how to renew TokenRequest
-                type: string
+                properties:
+                  renewTokenRequestInterval:
+                    description: RenewTokenRequestInterval is the interval at which
+                      to renew the TokenRequest
+                    type: string
+                required:
+                - renewTokenRequestInterval
+                type: object
             type: object
           status:
             description: SveltosClusterStatus defines the status of SveltosCluster

diff --git a/lib/crd/sveltosclusters.go b/lib/crd/sveltosclusters.go
@@ -84,7 +84,14 @@ spec:
               tokenRequestRenewalOption:
                 description: TokenRequestRenewalOption contains options describing
                   how to renew TokenRequest
-                type: string
+                properties:
+                  renewTokenRequestInterval:
+                    description: RenewTokenRequestInterval is the interval at which
+                      to renew the TokenRequest
+                    type: string
+                required:
+                - renewTokenRequestInterval
+                type: object
             type: object
           status:
             description: SveltosClusterStatus defines the status of SveltosCluster