v1 -> v1alpha

PROJECT

@@ -5,16 +5,16 @@ projectName: conduit-operator
 repo: github.com/conduitio/conduit-operator
 resources:
 - api:
-    crdVersion: v1
+    crdVersion: v1alpha
     namespaced: true
   controller: true
   domain: conduit.io
   group: operator
   kind: Conduit
-  path: github.com/conduitio/conduit-operator/api/v1
+  path: github.com/conduitio/conduit-operator/api/v1alpha
   version: v1
   webhooks:
     defaulting: true
     validation: true
-    webhookVersion: v1
+    webhookVersion: v1alpha
 version: "3"

api/v1/condition.go → api/v1alpha/condition.go

@@ -1,4 +1,4 @@
-package v1
+package v1alpha
 
 import (
 	"sort"

api/v1/condition_test.go → api/v1alpha/condition_test.go

@@ -1,4 +1,4 @@
-package v1
+package v1alpha
 
 import (
 	"testing"

api/v1/conduit_types.go → api/v1alpha/conduit_types.go

@@ -1,4 +1,4 @@
-package v1
+package v1alpha
 
 import (
 	"fmt"

api/v1/conduit_validator.go → api/v1alpha/conduit_validator.go

@@ -1,4 +1,4 @@
-package v1
+package v1alpha
 
 import (
 	"github.com/conduitio/conduit-operator/pkg/conduit"

api/v1/conduit_webhook.go → api/v1alpha/conduit_webhook.go

@@ -1,4 +1,4 @@
-package v1
+package v1alpha
 
 import (
 	"fmt"

api/v1/groupversion_info.go → api/v1alpha/groupversion_info.go

@@ -1,7 +1,7 @@
 // Package v1 contains API Schema definitions for the operator v1 API group
 // +kubebuilder:object:generate=true
 // +groupName=operator.conduit.io
-package v1
+package v1alpha
 
 import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -10,7 +10,7 @@ import (
 
 var (
 	// GroupVersion is group version used to register these objects
-	GroupVersion = schema.GroupVersion{Group: "operator.conduit.io", Version: "v1"}
+	GroupVersion = schema.GroupVersion{Group: "operator.conduit.io", Version: "v1alpha"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
 	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}

charts/conduit-operator/templates/crd.yaml

@@ -25,7 +25,7 @@ spec:
     singular: conduit
   scope: Namespaced
   versions:
-  - name: v1
+  - name: v1alpha
     schema:
       openAPIV3Schema:
         description: Conduit is the Schema for the conduits API

cmd/operator/main.go

@@ -18,7 +18,7 @@ import (
 	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 
-	v1 "github.com/conduitio/conduit-operator/api/v1"
+	v1alpha "github.com/conduitio/conduit-operator/api/v1alpha"
 	"github.com/conduitio/conduit-operator/controllers"
 	//+kubebuilder:scaffold:imports
 )
@@ -30,7 +30,7 @@ var (
 
 func init() {
 	utilruntime.Must(clientgoscheme.AddToScheme(scheme))
-	utilruntime.Must(v1.AddToScheme(scheme))
+	utilruntime.Must(v1alpha.AddToScheme(scheme))
 	//+kubebuilder:scaffold:scheme
 }
 
@@ -87,7 +87,7 @@ func main() {
 	}).SetupWithManager(mgr); err != nil {
 		fatal(err, "unable to create controller", "controller", "Conduit")
 	}
-	if err = (&v1.Conduit{}).SetupWebhookWithManager(mgr); err != nil {
+	if err = (&v1alpha.Conduit{}).SetupWebhookWithManager(mgr); err != nil {
 		fatal(err, "unable to create webhook", "webhook", "Conduit")
 	}
 	//+kubebuilder:scaffold:builder
@@ -110,8 +110,8 @@ func fatal(err error, msg string, kv ...any) {
 	os.Exit(1)
 }
 
-func readMetadata(file string) (*v1.ConduitInstanceMetadata, error) {
-	c := v1.ConduitInstanceMetadata{
+func readMetadata(file string) (*v1alpha.ConduitInstanceMetadata, error) {
+	c := v1alpha.ConduitInstanceMetadata{
 		PodAnnotations: make(map[string]string),
 		Labels:         make(map[string]string),
 	}

config/crd/bases/operator.conduit.io_conduits.yaml

@@ -14,7 +14,7 @@ spec:
     singular: conduit
   scope: Namespaced
   versions:
-  - name: v1
+  - name: v1alpha
     schema:
       openAPIV3Schema:
         description: Conduit is the Schema for the conduits API

controllers/conduit_config.go

@@ -8,7 +8,7 @@ import (
 
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	v1 "github.com/conduitio/conduit-operator/api/v1"
+	v1alpha "github.com/conduitio/conduit-operator/api/v1alpha"
 	cyaml "github.com/conduitio/conduit/pkg/provisioning/config/yaml/v2"
 	"github.com/conduitio/yaml/v3"
 	corev1 "k8s.io/api/core/v1"
@@ -18,7 +18,7 @@ const pipelineConfigVersion = "2.0"
 
 // PipelineConfigYAML produces a conduit pipeline configuration in YAML.
 // Invalid configuration will result in a marshalling error.
-func PipelineConfigYAML(ctx context.Context, client client.Client, conduit *v1.Conduit) (string, error) {
+func PipelineConfigYAML(ctx context.Context, client client.Client, conduit *v1alpha.Conduit) (string, error) {
 	var (
 		spec           = conduit.Spec
 		pipelineStatus = "stopped"
@@ -70,7 +70,7 @@ func PipelineConfigYAML(ctx context.Context, client client.Client, conduit *v1.C
 
 // EnvVars returns a slice of EnvVar with all connector settings.
 // Only secrets are put into environment variables.
-func EnvVars(c *v1.Conduit) []corev1.EnvVar {
+func EnvVars(c *v1alpha.Conduit) []corev1.EnvVar {
 	var envVars []corev1.EnvVar
 	for _, cc := range c.Spec.Connectors {
 		for _, v := range cc.Settings {
@@ -92,7 +92,7 @@ func EnvVars(c *v1.Conduit) []corev1.EnvVar {
 
 // settingsWithEnvVars converts settings to a map, every secret key
 // reference is converted to env var reference.
-func settingsWithEnvVars(ctx context.Context, client client.Client, s []v1.SettingsVar) (map[string]string, error) {
+func settingsWithEnvVars(ctx context.Context, client client.Client, s []v1alpha.SettingsVar) (map[string]string, error) {
 	settings := make(map[string]string)
 	for _, v := range s {
 		switch {
@@ -112,7 +112,7 @@ func settingsWithEnvVars(ctx context.Context, client client.Client, s []v1.Setti
 	return settings, nil
 }
 
-func configMapValue(ctx context.Context, cl client.Client, ref *v1.GlobalConfigMapRef) (string, error) {
+func configMapValue(ctx context.Context, cl client.Client, ref *v1alpha.GlobalConfigMapRef) (string, error) {
 	configMap := &corev1.ConfigMap{}
 
 	// Fetch the ConfigMap using the client's Get method
@@ -146,7 +146,7 @@ func envVarName(s string) string {
 // connectorConfig returns a conduit connector config which is created
 // from a connector resource settings. Settings which refer to a secret are
 // converted to env variables.
-func connectorConfig(ctx context.Context, cl client.Client, c *v1.ConduitConnector) (cyaml.Connector, error) {
+func connectorConfig(ctx context.Context, cl client.Client, c *v1alpha.ConduitConnector) (cyaml.Connector, error) {
 	var processors []cyaml.Processor
 	for _, p := range c.Processors {
 		procCfg, err := processorConfig(ctx, cl, p)
@@ -173,7 +173,7 @@ func connectorConfig(ctx context.Context, cl client.Client, c *v1.ConduitConnect
 	}, nil
 }
 
-func processorConfig(ctx context.Context, cl client.Client, p *v1.ConduitProcessor) (cyaml.Processor, error) {
+func processorConfig(ctx context.Context, cl client.Client, p *v1alpha.ConduitProcessor) (cyaml.Processor, error) {
 	settings, err := settingsWithEnvVars(ctx, cl, p.Settings)
 	if err != nil {
 		return cyaml.Processor{}, fmt.Errorf("failed getting settings for processor %v: %w", p.Name, err)

controllers/conduit_config_test.go

@@ -9,7 +9,7 @@ import (
 	"github.com/google/go-cmp/cmp"
 	corev1 "k8s.io/api/core/v1"
 
-	v1 "github.com/conduitio/conduit-operator/api/v1"
+	v1alpha "github.com/conduitio/conduit-operator/api/v1alpha"
 	ctrls "github.com/conduitio/conduit-operator/controllers"
 )
 
@@ -49,7 +49,7 @@ func Test_EnvVars(t *testing.T) {
 func Test_PipelineConfigYAML(t *testing.T) {
 	tests := []struct {
 		name    string
-		conduit *v1.Conduit
+		conduit *v1alpha.Conduit
 		want    string
 	}{
 		{

controllers/conduit_containers.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 	"sync"
 
-	v1 "github.com/conduitio/conduit-operator/api/v1"
+	v1alpha "github.com/conduitio/conduit-operator/api/v1alpha"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
 )
@@ -74,22 +74,22 @@ func (c *commandBuilder) addConnectorBuild(b connectorBuild) {
 }
 
 // ConduitInitContainers returns a slice of kubernetes container definitions
-func ConduitInitContainers(cc []*v1.ConduitConnector) []corev1.Container {
+func ConduitInitContainers(cc []*v1alpha.ConduitConnector) []corev1.Container {
 	builder := &commandBuilder{}
 
 	containers := []corev1.Container{
 		{
-			Name:            v1.ConduitInitContainerName,
-			Image:           v1.ConduitInitImage,
+			Name:            v1alpha.ConduitInitContainerName,
+			Image:           v1alpha.ConduitInitImage,
 			ImagePullPolicy: corev1.PullIfNotPresent,
 			Args: []string{
 				"sh", "-xe", "-c",
-				fmt.Sprintf("mkdir -p %s %s", v1.ConduitProcessorsPath, v1.ConduitConnectorsPath),
+				fmt.Sprintf("mkdir -p %s %s", v1alpha.ConduitProcessorsPath, v1alpha.ConduitConnectorsPath),
 			},
 			VolumeMounts: []corev1.VolumeMount{
 				{
-					Name:      v1.ConduitStorageVolumeMount,
-					MountPath: v1.ConduitVolumePath,
+					Name:      v1alpha.ConduitStorageVolumeMount,
+					MountPath: v1alpha.ConduitVolumePath,
 				},
 			},
 		},
@@ -103,24 +103,24 @@ func ConduitInitContainers(cc []*v1.ConduitConnector) []corev1.Container {
 			name:      fmt.Sprintf("%s-%s", filepath.Base(c.Plugin), c.PluginVersion),
 			goPkg:     c.PluginPkg,
 			tmpDir:    builderTempPath,
-			targetDir: v1.ConduitConnectorsPath,
+			targetDir: v1alpha.ConduitConnectorsPath,
 			ldflags:   fmt.Sprintf(`-ldflags "-X 'github.com/%s.version=%s'"`, c.Plugin, c.PluginVersion),
 		})
 	}
 
 	if !builder.empty() {
 		containers = append(containers, corev1.Container{
-			Name:            fmt.Sprint(v1.ConduitInitContainerName, "-connectors"),
-			Image:           v1.ConduitInitImage,
+			Name:            fmt.Sprint(v1alpha.ConduitInitContainerName, "-connectors"),
+			Image:           v1alpha.ConduitInitImage,
 			ImagePullPolicy: corev1.PullIfNotPresent,
 			Args: []string{
 				"sh", "-xe",
 				"-c", builder.renderScript(),
 			},
 			VolumeMounts: []corev1.VolumeMount{
 				{
-					Name:      v1.ConduitStorageVolumeMount,
-					MountPath: v1.ConduitVolumePath,
+					Name:      v1alpha.ConduitStorageVolumeMount,
+					MountPath: v1alpha.ConduitVolumePath,
 				},
 			},
 		})
@@ -134,19 +134,19 @@ func ConduitInitContainers(cc []*v1.ConduitConnector) []corev1.Container {
 func ConduitRuntimeContainer(image, version string, envVars []corev1.EnvVar) corev1.Container {
 	args := []string{
 		"/app/conduit",
-		"-pipelines.path", v1.ConduitPipelineFile,
-		"-connectors.path", v1.ConduitConnectorsPath,
+		"-pipelines.path", v1alpha.ConduitPipelineFile,
+		"-connectors.path", v1alpha.ConduitConnectorsPath,
 		"-db.type", "badger",
-		"-db.badger.path", v1.ConduitDBPath,
+		"-db.badger.path", v1alpha.ConduitDBPath,
 		"-pipelines.exit-on-error",
 	}
 
 	if withProcessors(version) {
-		args = append(args, "-processors.path", v1.ConduitProcessorsPath)
+		args = append(args, "-processors.path", v1alpha.ConduitProcessorsPath)
 	}
 
 	return corev1.Container{
-		Name:            v1.ConduitContainerName,
+		Name:            v1alpha.ConduitContainerName,
 		Image:           fmt.Sprint(image, ":", version),
 		ImagePullPolicy: corev1.PullAlways,
 		Args:            args,
@@ -177,12 +177,12 @@ func ConduitRuntimeContainer(image, version string, envVars []corev1.EnvVar) cor
 		},
 		VolumeMounts: []corev1.VolumeMount{
 			{
-				Name:      v1.ConduitStorageVolumeMount,
-				MountPath: v1.ConduitVolumePath,
+				Name:      v1alpha.ConduitStorageVolumeMount,
+				MountPath: v1alpha.ConduitVolumePath,
 			},
 			{
-				Name:      v1.ConduitPipelineVolumeMount,
-				MountPath: v1.ConduitPipelinePath,
+				Name:      v1alpha.ConduitPipelineVolumeMount,
+				MountPath: v1alpha.ConduitPipelinePath,
 				ReadOnly:  true,
 			},
 		},

controllers/conduit_containers_test.go

@@ -8,7 +8,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
 
-	v1 "github.com/conduitio/conduit-operator/api/v1"
+	v1alpha "github.com/conduitio/conduit-operator/api/v1alpha"
 	ctrls "github.com/conduitio/conduit-operator/controllers"
 )
 
@@ -26,13 +26,13 @@ func Test_ConduitInitContainers(t *testing.T) {
 
 	tests := []struct {
 		name       string
-		connectors []*v1.ConduitConnector
+		connectors []*v1alpha.ConduitConnector
 		imageVer   string
 		want       []corev1.Container
 	}{
 		{
 			name: "only builtin connectors",
-			connectors: []*v1.ConduitConnector{
+			connectors: []*v1alpha.ConduitConnector{
 				{
 					Plugin:        "builtin:builtin-test",
 					PluginVersion: "latest",
@@ -42,7 +42,7 @@ func Test_ConduitInitContainers(t *testing.T) {
 		},
 		{
 			name: "with latest standalone connector",
-			connectors: []*v1.ConduitConnector{
+			connectors: []*v1alpha.ConduitConnector{
 				{
 					Plugin:        "builtin:builtin-test",
 					PluginVersion: "latest",
@@ -74,7 +74,7 @@ func Test_ConduitInitContainers(t *testing.T) {
 		},
 		{
 			name: "with version standalone connector",
-			connectors: []*v1.ConduitConnector{
+			connectors: []*v1alpha.ConduitConnector{
 				{
 					Plugin:        "builtin:builtin-test",
 					PluginVersion: "latest",
@@ -106,7 +106,7 @@ func Test_ConduitInitContainers(t *testing.T) {
 		},
 		{
 			name: "with multiple standalone connector",
-			connectors: []*v1.ConduitConnector{
+			connectors: []*v1alpha.ConduitConnector{
 				{
 					Plugin:        "builtin:builtin-test",
 					PluginVersion: "latest",
@@ -143,7 +143,7 @@ func Test_ConduitInitContainers(t *testing.T) {
 		},
 		{
 			name: "with duplicate standalone connector",
-			connectors: []*v1.ConduitConnector{
+			connectors: []*v1alpha.ConduitConnector{
 				{
 					Plugin:        "builtin:builtin-test",
 					PluginVersion: "latest",