Support new API version for ClientIntents: v2beta1 (#552)

src/operator/api/v1alpha2/clientintents_webhook.go

@@ -80,7 +80,7 @@ func convertTopicsV1alpha2toV1alpha3(srcTopics []KafkaTopic) []v1alpha3.KafkaTop
 	return dstTopics
 }
 
-// ConvertFrom converts the Hub version (v2alpha1) to this ClientIntents.
+// ConvertFrom converts the Hub version (v2beta1) to this ClientIntents.
 func (in *ClientIntents) ConvertFrom(srcRaw conversion.Hub) error {
 	src := &v1alpha3.ClientIntents{}
 	if err := src.ConvertFrom(srcRaw); err != nil {

src/operator/api/v1alpha2/kafkaserverconfig_types.go

@@ -17,7 +17,7 @@ limitations under the License.
 package v1alpha2
 
 import (
-	"github.com/otterize/intents-operator/src/operator/api/v2alpha1"
+	"github.com/otterize/intents-operator/src/operator/api/v2beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/conversion"
 )
@@ -96,21 +96,21 @@ func init() {
 
 // ConvertTo converts this ProtectedService to the Hub version (v1alpha3).
 func (ksc *KafkaServerConfig) ConvertTo(dstRaw conversion.Hub) error {
-	dst := dstRaw.(*v2alpha1.KafkaServerConfig)
+	dst := dstRaw.(*v2beta1.KafkaServerConfig)
 	dst.ObjectMeta = ksc.ObjectMeta
-	dst.Spec = v2alpha1.KafkaServerConfigSpec{}
+	dst.Spec = v2beta1.KafkaServerConfigSpec{}
 	dst.Spec.Addr = ksc.Spec.Addr
-	dst.Spec.Workload = v2alpha1.Workload{Name: ksc.Spec.Service.Name}
+	dst.Spec.Workload = v2beta1.Workload{Name: ksc.Spec.Service.Name}
 	dst.Spec.NoAutoCreateIntentsForOperator = ksc.Spec.NoAutoCreateIntentsForOperator
-	dst.Spec.TLS = v2alpha1.TLSSource{
+	dst.Spec.TLS = v2beta1.TLSSource{
 		CertFile:   ksc.Spec.TLS.CertFile,
 		KeyFile:    ksc.Spec.TLS.KeyFile,
 		RootCAFile: ksc.Spec.TLS.RootCAFile,
 	}
 	for _, topic := range ksc.Spec.Topics {
-		dst.Spec.Topics = append(dst.Spec.Topics, v2alpha1.TopicConfig{
+		dst.Spec.Topics = append(dst.Spec.Topics, v2beta1.TopicConfig{
 			Topic:                  topic.Topic,
-			Pattern:                v2alpha1.ResourcePatternType(topic.Pattern), // this casting is fine as v1alpha2 == v1alpha3
+			Pattern:                v2beta1.ResourcePatternType(topic.Pattern), // this casting is fine as v1alpha2 == v1alpha3
 			ClientIdentityRequired: topic.ClientIdentityRequired,
 			IntentsRequired:        topic.IntentsRequired,
 		})
@@ -120,7 +120,7 @@ func (ksc *KafkaServerConfig) ConvertTo(dstRaw conversion.Hub) error {
 
 // ConvertFrom converts the Hub version (v1alpha3) to this KafkaServerConfig.
 func (ksc *KafkaServerConfig) ConvertFrom(srcRaw conversion.Hub) error {
-	src := srcRaw.(*v2alpha1.KafkaServerConfig)
+	src := srcRaw.(*v2beta1.KafkaServerConfig)
 	ksc.ObjectMeta = src.ObjectMeta
 	ksc.Spec = KafkaServerConfigSpec{}
 	ksc.Spec.Addr = src.Spec.Addr

src/operator/api/v1alpha3/webhooks_test.go

@@ -1,7 +1,7 @@
 package v1alpha3
 
 import (
-	"github.com/otterize/intents-operator/src/operator/api/v2alpha1"
+	"github.com/otterize/intents-operator/src/operator/api/v2beta1"
 	"github.com/stretchr/testify/suite"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"testing"
@@ -34,7 +34,7 @@ func (t *WebhooksTestSuite) TestMySQLServerConfigConversion() {
 	}
 
 	// ConvertTo
-	dstRaw := &v2alpha1.MySQLServerConfig{}
+	dstRaw := &v2beta1.MySQLServerConfig{}
 	err := original.ConvertTo(dstRaw)
 	t.Require().NoError(err)
 
@@ -71,7 +71,7 @@ func (t *WebhooksTestSuite) TestPostgreSQLServerConfigConversion() {
 	}
 
 	// ConvertTo
-	dstRaw := &v2alpha1.PostgreSQLServerConfig{}
+	dstRaw := &v2beta1.PostgreSQLServerConfig{}
 	err := original.ConvertTo(dstRaw)
 	t.Require().NoError(err)
 
@@ -107,7 +107,7 @@ func (t *WebhooksTestSuite) TestKafkaServerConfigConversion() {
 	}
 
 	// ConvertTo
-	dstRaw := &v2alpha1.KafkaServerConfig{}
+	dstRaw := &v2beta1.KafkaServerConfig{}
 	err := original.ConvertTo(dstRaw)
 	t.Require().NoError(err)
 
@@ -134,7 +134,7 @@ func (t *WebhooksTestSuite) TestProtectedServiceConversion() {
 	}
 
 	// ConvertTo
-	dstRaw := &v2alpha1.ProtectedService{}
+	dstRaw := &v2beta1.ProtectedService{}
 	err := original.ConvertTo(dstRaw)
 	t.Require().NoError(err)
 
@@ -176,7 +176,7 @@ func (t *WebhooksTestSuite) TestClientIntentsKubernetes() {
 		}}
 
 	// ConvertTo
-	dstRaw := &v2alpha1.ClientIntents{}
+	dstRaw := &v2beta1.ClientIntents{}
 	err := original.ConvertTo(dstRaw)
 	t.Require().NoError(err)
 
@@ -190,12 +190,12 @@ func (t *WebhooksTestSuite) TestClientIntentsKubernetes() {
 }
 
 func (t *WebhooksTestSuite) TestClientIntentsFromV2_serviceKubernetesDefault() {
-	// Create a v2alpha1.ClientIntents with random data
-	original := &v2alpha1.ClientIntents{
-		Spec: &v2alpha1.IntentsSpec{
-			Targets: []v2alpha1.Target{
+	// Create a v2beta1.ClientIntents with random data
+	original := &v2beta1.ClientIntents{
+		Spec: &v2beta1.IntentsSpec{
+			Targets: []v2beta1.Target{
 				{
-					Service: &v2alpha1.ServiceTarget{
+					Service: &v2beta1.ServiceTarget{
 						Name: "kubernetes.default",
 					},
 				},
@@ -211,20 +211,20 @@ func (t *WebhooksTestSuite) TestClientIntentsFromV2_serviceKubernetesDefault() {
 }
 
 func (t *WebhooksTestSuite) TestClientIntentsFromV2_EmptySliceHTTPShouldNotBeTypeHTTP() {
-	// Create a v2alpha1.ClientIntents with random data
-	original := &v2alpha1.ClientIntents{
-		Spec: &v2alpha1.IntentsSpec{
-			Targets: []v2alpha1.Target{
+	// Create a v2beta1.ClientIntents with random data
+	original := &v2beta1.ClientIntents{
+		Spec: &v2beta1.IntentsSpec{
+			Targets: []v2beta1.Target{
 				{
-					Service: &v2alpha1.ServiceTarget{
+					Service: &v2beta1.ServiceTarget{
 						Name: "test",
-						HTTP: []v2alpha1.HTTPTarget{},
+						HTTP: []v2beta1.HTTPTarget{},
 					},
 				},
 				{
-					Kubernetes: &v2alpha1.KubernetesTarget{
+					Kubernetes: &v2beta1.KubernetesTarget{
 						Name: "test2",
-						HTTP: []v2alpha1.HTTPTarget{},
+						HTTP: []v2beta1.HTTPTarget{},
 					},
 				},
 			},