AuthType defines the authentication method for SCIM API access.
SCIMConfig
authType
-github.com/cloudoperators/greenhouse/internal/scim.AuthType
+
+AuthType
+
|
diff --git a/e2e/authz/e2e_test.go b/e2e/authz/e2e_test.go
index 79aef94e5..203d00e48 100644
--- a/e2e/authz/e2e_test.go
+++ b/e2e/authz/e2e_test.go
@@ -102,7 +102,7 @@ var _ = BeforeSuite(func() {
org.Spec.Authentication = &greenhousev1alpha1.Authentication{
SCIMConfig: &greenhousev1alpha1.SCIMConfig{
BaseURL: scimBaseURL,
- AuthType: scim.Basic,
+ AuthType: greenhousev1alpha1.AuthTypeBasic,
BasicAuthUser: &greenhousev1alpha1.ValueFromSource{
Secret: &greenhousev1alpha1.SecretKeyReference{
Name: "mock-scim-secret",
diff --git a/go.mod b/go.mod
index ef7c20bb9..54b2b855f 100644
--- a/go.mod
+++ b/go.mod
@@ -3,6 +3,8 @@ module github.com/cloudoperators/greenhouse
go 1.26.0
replace (
+ github.com/cloudoperators/greenhouse/api => ./api //nolint:gomoddirectives
+
// DEX import matches version v2.45.1.
github.com/dexidp/dex => github.com/dexidp/dex v0.0.0-20260303133905-11d2eeb52b42
github.com/dexidp/dex/api/v2 => github.com/dexidp/dex/api/v2 v2.4.0
@@ -28,6 +30,7 @@ replace (
require (
github.com/cenkalti/backoff/v5 v5.0.3
+ github.com/cloudoperators/greenhouse/api v0.0.0-00010101000000-000000000000
github.com/dexidp/dex v0.0.0-20260303133905-11d2eeb52b42
github.com/fluxcd/cli-utils v1.2.1
github.com/fluxcd/helm-controller/api v1.5.5
diff --git a/internal/controller/catalog/source.go b/internal/controller/catalog/source.go
index 6aecebe2d..10a53e014 100644
--- a/internal/controller/catalog/source.go
+++ b/internal/controller/catalog/source.go
@@ -211,7 +211,7 @@ func (s *source) reconcileGitRepository(ctx context.Context) error {
spec := sourcev1.GitRepositorySpec{
URL: s.source.Repository,
Interval: s.source.GetInterval(),
- Reference: s.source.GetGitRepositoryReference(),
+ Reference: getGitRepositoryReference(&s.source),
Provider: genericAuthProvider,
Suspend: false,
}
diff --git a/internal/controller/catalog/utils.go b/internal/controller/catalog/utils.go
index 037ac02ee..f6c7b6e50 100644
--- a/internal/controller/catalog/utils.go
+++ b/internal/controller/catalog/utils.go
@@ -9,6 +9,10 @@ import (
"net/url"
"strconv"
"strings"
+
+ sourcev1 "github.com/fluxcd/source-controller/api/v1"
+
+ greenhousev1alpha1 "github.com/cloudoperators/greenhouse/api/v1alpha1"
)
// HashValue - returns a hash of the string
@@ -41,3 +45,22 @@ func GetOwnerRepoInfo(s string) (host, owner, repo string, err error) {
repo = comp[1]
return
}
+
+func getGitRepositoryReference(s *greenhousev1alpha1.CatalogSource) *sourcev1.GitRepositoryRef {
+ gitReference := &sourcev1.GitRepositoryRef{}
+ if s.Ref != nil {
+ // flux precedence 1
+ if s.Ref.SHA != nil {
+ gitReference.Commit = *s.Ref.SHA
+ }
+ // flux precedence 2
+ if s.Ref.Tag != nil {
+ gitReference.Tag = *s.Ref.Tag
+ }
+ // flux precedence 3
+ if s.Ref.Branch != nil {
+ gitReference.Branch = *s.Ref.Branch
+ }
+ }
+ return gitReference
+}
diff --git a/internal/controller/organization/organization_controller_test.go b/internal/controller/organization/organization_controller_test.go
index e09efb785..a773b4467 100644
--- a/internal/controller/organization/organization_controller_test.go
+++ b/internal/controller/organization/organization_controller_test.go
@@ -26,7 +26,6 @@ import (
"github.com/cloudoperators/greenhouse/internal/dex"
dexapi "github.com/cloudoperators/greenhouse/internal/dex/api"
"github.com/cloudoperators/greenhouse/internal/rbac"
- "github.com/cloudoperators/greenhouse/internal/scim"
"github.com/cloudoperators/greenhouse/internal/test"
)
@@ -157,7 +156,7 @@ var _ = Describe("Test Organization reconciliation", Ordered, func() {
o.Spec.Authentication = &greenhousev1alpha1.Authentication{
SCIMConfig: &greenhousev1alpha1.SCIMConfig{
BaseURL: groupsServer.URL + "/scim",
- AuthType: scim.Basic,
+ AuthType: greenhousev1alpha1.AuthTypeBasic,
BasicAuthUser: &greenhousev1alpha1.ValueFromSource{
Secret: &greenhousev1alpha1.SecretKeyReference{
Name: "test-secret",
@@ -199,7 +198,7 @@ var _ = Describe("Test Organization reconciliation", Ordered, func() {
o.Spec.Authentication = &greenhousev1alpha1.Authentication{
SCIMConfig: &greenhousev1alpha1.SCIMConfig{
BaseURL: groupsServer.URL + "/scim",
- AuthType: scim.BearerToken,
+ AuthType: greenhousev1alpha1.AuthTypeBearerToken,
BearerToken: &greenhousev1alpha1.ValueFromSource{
Secret: &greenhousev1alpha1.SecretKeyReference{
Name: "test-secret",
@@ -247,7 +246,7 @@ var _ = Describe("Test Organization reconciliation", Ordered, func() {
testOrg.Spec.Authentication = &greenhousev1alpha1.Authentication{
SCIMConfig: &greenhousev1alpha1.SCIMConfig{
BaseURL: groupsServer.URL + "/scim",
- AuthType: scim.Basic,
+ AuthType: greenhousev1alpha1.AuthTypeBasic,
BasicAuthUser: &greenhousev1alpha1.ValueFromSource{
Secret: &greenhousev1alpha1.SecretKeyReference{
Name: "test-secret",
diff --git a/internal/scim/scim_client.go b/internal/scim/scim_client.go
index 4bc0d4c5a..405d36d50 100644
--- a/internal/scim/scim_client.go
+++ b/internal/scim/scim_client.go
@@ -17,6 +17,8 @@ import (
"strings"
"github.com/go-logr/logr"
+
+ greenhousev1alpha1 "github.com/cloudoperators/greenhouse/api/v1alpha1"
)
type scimClient struct {
@@ -33,7 +35,7 @@ type basicAuthTransport struct {
type Config struct {
URL string
- AuthType AuthType
+ AuthType greenhousev1alpha1.AuthType
BasicAuth *BasicAuthConfig
BearerToken *BearerTokenConfig
}
@@ -96,7 +98,7 @@ func NewSCIMClient(logger logr.Logger, config *Config) (ISCIMClient, error) {
}
switch config.AuthType {
- case Basic:
+ case greenhousev1alpha1.AuthTypeBasic:
if config.BasicAuth == nil {
return nil, errors.New("could not create http scim client, Basic Auth Config missing")
}
@@ -109,7 +111,7 @@ func NewSCIMClient(logger logr.Logger, config *Config) (ISCIMClient, error) {
Password: config.BasicAuth.Password,
Next: http.DefaultTransport,
}
- case BearerToken:
+ case greenhousev1alpha1.AuthTypeBearerToken:
if config.BearerToken == nil {
return nil, errors.New("could not create http scim client, BearerToken Config missing")
}
diff --git a/internal/scim/scim_client_test.go b/internal/scim/scim_client_test.go
index 3d2e2db9d..c08096f97 100644
--- a/internal/scim/scim_client_test.go
+++ b/internal/scim/scim_client_test.go
@@ -6,13 +6,13 @@ package scim
import (
"context"
"fmt"
-
- ctrl "sigs.k8s.io/controller-runtime"
-
"net/http"
"testing"
"github.com/stretchr/testify/assert"
+ ctrl "sigs.k8s.io/controller-runtime"
+
+ greenhousev1alpha1 "github.com/cloudoperators/greenhouse/api/v1alpha1"
)
func Test_SCIM_Client(t *testing.T) {
@@ -20,14 +20,14 @@ func Test_SCIM_Client(t *testing.T) {
testTable := []struct {
name string
- authType AuthType
+ authType greenhousev1alpha1.AuthType
basicAuthConfig *BasicAuthConfig
bearerTokenConfig *BearerTokenConfig
withError bool
}{
{
name: "it should successfully create a basic auth client",
- authType: Basic,
+ authType: greenhousev1alpha1.AuthTypeBasic,
basicAuthConfig: &BasicAuthConfig{
Username: "some-username",
Password: "some-password",
@@ -35,7 +35,7 @@ func Test_SCIM_Client(t *testing.T) {
},
{
name: "it should fail to create a basic auth client, when no username is provided",
- authType: Basic,
+ authType: greenhousev1alpha1.AuthTypeBasic,
basicAuthConfig: &BasicAuthConfig{
Password: "some-password",
},
@@ -43,7 +43,7 @@ func Test_SCIM_Client(t *testing.T) {
},
{
name: "it should fail to create a basic auth client, when no password is provided",
- authType: Basic,
+ authType: greenhousev1alpha1.AuthTypeBasic,
basicAuthConfig: &BasicAuthConfig{
Username: "some-username",
},
@@ -51,19 +51,19 @@ func Test_SCIM_Client(t *testing.T) {
},
{
name: "it should fail to create a basic auth client, when no username and password is provided",
- authType: Basic,
+ authType: greenhousev1alpha1.AuthTypeBasic,
withError: true,
},
{
name: "it should successfully create a bearer token client",
- authType: BearerToken,
+ authType: greenhousev1alpha1.AuthTypeBearerToken,
bearerTokenConfig: &BearerTokenConfig{
Token: bearerToken,
},
},
{
name: "it should failed to create a bearer token client, when no bearer token is provided",
- authType: BearerToken,
+ authType: greenhousev1alpha1.AuthTypeBearerToken,
withError: true,
bearerTokenConfig: &BearerTokenConfig{},
},
@@ -111,7 +111,7 @@ func TestClient_GetGroups(t *testing.T) {
})
scimClient, err := NewSCIMClient(logger, &Config{
URL: server.URL + baseURLPath,
- AuthType: Basic,
+ AuthType: greenhousev1alpha1.AuthTypeBasic,
BasicAuth: &BasicAuthConfig{
Username: "some-username",
Password: "some-password",
@@ -199,7 +199,7 @@ func TestClient_GetUsers(t *testing.T) {
// Create the SCIM client
scimClient, err := NewSCIMClient(logger, &Config{
URL: server.URL + baseURLPath,
- AuthType: Basic,
+ AuthType: greenhousev1alpha1.AuthTypeBasic,
BasicAuth: &BasicAuthConfig{
Username: "some-username",
Password: "some-password",
@@ -294,7 +294,7 @@ func TestClient_GetPaginatedUsers(t *testing.T) {
// Create the SCIM client
scimClient, err := NewSCIMClient(logger, &Config{
URL: server.URL + baseURLPath,
- AuthType: Basic,
+ AuthType: greenhousev1alpha1.AuthTypeBasic,
BasicAuth: &BasicAuthConfig{
Username: "some-username",
Password: "some-password",
diff --git a/internal/scim/scim_types.go b/internal/scim/scim_types.go
index f6494fac2..3fd7fe3de 100644
--- a/internal/scim/scim_types.go
+++ b/internal/scim/scim_types.go
@@ -9,13 +9,6 @@ import (
"strings"
)
-type AuthType string
-
-const (
- Basic AuthType = "basic"
- BearerToken AuthType = "token"
-)
-
const (
InitialStartID = "initial"
)
diff --git a/internal/util/scim_config.go b/internal/util/scim_config.go
index 67e480455..45c25c1f4 100644
--- a/internal/util/scim_config.go
+++ b/internal/util/scim_config.go
@@ -9,18 +9,18 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
- greenhouseapisv1alpha1 "github.com/cloudoperators/greenhouse/api/v1alpha1"
+ greenhousev1alpha1 "github.com/cloudoperators/greenhouse/api/v1alpha1"
"github.com/cloudoperators/greenhouse/internal/clientutil"
"github.com/cloudoperators/greenhouse/internal/scim"
)
-func GreenhouseSCIMConfigToSCIMConfig(ctx context.Context, k8sClient client.Client, config *greenhouseapisv1alpha1.SCIMConfig, namespace string) (*scim.Config, error) {
+func GreenhouseSCIMConfigToSCIMConfig(ctx context.Context, k8sClient client.Client, config *greenhousev1alpha1.SCIMConfig, namespace string) (*scim.Config, error) {
cfg := &scim.Config{
URL: config.BaseURL,
AuthType: config.AuthType,
}
switch cfg.AuthType {
- case scim.Basic:
+ case greenhousev1alpha1.AuthTypeBasic:
var err error
username, err := clientutil.GetSecretKeyFromSecretKeyReference(ctx, k8sClient, namespace, *config.BasicAuthUser.Secret)
if err != nil {
@@ -34,7 +34,7 @@ func GreenhouseSCIMConfigToSCIMConfig(ctx context.Context, k8sClient client.Clie
Username: username,
Password: password,
}
- case scim.BearerToken:
+ case greenhousev1alpha1.AuthTypeBearerToken:
var err error
token, err := clientutil.GetSecretKeyFromSecretKeyReference(ctx, k8sClient, namespace, *config.BearerToken.Secret)
if err != nil {
diff --git a/internal/webhook/v1alpha1/organization_webhook.go b/internal/webhook/v1alpha1/organization_webhook.go
index d8ab3201a..f0ac471a7 100644
--- a/internal/webhook/v1alpha1/organization_webhook.go
+++ b/internal/webhook/v1alpha1/organization_webhook.go
@@ -13,7 +13,6 @@ import (
"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
greenhousev1alpha1 "github.com/cloudoperators/greenhouse/api/v1alpha1"
- "github.com/cloudoperators/greenhouse/internal/scim"
"github.com/cloudoperators/greenhouse/internal/webhook"
)
@@ -99,14 +98,14 @@ func validateSCIMConfig(org *greenhousev1alpha1.Organization) field.ErrorList {
}
switch scimCfg.AuthType {
- case scim.Basic:
+ case greenhousev1alpha1.AuthTypeBasic:
if scimCfg.BasicAuthUser == nil || scimCfg.BasicAuthUser.Secret == nil {
errs = append(errs, field.Required(scimPath.Child("basicAuthUser"), "basicAuthUser and its secret are required"))
}
if scimCfg.BasicAuthPw == nil || scimCfg.BasicAuthPw.Secret == nil {
errs = append(errs, field.Required(scimPath.Child("basicAuthPw"), "basicAuthPw and its secret are required"))
}
- case scim.BearerToken:
+ case greenhousev1alpha1.AuthTypeBearerToken:
if scimCfg.BearerToken == nil || scimCfg.BearerToken.Secret == nil {
errs = append(errs, field.Required(scimPath.Child("bearerToken"), "bearerToken and its secret are required"))
}
diff --git a/internal/webhook/v1alpha1/organization_webhook_test.go b/internal/webhook/v1alpha1/organization_webhook_test.go
index 3f317cab8..0411367e8 100644
--- a/internal/webhook/v1alpha1/organization_webhook_test.go
+++ b/internal/webhook/v1alpha1/organization_webhook_test.go
@@ -11,7 +11,6 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
greenhousev1alpha1 "github.com/cloudoperators/greenhouse/api/v1alpha1"
- "github.com/cloudoperators/greenhouse/internal/scim"
)
var _ = Describe("Validate Organization Defaulting Webhook", func() {
@@ -53,7 +52,7 @@ var _ = Describe("Validate Organization Webhook", func() {
Authentication: &greenhousev1alpha1.Authentication{
SCIMConfig: &greenhousev1alpha1.SCIMConfig{
BaseURL: "https://example.org",
- AuthType: scim.Basic,
+ AuthType: greenhousev1alpha1.AuthTypeBasic,
BasicAuthUser: &greenhousev1alpha1.ValueFromSource{
Secret: &greenhousev1alpha1.SecretKeyReference{
Name: "test-secret",
@@ -76,7 +75,7 @@ var _ = Describe("Validate Organization Webhook", func() {
Authentication: &greenhousev1alpha1.Authentication{
SCIMConfig: &greenhousev1alpha1.SCIMConfig{
BaseURL: "https://example.org",
- AuthType: scim.BearerToken,
+ AuthType: greenhousev1alpha1.AuthTypeBearerToken,
BearerToken: &greenhousev1alpha1.ValueFromSource{
Secret: &greenhousev1alpha1.SecretKeyReference{
Name: "test-secret",
@@ -93,7 +92,7 @@ var _ = Describe("Validate Organization Webhook", func() {
Authentication: &greenhousev1alpha1.Authentication{
SCIMConfig: &greenhousev1alpha1.SCIMConfig{
BaseURL: "https://example.org",
- AuthType: scim.Basic,
+ AuthType: greenhousev1alpha1.AuthTypeBasic,
BearerToken: &greenhousev1alpha1.ValueFromSource{
Secret: &greenhousev1alpha1.SecretKeyReference{
Name: "test-secret",
@@ -110,7 +109,7 @@ var _ = Describe("Validate Organization Webhook", func() {
Authentication: &greenhousev1alpha1.Authentication{
SCIMConfig: &greenhousev1alpha1.SCIMConfig{
BaseURL: "https://example.org",
- AuthType: scim.BearerToken,
+ AuthType: greenhousev1alpha1.AuthTypeBearerToken,
BasicAuthUser: &greenhousev1alpha1.ValueFromSource{
Secret: &greenhousev1alpha1.SecretKeyReference{
Name: "test-secret",
@@ -172,7 +171,7 @@ var _ = Describe("Validate Organization Webhook", func() {
Authentication: &greenhousev1alpha1.Authentication{
SCIMConfig: &greenhousev1alpha1.SCIMConfig{
BaseURL: "https://example.org",
- AuthType: scim.Basic,
+ AuthType: greenhousev1alpha1.AuthTypeBasic,
BasicAuthUser: &greenhousev1alpha1.ValueFromSource{
Secret: &greenhousev1alpha1.SecretKeyReference{
Name: "test-secret",
@@ -195,7 +194,7 @@ var _ = Describe("Validate Organization Webhook", func() {
Authentication: &greenhousev1alpha1.Authentication{
SCIMConfig: &greenhousev1alpha1.SCIMConfig{
BaseURL: "https://example.org",
- AuthType: scim.BearerToken,
+ AuthType: greenhousev1alpha1.AuthTypeBearerToken,
BearerToken: &greenhousev1alpha1.ValueFromSource{
Secret: &greenhousev1alpha1.SecretKeyReference{
Name: "test-secret",
diff --git a/types/typescript/schema.d.ts b/types/typescript/schema.d.ts
index 5f3987e5c..b5f0ba862 100644
--- a/types/typescript/schema.d.ts
+++ b/types/typescript/schema.d.ts
@@ -842,7 +842,12 @@ export interface components {
clusterOptionOverrides?: {
clusterName: string;
overrides: {
- /** @description Expression is a YAML string with ${...} placeholders that will be evaluated as CEL expressions. */
+ /**
+ * @description Expression is a YAML string with ${...} placeholders that will be evaluated as CEL expressions.
+ *
+ * Deprecated: Expression is deprecated on standalone Plugins and will be removed in a future release.
+ * Consider using a PluginPreset to deploy Plugins utilizing the Expression field.
+ */
expression?: string;
/** @description Name of the values. */
name: string;
@@ -850,7 +855,12 @@ export interface components {
value?: unknown;
/** @description ValueFrom references value in another source. */
valueFrom?: {
- /** @description Ref references values defined in another resource (Plugin, PluginPreset) */
+ /**
+ * @description Ref references values defined in another resource (Plugin, PluginPreset)
+ *
+ * Deprecated: Ref is deprecated on standalone Plugins and will be removed in a future release.
+ * Consider using a PluginPreset to deploy Plugins utilizing the Ref field.
+ */
ref?: {
/** @description Expression is a CEL expression to extract the value from the referenced resource */
expression: string;
@@ -944,8 +954,6 @@ export interface components {
deletionPolicy: "Delete" | "Retain";
/** @description PluginSpec is the spec of the plugin to be deployed by the PluginPreset. */
plugin: {
- /** @description ClusterName is the name of the cluster the plugin is deployed to. If not set, the plugin is deployed to the greenhouse cluster. */
- clusterName?: string;
/**
* @description DeletionPolicy defines how Helm Releases created by a Plugin are handled upon deletion of the Plugin.
* Supported values are "Delete" and "Retain". If not set, defaults to "Delete".
@@ -974,7 +982,12 @@ export interface components {
}[];
/** @description Values are the values for a PluginDefinition instance. */
optionValues?: {
- /** @description Expression is a YAML string with ${...} placeholders that will be evaluated as CEL expressions. */
+ /**
+ * @description Expression is a YAML string with ${...} placeholders that will be evaluated as CEL expressions.
+ *
+ * Deprecated: Expression is deprecated on standalone Plugins and will be removed in a future release.
+ * Consider using a PluginPreset to deploy Plugins utilizing the Expression field.
+ */
expression?: string;
/** @description Name of the values. */
name: string;
@@ -982,7 +995,12 @@ export interface components {
value?: unknown;
/** @description ValueFrom references value in another source. */
valueFrom?: {
- /** @description Ref references values defined in another resource (Plugin, PluginPreset) */
+ /**
+ * @description Ref references values defined in another resource (Plugin, PluginPreset)
+ *
+ * Deprecated: Ref is deprecated on standalone Plugins and will be removed in a future release.
+ * Consider using a PluginPreset to deploy Plugins utilizing the Ref field.
+ */
ref?: {
/** @description Expression is a CEL expression to extract the value from the referenced resource */
expression: string;
@@ -1059,16 +1077,6 @@ export interface components {
* Defaults to the Greenhouse managed namespace if not set.
*/
releaseNamespace?: string;
- /** @description WaitFor defines other Plugins to wait for before installing this Plugin. */
- waitFor?: {
- /** @description PluginRef defines a reference to the Plugin. */
- pluginRef: {
- /** @description Name of the Plugin. */
- name?: string;
- /** @description PluginPreset is the name of the PluginPreset which creates the Plugin. */
- pluginPreset?: string;
- };
- }[];
};
/** @description WaitFor defines other Plugins to wait for before creating the Plugin. */
waitFor?: {
@@ -1198,7 +1206,12 @@ export interface components {
}[];
/** @description Values are the values for a PluginDefinition instance. */
optionValues?: {
- /** @description Expression is a YAML string with ${...} placeholders that will be evaluated as CEL expressions. */
+ /**
+ * @description Expression is a YAML string with ${...} placeholders that will be evaluated as CEL expressions.
+ *
+ * Deprecated: Expression is deprecated on standalone Plugins and will be removed in a future release.
+ * Consider using a PluginPreset to deploy Plugins utilizing the Expression field.
+ */
expression?: string;
/** @description Name of the values. */
name: string;
@@ -1206,7 +1219,12 @@ export interface components {
value?: unknown;
/** @description ValueFrom references value in another source. */
valueFrom?: {
- /** @description Ref references values defined in another resource (Plugin, PluginPreset) */
+ /**
+ * @description Ref references values defined in another resource (Plugin, PluginPreset)
+ *
+ * Deprecated: Ref is deprecated on standalone Plugins and will be removed in a future release.
+ * Consider using a PluginPreset to deploy Plugins utilizing the Ref field.
+ */
ref?: {
/** @description Expression is a CEL expression to extract the value from the referenced resource */
expression: string;
|