Merge branch 'master' into KSPACE-28-spc-crd

codeready-toolchain · Jan 15, 2024 · 2c5dc5e · 2c5dc5e
2 parents e0e8324 + d5c7803
commit 2c5dc5e
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 5 deletions.
diff --git 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
@@ -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
diff --git a/api/v1alpha1/zz_generated.openapi.go b/api/v1alpha1/zz_generated.openapi.go