diff --git a/api/v1alpha1/tenantcontrolplane_status.go b/api/v1alpha1/tenantcontrolplane_status.go index 477174f..1432395 100644 --- a/api/v1alpha1/tenantcontrolplane_status.go +++ b/api/v1alpha1/tenantcontrolplane_status.go @@ -16,31 +16,34 @@ import ( type APIServerCertificatesStatus struct { SecretName string `json:"secretName,omitempty"` LastUpdate metav1.Time `json:"lastUpdate,omitempty"` + Checksum string `json:"checksum,omitempty"` } // ETCDCertificateStatus defines the observed state of ETCD Certificate for API server. type ETCDCertificateStatus struct { SecretName string `json:"secretName,omitempty"` LastUpdate metav1.Time `json:"lastUpdate,omitempty"` + Checksum string `json:"checksum,omitempty"` } // ETCDCertificatesStatus defines the observed state of ETCD Certificate for API server. type ETCDCertificatesStatus struct { - APIServer ETCDCertificateStatus `json:"apiServer,omitempty"` - CA ETCDCertificateStatus `json:"ca,omitempty"` + APIServer APIServerCertificatesStatus `json:"apiServer,omitempty"` + CA ETCDCertificateStatus `json:"ca,omitempty"` } // CertificatePrivateKeyPairStatus defines the status. type CertificatePrivateKeyPairStatus struct { - SecretName string `json:"secretName,omitempty"` - LastUpdate metav1.Time `json:"lastUpdate,omitempty"` - ResourceVersion string `json:"resourceVersion,omitempty"` + SecretName string `json:"secretName,omitempty"` + LastUpdate metav1.Time `json:"lastUpdate,omitempty"` + Checksum string `json:"checksum,omitempty"` } // PublicKeyPrivateKeyPairStatus defines the status. type PublicKeyPrivateKeyPairStatus struct { SecretName string `json:"secretName,omitempty"` LastUpdate metav1.Time `json:"lastUpdate,omitempty"` + Checksum string `json:"checksum,omitempty"` } // CertificatesStatus defines the observed state of ETCD Certificates. @@ -129,22 +132,26 @@ type KubeadmPhasesStatus struct { type ExternalKubernetesObjectStatus struct { Name string `json:"name,omitempty"` Namespace string `json:"namespace,omitempty"` - // Resource version of k8s object - RV string `json:"resourceVersion,omitempty"` + Checksum string `json:"checksum,omitempty"` // Last time when k8s object was updated LastUpdate metav1.Time `json:"lastUpdate,omitempty"` } // KonnectivityStatus defines the status of Konnectivity as Addon. type KonnectivityStatus struct { - Enabled bool `json:"enabled"` - EgressSelectorConfiguration string `json:"egressSelectorConfiguration,omitempty"` - Certificate CertificatePrivateKeyPairStatus `json:"certificate,omitempty"` - Kubeconfig KubeconfigStatus `json:"kubeconfig,omitempty"` - ServiceAccount ExternalKubernetesObjectStatus `json:"sa,omitempty"` - ClusterRoleBinding ExternalKubernetesObjectStatus `json:"clusterrolebinding,omitempty"` - Agent ExternalKubernetesObjectStatus `json:"agent,omitempty"` - Service KubernetesServiceStatus `json:"service,omitempty"` + Enabled bool `json:"enabled"` + ConfigMap KonnectivityConfigMap `json:"configMap,omitempty"` + Certificate CertificatePrivateKeyPairStatus `json:"certificate,omitempty"` + Kubeconfig KubeconfigStatus `json:"kubeconfig,omitempty"` + ServiceAccount ExternalKubernetesObjectStatus `json:"sa,omitempty"` + ClusterRoleBinding ExternalKubernetesObjectStatus `json:"clusterrolebinding,omitempty"` + Agent ExternalKubernetesObjectStatus `json:"agent,omitempty"` + Service KubernetesServiceStatus `json:"service,omitempty"` +} + +type KonnectivityConfigMap struct { + Name string `json:"name,omitempty"` + Checksum string `json:"checksum,omitempty"` } // AddonStatus defines the observed state of an Addon. diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go index 7cee047..67f4eeb 100644 --- a/api/v1alpha1/zz_generated.deepcopy.go +++ b/api/v1alpha1/zz_generated.deepcopy.go @@ -407,6 +407,21 @@ func (in *KineStatus) DeepCopy() *KineStatus { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *KonnectivityConfigMap) DeepCopyInto(out *KonnectivityConfigMap) { + *out = *in +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KonnectivityConfigMap. +func (in *KonnectivityConfigMap) DeepCopy() *KonnectivityConfigMap { + if in == nil { + return nil + } + out := new(KonnectivityConfigMap) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *KonnectivitySpec) DeepCopyInto(out *KonnectivitySpec) { *out = *in @@ -430,6 +445,7 @@ func (in *KonnectivitySpec) DeepCopy() *KonnectivitySpec { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *KonnectivityStatus) DeepCopyInto(out *KonnectivityStatus) { *out = *in + out.ConfigMap = in.ConfigMap in.Certificate.DeepCopyInto(&out.Certificate) in.Kubeconfig.DeepCopyInto(&out.Kubeconfig) in.ServiceAccount.DeepCopyInto(&out.ServiceAccount)