[WIP]

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

Author: alexandreLamarre

go.mod

@@ -38,10 +38,10 @@ require (
 )
 
 // TODO: remove
-replace (
-	github.com/rancher/lasso => /home/alex/forks/lasso
-	github.com/rancher/wrangler/v3 => /home/alex/forks/wrangler
-)
+// replace (
+// 	github.com/rancher/lasso => /home/alex/forks/lasso
+// 	github.com/rancher/wrangler/v3 => /home/alex/forks/wrangler
+// )
 
 require (
 	emperror.dev/errors v0.8.1 // indirect

go.sum

@@ -187,6 +187,10 @@ github.com/prometheus/common v0.61.0 h1:3gv/GThfX0cV2lpO7gkTUwZru38mxevy90Bj8YFS
 github.com/prometheus/common v0.61.0/go.mod h1:zr29OCN/2BsJRaFwG8QOBr41D6kkchKbpeNH7pAjb/s=
 github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
 github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
+github.com/rancher/lasso v0.2.1 h1:SZTqMVQn8cAOqvwGBd1/EYOIJ/MGN+UfJrOWvHd4jHU=
+github.com/rancher/lasso v0.2.1/go.mod h1:KSV3jBXfdXqdCuMm2uC8kKB9q/wuDYb3h0eHZoRjShM=
+github.com/rancher/wrangler/v3 v3.2.0-rc.2 h1:weBa8NvAPFKFfkg3ZeD+V+B4yxCpaoiM9rPbvONKBVQ=
+github.com/rancher/wrangler/v3 v3.2.0-rc.2/go.mod h1:Py71XA9ENufjKSGHr9n/pk+iMB6vU5ZrD1EOu9Q9nIs=
 github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
 github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
 github.com/rubenv/sql-migrate v1.5.2 h1:bMDqOnrJVV/6JQgQ/MxOpU+AdO8uzYYA/TxFUBzFtS0=
@@ -241,8 +245,6 @@ go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 h1:3Q/xZUyC1BBkualc9RO
 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0/go.mod h1:s75jGIWA9OfCMzF0xr+ZgfrB5FEbbV7UuYo32ahUiFI=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 h1:qFffATk0X+HD+f1Z8lswGiOQYKHRlzfmdJm0wEaVrFA=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0/go.mod h1:MOiCmryaYtc+V0Ei+Tx9o5S1ZjA7kzLucuVuyzBZloQ=
-go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.34.0 h1:jBpDk4HAUsrnVO1FsfCfCOTEc/MkInJmvfCHYLFiT80=
-go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.34.0/go.mod h1:H9LUIM1daaeZaz91vZcfeM0fejXPmgCYE8ZhzqfJuiU=
 go.opentelemetry.io/otel/metric v1.34.0 h1:+eTR3U0MyfWjRDhmFMxe2SsW64QrZ84AOhvqS7Y+PoQ=
 go.opentelemetry.io/otel/metric v1.34.0/go.mod h1:CEDrp0fy2D0MvkXE+dPV7cMi8tWZwX3dmaIhwPOaqHE=
 go.opentelemetry.io/otel/sdk v1.34.0 h1:95zS4k/2GOy069d321O8jWgYsW3MzVV+KuSPKp7Wr1A=

internal/helm-project-operator/controllers/project/integration.go

@@ -2,6 +2,7 @@ package project
 
 import (
 	"context"
+	"fmt"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
@@ -10,6 +11,8 @@ import (
 	"github.com/rancher/prometheus-federator/internal/helm-project-operator/controllers/namespace"
 	"github.com/rancher/prometheus-federator/internal/helm-project-operator/controllers/setup"
 	"github.com/rancher/prometheus-federator/internal/test"
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	// . "github.com/kralicky/kmatch"
 )
 
@@ -62,7 +65,7 @@ func ProjectControllerTest(
 				)
 
 				// TODO : https://github.com/rancher/prometheus-federator/pull/166
-				By("verifying registed role bindings")
+				By("verifying registered role bindings")
 
 				By("starting all controllers")
 				ctxca, ca := context.WithCancel(t.Context())
@@ -72,7 +75,41 @@ func ProjectControllerTest(
 		})
 
 		When("the controller is running", func() {
-			It("should do something", func() {
+			Specify("when we create a project helm chart", func() {
+				dummyRegistrationNamespace := fmt.Sprintf(
+					common.ProjectRegistrationNamespaceFmt,
+					"dummy-registration-namespace",
+				)
+				projectId := "dumb-1"
+				ns := &corev1.Namespace{
+					ObjectMeta: metav1.ObjectMeta{
+						Name: dummyRegistrationNamespace,
+						Labels: map[string]string{
+							opts.ProjectLabel: projectId,
+						},
+					},
+				}
+				// t.ObjectTracker().Add(ns)
+				Expect(t.K8sClient().Create(t.Context(), ns)).To(Succeed())
+
+				ph := &v1alpha1.ProjectHelmChart{
+					ObjectMeta: metav1.ObjectMeta{
+						Name:      "hello",
+						Namespace: dummyRegistrationNamespace,
+					},
+					Spec: v1alpha1.ProjectHelmChartSpec{
+						HelmAPIVersion: opts.HelmAPIVersion,
+						Values: map[string]interface{}{
+							"enabled": "true",
+						},
+					},
+				}
+				// t.ObjectTracker().Add(ph)
+				Expect(t.K8sClient().Create(t.Context(), ph)).To(Succeed())
+
+				Eventually(func() error {
+					return nil
+				}).Should(Succeed())
 			})
 		})
 

internal/integration/examples/foo-chart/templates/configmap.yaml

@@ -5,3 +5,4 @@ metadata:
   namespace: {{ .Release.Namespace }}
 data: 
   "contents" : {{ .Values.contents}}
+  "contents2" : {{ .Values.contents2}}

internal/integration/integration_test.go

@@ -5,6 +5,7 @@ import (
 	helm_locker "github.com/rancher/prometheus-federator/internal/helm-locker"
 	"github.com/rancher/prometheus-federator/internal/helm-project-operator/controllers/common"
 	"github.com/rancher/prometheus-federator/internal/helm-project-operator/controllers/namespace"
+	"github.com/rancher/prometheus-federator/internal/helm-project-operator/controllers/project"
 	"github.com/rancher/prometheus-federator/internal/test"
 	"github.com/rancher/prometheus-federator/pkg/instrumentation"
 )
@@ -20,10 +21,8 @@ const overrideProjectLabel = "x.y.z/projectId"
 var _ = BeforeSuite(test.Setup)
 
 var _ = Describe("Prometheus Federator integration tests", Ordered, func() {
-	Describe("HPO/SingleNamespaceController", Ordered, namespace.SingleNamespaceTest())
-	// TODO : discuss whether or not we should allow helm-project-operator to sync invalid yaml
-	// to questions/values project registration namespaces
-	Describe("HPO/MultiNamespaceController/InvalidYaml", Ordered, namespace.MultiNamespaceTest(
+	Describe("HPO/NamespaceController/Single", Ordered, namespace.SingleNamespaceTest())
+	Describe("HPO/NamespaceController/InvalidYaml", Ordered, namespace.MultiNamespaceTest(
 		"cattle-helm-system",
 		common.Options{
 			OperatorOptions: common.OperatorOptions{
@@ -44,7 +43,7 @@ var _ = Describe("Prometheus Federator integration tests", Ordered, func() {
 		"questions?",
 		"project-id-1",
 	))
-	Describe("HPO/MultiNamespaceController/ValidYaml", Ordered, namespace.MultiNamespaceTest(
+	Describe("HPO/NamespaceController/ValidYaml", Ordered, namespace.MultiNamespaceTest(
 		"cattle-helm-system",
 		common.Options{
 			OperatorOptions: common.OperatorOptions{
@@ -64,8 +63,29 @@ var _ = Describe("Prometheus Federator integration tests", Ordered, func() {
 		validValuesYaml,
 		emptyQuestions,
 		"project-id-2",
-	),
-	)
+	))
+	Describe("HPO/ProjectController", Ordered, project.ProjectControllerTest(
+		"cattle-helm-system",
+		common.Options{
+			OperatorOptions: common.OperatorOptions{
+				HelmAPIVersion: "v1",
+				ReleaseName:    "test-1",
+				// TODO : set this to a valid chart content
+				ChartContent: "",
+			},
+			RuntimeOptions: common.RuntimeOptions{
+				ProjectLabel: projectIdLabel,
+			},
+		},
+		map[string]interface{}{
+			"contents2": "alwaysOverriden",
+		},
+		projectGetter(
+			[]string{},
+			[]string{},
+			map[string][]string{},
+		),
+	))
 	Describe("HelmLocker/e2e", Ordered, helm_locker.E2eTest())
 })
 

internal/integration/projectgetter.go

@@ -0,0 +1,57 @@
+package integration
+
+import (
+	"slices"
+
+	v1alpha1 "github.com/rancher/prometheus-federator/internal/helm-project-operator/apis/helm.cattle.io/v1alpha1"
+	"github.com/rancher/prometheus-federator/internal/helm-project-operator/controllers/namespace"
+	corev1 "k8s.io/api/core/v1"
+)
+
+type embedProjectGetter struct {
+	projRegistration []string
+	system           []string
+	targetNamespaces map[string][]string
+}
+
+func (e *embedProjectGetter) IsProjectRegistrationNamespace(namespace *corev1.Namespace) bool {
+	if namespace == nil {
+		return false
+	}
+	return slices.Contains(e.projRegistration, namespace.Name)
+}
+
+func (e *embedProjectGetter) IsSystemNamespace(namespace *corev1.Namespace) bool {
+	if namespace == nil {
+		return false
+	}
+	return slices.Contains(e.system, namespace.Name)
+}
+
+// GetTargetProjectNamespaces returns the list of namespaces that should be targeted for a given ProjectHelmChart
+// Any namespace returned by this should not be a project registration namespace or a system namespace
+func (e *embedProjectGetter) GetTargetProjectNamespaces(projectHelmChart *v1alpha1.ProjectHelmChart) ([]string, error) {
+	if projectHelmChart == nil {
+		return []string{}, nil
+	}
+	vals, ok := e.targetNamespaces[projectHelmChart.Name]
+	if !ok {
+		return []string{}, nil
+	}
+	return vals, nil
+}
+
+var _ namespace.ProjectGetter = (*embedProjectGetter)(nil)
+
+func projectGetter(
+	projRegistration []string,
+	system []string,
+	targetNamespaces map[string][]string,
+) namespace.ProjectGetter {
+
+	return &embedProjectGetter{
+		projRegistration: projRegistration,
+		system:           system,
+		targetNamespaces: targetNamespaces,
+	}
+}