Merge pull request #28 from posit-dev/fix-ci-unit-tests

fix(ci): add Keycloak CRDs and fix flightdeck workflow

Author: ian-flores

.github/workflows/flightdeck.yml

@@ -136,9 +136,12 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Push to GHCR (main branch)
+        if: github.ref == 'refs/heads/main'
+        run: docker push "${{ env.GHCR_REGISTRY }}/flightdeck:${{ steps.metadata.outputs.version }}"
+
       - name: Push to GHCR (for PRs - adhoc testing)
         if: github.event_name == 'pull_request'
-        working-directory: flightdeck/
         run: |
           ADHOC_TAG="${{ steps.adhoc-tag.outputs.tag }}"
           docker tag "${{ env.GHCR_REGISTRY }}/flightdeck:${{ steps.metadata.outputs.version }}" "${{ env.GHCR_REGISTRY }}/flightdeck:${ADHOC_TAG}"

api/core/v1beta1/connect_types.go

@@ -9,8 +9,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/rstudio/goex/ptr"
 	"github.com/posit-dev/team-operator/api/product"
+	"github.com/rstudio/goex/ptr"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	v1 "sigs.k8s.io/secrets-store-csi-driver/apis/v1"

api/core/v1beta1/keycloak.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/rstudio/goex/ptr"
 	"github.com/posit-dev/team-operator/api/product"
+	"github.com/rstudio/goex/ptr"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

api/core/v1beta1/packagemanager_types.go

@@ -8,8 +8,8 @@ package v1beta1
 import (
 	"fmt"
 
-	"github.com/rstudio/goex/ptr"
 	"github.com/posit-dev/team-operator/api/product"
+	"github.com/rstudio/goex/ptr"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )

api/core/v1beta1/workbench_types.go

@@ -11,8 +11,8 @@ import (
 
 	"github.com/go-logr/logr"
 	"github.com/pkg/errors"
-	"github.com/rstudio/goex/ptr"
 	"github.com/posit-dev/team-operator/api/product"
+	"github.com/rstudio/goex/ptr"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )

api/core/v1beta1/zz_generated.deepcopy.go

@@ -2,8 +2,6 @@ package localtest
 
 import (
 	"context"
-	"fmt"
-	"os"
 	"path/filepath"
 
 	"github.com/go-logr/logr"
@@ -21,16 +19,10 @@ type LocalTestEnv struct {
 }
 
 func (lte *LocalTestEnv) makeEnv() error {
-	topDir, ok := os.LookupEnv("TOP")
-	if !ok {
-		fmt.Printf("TOP environment variable not set, guessing...\n")
-		topDir = filepath.Join(RootDir, "../")
-	}
-
 	lte.env = &envtest.Environment{
 		CRDDirectoryPaths: []string{
 			filepath.Join(RootDir, "config", "crd", "bases"),
-			filepath.Join(topDir, "keycloak", "kustomization", "crds"),
+			filepath.Join(RootDir, "hack", "keycloak", "crds"),
 			filepath.Join(RootDir, "hack", "traefik", "crds"),
 		},
 		ErrorIfCRDPathMissing: true,