Bump to go1.24 and upgrade argocd to 2.14.17 #2433
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| FROM registry.access.redhat.com/ubi8/go-toolset:1.24.6-1756315360 AS build | ||
| USER root | ||
| ENV GOFLAGS="-mod=mod" | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -94,8 +94,8 @@ github.com/antihax/optional v1.0.0 h1:xK2lYat7ZLaVVcIuj82J8kIro4V6kDe0AUDFboUCwc | |
| github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= | ||
| github.com/argoproj-labs/argocd-operator v0.14.0 h1:ksHsdV5hC8u275PWU746EXB/c09g7UzdJPdkIqDQwjU= | ||
| github.com/argoproj-labs/argocd-operator v0.14.0/go.mod h1:UHe70eXnnCEfzp7EWRofMU+BFnPgZiT5OSqpuInEARA= | ||
| github.com/argoproj/argo-cd/v2 v2.14.17 h1:r/CkYKzHoPjGgJ/4/fdubUVpG+LBj6AtOigbitNHgy4= | ||
| github.com/argoproj/argo-cd/v2 v2.14.17/go.mod h1:CF9GX0CjKiszpAnvYNCLV5tLSVqgfOgn/tcOt2VHTQo= | ||
| github.com/argoproj/gitops-engine v0.7.1-0.20250521000818-c08b0a72c1f1 h1:Ze4U6kV49vSzlUBhH10HkO52bYKAIXS4tHr/MlNDfdU= | ||
| github.com/argoproj/gitops-engine v0.7.1-0.20250521000818-c08b0a72c1f1/go.mod h1:WsnykM8idYRUnneeT31cM/Fq/ZsjkefCbjiD8ioCJkU= | ||
| github.com/argoproj/pkg v0.13.7-0.20230626144333-d56162821bd1 h1:qsHwwOJ21K2Ao0xPju1sNuqphyMnMYkyB3ZLoLtxWpo= | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,7 +3,6 @@ package handlers | |
|
|
||
| import ( | ||
| "encoding/json" | ||
| "io" | ||
| "net/http" | ||
| "regexp" | ||
|
|
@@ -376,7 +375,7 @@ func (h adminCentralHandler) GetTrait(w http.ResponseWriter, r *http.Request) { | |
| return nil, svcErr | ||
| } | ||
| if !arrays.Contains(cr.Traits, trait) { | ||
| return nil, errors.NotFound("Trait %q not found", trait) | ||
| } | ||
| return nil, nil | ||
| }, | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -287,7 +287,7 @@ func (k *centralService) RegisterCentralJob(ctx context.Context, centralRequest | |
| } else if !hasCapacity { | ||
| errorMsg := fmt.Sprintf("Cluster capacity(%d) exhausted in %s region", int64(k.dataplaneClusterConfig.ClusterConfig.GetCapacityForRegion(centralRequest.Region)), centralRequest.Region) | ||
| logger.Logger.Warningf(errorMsg) | ||
| return errors.TooManyCentralInstancesReached("%s", errorMsg) | ||
| } | ||
|
|
||
| instanceType := k.DetectInstanceType(centralRequest) | ||
|
|
@@ -298,7 +298,7 @@ func (k *centralService) RegisterCentralJob(ctx context.Context, centralRequest | |
| if e != nil || cluster == nil { | ||
| msg := fmt.Sprintf("No available cluster found for '%s' central instance in region: '%s'", centralRequest.InstanceType, centralRequest.Region) | ||
| logger.Logger.Errorf(msg) | ||
| return errors.TooManyCentralInstancesReached("Region %s cannot accept instance type: %s at this moment", centralRequest.Region, centralRequest.InstanceType) | ||
| } | ||
| centralRequest.ClusterID = cluster.ClusterID | ||
| subscriptionID, err := k.reserveQuota(ctx, centralRequest, "", "") | ||
|
|
@@ -747,7 +747,7 @@ func (k *centralService) VerifyAndUpdateCentralAdmin(ctx context.Context, centra | |
| return errors.NewWithCause(errors.ErrorGeneral, svcErr, "Unable to find cluster associated with central request: %s", centralRequest.ID) | ||
| } | ||
| if cluster == nil { | ||
| return errors.New(errors.ErrorValidation, "Unable to get cluster for central %s", centralRequest.ID) | ||
| } | ||
|
|
||
| return k.UpdateIgnoreNils(centralRequest) | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,7 +3,6 @@ package quota | |
|
|
||
| import ( | ||
| "context" | ||
| "net/http" | ||
| "time" | ||
|
|
||
|
|
@@ -50,9 +49,9 @@ func (q amsQuotaService) HasQuotaAllowance(central *dbapi.CentralRequest, instan | |
| quotaType := instanceType.GetQuotaType() | ||
| quotaCosts, err := q.amsClient.GetQuotaCostsForProduct(org.ID(), quotaType.GetResourceName(), quotaType.GetProduct()) | ||
| if err != nil { | ||
| return false, errors.NewWithCause(errors.ErrorGeneral, err, | ||
| "failed to get assigned quota of type %q for organization with external id %q and id %q", | ||
| quotaType, central.OrganisationID, org.ID()) | ||
| } | ||
|
|
||
| quotaCostsByModel, unsupportedModels := mapAllowedQuotaCosts(quotaCosts) | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -95,12 +95,12 @@ func (q QuotaManagementListService) ReserveQuota(_ context.Context, central *dba | |
| if quotaManagementListItem.IsInstanceCountWithinLimit(totalInstanceCount) { | ||
| return "", nil | ||
| } | ||
| return "", errors.MaximumAllowedInstanceReached("%s", message) | ||
| } | ||
|
|
||
| if instanceType == types.EVAL && quotaManagementListItem == nil { | ||
| if totalInstanceCount >= quotamanagement.GetDefaultMaxAllowedInstances() { | ||
| return "", errors.MaximumAllowedInstanceReached("%s", message) | ||
| } | ||
| return "", nil | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -142,7 +142,7 @@ func TestCentral_Delete(t *testing.T) { | |
| ocmServerBuilder := mocks.NewMockConfigurableServerBuilder() | ||
| mockedGetClusterResponse, err := mockedClusterWithMetricsInfo(mocks.MockClusterComputeNodes) | ||
| if err != nil { | ||
| t.Fatalf("%s", err.Error()) | ||
| } | ||
| ocmServerBuilder.SetClusterGetResponse(mockedGetClusterResponse, nil) | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -28,7 +28,7 @@ func TestDataPlaneClusterStatus(t *testing.T) { | |
| ocmServerBuilder := mocks.NewMockConfigurableServerBuilder() | ||
| mockedGetClusterResponse, err := mockedClusterWithMetricsInfo(mocks.MockClusterComputeNodes) | ||
| if err != nil { | ||
| t.Fatalf("%s", err.Error()) | ||
| } | ||
|
|
||
| ocmServerBuilder.SetClusterGetResponse(mockedGetClusterResponse, nil) | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -28,7 +28,7 @@ func termsRequiredSetup(termsRequired bool, t *testing.T) TestEnv { | |
| ocmServerBuilder := mocks.NewMockConfigurableServerBuilder() | ||
| termsReviewResponse, err := mocks.GetMockTermsReviewBuilder(nil).TermsRequired(termsRequired).Build() | ||
| if err != nil { | ||
| t.Fatalf("%s", err.Error()) | ||
| } | ||
| ocmServerBuilder.SetTermsReviewPostResponse(termsReviewResponse, nil) | ||
| ocmServer := ocmServerBuilder.Build() | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,11 +17,7 @@ func SendNotFound(w http.ResponseWriter, r *http.Request) { | |
| w.Header().Set("Content-Type", "application/json") | ||
|
|
||
| // Prepare the body: | ||
| apiError := errors.NotFound("The requested resource '%s' doesn't exist", r.URL.Path).AsOpenapiError("", r.RequestURI) | ||
| data, err := json.Marshal(apiError) | ||
| if err != nil { | ||
| SendPanic(w, r) | ||
|
|
@@ -41,8 +37,7 @@ func SendNotFound(w http.ResponseWriter, r *http.Request) { | |
|
|
||
| // SendMethodNotAllowed response | ||
| func SendMethodNotAllowed(w http.ResponseWriter, r *http.Request) { | ||
| apiError := errors.NotImplemented("Method: %s is not allowed or not yet implemented for %s", r.Method, r.URL.Path).AsOpenapiError("", r.RequestURI) | ||
| jsonPayload, err := json.Marshal(apiError) | ||
| if err != nil { | ||
| SendPanic(w, r) | ||
|
|
@@ -87,7 +82,7 @@ func SendServiceUnavailable(w http.ResponseWriter, r *http.Request, reason strin | |
| w.Header().Set("Content-Type", "application/json") | ||
| w.WriteHeader(http.StatusServiceUnavailable) | ||
|
|
||
| apiError := errors.GeneralError("%s", reason).AsOpenapiError("", r.RequestURI) | ||
| jsonPayload, err := json.Marshal(apiError) | ||
| if err != nil { | ||
| SendPanic(w, r) | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,7 +11,7 @@ func TestResourceIDGeneration(t *testing.T) { | |
| errors := validation.IsDNS1123Label(id) | ||
| if len(errors) > 0 { | ||
| for _, e := range errors { | ||
| t.Fatalf("%s", e) | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -123,7 +123,7 @@ func (c *client) CreateCluster(cluster *clustersmgmtv1.Cluster) (*clustersmgmtv1 | |
| clusterResource := c.connection.ClustersMgmt().V1().Clusters() | ||
| response, err := clusterResource.Add().Body(cluster).Send() | ||
| if err != nil { | ||
| return &clustersmgmtv1.Cluster{}, serviceErrors.New(serviceErrors.ErrorGeneral, "%s", err.Error()) | ||
| } | ||
| createdCluster := response.Body() | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -314,7 +314,7 @@ func ToServiceError(err error) *ServiceError { | |
| case *ServiceError: | ||
| return convertedErr | ||
| default: | ||
| return GeneralError("%s", convertedErr.Error()) | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -398,7 +398,7 @@ func (e *ServiceError) AsError() error { | |
| if e == nil { | ||
| return nil | ||
| } | ||
| return fmt.Errorf("%s", e.Error()) | ||
| } | ||
|
|
||
| // Is404 ... | ||
|
|
@@ -693,5 +693,5 @@ func FailedClusterAuthorization(err error) *ServiceError { | |
| if svcErr.IsForbidden() { | ||
| reason += " - please contact your administrator to ensure that your Red Hat account has the RedhatManagedCluster permission." | ||
| } | ||
| return NewWithCause(svcErr.Code, svcErr, "%s", reason) | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,9 @@ | ||
| FROM --platform=$BUILDPLATFORM registry.access.redhat.com/ubi8/go-toolset:1.24.6-1756315360 AS build | ||
| USER root | ||
| ENV GOFLAGS="-mod=mod" | ||
|
|
||
| RUN mkdir /src | ||
| WORKDIR /src | ||
|
Member
Author
There was a problem hiding this comment. Looks like a debugging leftover |
||
| COPY go.* ./ | ||
| RUN go mod download | ||
| COPY . ./ | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice