Use Strimzi v1 APIs

Signed-off-by: Jakub Scholz <www@scholzj.com>

Author: scholzj

cmd/continue.go

@@ -50,7 +50,7 @@ var continueCmd = &cobra.Command{
 			log.Fatalf("Failed to create Strimzi client: %v", err)
 		}
 
-		kafka, err := strimzi.KafkaV1beta2().Kafkas(namespace).Get(context.TODO(), name, metav1.GetOptions{})
+		kafka, err := strimzi.KafkaV1().Kafkas(namespace).Get(context.TODO(), name, metav1.GetOptions{})
 		if err != nil {
 			log.Fatalf("Kafka cluster %v in namespace %s not found: %v", name, namespace, err)
 		}
@@ -66,7 +66,7 @@ var continueCmd = &cobra.Command{
 			}
 
 			log.Printf("Unpausing reconciliation of Kafka cluster %s in namespace %s", name, namespace)
-			_, err = strimzi.KafkaV1beta2().Kafkas(namespace).Update(context.TODO(), unpausedKafka, metav1.UpdateOptions{})
+			_, err = strimzi.KafkaV1().Kafkas(namespace).Update(context.TODO(), unpausedKafka, metav1.UpdateOptions{})
 			if err != nil {
 				log.Fatalf("failed to unpause Kafka cluster %s in namespace %s: %v", name, namespace, err)
 			}

cmd/stop.go

@@ -21,7 +21,7 @@ import (
 	"slices"
 	"sync"
 
-	kafkaapi "github.com/scholzj/strimzi-go/pkg/apis/kafka.strimzi.io/v1beta2"
+	kafkaapi "github.com/scholzj/strimzi-go/pkg/apis/kafka.strimzi.io/v1"
 	"github.com/spf13/cobra"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
@@ -59,7 +59,7 @@ var stopCmd = &cobra.Command{
 			log.Fatalf("Failed to create Strimzi client: %v", err)
 		}
 
-		kafka, err := strimzi.KafkaV1beta2().Kafkas(namespace).Get(context.TODO(), name, metav1.GetOptions{})
+		kafka, err := strimzi.KafkaV1().Kafkas(namespace).Get(context.TODO(), name, metav1.GetOptions{})
 		if err != nil {
 			log.Fatalf("Kafka cluster %v in namespace %s not found: %v", name, namespace, err)
 		}
@@ -73,7 +73,7 @@ var stopCmd = &cobra.Command{
 			}
 
 			log.Printf("Pausing reconciliation of Kafka cluster %s in namespace %s", name, namespace)
-			_, err = strimzi.KafkaV1beta2().Kafkas(namespace).Update(context.TODO(), pausedKafka, metav1.UpdateOptions{})
+			_, err = strimzi.KafkaV1().Kafkas(namespace).Update(context.TODO(), pausedKafka, metav1.UpdateOptions{})
 			if err != nil {
 				log.Fatalf("failed to pause Kafka cluster %s in namespace %s: %v", name, namespace, err)
 			}
@@ -127,7 +127,7 @@ var stopCmd = &cobra.Command{
 		// Wait for deployment deletions to complete
 		deploymentWg.Wait()
 
-		nodePools, err := strimzi.KafkaV1beta2().KafkaNodePools(namespace).List(context.TODO(), metav1.ListOptions{LabelSelector: "strimzi.io/cluster=" + name})
+		nodePools, err := strimzi.KafkaV1().KafkaNodePools(namespace).List(context.TODO(), metav1.ListOptions{LabelSelector: "strimzi.io/cluster=" + name})
 		if err != nil {
 			log.Fatalf("failed to get KafkaNodePools belonging to Kafka cluster %s in namespace %s: %v", name, namespace, err)
 		}

cmd/utils.go

@@ -18,7 +18,7 @@ package cmd
 import (
 	"context"
 	"fmt"
-	kafkaapi "github.com/scholzj/strimzi-go/pkg/apis/kafka.strimzi.io/v1beta2"
+	kafkaapi "github.com/scholzj/strimzi-go/pkg/apis/kafka.strimzi.io/v1"
 	strimzi "github.com/scholzj/strimzi-go/pkg/client/clientset/versioned"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -126,7 +126,7 @@ func waitUntilReady(client *strimzi.Clientset, name string, namespace string, ti
 	watchContext, watchContextCancel := context.WithTimeout(context.Background(), time.Millisecond*time.Duration(timeout))
 	defer watchContextCancel()
 
-	watcher, err := client.KafkaV1beta2().Kafkas(namespace).Watch(watchContext, metav1.ListOptions{FieldSelector: fields.OneTermEqualSelector(metav1.ObjectNameField, name).String()})
+	watcher, err := client.KafkaV1().Kafkas(namespace).Watch(watchContext, metav1.ListOptions{FieldSelector: fields.OneTermEqualSelector(metav1.ObjectNameField, name).String()})
 	if err != nil {
 		panic(err)
 	}
@@ -168,7 +168,7 @@ func waitUntilReconciliationPaused(client *strimzi.Clientset, name string, names
 	watchContext, watchContextCancel := context.WithTimeout(context.Background(), time.Millisecond*time.Duration(timeout))
 	defer watchContextCancel()
 
-	watcher, err := client.KafkaV1beta2().Kafkas(namespace).Watch(watchContext, metav1.ListOptions{FieldSelector: fields.OneTermEqualSelector(metav1.ObjectNameField, name).String()})
+	watcher, err := client.KafkaV1().Kafkas(namespace).Watch(watchContext, metav1.ListOptions{FieldSelector: fields.OneTermEqualSelector(metav1.ObjectNameField, name).String()})
 	if err != nil {
 		panic(err)
 	}
@@ -210,7 +210,7 @@ func deletePodSet(kube *kubernetes.Clientset, strimzi *strimzi.Clientset, cluste
 
 	propagationPolicy := metav1.DeletePropagationForeground
 
-	err := strimzi.CoreV1beta2().StrimziPodSets(namespace).Delete(context.TODO(), podSetName, metav1.DeleteOptions{PropagationPolicy: &propagationPolicy})
+	err := strimzi.CoreV1().StrimziPodSets(namespace).Delete(context.TODO(), podSetName, metav1.DeleteOptions{PropagationPolicy: &propagationPolicy})
 	if err != nil && !errors.IsNotFound(err) {
 		return fmt.Errorf("failed to delete StrimziPodset %s in namespace %s: %v", podSetName, namespace, err)
 	} else if errors.IsNotFound(err) {