f

Author: emosbaugh

api/internal/clients/kube.go

@@ -22,11 +22,11 @@ import (
 var localSchemeBuilder = runtime.NewSchemeBuilder(
 	apiextensionsv1.AddToScheme,
 	embeddedclusterv1beta1.AddToScheme,
-	//nolint:staticcheck // SA1019 we are using the deprecated scheme for backwards compatibility, we can remove this once we stop supporting k0s v1.30
-	autopilotv1beta2.AddToScheme,
-	k0sv1beta1.AddToScheme,
-	//nolint:staticcheck // SA1019 we are using the deprecated scheme for backwards compatibility, we can remove this once we stop supporting k0s v1.30
-	k0shelmv1beta1.AddToScheme,
+	// we are using the deprecated scheme for backwards compatibility, we can remove this once we stop supporting k0s v1.30
+	autopilotv1beta2.Install,
+	k0sv1beta1.Install,
+	// we are using the deprecated scheme for backwards compatibility, we can remove this once we stop supporting k0s v1.30
+	k0shelmv1beta1.Install,
 	velerov1.AddToScheme,
 )
 

operator/pkg/cli/migratev2/k0s_test.go

@@ -88,10 +88,11 @@ func TestNeedsK0sChartCleanup(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			scheme := runtime.NewScheme()
-			err := k0sv1beta1.AddToScheme(scheme)
+			// we are using the deprecated scheme for backwards compatibility, we can remove this once we stop supporting k0s v1.30
+			err := k0sv1beta1.Install(scheme)
 			require.NoError(t, err)
-			//nolint:staticcheck // SA1019 we are using the deprecated scheme for backwards compatibility, we can remove this once we stop supporting k0s v1.30
-			err = k0shelmv1beta1.AddToScheme(scheme)
+			// we are using the deprecated scheme for backwards compatibility, we can remove this once we stop supporting k0s v1.30
+			err = k0shelmv1beta1.Install(scheme)
 			require.NoError(t, err)
 
 			cli := fake.NewClientBuilder().

pkg-new/upgrade/upgrade_test.go

@@ -29,8 +29,7 @@ func TestUpdateClusterConfig(t *testing.T) {
 	logger.SetLevel(logrus.ErrorLevel)
 
 	scheme := runtime.NewScheme()
-	//nolint:staticcheck // SA1019 we are using the deprecated scheme for backwards compatibility, we can remove this once we stop supporting k0s v1.30
-	require.NoError(t, k0sv1beta1.AddToScheme(scheme))
+	require.NoError(t, k0sv1beta1.Install(scheme))
 
 	// We need to disable telemetry in a backwards compatible way with k0s v1.30 and v1.29
 	// See - https://github.com/k0sproject/k0s/pull/4674/files#diff-eea4a0c68e41d694c3fd23b4865a7b28bcbba61dc9c642e33c2e2f5f7f9ee05d

pkg/kubeutils/client.go

@@ -24,11 +24,12 @@ var (
 
 func init() {
 	utilruntime.Must(embeddedclusterv1beta1.AddToScheme(Scheme))
-	//nolint:staticcheck // SA1019 we are using the deprecated scheme for backwards compatibility, we can remove this once we stop supporting k0s v1.30
-	utilruntime.Must(autopilotv1beta2.AddToScheme(Scheme))
-	utilruntime.Must(k0sv1beta1.AddToScheme(Scheme))
-	//nolint:staticcheck // SA1019 we are using the deprecated scheme for backwards compatibility, we can remove this once we stop supporting k0s v1.30
-	utilruntime.Must(k0shelmv1beta1.AddToScheme(Scheme))
+	// we are using the deprecated scheme for backwards compatibility, we can remove this once we stop supporting k0s v1.30
+	utilruntime.Must(autopilotv1beta2.Install(Scheme))
+	// we are using the deprecated scheme for backwards compatibility, we can remove this once we stop supporting k0s v1.30
+	utilruntime.Must(k0sv1beta1.Install(Scheme))
+	// we are using the deprecated scheme for backwards compatibility, we can remove this once we stop supporting k0s v1.30
+	utilruntime.Must(k0shelmv1beta1.Install(Scheme))
 	utilruntime.Must(velerov1.AddToScheme(Scheme))
 }