Merge branch 'master' into dependabot/github_actions/golangci/golangci-lint-action-8

Author: fbm3307

README.adoc

@@ -9,7 +9,6 @@ For the API reference docs go xref:api/v1alpha1/docs/apiref.adoc[here]
 Requires:
 
 * Go version 1.22.x (1.22.12 or higher) - download for your development environment https://golang.org/dl/[here].
-* Operator SDK v1.38.0 - download for your development environment https://v1-36-x.sdk.operatorframework.io/docs/installation/#install-from-github-release[here]
 
 CodeReady ToolChain API is built using https://github.com/golang/go/wiki/Modules[Go modules].
 

api/v1alpha1/docs/apiref.adoc

@@ -2124,6 +2124,16 @@ Consumed by host operator and set as env var on registration-service deployment
 | *`registrationServiceURL`* __string__ | RegistrationServiceURL is the URL used to a ccess the registration service + |  | 
 | *`replicas`* __integer__ | Replicas specifies the number of replicas to use for the registration service deployment + |  | 
 | *`verification`* __xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-registrationserviceverificationconfig[$$RegistrationServiceVerificationConfig$$]__ | Keeps parameters necessary for the registration service verification config + |  | 
+| *`uiCanaryDeploymentWeight`* __integer__ | UICanaryDeploymentWeight specifies the threshold of users that will be using the new UI. +
+This configuration option is just a temporary solution for rolling out our new RHDH based UI using canary deployment strategy. +
+Once we switch all our users to the new UI this will be removed. +
+How this works: +
+- backend returns a weight +
+- old UI assigns a sticky random number for each user +
+- if the user has a number within the weight returned from the backend than user get's redirect to new UI +
+- if the user has a number above the weight they keep using the current UI + |  | Maximum: 100 +
+Minimum: 0 +
+
 |===
 
 

api/v1alpha1/toolchainconfig_types.go

@@ -244,6 +244,20 @@ type RegistrationServiceConfig struct {
 	// Keeps parameters necessary for the registration service verification config
 	// +optional
 	Verification RegistrationServiceVerificationConfig `json:"verification,omitempty"`
+
+	// UICanaryDeploymentWeight specifies the threshold of users that will be using the new UI.
+	// This configuration option is just a temporary solution for rolling out our new RHDH based UI using canary deployment strategy.
+	// Once we switch all our users to the new UI this will be removed.
+	// How this works:
+	// - backend returns a weight
+	// - old UI assigns a sticky random number for each user
+	// - if the user has a number within the weight returned from the backend than user get's redirect to new UI
+	// - if the user has a number above the weight they keep using the current UI
+	//
+	// +optional
+	// +kubebuilder:validation:Minimum=0
+	// +kubebuilder:validation:Maximum=100
+	UICanaryDeploymentWeight *int `json:"uiCanaryDeploymentWeight,omitempty"`
 }
 
 // RegistrationServiceAnalyticsConfig contains the subset of registration service configuration parameters related to analytics

api/v1alpha1/zz_generated.deepcopy.go

@@ -6,25 +6,26 @@ toolchain go1.22.12
 
 require (
 	github.com/go-bindata/go-bindata v3.1.2+incompatible
-	// using latest commit from 'github.com/openshift/api branch release-4.17'
-	github.com/openshift/api v0.0.0-20250214103856-0cfc958f642b
-	k8s.io/api v0.30.1
-	k8s.io/apimachinery v0.30.1
-	k8s.io/code-generator v0.30.1
+	// using latest commit from 'github.com/openshift/api branch release-4.18'
+	github.com/openshift/api v0.0.0-20250410062700-d6c84c55a124
+	k8s.io/api v0.31.2
+	k8s.io/apimachinery v0.31.2
+	k8s.io/code-generator v0.31.2
 	k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01
 	k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340
-	sigs.k8s.io/controller-runtime v0.18.4
-	sigs.k8s.io/controller-tools v0.15.0
+	sigs.k8s.io/controller-runtime v0.19.7
+	sigs.k8s.io/controller-tools v0.16.5
 )
 
 require (
 	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
-	github.com/fatih/color v1.16.0 // indirect
-	github.com/go-logr/logr v1.4.1 // indirect
+	github.com/fatih/color v1.18.0 // indirect
+	github.com/fxamacker/cbor/v2 v2.7.0 // indirect
+	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-openapi/jsonpointer v0.19.6 // indirect
 	github.com/go-openapi/jsonreference v0.20.2 // indirect
-	github.com/go-openapi/swag v0.22.3 // indirect
-	github.com/gobuffalo/flect v1.0.2 // indirect
+	github.com/go-openapi/swag v0.22.4 // indirect
+	github.com/gobuffalo/flect v1.0.3 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/gnostic-models v0.6.8 // indirect
@@ -37,22 +38,23 @@ require (
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/spf13/cobra v1.8.0 // indirect
+	github.com/spf13/cobra v1.8.1 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	golang.org/x/mod v0.17.0 // indirect
+	github.com/x448/float16 v0.8.4 // indirect
+	golang.org/x/mod v0.21.0 // indirect
 	golang.org/x/net v0.33.0 // indirect
 	golang.org/x/sync v0.10.0 // indirect
 	golang.org/x/sys v0.28.0 // indirect
 	golang.org/x/text v0.21.0 // indirect
-	golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
-	google.golang.org/protobuf v1.33.0 // indirect
+	golang.org/x/tools v0.26.0 // indirect
+	google.golang.org/protobuf v1.34.2 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/apiextensions-apiserver v0.30.1 // indirect
+	k8s.io/apiextensions-apiserver v0.31.2 // indirect
 	k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
-	k8s.io/klog/v2 v2.120.1 // indirect
-	k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
+	k8s.io/klog/v2 v2.130.1 // indirect
+	k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
 	sigs.k8s.io/yaml v1.4.0 // indirect