f

Author: emosbaugh

api/integration/app/upgrade/apppreflight_test.go

@@ -37,7 +37,6 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 	helmcli "helm.sh/helm/v3/pkg/cli"
-	"k8s.io/cli-runtime/pkg/genericclioptions"
 )
 
 type AppPreflightTestSuite struct {
@@ -501,8 +500,7 @@ func TestAppPreflightSuite(t *testing.T) {
 					InstallTarget: types.InstallTargetKubernetes,
 					Password:      "password",
 					KubernetesConfig: types.KubernetesConfig{
-						RESTClientGetter: &genericclioptions.ConfigFlags{},
-						Installation:     mockInstallation,
+						Installation: mockInstallation,
 					},
 					ReleaseData: rd,
 					Mode:        types.ModeUpgrade,

api/integration/kubernetes/install/apppreflight_test.go

@@ -27,7 +27,6 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
-	"k8s.io/cli-runtime/pkg/genericclioptions"
 )
 
 // Test the getAppPreflightsStatus endpoint returns app preflights status correctly
@@ -348,8 +347,7 @@ func TestPostRunAppPreflights(t *testing.T) {
 			InstallTarget: types.InstallTargetKubernetes,
 			Password:      "password",
 			KubernetesConfig: types.KubernetesConfig{
-				RESTClientGetter: &genericclioptions.ConfigFlags{},
-				Installation:     mockInstallation,
+				Installation: mockInstallation,
 			},
 			ReleaseData: integration.DefaultReleaseData(),
 			Mode:        types.ModeInstall,
@@ -403,8 +401,7 @@ func TestPostRunAppPreflights(t *testing.T) {
 			InstallTarget: types.InstallTargetKubernetes,
 			Password:      "password",
 			KubernetesConfig: types.KubernetesConfig{
-				RESTClientGetter: &genericclioptions.ConfigFlags{},
-				Installation:     mockInstallation,
+				Installation: mockInstallation,
 			},
 			ReleaseData: integration.DefaultReleaseData(),
 			Mode:        types.ModeInstall,
@@ -452,8 +449,7 @@ func TestPostRunAppPreflights(t *testing.T) {
 			InstallTarget: types.InstallTargetKubernetes,
 			Password:      "password",
 			KubernetesConfig: types.KubernetesConfig{
-				RESTClientGetter: &genericclioptions.ConfigFlags{},
-				Installation:     mockInstallation,
+				Installation: mockInstallation,
 			},
 			ReleaseData: integration.DefaultReleaseData(),
 			Mode:        types.ModeInstall,

api/types/api.go

@@ -6,7 +6,6 @@ import (
 	"github.com/replicatedhq/embedded-cluster/pkg/airgap"
 	"github.com/replicatedhq/embedded-cluster/pkg/release"
 	"github.com/replicatedhq/embedded-cluster/pkg/runtimeconfig"
-	"k8s.io/cli-runtime/pkg/genericclioptions"
 )
 
 // APIConfig holds the configuration for the API server
@@ -51,6 +50,5 @@ type LinuxConfig struct {
 }
 
 type KubernetesConfig struct {
-	RESTClientGetter genericclioptions.RESTClientGetter
-	Installation     kubernetesinstallation.Installation
+	Installation kubernetesinstallation.Installation
 }

cmd/installer/cli/api_test.go

@@ -4,17 +4,22 @@ import (
 	"context"
 	"crypto/tls"
 	"crypto/x509"
+	"encoding/json"
 	"fmt"
 	"io"
 	"net"
 	"net/http"
+	"net/http/httptest"
+	"os"
+	"path/filepath"
 	"strconv"
 	"testing"
 	"testing/fstest"
 	"time"
 
 	apilogger "github.com/replicatedhq/embedded-cluster/api/pkg/logger"
 	apitypes "github.com/replicatedhq/embedded-cluster/api/types"
+	"github.com/replicatedhq/embedded-cluster/pkg-new/kubernetesinstallation"
 	"github.com/replicatedhq/embedded-cluster/pkg-new/tlsutils"
 	"github.com/replicatedhq/embedded-cluster/pkg/release"
 	"github.com/replicatedhq/embedded-cluster/pkg/runtimeconfig"
@@ -24,6 +29,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"golang.org/x/crypto/bcrypt"
+	helmcli "helm.sh/helm/v3/pkg/cli"
+	"k8s.io/apimachinery/pkg/version"
 )
 
 func Test_serveAPI(t *testing.T) {
@@ -124,14 +131,14 @@ func Test_serveAPI(t *testing.T) {
 func Test_serveAPIHTMLInjection(t *testing.T) {
 	tests := []struct {
 		name          string
-		installTarget string
+		installTarget apitypes.InstallTarget
 		mode          web.Mode
 		title         string
 	}{
-		{"linux install mode", "linux", web.ModeInstall, "Linux Install App"},
-		{"linux upgrade mode", "linux", web.ModeUpgrade, "Linux Upgrade App"},
-		{"kubernetes install mode", "kubernetes", web.ModeInstall, "K8s Install App"},
-		{"kubernetes upgrade mode", "kubernetes", web.ModeUpgrade, "K8s Upgrade App"},
+		{"linux install mode", apitypes.InstallTargetLinux, web.ModeInstall, "Linux Install App"},
+		{"linux upgrade mode", apitypes.InstallTargetLinux, web.ModeUpgrade, "Linux Upgrade App"},
+		{"kubernetes install mode", apitypes.InstallTargetKubernetes, web.ModeInstall, "K8s Install App"},
+		{"kubernetes upgrade mode", apitypes.InstallTargetKubernetes, web.ModeUpgrade, "K8s Upgrade App"},
 	}
 
 	for _, tt := range tests {
@@ -175,7 +182,7 @@ func Test_serveAPIHTMLInjection(t *testing.T) {
 
 			config := apiOptions{
 				APIConfig: apitypes.APIConfig{
-					InstallTarget: apitypes.InstallTargetLinux,
+					InstallTarget: tt.installTarget,
 					Password:      password,
 					PasswordHash:  passwordHash,
 					ReleaseData: &release.ReleaseData{
@@ -197,6 +204,15 @@ func Test_serveAPIHTMLInjection(t *testing.T) {
 				WebAssetsFS: webAssetsFS,
 			}
 
+			if tt.installTarget == apitypes.InstallTargetKubernetes {
+				ki := setupMockKubernetesInstallation(t)
+				config.Installation = ki
+			} else {
+				// Create a runtime config with temp directory
+				rc := setupMockRuntimeConfig(t)
+				config.RuntimeConfig = rc
+			}
+
 			go func() {
 				err := serveAPI(ctx, listener, cert, config)
 				t.Logf("Install API exited with error: %v", err)
@@ -236,3 +252,65 @@ func Test_serveAPIHTMLInjection(t *testing.T) {
 		})
 	}
 }
+
+func setupMockRuntimeConfig(t *testing.T) *runtimeconfig.MockRuntimeConfig {
+	// Set up mock Kubernetes API server for helm client to use
+	mockK8sServer := setupMockKubernetesAPI(t)
+	t.Cleanup(func() {
+		mockK8sServer.Close()
+	})
+	t.Setenv("HELM_KUBEAPISERVER", mockK8sServer.URL)
+	fmt.Println("HELM_KUBEAPISERVER", mockK8sServer.URL)
+
+	// Write the helm binary to the temp directory for helm client to use
+	helmPath := filepath.Join(t.TempDir(), "helm")
+	err := os.WriteFile(helmPath, []byte(mockK8sServer.URL), 0644)
+	require.NoError(t, err)
+
+	rc := &runtimeconfig.MockRuntimeConfig{}
+	rc.On("GetKubernetesEnvSettings").Return(helmcli.New())
+	rc.On("PathToEmbeddedClusterBinary", "helm").Return(helmPath, nil)
+	return rc
+}
+
+func setupMockKubernetesInstallation(t *testing.T) *kubernetesinstallation.MockInstallation {
+	// Set up mock Kubernetes API server for helm client to use
+	mockK8sServer := setupMockKubernetesAPI(t)
+	t.Cleanup(func() {
+		mockK8sServer.Close()
+	})
+	t.Setenv("HELM_KUBEAPISERVER", mockK8sServer.URL)
+	fmt.Println("HELM_KUBEAPISERVER", mockK8sServer.URL)
+
+	// Write the helm binary to the temp directory for helm client to use
+	helmPath := filepath.Join(t.TempDir(), "helm")
+	err := os.WriteFile(helmPath, []byte(mockK8sServer.URL), 0644)
+	require.NoError(t, err)
+
+	ki := &kubernetesinstallation.MockInstallation{}
+	ki.On("GetKubernetesEnvSettings").Return(helmcli.New())
+	ki.On("PathToEmbeddedBinary", "helm").Return(helmPath, nil)
+	return ki
+}
+
+// setupMockKubernetesAPI creates a mock Kubernetes API server for testing
+func setupMockKubernetesAPI(_ *testing.T) *httptest.Server {
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		switch r.URL.Path {
+		case "/version":
+			// Return a mock Kubernetes version
+			versionInfo := version.Info{
+				Major:      "1",
+				Minor:      "28",
+				GitVersion: "v1.28.0",
+			}
+			w.Header().Set("Content-Type", "application/json")
+			json.NewEncoder(w).Encode(versionInfo)
+		default:
+			// Return 404 for other endpoints
+			w.WriteHeader(http.StatusNotFound)
+		}
+	}))
+
+	return server
+}

cmd/installer/cli/install.go

@@ -54,7 +54,6 @@ import (
 	"github.com/spf13/pflag"
 	"golang.org/x/crypto/bcrypt"
 	helmcli "helm.sh/helm/v3/pkg/cli"
-	"k8s.io/cli-runtime/pkg/genericclioptions"
 	"k8s.io/client-go/discovery"
 	"k8s.io/client-go/metadata"
 	nodeutil "k8s.io/component-helpers/node/util"
@@ -102,8 +101,6 @@ type installConfig struct {
 	tlsCert      tls.Certificate
 	tlsCertBytes []byte
 	tlsKeyBytes  []byte
-
-	kubernetesRESTClientGetter genericclioptions.RESTClientGetter
 }
 
 // webAssetsFS is the filesystem to be used by the web component. Defaults to nil allowing the web server to use the default assets embedded in the binary. Useful for testing.
@@ -322,27 +319,8 @@ func newKubernetesInstallFlags(flags *InstallCmdFlags, enableV3 bool) *pflag.Fla
 }
 
 func addKubernetesCLIFlags(flagSet *pflag.FlagSet, flags *InstallCmdFlags) {
-	// From helm
-	// https://github.com/helm/helm/blob/v3.18.3/pkg/cli/environment.go#L145-L163
-
 	s := helmcli.New()
-
-	flagSet.StringVar(&s.KubeConfig, "kubeconfig", "", "Path to the kubeconfig file")
-	flagSet.StringVar(&s.KubeContext, "kube-context", s.KubeContext, "Name of the kubeconfig context to use")
-	flagSet.StringVar(&s.KubeToken, "kube-token", s.KubeToken, "Bearer token used for authentication")
-	flagSet.StringVar(&s.KubeAsUser, "kube-as-user", s.KubeAsUser, "Username to impersonate for the operation")
-	flagSet.StringArrayVar(&s.KubeAsGroups, "kube-as-group", s.KubeAsGroups, "Group to impersonate for the operation, this flag can be repeated to specify multiple groups.")
-	flagSet.StringVar(&s.KubeAPIServer, "kube-apiserver", s.KubeAPIServer, "The address and the port for the Kubernetes API server")
-	flagSet.StringVar(&s.KubeCaFile, "kube-ca-file", s.KubeCaFile, "The certificate authority file for the Kubernetes API server connection")
-	flagSet.StringVar(&s.KubeTLSServerName, "kube-tls-server-name", s.KubeTLSServerName, "Server name to use for Kubernetes API server certificate validation. If it is not provided, the hostname used to contact the server is used")
-	// flagSet.BoolVar(&s.Debug, "helm-debug", s.Debug, "enable verbose output")
-	flagSet.BoolVar(&s.KubeInsecureSkipTLSVerify, "kube-insecure-skip-tls-verify", s.KubeInsecureSkipTLSVerify, "If true, the Kubernetes API server's certificate will not be checked for validity. This will make your HTTPS connections insecure")
-	// flagSet.StringVar(&s.RegistryConfig, "helm-registry-config", s.RegistryConfig, "Path to the Helm registry config file")
-	// flagSet.StringVar(&s.RepositoryConfig, "helm-repository-config", s.RepositoryConfig, "Path to the file containing Helm repository names and URLs")
-	// flagSet.StringVar(&s.RepositoryCache, "helm-repository-cache", s.RepositoryCache, "Path to the directory containing cached Helm repository indexes")
-	flagSet.IntVar(&s.BurstLimit, "burst-limit", s.BurstLimit, "Kubernetes API client-side default throttling limit")
-	flagSet.Float32Var(&s.QPS, "qps", s.QPS, "Queries per second used when communicating with the Kubernetes API, not including bursting")
-
+	helm.AddKubernetesCLIFlags(flagSet, s)
 	flags.kubernetesEnvSettings = s
 }
 
@@ -580,7 +558,7 @@ func preRunInstallLinux(cmd *cobra.Command, flags *InstallCmdFlags, rc runtimeco
 	return nil
 }
 
-func preRunInstallKubernetes(_ *cobra.Command, flags *InstallCmdFlags, _ kubernetesinstallation.Installation) error {
+func preRunInstallKubernetes(_ *cobra.Command, flags *InstallCmdFlags, ki kubernetesinstallation.Installation) error {
 	// TODO: we only support amd64 clusters for target=kubernetes installs
 	helpers.SetClusterArch("amd64")
 
@@ -608,7 +586,7 @@ func preRunInstallKubernetes(_ *cobra.Command, flags *InstallCmdFlags, _ kuberne
 		return fmt.Errorf("failed to connect to kubernetes api server: %w", err)
 	}
 
-	flags.kubernetesRESTClientGetter = flags.kubernetesEnvSettings.RESTClientGetter()
+	ki.SetKubernetesEnvSettings(flags.kubernetesEnvSettings)
 
 	return nil
 }
@@ -722,8 +700,7 @@ func runManagerExperienceInstall(
 				AllowIgnoreHostPreflights: flags.ignoreHostPreflights,
 			},
 			KubernetesConfig: apitypes.KubernetesConfig{
-				RESTClientGetter: flags.kubernetesRESTClientGetter,
-				Installation:     ki,
+				Installation: ki,
 			},
 		},