integrations/operator: add multi-version support in crdgen

examples/chart/teleport-cluster/charts/teleport-operator/templates/resources.teleport.dev_accesslists.yaml

@@ -201,6 +201,7 @@ spec:
                 type: string
             type: object
           status:
+            description: Status defines the observed state of the Teleport resource
             properties:
               conditions:
                 description: Conditions represent the latest available observations

examples/chart/teleport-cluster/charts/teleport-operator/templates/resources.teleport.dev_githubconnectors.yaml

@@ -78,8 +78,7 @@ spec:
                 type: array
             type: object
           status:
-            description: TeleportGithubConnectorStatus defines the observed state
-              of TeleportGithubConnector
+            description: Status defines the observed state of the Teleport resource
             properties:
               conditions:
                 description: Conditions represent the latest available observations

examples/chart/teleport-cluster/charts/teleport-operator/templates/resources.teleport.dev_loginrules.yaml

@@ -57,6 +57,7 @@ spec:
                 type: object
             type: object
           status:
+            description: Status defines the observed state of the Teleport resource
             properties:
               conditions:
                 description: Conditions represent the latest available observations

examples/chart/teleport-cluster/charts/teleport-operator/templates/resources.teleport.dev_oidcconnectors.yaml

@@ -123,8 +123,7 @@ spec:
                 type: string
             type: object
           status:
-            description: TeleportOIDCConnectorStatus defines the observed state of
-              TeleportOIDCConnector
+            description: Status defines the observed state of the Teleport resource
             properties:
               conditions:
                 description: Conditions represent the latest available observations

examples/chart/teleport-cluster/charts/teleport-operator/templates/resources.teleport.dev_oktaimportrules.yaml

@@ -95,6 +95,7 @@ spec:
                 type: integer
             type: object
           status:
+            description: Status defines the observed state of the Teleport resource
             properties:
               conditions:
                 description: Conditions represent the latest available observations

examples/chart/teleport-cluster/charts/teleport-operator/templates/resources.teleport.dev_provisiontokens.yaml

@@ -330,8 +330,7 @@ spec:
                 type: object
             type: object
           status:
-            description: TeleportProvisionTokenStatus defines the observed state of
-              TeleportProvisionToken
+            description: Status defines the observed state of the Teleport resource
             properties:
               conditions:
                 description: Conditions represent the latest available observations

examples/chart/teleport-cluster/charts/teleport-operator/templates/resources.teleport.dev_samlconnectors.yaml

@@ -120,8 +120,7 @@ spec:
                 type: string
             type: object
           status:
-            description: TeleportSAMLConnectorStatus defines the observed state of
-              TeleportSAMLConnector
+            description: Status defines the observed state of the Teleport resource
             properties:
               conditions:
                 description: Conditions represent the latest available observations

examples/chart/teleport-cluster/charts/teleport-operator/templates/resources.teleport.dev_users.yaml

@@ -106,7 +106,7 @@ spec:
                 type: array
             type: object
           status:
-            description: TeleportUserStatus defines the observed state of TeleportUser
+            description: Status defines the observed state of the Teleport resource
             properties:
               conditions:
                 description: Conditions represent the latest available observations

integrations/operator/apis/resources/status.go

