Merge branch 'main' into refactor-add-tests

Makefile

@@ -46,8 +46,8 @@ local-registry:
 	./tools/deploy-local-registry.sh
 
 local-docker-image:
-	docker build -t localhost:5000/wego-app:latest .
-	docker push localhost:5000/wego-app:latest
+	docker build -t localhost:5001/wego-app:latest .
+	docker push localhost:5001/wego-app:latest
 
 fakes: ## Generate testing fakes
 	go generate ./...

Tiltfile

@@ -10,7 +10,7 @@ local_resource(
 )
 
 docker_build_with_restart(
-    'localhost:5000/weaveworks/wego-app', 
+    'localhost:5001/weaveworks/wego-app', 
     '.',
     only=[
         './bin',

pkg/models/manifest.go

@@ -11,21 +11,19 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/fluxcd/go-git-providers/gitprovider"
+	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/validation"
-
-	corev1 "k8s.io/api/core/v1"
-
-	"github.com/fluxcd/go-git-providers/gitprovider"
+	"sigs.k8s.io/kustomize/api/types"
+	"sigs.k8s.io/yaml"
 
 	"github.com/weaveworks/weave-gitops/cmd/gitops/version"
 	"github.com/weaveworks/weave-gitops/manifests"
 	"github.com/weaveworks/weave-gitops/pkg/flux"
 	"github.com/weaveworks/weave-gitops/pkg/git"
 	"github.com/weaveworks/weave-gitops/pkg/gitproviders"
 	"github.com/weaveworks/weave-gitops/pkg/kube"
-	"sigs.k8s.io/kustomize/api/types"
-	"sigs.k8s.io/yaml"
 )
 
 type Manifest struct {
@@ -48,7 +46,7 @@ const (
 
 	WegoConfigMapName = "weave-gitops-config"
 	WegoImage         = "ghcr.io/weaveworks/wego-app"
-	localWegoImage    = "localhost:5000/wego-app"
+	localWegoImage    = "localhost:5001/wego-app"
 )
 
 type ManifestsParams struct {
@@ -186,6 +184,10 @@ func NoClusterApplicableManifests(params ManifestsParams) ([]Manifest, error) {
 			Path:    git.GetSystemQualifiedPath(params.ClusterName, SystemKustomizationPath),
 			Content: systemKustomizationManifest,
 		},
+		{
+			Path:    git.GetSystemQualifiedPath(params.ClusterName, WegoProfilesPath),
+			Content: []byte(""),
+		},
 		{
 			Path:    filepath.Join(git.GetUserPath(params.ClusterName), ".keep"),
 			Content: strconv.AppendQuote(nil, "# keep"),

pkg/models/manifest_test.go

@@ -178,13 +178,17 @@ var _ = Describe("Installer", func() {
 				noClusterApplicableManifests, err := NoClusterApplicableManifests(params)
 				Expect(err).ShouldNot(HaveOccurred())
 
-				Expect(len(noClusterApplicableManifests)).Should(Equal(2))
+				Expect(len(noClusterApplicableManifests)).Should(Equal(3))
 
 				expectedManifests := []Manifest{
 					{
 						Path:    git.GetSystemQualifiedPath(params.ClusterName, SystemKustomizationPath),
 						Content: systemKustomizationManifest,
 					},
+					{
+						Path:    git.GetSystemQualifiedPath(params.ClusterName, WegoProfilesPath),
+						Content: []byte(""),
+					},
 					{
 						Path:    filepath.Join(git.GetUserPath(params.ClusterName), ".keep"),
 						Content: strconv.AppendQuote(nil, "# keep"),

pkg/services/install/install_test.go

@@ -239,6 +239,10 @@ var _ = Describe("Installer", func() {
 					Path:    git.GetSystemQualifiedPath(clusterName, models.SystemKustomizationPath),
 					Content: systemKustomizationManifest,
 				},
+				{
+					Path:    git.GetSystemQualifiedPath(clusterName, models.WegoProfilesPath),
+					Content: []byte(""),
+				},
 				{
 					Path:    filepath.Join(git.GetUserPath(clusterName), ".keep"),
 					Content: strconv.AppendQuote(nil, "# keep"),
@@ -313,6 +317,10 @@ var _ = Describe("Installer", func() {
 					Path:    git.GetSystemQualifiedPath(clusterName, models.SystemKustomizationPath),
 					Content: systemKustomizationManifest,
 				},
+				{
+					Path:    git.GetSystemQualifiedPath(clusterName, models.WegoProfilesPath),
+					Content: []byte(""),
+				},
 				{
 					Path:    filepath.Join(git.GetUserPath(clusterName), ".keep"),
 					Content: strconv.AppendQuote(nil, "# keep"),

test/acceptance/test/add_tests.go

@@ -545,8 +545,8 @@ var _ = Describe("Weave GitOps Add App Tests", func() {
 
 		By("Then I should see my workload deployed for app2", func() {
 			verifyWegoAddCommand(appName2, WEGO_DEFAULT_NAMESPACE)
-			Expect(waitForResource("apps", appName2, WEGO_DEFAULT_NAMESPACE, INSTALL_PODS_READY_TIMEOUT)).To(Succeed())
-			Expect(waitForResource("configmaps", "helloworld-configmap", WEGO_DEFAULT_NAMESPACE, INSTALL_PODS_READY_TIMEOUT)).To(Succeed())
+			waitForResourceToExist("apps", appName2, WEGO_DEFAULT_NAMESPACE, INSTALL_PODS_READY_TIMEOUT)
+			waitForResourceToExist("configmaps", "helloworld-configmap", WEGO_DEFAULT_NAMESPACE, INSTALL_PODS_READY_TIMEOUT)
 		})
 
 		By("When I run gitops add app command for app3: "+appName3, func() {
@@ -871,8 +871,8 @@ var _ = Describe("Weave GitOps Add App Tests", func() {
 
 		By("Then I should see my workload deployed to the cluster", func() {
 			verifyWegoAddCommand(appName, WEGO_DEFAULT_NAMESPACE)
-			Expect(waitForResource("apps", appName, WEGO_DEFAULT_NAMESPACE, INSTALL_PODS_READY_TIMEOUT)).To(Succeed())
-			Expect(waitForResource("configmaps", "helloworld-configmap", WEGO_DEFAULT_NAMESPACE, INSTALL_PODS_READY_TIMEOUT)).To(Succeed())
+			waitForResourceToExist("apps", appName, WEGO_DEFAULT_NAMESPACE, INSTALL_PODS_READY_TIMEOUT)
+			waitForResourceToExist("configmaps", "helloworld-configmap", WEGO_DEFAULT_NAMESPACE, INSTALL_PODS_READY_TIMEOUT)
 		})
 
 		By("And repo created has private visibility", func() {
@@ -934,8 +934,8 @@ var _ = Describe("Weave GitOps Add App Tests", func() {
 
 		By("Then I should see my workload deployed to the cluster", func() {
 			verifyWegoAddCommand(appName, WEGO_DEFAULT_NAMESPACE)
-			Expect(waitForResource("apps", appName, WEGO_DEFAULT_NAMESPACE, INSTALL_PODS_READY_TIMEOUT)).To(Succeed())
-			Expect(waitForResource("configmaps", "helloworld-configmap", WEGO_DEFAULT_NAMESPACE, INSTALL_PODS_READY_TIMEOUT)).To(Succeed())
+			waitForResourceToExist("apps", appName, WEGO_DEFAULT_NAMESPACE, INSTALL_PODS_READY_TIMEOUT)
+			waitForResourceToExist("configmaps", "helloworld-configmap", WEGO_DEFAULT_NAMESPACE, INSTALL_PODS_READY_TIMEOUT)
 		})
 
 	})
@@ -1585,6 +1585,10 @@ var _ = Describe("Weave GitOps Add Tests With Long Cluster Name", func() {
 			installAndVerifyWego(WEGO_DEFAULT_NAMESPACE, configRepoRemoteURL)
 		})
 
+		By("And the kustomizations should not have any errors", func() {
+			VerifyKustomizations(clusterContext, WEGO_DEFAULT_NAMESPACE)
+		})
+
 		By("And I run gitops add app command for app: "+appName, func() {
 			runWegoAddCommand(repoAbsolutePath, addCommand, WEGO_DEFAULT_NAMESPACE)
 		})

test/acceptance/test/scripts/kind-cluster.sh

@@ -19,8 +19,10 @@
 
 set -o errexit
 
-echo "Delete existing kind clusters"
-kind delete clusters --all
+if [[ -z "${SKIP_DELETE}" ]]; then
+  echo "Delete existing kind clusters"
+  kind delete clusters --all
+fi
 
 echo "Create a new kind cluster with name "$1
 
@@ -35,7 +37,7 @@ fi
 kind_version=$(kind version)
 kind_network='kind'
 reg_name='kind-registry'
-reg_port='5000'
+reg_port='5001'
 case "${kind_version}" in
   "kind v0.7."* | "kind v0.6."* | "kind v0.5."*)
     kind_network='bridge'
@@ -81,4 +83,4 @@ if [ "${kind_network}" != "bridge" ]; then
   if [ "${needs_connect}" = "true" ]; then
     docker network connect "${kind_network}" "${reg_name}" || true
   fi
-fi
+fi