basic conversion

Author: programmer04

api/gateway-operator/v1beta1/controlplane_types.go

@@ -18,7 +18,9 @@ package v1beta1
 
 import (
 	"fmt"
+	"strings"
 
+	"github.com/samber/lo"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/conversion"
@@ -60,7 +62,7 @@ type ControlPlane struct {
 // +apireference:kgo:include
 type ControlPlaneList struct {
 	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
+	metav1.ListMeta `json:"metadata"`
 	Items           []ControlPlane `json:"items"`
 }
 
@@ -172,21 +174,124 @@ func (c *ControlPlane) GetExtensions() []commonv1alpha1.ExtensionRef {
 	return c.Spec.Extensions
 }
 
+func getFeatureGates(envs []corev1.EnvVar) ([]operatorv2alpha1.ControlPlaneFeatureGate, error) {
+	fg, _ := lo.Find(envs, func(fg corev1.EnvVar) bool {
+		return fg.Name == "CONTROLLER_FEATURE_GATES"
+	})
+
+	parts := strings.Split(fg.Value, ",")
+	featureGates := make([]operatorv2alpha1.ControlPlaneFeatureGate, 0, len(parts))
+	for _, part := range parts {
+		part = strings.TrimSpace(part)
+		if part == "" {
+			continue
+		}
+		parts := strings.Split(part, "=")
+		if len(parts) != 2 {
+			continue
+		}
+		key, value := strings.TrimSpace(parts[0]), strings.TrimSpace(parts[1])
+		if key == "" || value == "" {
+			continue
+		}
+		var state operatorv2alpha1.FeatureGateState
+		switch strings.ToLower(value) {
+		case "true":
+			state = operatorv2alpha1.FeatureGateStateEnabled
+		case "false":
+			state = operatorv2alpha1.FeatureGateStateDisabled
+		default:
+			return nil, fmt.Errorf("invalid value for feature gate %q: %q, expected 'true' or 'false'", key, value)
+		}
+		featureGates = append(featureGates, operatorv2alpha1.ControlPlaneFeatureGate{
+			Name:  key,
+			State: state,
+		})
+	}
+	return featureGates, nil
+}
+
+func getControllers(envs []corev1.EnvVar) ([]operatorv2alpha1.ControlPlaneController, error) { //nolint:unparam
+	controllersEnvs := lo.Filter(envs, func(env corev1.EnvVar, _ int) bool {
+		return strings.HasPrefix(env.Name, "CONTROLLER_") && strings.HasSuffix(env.Name, "_ENABLED")
+	})
+	_ = controllersEnvs
+	//TODO:
+	return nil, nil
+}
+
 // ConvertTo converts this ControlPlane (v1beta1) to the Hub version (v2alpha1).
 func (c *ControlPlane) ConvertTo(dstRaw conversion.Hub) error {
 	// Proper type ensured by Kubernetes machinery.
-	fmt.Println(">> Converting ControlPlane from v1beta1 to v2alpha1")
 	dst := dstRaw.(*operatorv2alpha1.ControlPlane)
-	_ = dst
+
+	dst.ObjectMeta = c.ObjectMeta
+
+	var (
+		fgs   []operatorv2alpha1.ControlPlaneFeatureGate
+		ctrls []operatorv2alpha1.ControlPlaneController
+	)
+	if pts := c.Spec.Deployment.PodTemplateSpec; pts != nil {
+		if len(pts.Spec.Containers) > 0 {
+			var err error
+			fgs, err = getFeatureGates(c.Spec.Deployment.PodTemplateSpec.Spec.Containers[0].Env)
+			if err != nil {
+				return err
+			}
+			ctrls, err = getControllers(c.Spec.Deployment.PodTemplateSpec.Spec.Containers[0].Env)
+			if err != nil {
+				return err
+			}
+		}
+	}
+
+	// Convert Spec
+	dst.Spec.ControlPlaneOptions = operatorv2alpha1.ControlPlaneOptions{
+		IngressClass:    c.Spec.IngressClass,
+		WatchNamespaces: c.Spec.WatchNamespaces,
+		FeatureGates:    fgs,
+		Controllers:     ctrls,
+	}
+	dst.Spec.Extensions = c.Spec.Extensions
+
+	if dp := lo.FromPtr(c.Spec.DataPlane); dp != "" {
+		dst.Spec.DataPlane = operatorv2alpha1.ControlPlaneDataPlaneTarget{
+			Type: operatorv2alpha1.ControlPlaneDataPlaneTargetRefType,
+			Ref: &operatorv2alpha1.ControlPlaneDataPlaneTargetRef{
+				Name: dp,
+			},
+		}
+	} else {
+		dst.Spec.DataPlane = operatorv2alpha1.ControlPlaneDataPlaneTarget{
+			Type: operatorv2alpha1.ControlPlaneDataPlaneTargetManagedByType,
+		}
+	}
+
+	// Convert Status
+	dst.Status.Conditions = c.Status.Conditions
 
 	return nil
 }
 
 // ConvertFrom converts from the Hub version (v2alpha1) to this version (v1beta1).
 func (c *ControlPlane) ConvertFrom(srcRaw conversion.Hub) error {
 	// Proper type ensured by Kubernetes machinery.
-	fmt.Println(">> Converting ControlPlane from v2alpha1 to v1beta1")
-	dst := srcRaw.(*operatorv2alpha1.ControlPlane)
-	_ = dst
+	src := srcRaw.(*operatorv2alpha1.ControlPlane)
+
+	c.ObjectMeta = src.ObjectMeta
+
+	// Convert Spec
+	c.Spec.IngressClass = src.Spec.IngressClass
+	c.Spec.WatchNamespaces = src.Spec.WatchNamespaces
+	c.Spec.Extensions = src.Spec.Extensions
+
+	// Convert DataPlane reference
+	if src.Spec.DataPlane.Type == operatorv2alpha1.ControlPlaneDataPlaneTargetRefType && src.Spec.DataPlane.Ref != nil {
+		c.Spec.DataPlane = &src.Spec.DataPlane.Ref.Name
+	}
+
+	// Convert Status
+	c.Status.Conditions = src.Status.Conditions
+
 	return nil
 }

api/gateway-operator/v2alpha1/controlplane_types.go

@@ -40,15 +40,15 @@ func init() {
 // +kong:channels=gateway-operator
 type ControlPlane struct {
 	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
+	metav1.ObjectMeta `json:"metadata"`
 
 	// Spec is the specification of the ControlPlane resource.
 	Spec ControlPlaneSpec `json:"spec,omitempty"`
 
 	// Status is the status of the ControlPlane resource.
 	//
 	// +optional
-	Status ControlPlaneStatus `json:"status,omitempty"`
+	Status ControlPlaneStatus `json:"status"`
 }
 
 // ControlPlaneList contains a list of ControlPlane
@@ -57,7 +57,7 @@ type ControlPlane struct {
 // +apireference:kgo:include
 type ControlPlaneList struct {
 	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
+	metav1.ListMeta `json:"metadata"`
 	Items           []ControlPlane `json:"items"`
 }
 

api/gateway-operator/v2alpha1/groupversion_info.go

@@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// Package v2alpha1 contains API Schema definitions for the gateway-operator.konghq.com v2alpha1 API group
 // +kubebuilder:object:generate=true
 // +groupName=gateway-operator.konghq.com
 package v2alpha1