Merge branch 'main' into artie-charts-dashboard

.github/labeler.yml

@@ -15,13 +15,6 @@ documentation:
     - README.md
     - docs/**
 
-headscale:
-- changed-files:
-  - any-glob-to-any-file:
-    - charts/headscale/**
-    - pkg/headscale/**
-    - pkg/headscalectl/**
-
 idproxy:
 - changed-files:
   - any-glob-to-any-file:

.github/licenserc.yaml

@@ -37,8 +37,6 @@ header:
     - 'Makefile'
     - 'pkg/idproxy/web/**'
     - 'pkg/apis/scheme_builder.go' # Belongs to the Kubernetes authors
-    - 'cmd/tcp-proxy/main.go' # MIT License
-    - 'pkg/tcp-proxy/proxy/*.go' # MIT License
     - '**/zz_generated.deepcopy.go' # Generated by Kubebuilder
     - 'charts/**/templates/*.yaml' # license headers on helm templates are causing issues 
 

.github/workflows/docker-build.yaml

@@ -33,12 +33,6 @@ jobs:
             Imagename: greenhouse
           - Dockerfiles: Dockerfile.dev-env
             Imagename: greenhouse-dev-env
-          - Dockerfiles: Dockerfile.headscalectl
-            Imagename: greenhouse-headscalectl
-          - Dockerfiles: Dockerfile.tailscale
-            Imagename: greenhouse-tailscale
-          - Dockerfiles: Dockerfile.tcp-proxy
-            Imagename: greenhouse-tcp-proxy
           # - Dockerfiles: Dockerfile.dev-ui
           #   Imagename: greenhouse-dev-ui
 
@@ -57,7 +51,7 @@ jobs:
       # https://github.com/sigstore/cosign-installer
       - name: Install cosign
         if: github.event_name != 'pull_request'
-        uses: sigstore/cosign-installer@v3.6.0
+        uses: sigstore/cosign-installer@v3.7.0
         with:
           cosign-release: 'v2.2.3'
 
@@ -151,12 +145,6 @@ jobs:
             Imagename: greenhouse
           - Dockerfiles: Dockerfile.dev-env
             Imagename: greenhouse-dev-env
-          - Dockerfiles: Dockerfile.headscalectl
-            Imagename: greenhouse-headscalectl
-          - Dockerfiles: Dockerfile.tailscale
-            Imagename: greenhouse-tailscale
-          - Dockerfiles: Dockerfile.tcp-proxy
-            Imagename: greenhouse-tcp-proxy
           # - Dockerfiles: Dockerfile.dev-ui
           #   Imagename: greenhouse-dev-ui
 

.github/workflows/pr-docker-build.yaml

@@ -25,12 +25,6 @@ jobs:
             Imagename: greenhouse
           - Dockerfiles: Dockerfile.dev-env
             Imagename: greenhouse-dev-env
-          - Dockerfiles: Dockerfile.headscalectl
-            Imagename: greenhouse-headscalectl
-          - Dockerfiles: Dockerfile.tailscale
-            Imagename: greenhouse-tailscale
-          - Dockerfiles: Dockerfile.tcp-proxy
-            Imagename: greenhouse-tcp-proxy
 
     permissions:
       contents: read

.mockery.yaml

@@ -0,0 +1,16 @@
+# SPDX-FileCopyrightText: 2024 SAP SE or an SAP affiliate company and Greenhouse contributors
+# SPDX-License-Identifier: Apache-2.0
+
+# .mockery.yaml
+with-expecter: false
+filename: "mock_{{.InterfaceName}}.go"
+outpkg: mocks
+dir: pkg/mocks
+packages:
+  github.com/cloudoperators/greenhouse/pkg/lifecycle:
+    interfaces:
+      Reconciler:
+  sigs.k8s.io/controller-runtime/pkg/client:
+    interfaces:
+      Client:
+      SubResourceWriter:

Makefile

@@ -199,7 +199,7 @@ HELMIFY ?= $(LOCALBIN)/helmify
 ## Tool Versions
 KUSTOMIZE_VERSION ?= v5.4.2
 CONTROLLER_TOOLS_VERSION ?= v0.15.0
