Change timeout type from time.Duration to metav1.Duration (#6709)

aws · Sep 21, 2023 · 3f055fc · 3f055fc
1 parent d7f7813
commit 3f055fc
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 11 deletions.
diff --git a/config/crd/bases/anywhere.eks.amazonaws.com_clusters.yaml b/config/crd/bases/anywhere.eks.amazonaws.com_clusters.yaml
@@ -248,8 +248,7 @@ spec:
                               timeout:
                                 description: Timeout for kube-apiserver to wait for
                                   KMS plugin. Default is 3s.
-                                format: int64
-                                type: integer
+                                type: string
                             required:
                             - name
                             - socketListenAddress

diff --git a/config/manifest/eksa-components.yaml b/config/manifest/eksa-components.yaml
@@ -3884,8 +3884,7 @@ spec:
                               timeout:
                                 description: Timeout for kube-apiserver to wait for
                                   KMS plugin. Default is 3s.
-                                format: int64
-                                type: integer
+                                type: string
                             required:
                             - name
                             - socketListenAddress

diff --git a/pkg/api/v1alpha1/etcdencryption.go b/pkg/api/v1alpha1/etcdencryption.go
@@ -5,13 +5,14 @@ import (
 	"time"
 
 	"github.com/pkg/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	"github.com/aws/eks-anywhere/pkg/utils/ptr"
 )
 
 var (
 	defaultKMSCacheSize = ptr.Int32(1000)
-	defaultKMSTimeout   = time.Second * 3
+	defaultKMSTimeout   = metav1.Duration{Duration: time.Second * 3}
 )
 
 // ValidateEtcdEncryptionConfig validates the etcd encryption configuration.

diff --git a/pkg/api/v1alpha1/etcdencryption_types.go b/pkg/api/v1alpha1/etcdencryption_types.go
@@ -1,8 +1,6 @@
 package v1alpha1
 
-import (
-	"time"
-)
+import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 // EtcdEncryption defines the configuration for ETCD encryption.
 type EtcdEncryption struct {
@@ -28,5 +26,5 @@ type KMS struct {
 	// SocketListenAddress defines a UNIX socket address that the KMS provider listens on.
 	SocketListenAddress string `json:"socketListenAddress"`
 	// Timeout for kube-apiserver to wait for KMS plugin. Default is 3s.
-	Timeout *time.Duration `json:"timeout,omitempty"`
+	Timeout *metav1.Duration `json:"timeout,omitempty"`
 }
diff --git a/pkg/api/v1alpha1/zz_generated.deepcopy.go b/pkg/api/v1alpha1/zz_generated.deepcopy.go