fix integration testing

Signed-off-by: Alexandre Lamarre <[email protected]>

.github/workflows/integration.yaml

@@ -65,8 +65,10 @@ jobs:
     - name : Package helm-project-operator
       run : |
         BUILD_TARGET=helm-project-operator ./scripts/package
-        source ./scripts/version
+        BUILD_TARGET=helm-project-operator source ./scripts/version
         k3d image import -c test-cluster $IMAGE
+    - name : Debug k3d images 
+      run : docker exec k3d-test-cluster-server-0 crictl images
     - name : Run e2e tests
       run : |
         KUBECONFIG=$KUBECONFIG ./scripts/integration

internal/helm-locker/e2e_suite_test.go

@@ -7,6 +7,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/google/uuid"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	lockerv1alpha1 "github.com/rancher/prometheus-federator/internal/helm-locker/pkg/apis/helm.cattle.io/v1alpha1"
@@ -40,6 +41,10 @@ var (
 	clientCmdCfg clientcmd.ClientConfig
 )
 
+var (
+	operatorName = "helm-locker-" + uuid.New().String()
+)
+
 type TestSpec struct {
 	Kubeconfig string `env:"KUBECONFIG,required"`
 }

internal/helm-locker/e2e_test.go

@@ -68,7 +68,7 @@ var _ = Describe("E2E helm locker operator tests", Ordered, Label("kubernetes"),
 				operator.ControllerOptions{
 					ClientConfig:   clientCmdCfg,
 					Namespace:      ns,
-					ControllerName: "helmlocker",
+					ControllerName: operatorName,
 					NodeName:       "node1",
 					PprofEnabled:   false,
 				},
@@ -164,7 +164,7 @@ var _ = Describe("E2E helm locker operator tests", Ordered, Label("kubernetes"),
 				Eventually(Object(release)).Should(
 					ExistAnd(
 						HaveAnnotations(
-							"helmreleases.cattle.io/managed-by", "helmlocker",
+							"helmreleases.cattle.io/managed-by", operatorName,
 						),
 						HaveFinalizers("wrangler.cattle.io/on-helm-release-remove"),
 					),

internal/helm-project-operator/e2e_suite_test.go

@@ -26,7 +26,7 @@ import (
 )
 
 func TestE2e(t *testing.T) {
-	SetDefaultEventuallyTimeout(60 * time.Second)
+	SetDefaultEventuallyTimeout(30 * time.Second)
 	SetDefaultEventuallyPollingInterval(50 * time.Millisecond)
 	SetDefaultConsistentlyDuration(1 * time.Second)
 	SetDefaultConsistentlyPollingInterval(50 * time.Millisecond)

internal/helm-project-operator/e2e_test.go

@@ -222,13 +222,16 @@ var _ = Describe("E2E helm project operator tests", Ordered, Label("kubernetes")
 			// }()
 			ctxT, ca := context.WithTimeout(testCtx, 5*time.Minute)
 			defer ca()
+
+			image := strings.TrimPrefix(ts.image.Repository(), "docker.io/")
 			helmInstaller := newHelmInstaller(
 				WithContext(ctxT),
 				WithCreateNamespace(),
 				WithNamespace(chartNs),
 				WithReleaseName("helm-project-operator"),
 				WithChartRegistry("../../packages/helm-project-operator/charts"),
-				WithValue("image.repository", ts.image.Repository()),
+				WithValue("image.registry", "docker.io"),
+				WithValue("image.repository", image),
 				WithValue("image.tag", ts.image.Tag()),
 				WithValue("helmController.enabled", "true"),
 			)
@@ -251,7 +254,7 @@ var _ = Describe("E2E helm project operator tests", Ordered, Label("kubernetes")
 			Eventually(Object(deploy)).Should(ExistAnd(
 				HaveMatchingContainer(And(
 					HaveName("helm-project-operator"),
-					HaveImage(fmt.Sprintf("%s:%s", ts.image.Registry(), ts.image.Tag())),
+					HaveImage(fmt.Sprintf("%s:%s", ts.image.Repository(), ts.image.Tag())),
 				)),
 			))
 

package/Dockerfile-helm-project-operator

@@ -2,7 +2,6 @@
 FROM --platform=$BUILDPLATFORM rancher/mirrored-tonistiigi-xx:1.3.0 AS xx
 
 FROM --platform=$BUILDPLATFORM registry.suse.com/bci/golang:1.23 AS builder
-FROM registry.suse.com/bci/golang:1.23 AS builder
 ARG TARGETARCH
 ENV BUILD_TARGET="helm-project-operator"
 WORKDIR /usr/src/app

pkg/chart/build/example-chart.tgz.base64

@@ -1,29 +1,29 @@
 H4sIFAAAAAAA/ykAK2FIUjBjSE02THk5NWIzVjBkUzVpWlM5Nk9WVjZNV2xqYW5keVRRbz1IZWxt
-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
-bYZjv+axld/DHvawh+8Y/gwAAP//3Jg0uQAsAAA=
+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
+9vAdw38DAAD///QYY1sALAAA

scripts/build-chart

@@ -31,11 +31,16 @@ elif [ "$BUILD_TARGET" == "helm-project-operator" ]; then
   cp -rf "examples/${BUILD_TARGET}/${CHART}" build/charts/
 
   # Update the chart placeholders
-  edit-charts "build/charts/${CHART}/Chart.yaml" "${HELM_CHART_VERSION}" "${HELM_IMAGE_TAG}"
+  # FIXME: causes a git diff because we add git tagged versions to the helm-chart metadata. I think we can omit this
+  # from builds since the helm-project-operator is a sub-chart and end-users shouldn't look to 
+  # this metadata for clarifying information since the version of the prometheus-federator version chart is the one
+  # indicating changes from now on
+
+  # edit-charts "build/charts/${CHART}/Chart.yaml" "${HELM_CHART_VERSION}" "${HELM_IMAGE_TAG}"
   package-charts "./build/charts/${CHART}" ./build/charts
 
   # Prepare chart for embedding location
-  base64 -i "./build/charts/${CHART}-${HELM_CHART_VERSION}.tgz" > "pkg/chart/build/${CHART}.tgz.base64"
+  base64 -i "./build/charts/${CHART}-0.0.0.tgz" > "pkg/chart/build/${CHART}.tgz.base64"
 fi
 
 echo "Completed ${CHART} (ver: ${HELM_CHART_VERSION:-"n/a"}) build process."

scripts/integration

@@ -1,10 +1,19 @@
 #!/usr/bin/env bash
 set -e
 
+# harcode since we expect to run integration tests against the helm-project-operator image
+BUILD_TARGET=helm-project-operator
+
 source $(dirname $0)/version
 cd $(dirname $0)/..
 
 echo "Starting integration tests"
+# we separate these two test suites since the embedded helm-locker in helm-project-operator can cause a race
+# condition that causes the helm-locker tests to fail, because either controller can acquire and harden a helm-release.
+
+echo "Running helm-locker integration tests"
+KUBECONFIG=$KUBECONFIG go test -cover ./internal/helm-locker --ginkgo.label-filter='kubernetes'
 
-echo "Running integration tests for $BUILD_TARGET"
-KUBECONFIG=$KUBECONFIG IMAGE=$IMAGE go test -cover ./... --ginkgo.label-filter 'kubernetes'
+# expects the dev image $IMAGE to be available to the cluster pointed to by $KUBECONFIG
+echo "Running helm-project-operator integration tests with image : $IMAGE"
+KUBECONFIG=$KUBECONFIG IMAGE=$IMAGE go test -cover ./internal/helm-project-operator --ginkgo.label-filter 'kubernetes'

scripts/package-helm

@@ -29,5 +29,10 @@ fi
 clean-old-chart "$BUILD_TARGET"
 cp -rf "${DEFAULT_CHART_SOURCE}" "./build/charts/${BUILD_TARGET}"
 
-edit-charts "./build/charts/${BUILD_TARGET}/Chart.yaml" "${HELM_CHART_VERSION}" "${HELM_IMAGE_TAG}"
+# FIXME: causes a git diff because we add git tagged versions to the helm-chart metadata. I think we can omit this
+# from builds since the helm-project-operator is a sub-chart and end-users shouldn't look to 
+# this metadata for clarifying information since the version of the prometheus-federator version chart is the one
+# indicating changes from now on
+# edit-charts "./build/charts/${BUILD_TARGET}/Chart.yaml" "${HELM_CHART_VERSION}" "${HELM_IMAGE_TAG}"
+
 package-charts "./build/charts/${BUILD_TARGET}"