Merge branch 'master' of github.com:mfrancisc/api

Author: Devtools

.github/workflows/ci-build.yml

@@ -23,7 +23,7 @@ jobs:
         go-version-file: go.mod
 
     - name: Lint
-      uses: golangci/golangci-lint-action@v8
+      uses: golangci/golangci-lint-action@v9
       with:
         version: v2.1.6
         skip-pkg-cache: true

.golangci.yml

@@ -30,6 +30,7 @@ linters:
     - testifylint
     - unparam
     - zerologlint
+    - copyloopvar
   disable:
     - contextcheck
     - noctx

.govulncheck.yaml

@@ -1,7 +1,25 @@
 ignored-vulnerabilities:
-  # Inconsistent handling of O_CREATE|O_EXCL on Unix and Windows in os in syscall
-  # Found in: os@go1.22.12
-  # Fixed in: os@go1.23.10
-  - id: GO-2025-3750
-    silence-until: 2025-10-02
-    info: https://pkg.go.dev/vuln/GO-2025-3750
+  # Parsing DER payload can cause memory exhaustion in encoding/asn1
+  # Found in: encoding/asn1@go1.23.12
+  # Fixed in: encoding/asn1@go1.24.8
+  - id: GO-2025-4011
+    info: https://pkg.go.dev/vuln/GO-2025-4011
+    silence-until: 2025-12-03
+# Insufficient validation of bracketed IPv6 hostnames in net/url
+  # Found in: net/url@go1.23.12
+  # Fixed in: net/url@go1.24.8
+  - id: GO-2025-4010
+    info: https://pkg.go.dev/vuln/GO-2025-4010
+    silence-until: 2025-12-03
+  # Quadratic complexity when parsing some invalid inputs in encoding/pem
+  # Found in: encoding/pem@go1.23.12
+  # Fixed in: encoding/pem@go1.24.8
+  - id: GO-2025-4009
+    info: https://pkg.go.dev/vuln/GO-2025-4009
+    silence-until: 2025-12-03
+  # Quadratic complexity when checking name constraints in crypto/x509
+  # Found in: crypto/x509@go1.23.12
+  # Fixed in: crypto/x509@go1.24.9
+  - id: GO-2025-4007
+    info: https://pkg.go.dev/vuln/GO-2025-4007
+    silence-until: 2025-12-03

README.adoc

@@ -8,7 +8,7 @@ For the API reference docs go xref:api/v1alpha1/docs/apiref.adoc[here]
 == Building
 Requires:
 
-* Go version 1.22.x (1.22.12 or higher) - download for your development environment https://golang.org/dl/[here].
+* Go version 1.23.x (1.23.12 or higher) - download for your development environment https://golang.org/dl/[here].
 
 CodeReady ToolChain API is built using https://github.com/golang/go/wiki/Modules[Go modules].
 

api/v1alpha1/docs/apiref.adoc