@@ -0,0 +1,41 @@
+/*
+ * Teleport
+ * Copyright (C) 2023  Gravitational, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package resources
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+// Status defines the observed state of the Teleport resource
+type Status struct {
+	// Conditions represent the latest available observations of an object's state
+	// +optional
+	Conditions []metav1.Condition `json:"conditions"`
+	// +optional
+	TeleportResourceID int64 `json:"teleportResourceID"`
+}
+
+// DeepCopyInto deep-copies one resource status into another.
+// Required to satisfy runtime.Object interface.
+func (status *Status) DeepCopyInto(out *Status) {
+	*out = Status{}
+	out.Conditions = make([]metav1.Condition, len(status.Conditions))
+	copy(out.Conditions, status.Conditions)
+	out.TeleportResourceID = status.TeleportResourceID
+}

integrations/operator/apis/resources/v1/accesslist_types.go

@@ -37,21 +37,13 @@ type TeleportAccessList struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	Spec   TeleportAccessListSpec   `json:"spec,omitempty"`
-	Status TeleportAccessListStatus `json:"status,omitempty"`
+	Spec   TeleportAccessListSpec `json:"spec,omitempty"`
+	Status resources.Status       `json:"status,omitempty"`
 }
 
 // TeleportAccessListSpec defines the desired state of TeleportProvisionToken
 type TeleportAccessListSpec accesslist.Spec
 
-type TeleportAccessListStatus struct {
-	// Conditions represent the latest available observations of an object's state
-	// +optional
-	Conditions []metav1.Condition `json:"conditions,omitempty"`
-	// +optional
-	TeleportResourceID int64 `json:"teleportResourceID,omitempty"`
-}
-
 //+kubebuilder:object:root=true
 
 // TeleportAccessListList contains a list of TeleportAccessList

integrations/operator/apis/resources/v1/loginrule_types.go

@@ -39,8 +39,8 @@ type TeleportLoginRule struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	Spec   TeleportLoginRuleSpec   `json:"spec,omitempty"`
-	Status TeleportLoginRuleStatus `json:"status,omitempty"`
+	Spec   TeleportLoginRuleSpec `json:"spec,omitempty"`
+	Status resources.Status      `json:"status,omitempty"`
 }
 
 // TeleportLoginRuleSpec matches the JSON of generated CRD spec
@@ -51,14 +51,6 @@ type TeleportLoginRuleSpec struct {
 	TraitsMap        map[string][]string `json:"traits_map,omitempty"`
 }
 
-type TeleportLoginRuleStatus struct {
-	// Conditions represent the latest available observations of an object's state
-	// +optional
-	Conditions []metav1.Condition `json:"conditions,omitempty"`
-	// +optional
-	TeleportResourceID int64 `json:"teleportResourceID,omitempty"`
-}
-
 //+kubebuilder:object:root=true
 
 // TeleportLoginRuleList contains a list of TeleportLoginRule

integrations/operator/apis/resources/v1/okta_import_rule.go

@@ -38,8 +38,8 @@ type TeleportOktaImportRule struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	Spec   TeleportOktaImportRuleSpec   `json:"spec,omitempty"`
-	Status TeleportOktaImportRuleStatus `json:"status,omitempty"`
+	Spec   TeleportOktaImportRuleSpec `json:"spec,omitempty"`
+	Status resources.Status           `json:"status,omitempty"`
 }
 
 // TeleportOktaImportRuleSpec matches the JSON of generated CRD spec
@@ -71,14 +71,6 @@ type TeleportOktaImportRuleList struct {
 	Items           []TeleportOktaImportRule `json:"items"`
 }
 
-type TeleportOktaImportRuleStatus struct {
-	// Conditions represent the latest available observations of an object's state
-	// +optional
-	Conditions []metav1.Condition `json:"conditions,omitempty"`
-	// +optional
-	TeleportResourceID int64 `json:"teleportResourceID,omitempty"`
-}
-
 // ToTeleport returns an OktaImportRule, which wraps the actual
 // [types.OktaImportRuleV1] and implements the necessary interface methods used
 // by the TeleportResourceReconciler.

integrations/operator/apis/resources/v2/provisiontoken_types.go

@@ -32,15 +32,6 @@ func init() {
 // TeleportProvisionTokenSpec defines the desired state of TeleportProvisionToken
 type TeleportProvisionTokenSpec types.ProvisionTokenSpecV2
 
-// TeleportProvisionTokenStatus defines the observed state of TeleportProvisionToken
-type TeleportProvisionTokenStatus struct {
-	// Conditions represent the latest available observations of an object's state
-	// +optional
-	Conditions []metav1.Condition `json:"conditions,omitempty"`
-	// +optional
-	TeleportResourceID int64 `json:"teleportResourceID,omitempty"`
-}
-
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
 
@@ -49,8 +40,8 @@ type TeleportProvisionToken struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	Spec   TeleportProvisionTokenSpec   `json:"spec,omitempty"`
-	Status TeleportProvisionTokenStatus `json:"status,omitempty"`
+	Spec   TeleportProvisionTokenSpec `json:"spec,omitempty"`
+	Status resources.Status           `json:"status,omitempty"`
 }
 
 //+kubebuilder:object:root=true

integrations/operator/apis/resources/v2/samlconnector_types.go

@@ -32,15 +32,6 @@ func init() {
 // TeleportSAMLConnectorSpec defines the desired state of TeleportSAMLConnector
 type TeleportSAMLConnectorSpec types.SAMLConnectorSpecV2
 
-// TeleportSAMLConnectorStatus defines the observed state of TeleportSAMLConnector
-type TeleportSAMLConnectorStatus struct {
-	// Conditions represent the latest available observations of an object's state
-	// +optional
-	Conditions []metav1.Condition `json:"conditions,omitempty"`
-	// +optional
-	TeleportResourceID int64 `json:"teleportResourceID,omitempty"`
-}
-
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
 
@@ -49,8 +40,8 @@ type TeleportSAMLConnector struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	Spec   TeleportSAMLConnectorSpec   `json:"spec,omitempty"`
-	Status TeleportSAMLConnectorStatus `json:"status,omitempty"`
+	Spec   TeleportSAMLConnectorSpec `json:"spec,omitempty"`
+	Status resources.Status          `json:"status,omitempty"`
 }
 
 //+kubebuilder:object:root=true

integrations/operator/apis/resources/v2/user_types.go

@@ -32,15 +32,6 @@ func init() {
 // TeleportUserSpec defines the desired state of TeleportUser
 type TeleportUserSpec types.UserSpecV2
 
-// TeleportUserStatus defines the observed state of TeleportUser
-type TeleportUserStatus struct {
-	// Conditions represent the latest available observations of an object's state
-	// +optional
-	Conditions []metav1.Condition `json:"conditions,omitempty"`
-	// +optional
-	TeleportResourceID int64 `json:"teleportResourceID,omitempty"`
-}
-
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
 
@@ -49,8 +40,8 @@ type TeleportUser struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	Spec   TeleportUserSpec   `json:"spec,omitempty"`
-	Status TeleportUserStatus `json:"status,omitempty"`
+	Spec   TeleportUserSpec `json:"spec,omitempty"`
+	Status resources.Status `json:"status,omitempty"`
 }
 
 //+kubebuilder:object:root=true