Merge branch 'main' of github.com:stolostron/multicluster-observabili…

…ty-operator into fix-csr-sign-usage

Signed-off-by: Douglas Camata <[email protected]>

.github/workflows/integration_tests.yaml

@@ -0,0 +1,35 @@
+name: integration 
+
+on:
+  push:
+    branches:
+      - main
+    tags:
+      - "*"
+  pull_request:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    name: Integration tests
+    env:
+      GOBIN: /tmp/.bin
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Install Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: 1.21.x
+          cache-dependency-path: "**/*.sum"
+
+      - name: Install deps
+        run: make deps
+      - name: Build
+        run: make build
+
+      - name: Run tests
+        run: |
+          source <(BIN_DIR=$GOBIN make install-envtest-deps)
+          make integration-test-operators

Makefile

@@ -205,3 +205,8 @@ install-integration-test-deps:
 install-e2e-test-deps:
 	@mkdir -p $(BIN_DIR)
 	@./scripts/install-binaries.sh install_e2e_tests_deps $(BIN_DIR)
+
+.PHONY: install-envtest-deps
+install-envtest-deps:
+	@mkdir -p $(BIN_DIR)
+	@./scripts/install-binaries.sh install_envtest_deps $(BIN_DIR)

operators/endpointmetrics/controllers/observabilityendpoint/observabilityaddon_controller_integration_test.go

@@ -8,6 +8,7 @@ package observabilityendpoint
 
 import (
 	"context"
+	"os"
 	"path/filepath"
 	"testing"
 	"time"
@@ -17,11 +18,15 @@ import (
 	"github.com/stolostron/multicluster-observability-operator/operators/endpointmetrics/pkg/hypershift"
 	"github.com/stolostron/multicluster-observability-operator/operators/endpointmetrics/pkg/util"
 	oav1beta1 "github.com/stolostron/multicluster-observability-operator/operators/multiclusterobservability/api/v1beta1"
+	mcov1beta2 "github.com/stolostron/multicluster-observability-operator/operators/multiclusterobservability/api/v1beta2"
 	"github.com/stretchr/testify/assert"
 	corev1 "k8s.io/api/core/v1"
+	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/serializer/yaml"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/wait"
 	kubescheme "k8s.io/client-go/kubernetes/scheme"
@@ -64,7 +69,8 @@ func TestIntegrationReconcileHypershift(t *testing.T) {
 	}
 
 	mgr, err := ctrl.NewManager(testEnv.Config, ctrl.Options{
-		Scheme: k8sClient.Scheme(),
+		Scheme:             k8sClient.Scheme(),
+		MetricsBindAddress: "0", // Avoids port conflict with the default port 8080
 	})
 	assert.NoError(t, err)
 
@@ -100,8 +106,15 @@ func TestIntegrationReconcileHypershift(t *testing.T) {
 
 // setupTestEnv starts the test environment (etcd and kube api-server).
 func setupTestEnv(t *testing.T) (*envtest.Environment, client.Client) {
+	rootPath := filepath.Join("..", "..", "..")
+	crds := readCRDFiles(t,
+		filepath.Join(rootPath, "multiclusterobservability", "config", "crd", "bases", "observability.open-cluster-management.io_multiclusterobservabilities.yaml"),
+		filepath.Join(rootPath, "endpointmetrics", "manifests", "prometheus", "crd", "servicemonitor_crd_0_53_1.yaml"),
+		filepath.Join(rootPath, "endpointmetrics", "manifests", "prometheus", "crd", "prometheusrule_crd_0_53_1.yaml"),
+	)
 	testEnv := &envtest.Environment{
 		CRDDirectoryPaths: []string{filepath.Join("testdata", "crd"), filepath.Join("..", "..", "config", "crd", "bases")},
+		CRDs:              crds,
 	}
 
 	cfg, err := testEnv.Start()
@@ -114,6 +127,7 @@ func setupTestEnv(t *testing.T) (*envtest.Environment, client.Client) {
 	hyperv1.AddToScheme(scheme)
 	promv1.AddToScheme(scheme)
 	oav1beta1.AddToScheme(scheme)
+	mcov1beta2.AddToScheme(scheme)
 
 	k8sClient, err := client.New(cfg, client.Options{Scheme: scheme})
 	if err != nil {
@@ -128,6 +142,28 @@ func setupTestEnv(t *testing.T) (*envtest.Environment, client.Client) {
 	return testEnv, k8sClient
 }
 
+func readCRDFiles(t *testing.T, crdPaths ...string) []*apiextensionsv1.CustomResourceDefinition {
+	ret := []*apiextensionsv1.CustomResourceDefinition{}
+
+	for _, crdPath := range crdPaths {
+		crdYamlData, err := os.ReadFile(crdPath)
+		if err != nil {
+			t.Fatalf("Failed to read CRD file: %v", err)
+		}
+
+		dec := yaml.NewDecodingSerializer(unstructured.UnstructuredJSONScheme)
+		var crd apiextensionsv1.CustomResourceDefinition
+		_, _, err = dec.Decode(crdYamlData, nil, &crd)
+		if err != nil {
+			t.Fatalf("Failed to decode CRD: %v", err)
+		}
+
+		ret = append(ret, &crd)
+	}
+
+	return ret
+}
+
 func makeNamespace(name string) *corev1.Namespace {
 	return &corev1.Namespace{
 		ObjectMeta: metav1.ObjectMeta{