@@ -15,10 +15,6 @@ type MemberOperatorConfigSpec struct {
 	// +optional
 	Autoscaler AutoscalerConfig `json:"autoscaler,omitempty"`
 
-	// Keeps parameters concerned with Che/CRW
-	// +optional
-	Che CheConfig `json:"che,omitempty"`
-
 	// Keeps parameters concerned with the console
 	// +optional
 	Console ConsoleConfig `json:"console,omitempty"`
@@ -72,50 +68,6 @@ type AutoscalerConfig struct {
 	BufferReplicas *int `json:"bufferReplicas,omitempty"`
 }
 
-// Defines all parameters concerned with Che
-// +k8s:openapi-gen=true
-type CheConfig struct {
-	// Defines the Che/CRW Keycloak route name
-	// +optional
-	KeycloakRouteName *string `json:"keycloakRouteName,omitempty"`
-
-	// Defines the Che/CRW route name
-	// +optional
-	RouteName *string `json:"routeName,omitempty"`
-
-	// Defines the Che/CRW operator namespace
-	// +optional
-	Namespace *string `json:"namespace,omitempty"`
-
-	// Defines a flag that indicates whether the Che/CRW operator is required to be installed on the cluster. May be used in monitoring.
-	// +optional
-	Required *bool `json:"required,omitempty"`
-
-	// Defines a flag to turn the Che user deletion logic on/off
-	// +optional
-	UserDeletionEnabled *bool `json:"userDeletionEnabled,omitempty"`
-
-	// Defines all secrets related to Che configuration
-	// +optional
-	Secret CheSecret `json:"secret,omitempty"`
-}
-
-// Defines all secrets related to Che configuration
-// +k8s:openapi-gen=true
-type CheSecret struct {
-	// The reference to the secret that is expected to contain the keys below
-	// +optional
-	ToolchainSecret `json:",inline"`
-
-	// The key for the Che admin username in the secret values map
-	// +optional
-	CheAdminUsernameKey *string `json:"cheAdminUsernameKey,omitempty"`
-
-	// The key for the Che admin password in the secret values map
-	// +optional
-	CheAdminPasswordKey *string `json:"cheAdminPasswordKey,omitempty"`
-}
-
 // Defines all parameters concerned with the console
 // +k8s:openapi-gen=true
 type ConsoleConfig struct {

api/v1alpha1/memberoperatorconfig_types.go

@@ -21,10 +21,6 @@ type MemberStatusStatus struct {
 	// Important: Run "operator-sdk generate k8s" to regenerate code after modifying this file
 	// Add custom validation using kubebuilder tags: https://book.kubebuilder.io/beyond_basics/generating_crd.html
 
-	// Che is the status of Che/CRW, such as installed and whether the member configuration is correct
-	// +optional
-	Che *CheStatus `json:"che,omitempty"`
-
 	// MemberOperator is the status of a toolchain member operator
 	// +optional
 	MemberOperator *MemberOperatorStatus `json:"memberOperator,omitempty"`
@@ -50,35 +46,18 @@ type MemberStatusStatus struct {
 	// +optional
 	ResourceUsage ResourceUsage `json:"resourceUsage,omitempty"`
 
-	// Routes/URLs of the cluster, such as Console and Che Dashboard URLs
+	// Routes/URLs of the cluster, such as Console
 	// +optional
 	Routes *Routes `json:"routes,omitempty"`
 }
 
-// CheStatus contains information about the status of Che/CRW, such as installed and whether the member configuration is correct
-// +k8s:openapi-gen=true
-type CheStatus struct {
-	// Conditions is an array of current Che status conditions
-	// Supported condition types: ConditionReady
-	// +optional
-	// +patchMergeKey=type
-	// +patchStrategy=merge
-	// +listType=map
-	// +listMapKey=type
-	Conditions []Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type"`
-}
-
 // Routes contains information about the public routes available to the user in the cluster
 // +k8s:openapi-gen=true
 type Routes struct {
 	// ConsoleURL is the web console URL of the cluster
 	// +optional
 	ConsoleURL string `json:"consoleURL,omitempty"`
 
-	// CheDashboardURL is the Che Dashboard URL of the cluster if Che is installed
-	// +optional
-	CheDashboardURL string `json:"cheDashboardURL,omitempty"`
-
 	// Conditions is an array of current member operator status conditions
 	// Supported condition types: ConditionReady
 	// +optional

api/v1alpha1/memberstatus_types.go

@@ -48,16 +48,10 @@ const (
 	ToolchainStatusHostRoutesAvailableReason   = "HostRoutesAvailable"
 
 	// member status reasons
-	ToolchainStatusMemberStatusNotFoundReason                  = "MemberStatusNotFound"
-	ToolchainStatusMemberToolchainClusterMissingReason         = "MemberToolchainClusterMissing"
-	ToolchainStatusMemberStatusConsoleRouteUnavailableReason   = "ConsoleRouteUnavailable"
-	ToolchainStatusMemberStatusRoutesAvailableReason           = "RoutesAvailable"
-	ToolchainStatusMemberStatusCheRouteUnavailableReason       = "CheRouteUnavailable"
-	ToolchainStatusMemberStatusCheUserAPICheckFailedReason     = "CheUserAPICheckFailed"
-	ToolchainStatusMemberStatusCheNotRequiredReason            = "CheNotRequired"
-	ToolchainStatusMemberStatusCheAdminUserNotConfiguredReason = "CheAdminUserNotConfigured"
-	ToolchainStatusMemberStatusCheUserDeletionNotEnabledReason = "CheUserDeletionNotEnabled"
-	ToolchainStatusMemberStatusCheReadyReason                  = "CheReady"
+	ToolchainStatusMemberStatusNotFoundReason                = "MemberStatusNotFound"
+	ToolchainStatusMemberToolchainClusterMissingReason       = "MemberToolchainClusterMissing"
+	ToolchainStatusMemberStatusConsoleRouteUnavailableReason = "ConsoleRouteUnavailable"
+	ToolchainStatusMemberStatusRoutesAvailableReason         = "RoutesAvailable"
 
 	// Metric Keys
 	// MasterUserRecordsPerDomainMetricKey the key to store the metric for the number of MasterUserRecords per email address domain

api/v1alpha1/toolchainstatus_types.go

@@ -206,6 +206,10 @@ type IdentityClaimsEmbedded struct {
 	// Company contains the value of the 'company' claim
 	// +optional
 	Company string `json:"company,omitempty"`
+
+	// AccountNumber contains the value of the 'account_number' claim
+	// +optional
+	AccountNumber string `json:"accountNumber,omitempty"`
 }
 
 // +k8s:openapi-gen=true