-GOLINT_VERSION ?= v1.60.2
+GOLINT_VERSION ?= v1.61.0
 GINKGOLINTER_VERSION ?= v0.16.2
 
 KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
@@ -267,4 +267,10 @@ WEBHOOK_DEV ?= false
 
 .PHONY: setup-webhook
 setup-webhook: cli
-	$(CLI) dev setup webhook --name $(ADMIN_CLUSTER) --namespace $(ADMIN_NAMESPACE) --release $(ADMIN_RELEASE) --chart-path $(ADMIN_CHART_PATH) --dockerfile ./ --dev-mode=$(WEBHOOK_DEV)
+	$(CLI) dev setup webhook --name $(ADMIN_CLUSTER) --namespace $(ADMIN_NAMESPACE) --release $(ADMIN_RELEASE) --chart-path $(ADMIN_CHART_PATH) --dockerfile ./ --dev-mode=$(WEBHOOK_DEV)
+
+# Download and install mockery locally via `brew install mockery`
+MOCKERY := $(shell which mockery)
+mockery:
+	# will look into .mockery.yaml for configuration
+	$(MOCKERY)

charts/greenhouse/Chart.lock

@@ -5,12 +5,6 @@ dependencies:
 - name: cors-proxy
   repository: file://../cors-proxy
   version: 0.2.0
-- name: headscale
-  repository: file://../headscale
-  version: 0.1.3
-- name: tailscale-proxy
-  repository: file://../tailscale-proxy
-  version: 0.1.0
 - name: manager
   repository: file://../manager
   version: 0.1.6
@@ -20,5 +14,5 @@ dependencies:
 - name: demo
   repository: file://../demo
   version: 0.1.1
-digest: sha256:a9f3691f99496f2a587ab98e599c7b0cc00c0c5a6e712b75c2fc070aedd1615b
-generated: "2024-09-06T14:19:08.271429486+02:00"
+digest: sha256:fd38eac090116758caa914c00b9fb1065f08ccda7685f858007a3939ff6efbb4
+generated: "2024-10-09T11:57:04.231793+02:00"

charts/greenhouse/Chart.yaml

@@ -5,7 +5,7 @@ apiVersion: v2
 name: greenhouse
 description: A Helm chart for deploying greenhouse
 type: application
-version: 0.2.7
+version: 0.3.0
 appVersion: "0.1.0"
 
 dependencies:
@@ -17,14 +17,6 @@ dependencies:
     name: cors-proxy
     repository: "file://../cors-proxy"
     version: 0.2.0
-  - condition: headscale.enabled
-    name: headscale
-    version: 0.1.3
-    repository: "file://../headscale"
-  - condition: tailscale-proxy.enabled
-    name: tailscale-proxy
-    version: 0.1.0
-    repository: "file://../tailscale-proxy"
   - name: manager
     version: 0.1.6
     repository: "file://../manager"

charts/greenhouse/ci/test-values.yaml

@@ -23,6 +23,11 @@ scim:
   username: topSecret!
   password: topSecret!123
 
+teams:
+  admin:
+    description: The Admin Team
+    mappedIdPGroup: Admin IDP Group
+
 alerts:
   enabled: true
   tlsConfig:
@@ -34,12 +39,6 @@ alerts:
     host: topSecret!
   endpoint: topSecret!
 
-headscale:
-  ingress:
-    host: "foo.bar"
-  postgres:
-    password: topSecret!
-
 tailscale-proxy:
   preauthkeyProvosioner:
     userName: topSecret!

charts/greenhouse/values.yaml

@@ -29,9 +29,9 @@ scim:
 # Configures core Greenhouse teams.
 teams:
   # An admin team must be specified. Additional teams are optional.
-  admin:
-    description: Greenhouse admin team
-    mappedIdPGroup: CCloud Greenhouse Admin
+  # admin:
+  #   description:
+  #   mappedIdPGroup:
 
 # toggles logshipping subchart
 logshipping: