diff --git a/api/v1alpha1/masteruserrecord_types.go b/api/v1alpha1/masteruserrecord_types.go index c085b7ed..4a0f3e52 100644 --- a/api/v1alpha1/masteruserrecord_types.go +++ b/api/v1alpha1/masteruserrecord_types.go @@ -142,7 +142,7 @@ type Cluster struct { // +kubebuilder:resource:shortName=mur // +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=`.status.conditions[?(@.type=="Ready")].status` // +kubebuilder:printcolumn:name="Reason",type="string",JSONPath=`.status.conditions[?(@.type=="Ready")].reason` -// +kubebuilder:printcolumn:name="Cluster",type="string",JSONPath=`.spec.userAccounts[].targetCluster` +// +kubebuilder:printcolumn:name="Cluster",type="string",JSONPath=`.status.userAccounts[].cluster.name` // +kubebuilder:printcolumn:name="Tier",type="string",JSONPath=`.spec.tierName` // +kubebuilder:printcolumn:name="Banned",type="string",JSONPath=`.spec.banned`,priority=1 // +kubebuilder:printcolumn:name="Disabled",type="string",JSONPath=`.spec.disabled`,priority=1 diff --git a/api/v1alpha1/toolchainconfig_types.go b/api/v1alpha1/toolchainconfig_types.go index c7843da7..c908d78b 100644 --- a/api/v1alpha1/toolchainconfig_types.go +++ b/api/v1alpha1/toolchainconfig_types.go @@ -291,17 +291,25 @@ type RegistrationServiceAuthConfig struct { // +optional AuthClientLibraryURL *string `json:"authClientLibraryURL,omitempty"` - // AuthClientConfigContentType specifies the auth config config content type + // AuthClientConfigContentType specifies the auth config content type // +optional AuthClientConfigContentType *string `json:"authClientConfigContentType,omitempty"` - // AuthClientConfigRaw specifies the URL used to a access the registration service + // AuthClientConfigRaw specifies the URL used to access the registration service // +optional AuthClientConfigRaw *string `json:"authClientConfigRaw,omitempty"` // AuthClientPublicKeysURL specifies the public keys URL // +optional AuthClientPublicKeysURL *string `json:"authClientPublicKeysURL,omitempty"` + + // SSOBaseURL specifies the SSO base URL such as https://sso.redhat.com + // +optional + SSOBaseURL *string `json:"ssoBaseURL,omitempty"` + + // SSORealm specifies the SSO realm name + // +optional + SSORealm *string `json:"ssoRealm,omitempty"` } // RegistrationServiceVerificationConfig contains the subset of registration service configuration parameters related to verification diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go index 420ce542..54f382cf 100644 --- a/api/v1alpha1/zz_generated.deepcopy.go +++ b/api/v1alpha1/zz_generated.deepcopy.go @@ -1946,6 +1946,16 @@ func (in *RegistrationServiceAuthConfig) DeepCopyInto(out *RegistrationServiceAu *out = new(string) **out = **in } + if in.SSOBaseURL != nil { + in, out := &in.SSOBaseURL, &out.SSOBaseURL + *out = new(string) + **out = **in + } + if in.SSORealm != nil { + in, out := &in.SSORealm, &out.SSORealm + *out = new(string) + **out = **in + } } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RegistrationServiceAuthConfig. diff --git a/api/v1alpha1/zz_generated.openapi.go b/api/v1alpha1/zz_generated.openapi.go index f565b81a..a4de0eb4 100644 --- a/api/v1alpha1/zz_generated.openapi.go +++ b/api/v1alpha1/zz_generated.openapi.go @@ -2574,14 +2574,14 @@ func schema_codeready_toolchain_api_api_v1alpha1_RegistrationServiceAuthConfig(r }, "authClientConfigContentType": { SchemaProps: spec.SchemaProps{ - Description: "AuthClientConfigContentType specifies the auth config config content type", + Description: "AuthClientConfigContentType specifies the auth config content type", Type: []string{"string"}, Format: "", }, }, "authClientConfigRaw": { SchemaProps: spec.SchemaProps{ - Description: "AuthClientConfigRaw specifies the URL used to a access the registration service", + Description: "AuthClientConfigRaw specifies the URL used to access the registration service", Type: []string{"string"}, Format: "", }, @@ -2593,6 +2593,20 @@ func schema_codeready_toolchain_api_api_v1alpha1_RegistrationServiceAuthConfig(r Format: "", }, }, + "ssoBaseURL": { + SchemaProps: spec.SchemaProps{ + Description: "SSOBaseURL specifies the SSO base URL such as https://sso.redhat.com", + Type: []string{"string"}, + Format: "", + }, + }, + "ssoRealm": { + SchemaProps: spec.SchemaProps{ + Description: "SSORealm specifies the SSO realm name", + Type: []string{"string"}, + Format: "", + }, + }, }, }, },