From ebdb24ce459cc0fbf8567a0ea4ce8078dbfde8ee Mon Sep 17 00:00:00 2001 From: Dario Tranchitella Date: Sat, 20 Aug 2022 11:32:13 +0200 Subject: [PATCH] feat(api)!: support for postgresql kine driver --- api/v1alpha1/tenantcontrolplane_status.go | 25 ++++++++++++----------- api/v1alpha1/zz_generated.deepcopy.go | 14 ++++++------- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/api/v1alpha1/tenantcontrolplane_status.go b/api/v1alpha1/tenantcontrolplane_status.go index 1a7a7be..477174f 100644 --- a/api/v1alpha1/tenantcontrolplane_status.go +++ b/api/v1alpha1/tenantcontrolplane_status.go @@ -61,24 +61,25 @@ type ETCDStatus struct { } type SQLCertificateStatus struct { - SecretName string `json:"secretName,omitempty"` - ResourceVersion string `json:"resourceVersion,omitempty"` - LastUpdate metav1.Time `json:"lastUpdate,omitempty"` + SecretName string `json:"secretName,omitempty"` + Checksum string `json:"checksum,omitempty"` + LastUpdate metav1.Time `json:"lastUpdate,omitempty"` } type SQLConfigStatus struct { - SecretName string `json:"secretName,omitempty"` - ResourceVersion string `json:"resourceVersion,omitempty"` + SecretName string `json:"secretName,omitempty"` + Checksum string `json:"checksum,omitempty"` } type SQLSetupStatus struct { - Schema string `json:"schema,omitempty"` - User string `json:"user,omitempty"` - LastUpdate metav1.Time `json:"lastUpdate,omitempty"` - SQLConfigResourceVersion string `json:"sqlConfigResourceVersion,omitempty"` + Schema string `json:"schema,omitempty"` + User string `json:"user,omitempty"` + LastUpdate metav1.Time `json:"lastUpdate,omitempty"` + Checksum string `json:"checksum,omitempty"` } -type KineMySQLStatus struct { +type KineStatus struct { + Driver string `json:"driver,omitempty"` Config SQLConfigStatus `json:"config,omitempty"` Setup SQLSetupStatus `json:"setup,omitempty"` Certificate SQLCertificateStatus `json:"certificate,omitempty"` @@ -86,8 +87,8 @@ type KineMySQLStatus struct { // StorageStatus defines the observed state of StorageStatus. type StorageStatus struct { - ETCD *ETCDStatus `json:"etcd,omitempty"` - KineMySQL *KineMySQLStatus `json:"kineMySQL,omitempty"` + ETCD *ETCDStatus `json:"etcd,omitempty"` + Kine *KineStatus `json:"kine,omitempty"` } // KubeconfigStatus contains information about the generated kubeconfig. diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go index a84ced8..7cee047 100644 --- a/api/v1alpha1/zz_generated.deepcopy.go +++ b/api/v1alpha1/zz_generated.deepcopy.go @@ -390,19 +390,19 @@ func (in *IngressSpec) DeepCopy() *IngressSpec { } // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *KineMySQLStatus) DeepCopyInto(out *KineMySQLStatus) { +func (in *KineStatus) DeepCopyInto(out *KineStatus) { *out = *in out.Config = in.Config in.Setup.DeepCopyInto(&out.Setup) in.Certificate.DeepCopyInto(&out.Certificate) } -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KineMySQLStatus. -func (in *KineMySQLStatus) DeepCopy() *KineMySQLStatus { +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KineStatus. +func (in *KineStatus) DeepCopy() *KineStatus { if in == nil { return nil } - out := new(KineMySQLStatus) + out := new(KineStatus) in.DeepCopyInto(out) return out } @@ -768,9 +768,9 @@ func (in *StorageStatus) DeepCopyInto(out *StorageStatus) { *out = new(ETCDStatus) (*in).DeepCopyInto(*out) } - if in.KineMySQL != nil { - in, out := &in.KineMySQL, &out.KineMySQL - *out = new(KineMySQLStatus) + if in.Kine != nil { + in, out := &in.Kine, &out.Kine + *out = new(KineStatus) (*in).DeepCopyInto(*out) } }