fix: add to k8s scheme once in init (#700)

* fix: add to k8s scheme once in init

* f

* f

Author: emosbaugh

.github/workflows/pull-request.yaml

@@ -225,6 +225,8 @@ jobs:
             runner: embedded-cluster
           - test: TestMultiNodeAirgapHADisasterRecovery
             runner: embedded-cluster
+          - test: TestSingleNodeAirgapDisasterRecovery
+            runner: embedded-cluster
     steps:
     - name: Checkout
       uses: actions/checkout@v4

.github/workflows/release-dev.yaml

@@ -177,6 +177,8 @@ jobs:
             runner: embedded-cluster
           - test: TestMultiNodeAirgapHADisasterRecovery
             runner: embedded-cluster
+          - test: TestSingleNodeAirgapDisasterRecovery
+            runner: embedded-cluster
     steps:
       - name: Checkout
         uses: actions/checkout@v4

cmd/embedded-cluster/join.go

@@ -13,7 +13,6 @@ import (
 	"github.com/google/uuid"
 	"github.com/k0sproject/dig"
 	k0sconfig "github.com/k0sproject/k0s/pkg/apis/k0s/v1beta1"
-	embeddedclusterv1beta1 "github.com/replicatedhq/embedded-cluster-kinds/apis/v1beta1"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
 	"gopkg.in/yaml.v2"
@@ -245,7 +244,6 @@ var joinCommand = &cli.Command{
 			metrics.ReportJoinFailed(c.Context, jcmd.MetricsBaseURL, jcmd.ClusterID, err)
 			return err
 		}
-		embeddedclusterv1beta1.AddToScheme(kcli.Scheme())
 		hostname, err := os.Hostname()
 		if err != nil {
 			err := fmt.Errorf("unable to get hostname: %w", err)

cmd/embedded-cluster/uninstall.go

@@ -11,7 +11,6 @@ import (
 	autopilot "github.com/k0sproject/k0s/pkg/apis/autopilot/v1beta2"
 	"github.com/k0sproject/k0s/pkg/apis/k0s/v1beta1"
 	"github.com/k0sproject/k0s/pkg/etcd"
-	embeddedclusterv1beta1 "github.com/replicatedhq/embedded-cluster-kinds/apis/v1beta1"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
 	corev1 "k8s.io/api/core/v1"
@@ -116,8 +115,6 @@ func (h *hostInfo) configureKubernetesClient() {
 		return
 	}
 	h.Kclient = client
-	autopilot.AddToScheme(h.Kclient.Scheme())
-	v1beta1.AddToScheme(h.Kclient.Scheme())
 }
 
 // getHostName fetches the hostname for the node
@@ -303,7 +300,6 @@ func maybePrintHAWarning(c *cli.Context) error {
 	if err != nil {
 		return fmt.Errorf("unable to create kube client: %w", err)
 	}
-	embeddedclusterv1beta1.AddToScheme(kubecli.Scheme())
 
 	if in, err := kubeutils.GetLatestInstallation(c.Context, kubecli); err != nil {
 		return fmt.Errorf("unable to get installation: %w", err)

cmd/local-artifact-mirror/pull.go

@@ -40,7 +40,6 @@ var pullCommand = &cli.Command{
 		if kubecli, err = kubeutils.KubeClient(); err != nil {
 			return fmt.Errorf("unable to create kube client: %w", err)
 		}
-		v1beta1.AddToScheme(kubecli.Scheme())
 		return nil
 	},
 	Subcommands: []*cli.Command{binariesCommand, imagesCommand, helmChartsCommand},

pkg/addons/embeddedclusteroperator/embeddedclusteroperator.go

@@ -217,7 +217,6 @@ func (e *EmbeddedClusterOperator) Outro(ctx context.Context, cli client.Client)
 			},
 		},
 	}
-	embeddedclusterv1beta1.AddToScheme(cli.Scheme())
 	if err := cli.Create(ctx, &installation); err != nil {
 		return fmt.Errorf("unable to create installation: %w", err)
 	}

pkg/kubeutils/kubeutils.go

@@ -125,8 +125,6 @@ func WaitForInstallation(ctx context.Context, cli client.Client, writer *spinner
 	backoff := wait.Backoff{Steps: 60 * 5, Duration: time.Second, Factor: 1.0, Jitter: 0.1}
 	var lasterr error
 
-	embeddedclusterv1beta1.AddToScheme(cli.Scheme())
-
 	if err := wait.ExponentialBackoffWithContext(
 		ctx, backoff, func(ctx context.Context) (bool, error) {
 			lastInstall, err := GetLatestInstallation(ctx, cli)

pkg/kubeutils/scheme.go

@@ -0,0 +1,14 @@
+package kubeutils
+
+import (
+	autopilotv1beta2 "github.com/k0sproject/k0s/pkg/apis/autopilot/v1beta2"
+	k0sv1beta1 "github.com/k0sproject/k0s/pkg/apis/k0s/v1beta1"
+	embeddedclusterv1beta1 "github.com/replicatedhq/embedded-cluster-kinds/apis/v1beta1"
+	"k8s.io/client-go/kubernetes/scheme"
+)
+
+func init() {
+	autopilotv1beta2.AddToScheme(scheme.Scheme)
+	k0sv1beta1.AddToScheme(scheme.Scheme)
+	embeddedclusterv1beta1.AddToScheme(scheme.Scheme)
+}