integration tests without custom domains (#1992)

* check helm chart image prefixes in dryrun

* add a dryrun test that ensures the default image proxy is used properly

* comment

Author: laverya

go.mod

@@ -1,6 +1,6 @@
 module github.com/replicatedhq/embedded-cluster
 
-go 1.23.4
+go 1.24.0
 
 require (
 	github.com/AlecAivazis/survey/v2 v2.3.7

tests/dryrun/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.23.4-alpine AS build
+FROM golang:1.24.0-alpine AS build
 
 RUN apk add --no-cache ca-certificates curl git make bash
 

tests/dryrun/assets/cluster-config-nodomains.yaml

@@ -0,0 +1,6 @@
+apiVersion: embeddedcluster.replicated.com/v1beta1
+kind: Config
+metadata:
+ name: "testconfig"
+spec:
+ version: "testversion"

tests/dryrun/assets/cluster-config.yaml

@@ -0,0 +1,9 @@
+apiVersion: embeddedcluster.replicated.com/v1beta1
+kind: Config
+metadata:
+ name: "testconfig"
+spec:
+ version: "testversion"
+ domains:
+   replicatedAppDomain: "fake-endpoint.com"
+   proxyRegistryDomain: "fake-replicated-proxy.test.net"

tests/dryrun/assets/install-release.yaml

@@ -3,3 +3,7 @@ channelID: "fake-channel-id"
 channelSlug: "fake-channel-slug"
 appSlug: "fake-app-slug"
 versionLabel: "fake-version-label"
+defaultDomains:
+  replicatedAppDomain: "staging.replicated.app"
+  proxyRegistryDomain: "proxy.staging.replicated.com"
+  replicatedRegistryDomain: "registry.staging.replicated.com"

tests/dryrun/install_test.go

@@ -44,20 +44,27 @@ func testDefaultInstallationImpl(t *testing.T) {
 	openebsOpts := hcli.Calls[0].Arguments[1].(helm.InstallOptions)
 	assert.Equal(t, "openebs", openebsOpts.ReleaseName)
 	assertHelmValues(t, openebsOpts.Values, map[string]interface{}{
-		"['localpv-provisioner'].localpv.basePath": "/var/lib/embedded-cluster/openebs-local",
+		"['localpv-provisioner'].localpv.basePath":         "/var/lib/embedded-cluster/openebs-local",
+		"['localpv-provisioner'].helperPod.image.registry": "fake-replicated-proxy.test.net/anonymous/",
+		"['localpv-provisioner'].localpv.image.registry":   "fake-replicated-proxy.test.net/anonymous/",
+		"['preUpgradeHook'].image.registry":                "fake-replicated-proxy.test.net/anonymous",
 	})
 
 	// embedded cluster operator
 	assert.Equal(t, "Install", hcli.Calls[1].Method)
 	operatorOpts := hcli.Calls[1].Arguments[1].(helm.InstallOptions)
 	assert.Equal(t, "embedded-cluster-operator", operatorOpts.ReleaseName)
+	assertHelmValues(t, operatorOpts.Values, map[string]interface{}{
+		"image.repository": "fake-replicated-proxy.test.net/anonymous/replicated/embedded-cluster-operator-image",
+	})
 
 	// velero
 	assert.Equal(t, "Install", hcli.Calls[2].Method)
 	veleroOpts := hcli.Calls[2].Arguments[1].(helm.InstallOptions)
 	assert.Equal(t, "velero", veleroOpts.ReleaseName)
 	assertHelmValues(t, veleroOpts.Values, map[string]interface{}{
 		"nodeAgent.podVolumePath": "/var/lib/embedded-cluster/k0s/kubelet/pods",
+		"image.repository":        "fake-replicated-proxy.test.net/anonymous/replicated/ec-velero",
 	})
 
 	// admin console
@@ -67,6 +74,12 @@ func testDefaultInstallationImpl(t *testing.T) {
 	assertHelmValues(t, adminConsoleOpts.Values, map[string]interface{}{
 		"kurlProxy.nodePort": float64(30000),
 	})
+	assertHelmValuePrefixes(t, adminConsoleOpts.Values, map[string]string{
+		"images.kotsadm":    "fake-replicated-proxy.test.net/anonymous",
+		"images.kurlProxy":  "fake-replicated-proxy.test.net/anonymous",
+		"images.migrations": "fake-replicated-proxy.test.net/anonymous",
+		"images.rqlite":     "fake-replicated-proxy.test.net/anonymous",
+	})
 
 	// --- validate os env --- //
 	assertEnv(t, dr.OSEnv, map[string]string{
@@ -159,6 +172,14 @@ func testDefaultInstallationImpl(t *testing.T) {
 	assert.Equal(t, "10.244.0.0/17", k0sConfig.Spec.Network.PodCIDR)
 	assert.Equal(t, "10.244.128.0/17", k0sConfig.Spec.Network.ServiceCIDR)
 	assert.Contains(t, k0sConfig.Spec.API.SANs, "kubernetes.default.svc.cluster.local")
+
+	assert.Contains(t, k0sConfig.Spec.Images.MetricsServer.Image, "fake-replicated-proxy.test.net/anonymous")
+	assert.Contains(t, k0sConfig.Spec.Images.KubeProxy.Image, "fake-replicated-proxy.test.net/anonymous")
+	assert.Contains(t, k0sConfig.Spec.Images.CoreDNS.Image, "fake-replicated-proxy.test.net/anonymous")
+	assert.Contains(t, k0sConfig.Spec.Images.Pause.Image, "fake-replicated-proxy.test.net/anonymous")
+	assert.Contains(t, k0sConfig.Spec.Images.Calico.CNI.Image, "fake-replicated-proxy.test.net/anonymous")
+	assert.Contains(t, k0sConfig.Spec.Images.Calico.Node.Image, "fake-replicated-proxy.test.net/anonymous")
+	assert.Contains(t, k0sConfig.Spec.Images.Calico.KubeControllers.Image, "fake-replicated-proxy.test.net/anonymous")
 }
 
 func TestCustomDataDir(t *testing.T) {
@@ -463,3 +484,90 @@ func TestCustomCidrInstallation(t *testing.T) {
 
 	t.Logf("%s: test complete", time.Now().Format(time.RFC3339))
 }
+
+// this test is to ensure that when no domains are provided in the cluster config that the domains from the embedded release file are used
+func TestNoDomains(t *testing.T) {
+	hcli := &helm.MockClient{}
+
+	mock.InOrder(
+		// 4 addons
+		hcli.On("Install", mock.Anything, mock.Anything).Times(4).Return(nil, nil),
+		hcli.On("Close").Once().Return(nil),
+	)
+
+	dr := dryrunInstallWithClusterConfig(t,
+		&dryrun.Client{HelmClient: hcli},
+		clusterConfigNoDomainsData,
+	)
+
+	// --- validate addons --- //
+
+	// openebs
+	assert.Equal(t, "Install", hcli.Calls[0].Method)
+	openebsOpts := hcli.Calls[0].Arguments[1].(helm.InstallOptions)
+	assert.Equal(t, "openebs", openebsOpts.ReleaseName)
+	assertHelmValues(t, openebsOpts.Values, map[string]interface{}{
+		"['localpv-provisioner'].localpv.basePath":         "/var/lib/embedded-cluster/openebs-local",
+		"['localpv-provisioner'].helperPod.image.registry": "proxy.staging.replicated.com/anonymous/",
+		"['localpv-provisioner'].localpv.image.registry":   "proxy.staging.replicated.com/anonymous/",
+		"['preUpgradeHook'].image.registry":                "proxy.staging.replicated.com/anonymous",
+	})
+
+	// embedded cluster operator
+	assert.Equal(t, "Install", hcli.Calls[1].Method)
+	operatorOpts := hcli.Calls[1].Arguments[1].(helm.InstallOptions)
+	assert.Equal(t, "embedded-cluster-operator", operatorOpts.ReleaseName)
+	assertHelmValues(t, operatorOpts.Values, map[string]interface{}{
+		"image.repository": "proxy.staging.replicated.com/anonymous/replicated/embedded-cluster-operator-image",
+	})
+
+	// velero
+	assert.Equal(t, "Install", hcli.Calls[2].Method)
+	veleroOpts := hcli.Calls[2].Arguments[1].(helm.InstallOptions)
+	assert.Equal(t, "velero", veleroOpts.ReleaseName)
+	assertHelmValues(t, veleroOpts.Values, map[string]interface{}{
+		"nodeAgent.podVolumePath": "/var/lib/embedded-cluster/k0s/kubelet/pods",
+		"image.repository":        "proxy.staging.replicated.com/anonymous/replicated/ec-velero",
+	})
+
+	// admin console
+	assert.Equal(t, "Install", hcli.Calls[3].Method)
+	adminConsoleOpts := hcli.Calls[3].Arguments[1].(helm.InstallOptions)
+	assert.Equal(t, "admin-console", adminConsoleOpts.ReleaseName)
+	assertHelmValues(t, adminConsoleOpts.Values, map[string]interface{}{
+		"kurlProxy.nodePort": float64(30000),
+	})
+	assertHelmValuePrefixes(t, adminConsoleOpts.Values, map[string]string{
+		"images.kotsadm":    "proxy.staging.replicated.com/anonymous",
+		"images.kurlProxy":  "proxy.staging.replicated.com/anonymous",
+		"images.migrations": "proxy.staging.replicated.com/anonymous",
+		"images.rqlite":     "proxy.staging.replicated.com/anonymous",
+	})
+
+	// --- validate installation object --- //
+	kcli, err := dr.KubeClient()
+	if err != nil {
+		t.Fatalf("failed to create kube client: %v", err)
+	}
+	in, err := kubeutils.GetLatestInstallation(context.TODO(), kcli)
+	if err != nil {
+		t.Fatalf("failed to get latest installation: %v", err)
+	}
+	// expected to be empty
+	assert.Equal(t, "", in.Spec.Config.Domains.ProxyRegistryDomain)
+	assert.Equal(t, "", in.Spec.Config.Domains.ReplicatedAppDomain)
+	assert.Equal(t, "", in.Spec.Config.Domains.ReplicatedRegistryDomain)
+
+	// --- validate k0s cluster config --- //
+	k0sConfig := readK0sConfig(t)
+
+	assert.Contains(t, k0sConfig.Spec.Images.MetricsServer.Image, "proxy.staging.replicated.com/anonymous")
+	assert.Contains(t, k0sConfig.Spec.Images.KubeProxy.Image, "proxy.staging.replicated.com/anonymous")
+	assert.Contains(t, k0sConfig.Spec.Images.CoreDNS.Image, "proxy.staging.replicated.com/anonymous")
+	assert.Contains(t, k0sConfig.Spec.Images.Pause.Image, "proxy.staging.replicated.com/anonymous")
+	assert.Contains(t, k0sConfig.Spec.Images.Calico.CNI.Image, "proxy.staging.replicated.com/anonymous")
+	assert.Contains(t, k0sConfig.Spec.Images.Calico.Node.Image, "proxy.staging.replicated.com/anonymous")
+	assert.Contains(t, k0sConfig.Spec.Images.Calico.KubeControllers.Image, "proxy.staging.replicated.com/anonymous")
+
+	t.Logf("%s: test complete", time.Now().Format(time.RFC3339))
+}

tests/dryrun/util.go

@@ -31,12 +31,18 @@ var (
 	//go:embed assets/install-release.yaml
 	releaseData string
 
+	//go:embed assets/cluster-config.yaml
+	clusterConfigData string
+
+	//go:embed assets/cluster-config-nodomains.yaml
+	clusterConfigNoDomainsData string
+
 	//go:embed assets/install-license.yaml
 	licenseData string
 )
 
 func dryrunJoin(t *testing.T, args ...string) dryruntypes.DryRun {
-	if err := embedReleaseData(); err != nil {
+	if err := embedReleaseData(clusterConfigData); err != nil {
 		t.Fatalf("fail to embed release data: %v", err)
 	}
 
@@ -57,7 +63,11 @@ func dryrunJoin(t *testing.T, args ...string) dryruntypes.DryRun {
 }
 
 func dryrunInstall(t *testing.T, c *dryrun.Client, args ...string) dryruntypes.DryRun {
-	if err := embedReleaseData(); err != nil {
+	return dryrunInstallWithClusterConfig(t, c, clusterConfigData, args...)
+}
+
+func dryrunInstallWithClusterConfig(t *testing.T, c *dryrun.Client, clusterConfig string, args ...string) dryruntypes.DryRun {
+	if err := embedReleaseData(clusterConfig); err != nil {
 		t.Fatalf("fail to embed release data: %v", err)
 	}
 
@@ -85,7 +95,7 @@ func dryrunInstall(t *testing.T, c *dryrun.Client, args ...string) dryruntypes.D
 }
 
 func dryrunUpdate(t *testing.T, args ...string) dryruntypes.DryRun {
-	if err := embedReleaseData(); err != nil {
+	if err := embedReleaseData(clusterConfigData); err != nil {
 		t.Fatalf("fail to embed release data: %v", err)
 	}
 
@@ -104,9 +114,10 @@ func dryrunUpdate(t *testing.T, args ...string) dryruntypes.DryRun {
 	return *dr
 }
 
-func embedReleaseData() error {
+func embedReleaseData(clusterConfig string) error {
 	if err := release.SetReleaseDataForTests(map[string][]byte{
-		"release.yaml": []byte(releaseData),
+		"release.yaml":        []byte(releaseData),
+		"cluster-config.yaml": []byte(clusterConfig),
 	}); err != nil {
 		return fmt.Errorf("set release data: %v", err)
 	}
@@ -246,3 +257,25 @@ func assertHelmValues(t *testing.T, actualValues map[string]interface{}, expecte
 		assert.Equal(t, expectedValue, actualValue)
 	}
 }
+
+func assertHelmValuePrefixes(t *testing.T, actualValues map[string]interface{}, expectedPrefixes map[string]string) {
+	for expectedKey, expectedPrefix := range expectedPrefixes {
+		actualValue, err := helm.GetValue(actualValues, expectedKey)
+		assert.NoError(t, err)
+		if actualValue == nil {
+			t.Errorf("expected prefix %s for key %s, got nil", expectedPrefix, expectedKey)
+			return
+		}
+
+		actualValueStr, ok := actualValue.(string)
+		if !ok {
+			t.Errorf("expected prefix %s for key %s, got %v", expectedPrefix, expectedKey, actualValue)
+			return
+		}
+
+		if !strings.HasPrefix(actualValueStr, expectedPrefix) {
+			t.Errorf("expected prefix %s for key %s, got %s", expectedPrefix, expectedKey, actualValueStr)
+			return
+		}
+	}
+}